mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
The infamous JavaScript Debugger is now available in the Web-tier (Web-Framework):
- set this log level: log4j.logger.org.alfresco.web.scripts.AlfrescoScriptDebugger=debug - or use this webscript: [your-web-server]/slingshot/service/api/javascript/debugger The usual repo JavaScript Debugger is available here: - set this log level: log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=debug - or use this webscript: [your-repo-server]/alfresco/service/api/javascript/debugger You can use both debuggers at the same time if required. Rewrite of the bizare IProxy code in the javascript debugger class - which in turn fixes the bug ALFCOM-1743 where closing the JavaScript debugger window would have caused all future JavaScripts to block until the server was restarted. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
@@ -1,6 +0,0 @@
|
|||||||
<webscript>
|
|
||||||
<shortname>Javascript Debugger</shortname>
|
|
||||||
<description>Javascript Debugger</description>
|
|
||||||
<url>/api/javascript/debugger</url>
|
|
||||||
<authentication>admin</authentication>
|
|
||||||
</webscript>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
|
||||||
<head>
|
|
||||||
<title>Alfresco Javascript Debugger</title>
|
|
||||||
<link rel="stylesheet" href="${url.context}/css/main.css" TYPE="text/css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<form action="${url.serviceContext}${url.match}" method="post">
|
|
||||||
<input type="hidden" name="visible" value="<#if visible>false<#else>true</#if>">
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
|
|
||||||
<td><nobr><span class="mainTitle">Alfresco Javascript Debugger</span></nobr></td>
|
|
||||||
</tr>
|
|
||||||
<tr><td><td>Alfresco ${server.edition} v${server.version}
|
|
||||||
<tr><td><td>Currently <#if visible>enabled<#else>disabled</#if>.
|
|
||||||
<input type="submit" name="submit" value="<#if visible>Disable<#else>Enable</#if>">
|
|
||||||
</table>
|
|
||||||
</form>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<webscript>
|
|
||||||
<shortname>Javascript Debugger Maintenance</shortname>
|
|
||||||
<description>Javascript Debugger Maintenance</description>
|
|
||||||
<url>/api/javascript/debugger?active={active?}</url>
|
|
||||||
<authentication>admin</authentication>
|
|
||||||
</webscript>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
|
||||||
<head>
|
|
||||||
<title>Alfresco Javascript Debugger</title>
|
|
||||||
<link rel="stylesheet" href="${url.context}/css/main.css" TYPE="text/css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<form action="${url.serviceContext}${url.match}" method="post">
|
|
||||||
<input type="hidden" name="visible" value="<#if visible>false<#else>true</#if>">
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td><img src="${url.context}/images/logo/AlfrescoLogo32.png" alt="Alfresco" /></td>
|
|
||||||
<td><nobr><span class="mainTitle">Alfresco Javascript Debugger</span></nobr></td>
|
|
||||||
</tr>
|
|
||||||
<tr><td><td>Alfresco ${server.edition} v${server.version}
|
|
||||||
<tr><td><td>Currently <#if visible>enabled<#else>disabled</#if>.
|
|
||||||
<input type="submit" name="submit" value="<#if visible>Disable<#else>Enable</#if>">
|
|
||||||
</table>
|
|
||||||
</form>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -141,10 +141,10 @@
|
|||||||
<!-- -->
|
<!-- -->
|
||||||
|
|
||||||
<!-- Javascript APIs -->
|
<!-- Javascript APIs -->
|
||||||
<bean id="webscript.org.alfresco.jsdebugger.get" class="org.alfresco.repo.web.scripts.bean.JavascriptDebugger" parent="webscript">
|
<bean id="webscript.org.alfresco.jsdebugger.get" class="org.alfresco.web.scripts.bean.JavascriptDebugger" parent="webscript">
|
||||||
<property name="debugger" ref="rhinoScriptDebugger" />
|
<property name="debugger" ref="rhinoScriptDebugger" />
|
||||||
</bean>
|
</bean>
|
||||||
<bean id="webscript.org.alfresco.jsdebugger.post" class="org.alfresco.repo.web.scripts.bean.JavascriptDebuggerPost" parent="webscript">
|
<bean id="webscript.org.alfresco.jsdebugger.post" class="org.alfresco.web.scripts.bean.JavascriptDebuggerPost" parent="webscript">
|
||||||
<property name="debugger" ref="rhinoScriptDebugger" />
|
<property name="debugger" ref="rhinoScriptDebugger" />
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
|
* As a special exception to the terms and conditions of version 2.0 of
|
||||||
|
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||||
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||||
|
* FLOSS exception. You should have recieved a copy of the text describing
|
||||||
|
* the FLOSS exception, and it is also available here:
|
||||||
|
* http://www.alfresco.com/legal/licensing"
|
||||||
|
*/
|
||||||
|
package org.alfresco.repo.web.scripts;
|
||||||
|
|
||||||
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||||
|
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
||||||
|
import org.alfresco.web.scripts.AlfrescoScriptDebugger;
|
||||||
|
import org.apache.commons.logging.Log;
|
||||||
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
import org.mozilla.javascript.ContextFactory;
|
||||||
|
import org.mozilla.javascript.tools.debugger.Dim;
|
||||||
|
import org.mozilla.javascript.tools.debugger.SwingGui;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Alfresco implementation of Rhino JavaScript debugger
|
||||||
|
*
|
||||||
|
* Provides support for authenticated access to object inspection.
|
||||||
|
*
|
||||||
|
* @author davidc
|
||||||
|
*/
|
||||||
|
public class AlfrescoRhinoScriptDebugger extends AlfrescoScriptDebugger
|
||||||
|
{
|
||||||
|
private static final Log logger = LogFactory.getLog(AlfrescoRhinoScriptDebugger.class);
|
||||||
|
|
||||||
|
// Logger
|
||||||
|
private ContextFactory factory = null;
|
||||||
|
private SwingGui gui = null;
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void initDebugger()
|
||||||
|
{
|
||||||
|
dim = new AlfrescoDim();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void start()
|
||||||
|
{
|
||||||
|
if (logger.isDebugEnabled())
|
||||||
|
{
|
||||||
|
activate();
|
||||||
|
show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static class AlfrescoDim extends Dim
|
||||||
|
{
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see org.mozilla.javascript.tools.debugger.Dim#objectToString(java.lang.Object)
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String objectToString(final Object arg0)
|
||||||
|
{
|
||||||
|
// execute command in context of currently selected user
|
||||||
|
return AuthenticationUtil.runAs(new RunAsWork<String>()
|
||||||
|
{
|
||||||
|
@SuppressWarnings("synthetic-access")
|
||||||
|
public String doWork() throws Exception
|
||||||
|
{
|
||||||
|
return AlfrescoDim.super.objectToString(arg0);
|
||||||
|
}
|
||||||
|
}, AuthenticationUtil.getSystemUserName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License
|
|
||||||
* as published by the Free Software Foundation; either version 2
|
|
||||||
* of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
* As a special exception to the terms and conditions of version 2.0 of
|
|
||||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
||||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
||||||
* FLOSS exception. You should have recieved a copy of the text describing
|
|
||||||
* the FLOSS exception, and it is also available here:
|
|
||||||
* http://www.alfresco.com/legal/licensing"
|
|
||||||
*/
|
|
||||||
package org.alfresco.repo.web.scripts.bean;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import org.alfresco.repo.jscript.AlfrescoRhinoScriptDebugger;
|
|
||||||
import org.alfresco.web.scripts.DeclarativeWebScript;
|
|
||||||
import org.alfresco.web.scripts.WebScriptRequest;
|
|
||||||
import org.alfresco.web.scripts.Status;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Javascript Debugger
|
|
||||||
*
|
|
||||||
* @author davidc
|
|
||||||
*/
|
|
||||||
public class JavascriptDebugger extends DeclarativeWebScript
|
|
||||||
{
|
|
||||||
// dependencies
|
|
||||||
private AlfrescoRhinoScriptDebugger debugger;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param ticketComponent
|
|
||||||
*/
|
|
||||||
public void setDebugger(AlfrescoRhinoScriptDebugger debugger)
|
|
||||||
{
|
|
||||||
this.debugger = debugger;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
|
|
||||||
{
|
|
||||||
// construct model
|
|
||||||
Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
|
|
||||||
model.put("visible", debugger.isVisible());
|
|
||||||
return model;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License
|
|
||||||
* as published by the Free Software Foundation; either version 2
|
|
||||||
* of the License, or (at your option) any later version.
|
|
||||||
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
* As a special exception to the terms and conditions of version 2.0 of
|
|
||||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
||||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
||||||
* FLOSS exception. You should have recieved a copy of the text describing
|
|
||||||
* the FLOSS exception, and it is also available here:
|
|
||||||
* http://www.alfresco.com/legal/licensing"
|
|
||||||
*/
|
|
||||||
package org.alfresco.repo.web.scripts.bean;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import org.alfresco.repo.jscript.AlfrescoRhinoScriptDebugger;
|
|
||||||
import org.alfresco.web.scripts.DeclarativeWebScript;
|
|
||||||
import org.alfresco.web.scripts.WebScriptRequest;
|
|
||||||
import org.alfresco.web.scripts.Status;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Javascript Debugger
|
|
||||||
*
|
|
||||||
* @author davidc
|
|
||||||
*/
|
|
||||||
public class JavascriptDebuggerPost extends DeclarativeWebScript
|
|
||||||
{
|
|
||||||
// dependencies
|
|
||||||
private AlfrescoRhinoScriptDebugger debugger;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param ticketComponent
|
|
||||||
*/
|
|
||||||
public void setDebugger(AlfrescoRhinoScriptDebugger debugger)
|
|
||||||
{
|
|
||||||
this.debugger = debugger;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.WebScriptResponse)
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
|
|
||||||
{
|
|
||||||
String visibleStr = req.getParameter("visible");
|
|
||||||
boolean visible = Boolean.valueOf(visibleStr);
|
|
||||||
|
|
||||||
if (visible)
|
|
||||||
{
|
|
||||||
debugger.show();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
debugger.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
Map<String, Object> model = new HashMap<String, Object>(7, 1.0f);
|
|
||||||
model.put("visible", debugger.isVisible());
|
|
||||||
return model;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user