geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r448482 - in /geronimo/sandbox/javaee5: assemblies-jee5/geronimo-jetty6-jee5/ assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/ configs-jee5/ configs-jee5/dojo-jetty6/ configs-jee5/webconsole-jetty6/
Date Thu, 21 Sep 2006 07:43:48 GMT
Author: djencks
Date: Thu Sep 21 00:43:47 2006
New Revision: 448482

URL: http://svn.apache.org/viewvc?view=rev&rev=448482
Log:
demonstrate the webconsole working on jetty6 modulo JETTY-124

Added:
    geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/
      - copied from r448417, geronimo/server/trunk/configs/dojo-jetty/
    geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/
      - copied from r448417, geronimo/server/trunk/configs/webconsole-jetty/
Modified:
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml?view=diff&rev=448482&r1=448481&r2=448482
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml Thu Sep 21 00:43:47
2006
@@ -231,14 +231,14 @@
             <type>car</type>
         </dependency>
         
-        
+-->        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webconsole-jetty</artifactId>
+            <artifactId>webconsole-jetty6</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+<!--        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=448482&r1=448481&r2=448482
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
(original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
Thu Sep 21 00:43:47 2006
@@ -135,9 +135,10 @@
     <module name="org.apache.geronimo.configs/jetty6-deployer/${pom.version}/car"/>
 <!--    
     <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
-    
-    <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
-    
+-->
+    <module name="org.apache.geronimo.configs/dojo-jetty6/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/webconsole-jetty6/${pom.version}/car"/>
+<!--    
     <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>

Modified: geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml?view=diff&rev=448482&r1=448417&r2=448482
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml Thu Sep 21 00:43:47 2006
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <artifactId>configs-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>dojo-jetty</artifactId>
+    <artifactId>dojo-jetty6</artifactId>
     <name>Geronimo Configs :: Dojo app jetty</name>
     <packaging>car</packaging>
     
@@ -36,7 +36,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>jetty6-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -67,7 +67,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${clientDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${axisDeployer}</deploymentConfig>

Modified: geronimo/sandbox/javaee5/configs-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/pom.xml?view=diff&rev=448482&r1=448481&r2=448482
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/pom.xml Thu Sep 21 00:43:47 2006
@@ -47,7 +47,7 @@
         <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
+        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${pom.version}/car</jetty6Deployer>
         
         <!-- Common plan properties -->
         <PlanServerHostname>localhost</PlanServerHostname>
@@ -116,6 +116,8 @@
         <module>transaction-jta11</module>
         <module>jetty6</module>
         <module>jetty6-deployer</module>
+        <module>dojo-jetty6</module>
+        <module>webconsole-jetty6</module>
     </modules>
     
 </project>

Modified: geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml?view=diff&rev=448482&r1=448417&r2=448482
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml Thu Sep 21 00:43:47 2006
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <artifactId>configs-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>webconsole-jetty</artifactId>
+    <artifactId>webconsole-jetty6</artifactId>
     <name>Geronimo Configs :: WebConsole Jetty</name>
     <packaging>car</packaging>
 
@@ -43,7 +43,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>jetty6-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty</artifactId>
+            <artifactId>dojo-jetty6</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -154,7 +154,8 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.console</groupId>



Mime
View raw message