You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2006/12/12 20:30:36 UTC
svn commit: r486288 - in /geronimo/server/trunk:
assemblies/geronimo-framework/ assemblies/geronimo-jetty6-jee5/
assemblies/geronimo-jetty6-jee5/src/main/var/config/
assemblies/geronimo-jetty6-minimal/
assemblies/geronimo-jetty6-minimal/src/main/var/co...
Author: jbohn
Date: Tue Dec 12 11:30:35 2006
New Revision: 486288
URL: http://svn.apache.org/viewvc?view=rev&rev=486288
Log:
Update jsp-examples-jetty, ldap-demo-jetty, servlet-examples-jetty, and ca-helper-jetty for jetty6
Also update jetty assemblies to include remote-deploy-jetty and ca-helper-jetty (load=false) for consistency with Tomcat
Also fixed dependency in framework assembly
Modified:
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
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/geronimo-jetty6-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
geronimo/server/trunk/configs/ca-helper-jetty/pom.xml
geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Tue Dec 12 11:30:35 2006
@@ -161,7 +161,7 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty-builder</artifactId>
+ <artifactId>geronimo-jetty6-builder</artifactId>
<version>${version}</version>
</artifactItem>
</artifactItems>
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=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Tue Dec 12 11:30:35 2006
@@ -281,14 +281,14 @@
<version>${version}</version>
<type>car</type>
</dependency>
-<!--
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>remote-deploy-jetty</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
--->
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>uddi-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=486288&r1=486287&r2=486288
==============================================================================
--- 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 Tue Dec 12 11:30:35 2006
@@ -211,11 +211,13 @@
<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"/>
+
+ <module name="org.apache.geronimo.configs/uddi-jetty/${version}/car" load="false"/>
<module name="org.apache.geronimo.configs/remote-deploy-jetty/${version}/car"/>
--->
+
<module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
+
+ <module name="org.apache.geronimo.configs/ca-helper-jetty/${version}/car" load="false"/>
</attributes>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?view=diff&rev=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Tue Dec 12 11:30:35 2006
@@ -95,14 +95,12 @@
<type>car</type>
</dependency>
-<!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>remote-deploy-jetty</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
--->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml?view=diff&rev=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml Tue Dec 12 11:30:35 2006
@@ -97,9 +97,7 @@
</gbean>
</module>
-<!--
<module name="org.apache.geronimo.configs/remote-deploy-jetty/${version}/car"/>
--->
<module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
Modified: geronimo/server/trunk/configs/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/pom.xml?view=diff&rev=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-jetty/pom.xml Tue Dec 12 11:30:35 2006
@@ -45,7 +45,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>
@@ -68,7 +68,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${jettyDeployer}</deploymentConfig>
+ <deploymentConfig>${jetty6Deployer}</deploymentConfig>
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.applications</groupId>
Modified: geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml?view=diff&rev=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml Tue Dec 12 11:30:35 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.examples</groupId>
Modified: geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml?view=diff&rev=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml Tue Dec 12 11:30:35 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>
Modified: geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml?view=diff&rev=486288&r1=486287&r2=486288
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml Tue Dec 12 11:30:35 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.examples</groupId>