svn commit: r965184 - in /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main: java/org/apache/clerezza/platform/scripting/scriptmanager/ resources/org/apache/clerezza/platform/scripting/scr...

[it...@apache.org]

Author: ito
Date: Sun Jul 18 09:29:07 2010
New Revision: 965184

URL: http://svn.apache.org/viewvc?rev=965184&view=rev
Log:
CLEREZZA-257 menu name and menu entry name change. Access web services via /admin/scripting/

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-install.xhtml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java?rev=965184&r1=965183&r2=965184&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java Sun Jul 18 09:29:07 2010
@@ -92,7 +92,7 @@ import org.wymiwyg.commons.util.dirbrows
 
 /**
  *
- * Script Manager (/admin/script-manager)
+ * Script Manager (/admin/scripting)
  *
  * Allows to install, delete, edit and execute script using a web front end.
  *
@@ -106,7 +106,7 @@ import org.wymiwyg.commons.util.dirbrows
 	@Service(value=GlobalMenuItemsProvider.class)
 })
 @Property(name="javax.ws.rs", boolValue=true)
-@Path("/admin/script-manager")
+@Path("/admin/scripting")
 public class ScriptManager implements GlobalMenuItemsProvider{
 
 	private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -191,7 +191,7 @@ public class ScriptManager implements Gl
 					"script-overview", uriInfo);
 		}
 		return RedirectUtil.createSeeOtherResponse(
-				"script-manager/script-overview", uriInfo);
+				"scripting/script-overview", uriInfo);
 	}
 
 	/**
@@ -827,8 +827,8 @@ public class ScriptManager implements Gl
 		} catch (AccessControlException e) {
 			return items;
 		}
-		items.add(new GlobalMenuItem("/admin/script-manager/", "SCM", "Script Manager", 1,
-				"Dev-Modules"));
+		items.add(new GlobalMenuItem("/admin/scripting/", "SCM", "Scripting", 1,
+				"Development"));
 		return items;
 	}
 }

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml?rev=965184&r1=965183&r2=965184&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml Sun Jul 18 09:29:07 2010
@@ -4,8 +4,8 @@ resultDocModifier.addScriptReference("/s
 resultDocModifier.addScriptReference("/scripts/alert-message.js");
 resultDocModifier.addScriptReference("js/scriptmanager.js");
 resultDocModifier.addScriptReference("js/scriptmanager-execution-uri.js");
-resultDocModifier.setTitle("Script Manager");
-resultDocModifier.addNodes2Elem("tx-module", <h1>Script Manager</h1>);
+resultDocModifier.setTitle("Scripting");
+resultDocModifier.addNodes2Elem("tx-module", <h1>Scripting</h1>);
 
 resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class=""><a href="script-overview">Scripts</a></li>);
 resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class=""><a href="script-install">Install Scripts</a></li>);

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-install.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-install.xhtml?rev=965184&r1=965183&r2=965184&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-install.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-install.xhtml Sun Jul 18 09:29:07 2010
@@ -2,8 +2,8 @@ def sma(s: Any) = new UriRef("http://cle
 def script(s: Any) = new UriRef("http://clerezza.org/2009/07/script#"+s)
 
 resultDocModifier.addScriptReference("js/scriptmanager.js");
-resultDocModifier.setTitle("Script Manager");
-resultDocModifier.addNodes2Elem("tx-module", <h1>Script Manager</h1>);
+resultDocModifier.setTitle("Scripting");
+resultDocModifier.addNodes2Elem("tx-module", <h1>Scripting</h1>);
 
 resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class=""><a href="script-overview">Scripts</a></li>);
 resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Install Scripts</a></li>);

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml?rev=965184&r1=965183&r2=965184&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml Sun Jul 18 09:29:07 2010
@@ -4,8 +4,8 @@ resultDocModifier.addScriptReference("/s
 resultDocModifier.addScriptReference("/scripts/alert-message.js");
 resultDocModifier.addScriptReference("js/scriptmanager.js");
 resultDocModifier.addScriptReference("js/scriptmanager-overview.js");
-resultDocModifier.setTitle("Script Manager");
-resultDocModifier.addNodes2Elem("tx-module", <h1>Script Manager</h1>);
+resultDocModifier.setTitle("Scripting");
+resultDocModifier.addNodes2Elem("tx-module", <h1>Scripting</h1>);
 
 resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class="tx-active"><a href="#">Scripts</a></li>);
 resultDocModifier.addNodes2Elem("tx-module-tabs-ol", <li class=""><a href="script-install">Install Scripts</a></li>);