geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r485918 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-jee5/pom.xml assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml assemblies/pom.xml configs/welcome-jetty/pom.xml
Date Mon, 11 Dec 2006 22:19:46 GMT
Author: jbohn
Date: Mon Dec 11 14:19:45 2006
New Revision: 485918

URL: http://svn.apache.org/viewvc?view=rev&rev=485918
Log:
GERONIMO-2642 Updates for Welcome app in Jetty6
Note:  Welcome is set as load=false in config.xml due to what looks to be a jetty bug. When
Welcome is running with context "/" it seems to break web console with context "/console"
which results in 404 errors for web console.

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/configs/welcome-jetty/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=485918&r1=485917&r2=485918
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Mon Dec 11 14:19:45 2006
@@ -267,7 +267,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-<!--
+ 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
@@ -275,7 +275,6 @@
             <type>car</type>
         </dependency>
 
--->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webconsole-jetty6</artifactId>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=485918&r1=485917&r2=485918
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Mon
Dec 11 14:19:45 2006
@@ -205,10 +205,11 @@
     </module>
 
     <module name="org.apache.geronimo.configs/jetty6-deployer/${version}/car"/>
-<!--    
-    <module name="org.apache.geronimo.configs/welcome-jetty/${version}/car"/>
--->
+        
+    <module load="false" name="org.apache.geronimo.configs/welcome-jetty/${version}/car"/>
+
     <module name="org.apache.geronimo.configs/dojo-jetty6/${version}/car"/>
+
     <module name="org.apache.geronimo.configs/webconsole-jetty6/${version}/car"/>
 <!--    
     <module name="org.apache.geronimo.configs/uddi-jetty/${version}/car"/>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=485918&r1=485917&r2=485918
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Mon Dec 11 14:19:45 2006
@@ -72,7 +72,6 @@
         <module>geronimo-boilerplate-j2ee</module>
         <module>geronimo-boilerplate-jee5</module>
         <module>geronimo-framework</module>
-        <module>geronimo-jetty-j2ee</module>
         <module>geronimo-jetty-minimal</module>
         <module>geronimo-jetty6-jee5</module>
         <module>geronimo-tomcat6-jee5</module>

Modified: geronimo/server/trunk/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/pom.xml?view=diff&rev=485918&r1=485917&r2=485918
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/pom.xml Mon Dec 11 14:19:45 2006
@@ -52,7 +52,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>jetty6-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -75,7 +75,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>



Mime
View raw message