geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r570141 - in /geronimo/plugins: debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/ debugviews/trunk/debugviews-jetty/src/plan/ debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/ debugviews/trunk/debugviews-tomcat/sr...
Date Mon, 27 Aug 2007 14:30:43 GMT
Author: pmcmahan
Date: Mon Aug 27 07:30:42 2007
New Revision: 570141

URL: http://svn.apache.org/viewvc?rev=570141&view=rev
Log:
GERONIMO-3413 make dojo install automatically for debugviews instead of declaring prerequisite
on it.
follow convention from other plugins for webapp contexts, /foo-bar vs. /FooBar

Modified:
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml
    geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml
    geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml

Modified: geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=570141&r1=570140&r2=570141&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml
Mon Aug 27 07:30:42 2007
@@ -49,6 +49,7 @@
             plugin to register the web application context for its management portlets.
         </description>
     </prerequisite>
+<!--
     <prerequisite>
         <id>org.apache.geronimo.configs/dojo-jetty6//car</id>
         <resource-type>Web Resources</resource-type>
@@ -57,6 +58,8 @@
             plugin to have access to resources from the dojo library.
         </description>
     </prerequisite>
+-->
+    <dependency>org.apache.geronimo.configs/dojo-jetty6/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.configs/jee-specs/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.plugins/console-core/1.0-SNAPSHOT/jar</dependency>

Modified: geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml?rev=570141&r1=570140&r2=570141&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml Mon Aug 27 07:30:42
2007
@@ -19,7 +19,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
     
     <!-- This is where the files are accessed from. (aka - portletContext) -->
-    <context-root>/DebugViews</context-root>
+    <context-root>/debug-views</context-root>
 
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
@@ -32,31 +32,31 @@
     
     <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JMXViewer]</attribute>
     </gbean>
 
     <gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[LDAPViewer]</attribute>
     </gbean>
 
     <gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[ClassLoaderViewer]</attribute>
     </gbean>
 
     <gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JNDIViewer]</attribute>
     </gbean>
 
     <gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[DependencyViewer]</attribute>
     </gbean>
 

Modified: geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=570141&r1=570140&r2=570141&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Mon Aug 27 07:30:42 2007
@@ -49,15 +49,8 @@
             plugin to register the web application context for its management portlets.
         </description>
     </prerequisite>
-    <prerequisite>
-        <id>org.apache.geronimo.configs/dojo-tomcat//car</id>
-        <resource-type>Web Resources</resource-type>
-        <description>
-            The dojo configuration must be present in order for this
-            plugin to have access to resources from the dojo library.
-        </description>
-    </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</dependency>
+    <dependency>org.apache.geronimo.configs/dojo-tomcat/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.configs/jee-specs/2.1-SNAPSHOT/car</dependency>
     <dependency>org.apache.geronimo.plugins/console-core/1.0-SNAPSHOT/jar</dependency>
     <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>

Modified: geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml?rev=570141&r1=570140&r2=570141&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml Mon Aug 27 07:30:42
2007
@@ -19,7 +19,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
     
     <!-- This is where the files are accessed from. (aka - portletContext) -->
-    <context-root>/DebugViews</context-root>
+    <context-root>/debug-views</context-root>
 
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
@@ -33,31 +33,31 @@
     
     <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JMXViewer]</attribute>
     </gbean>
 
     <gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[LDAPViewer]</attribute>
     </gbean>
 
     <gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[ClassLoaderViewer]</attribute>
     </gbean>
 
     <gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JNDIViewer]</attribute>
     </gbean>
 
     <gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
-        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[DependencyViewer]</attribute>
     </gbean>
 

Modified: geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml?rev=570141&r1=570140&r2=570141&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-jetty/src/plan/plan.xml Mon Aug 27 07:30:42
2007
@@ -19,7 +19,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
     
     <!-- This is where the files are accessed from. (aka - portletContext) -->
-    <context-root>/PlanCreator</context-root>
+    <context-root>/plan-creator</context-root>
 
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
@@ -33,7 +33,7 @@
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Plan Creator</attribute>
-        <attribute name="portletContext">/PlanCreator</attribute>
+        <attribute name="portletContext">/plan-creator</attribute>
         <attribute name="portletList">[PlanCreator]</attribute>
     </gbean>
 </web-app>

Modified: geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml?rev=570141&r1=570140&r2=570141&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
Mon Aug 27 07:30:42 2007
@@ -32,12 +32,12 @@
 
     <servlet-mapping>
         <servlet-name>PlanCreator</servlet-name>
-        <url-pattern>/PlutoInvoker/PlanCreator</url-pattern>
+        <url-pattern>/PlutoInvoker/plan-creator</url-pattern>
     </servlet-mapping>
 
     <security-constraint>
         <web-resource-collection>
-            <web-resource-name>plancreator</web-resource-name>
+            <web-resource-name>plan-creator</web-resource-name>
             <url-pattern>/</url-pattern>
             <http-method>GET</http-method>
             <http-method>POST</http-method>

Modified: geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml?rev=570141&r1=570140&r2=570141&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/plancreator/trunk/plancreator-tomcat/src/plan/plan.xml Mon Aug 27 07:30:42
2007
@@ -19,7 +19,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
     
     <!-- This is where the files are accessed from. (aka - portletContext) -->
-    <context-root>/PlanCreator</context-root>
+    <context-root>/plan-creator</context-root>
 
     <!-- required for pluto cross context dispatches -->
     <cross-context />
@@ -36,7 +36,7 @@
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Plan Creator</attribute>
-        <attribute name="portletContext">/PlanCreator</attribute>
+        <attribute name="portletContext">/plan-creator</attribute>
         <attribute name="portletList">[PlanCreator]</attribute>
     </gbean>
 </web-app>



Mime
View raw message