geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r565478 - in /geronimo/sandbox/portals/plugins/console/trunk: console-jetty/ console-jetty/pom.xml console-jetty/src/main/resources/META-INF/geronimo-plugin.xml console-jetty/src/plan/plan.xml pom.xml
Date Mon, 13 Aug 2007 19:11:07 GMT
Author: pmcmahan
Date: Mon Aug 13 12:11:06 2007
New Revision: 565478

URL: http://svn.apache.org/viewvc?view=rev&rev=565478
Log:
GERONIMO-3345 console plugin for jetty

Added:
    geronimo/sandbox/portals/plugins/console/trunk/console-jetty/
      - copied from r564771, geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/
    geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/plan/plan.xml
      - copied, changed from r565417, geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml
Modified:
    geronimo/sandbox/portals/plugins/console/trunk/console-jetty/pom.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/plugins/console/trunk/pom.xml

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-jetty/pom.xml?view=diff&rev=565478&r1=564771&r2=565478
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-jetty/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-jetty/pom.xml Mon Aug 13 12:11:06
2007
@@ -30,8 +30,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>console-tomcat</artifactId>
-    <name>Geronimo Administration Console Plugin :: Configuration for Tomcat</name>
+    <artifactId>console-jetty</artifactId>
+    <name>Geronimo Administration Console Plugin :: Configuration for Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -175,7 +175,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

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

Copied: geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/plan/plan.xml (from
r565417, geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/plan/plan.xml?view=diff&rev=565478&p1=geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml&r1=565417&p2=geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/plan/plan.xml&r2=565478
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-jetty/src/plan/plan.xml Mon Aug
13 12:11:06 2007
@@ -22,7 +22,7 @@
 
     <module>
         <web>portal-driver.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <dep:environment>
                 <dep:moduleId>
                     <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
@@ -35,14 +35,13 @@
                 <dep:non-overridable-classes />
             </dep:environment>
             <context-root>/console</context-root>
-            <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
         </web-app>
     </module>
 
     <module>
         <web>base-portlets.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <dep:environment>
                 <dep:moduleId>
                     <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
@@ -58,7 +57,6 @@
             </dep:environment>
 
             <context-root>/console-base</context-root>
-            <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
 
 

Modified: geronimo/sandbox/portals/plugins/console/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/pom.xml?view=diff&rev=565478&r1=565477&r2=565478
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/pom.xml Mon Aug 13 12:11:06 2007
@@ -532,6 +532,7 @@
                 <module>console-portal-driver</module>
                 <module>console-ear</module>
                 <module>console-tomcat</module>
+                <module>console-jetty</module>
             </modules>
         </profile>
     </profiles>



Mime
View raw message