geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r569112 - in /geronimo/plugins/jee-management/trunk: jee-management-tomcat/ jee-management-tomcat/pom.xml jee-management-tomcat/src/main/resources/META-INF/geronimo-plugin.xml jee-management-tomcat/src/plan/plan.xml pom.xml
Date Thu, 23 Aug 2007 18:38:21 GMT
Author: pmcmahan
Date: Thu Aug 23 11:38:20 2007
New Revision: 569112

URL: http://svn.apache.org/viewvc?rev=569112&view=rev
Log:
GERONIMO-3413 jee management portlets for tomcat assemblies

Added:
    geronimo/plugins/jee-management/trunk/jee-management-tomcat/
      - copied from r569103, geronimo/plugins/jee-management/trunk/jee-management-jetty/
Modified:
    geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml
    geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/plan/plan.xml
    geronimo/plugins/jee-management/trunk/pom.xml

Modified: geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml?rev=569112&r1=569103&r2=569112&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml (original)
+++ geronimo/plugins/jee-management/trunk/jee-management-tomcat/pom.xml Thu Aug 23 11:38:20
2007
@@ -30,8 +30,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>jee-management-jetty</artifactId>
-    <name>Java EE Management :: Configuration for Jetty</name>
+    <artifactId>jee-management-tomcat</artifactId>
+    <name>Java EE Management :: Configuration for Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -83,7 +83,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=569112&r1=569103&r2=569112&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Thu Aug 23 11:38:20 2007
@@ -19,11 +19,11 @@
 <!-- $Rev$ $Date$ -->
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-    <name>JEE Management -- Jetty</name>
-    <module-id>org.apache.geronimo.plugins/jee-management-jetty/1.0-SNAPSHOT/car</module-id>
+    <name>JEE Management -- Tomcat</name>
+    <module-id>org.apache.geronimo.plugins/jee-management-tomcat/1.0-SNAPSHOT/car</module-id>
     <category>Application</category>
     <description>
-       Geronimo JEE Management for Jetty
+       Geronimo JEE Management for Tomcat
     </description>
 
     <url>http://geronimo.apache.org/</url>
@@ -32,12 +32,12 @@
     <geronimo-version>2.1-SNAPSHOT</geronimo-version>
 
     <prerequisite>
-        <id>org.apache.geronimo.configs/jetty6/2.1-SNAPSHOT/car</id>
+        <id>org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car</id>
         <resource-type>Web Container</resource-type>
         <description>
-            This version of the plugin works with the Geronimo/Jetty distribution.
-            It is not intended to run in the Geronimo/Tomcat distribution.
-            There is a separate version of this application that works with Tomcat.
+            This version of the plugin works with the Geronimo/Tomcat distribution.
+            It is not intended to run in the Geronimo/Jetty distribution.
+            There is a separate version of this application that works with Jetty.
             Please install the version appropriate to your Geronimo distribution.
         </description>
     </prerequisite>

Modified: geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/plan/plan.xml?rev=569112&r1=569103&r2=569112&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/jee-management/trunk/jee-management-tomcat/src/plan/plan.xml Thu Aug
23 11:38:20 2007
@@ -16,7 +16,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
+<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>/jee-management</context-root>
@@ -29,6 +29,7 @@
             </role>
         </role-mappings>
     </security>
+    <cross-context/>
     
     <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Application EARs</attribute>

Modified: geronimo/plugins/jee-management/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/jee-management/trunk/pom.xml?rev=569112&r1=569111&r2=569112&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/pom.xml (original)
+++ geronimo/plugins/jee-management/trunk/pom.xml Thu Aug 23 11:38:20 2007
@@ -290,9 +290,7 @@
 
             <modules>
                 <module>jee-management-portlets</module>
-<!--
                 <module>jee-management-tomcat</module>
--->
                 <module>jee-management-jetty</module>
             </modules>
         </profile>



Mime
View raw message