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 04:32:15 UTC
svn commit: r486002 - in /geronimo/server/trunk: ./ assemblies/
assemblies/geronimo-jetty-minimal/
assemblies/geronimo-jetty6-jee5/src/main/var/config/
assemblies/geronimo-jetty6-minimal/ assemblies/geronimo-jetty6-minimal/src/
assemblies/geronimo-jett...
Author: jbohn
Date: Mon Dec 11 19:32:14 2006
New Revision: 486002
URL: http://svn.apache.org/viewvc?view=rev&rev=486002
Log:
Update Jetty minimal assembly for Jetty6
Added:
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/
- copied from r485756, geronimo/server/trunk/assemblies/geronimo-jetty-minimal/
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/LICENSE.txt
- copied unchanged from r485918, geronimo/server/trunk/assemblies/geronimo-jetty-minimal/LICENSE.txt
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/NOTICE.txt
- copied unchanged from r485918, geronimo/server/trunk/assemblies/geronimo-jetty-minimal/NOTICE.txt
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
- copied, changed from r485918, geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/
- copied from r485918, geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/
Removed:
geronimo/server/trunk/assemblies/geronimo-jetty-minimal/
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list
geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list?view=diff&rev=486002&r1=486001&r2=486002
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/offline-deployer-list Mon Dec 11 19:32:14 2006
@@ -23,4 +23,4 @@
org.apache.geronimo.configs/openejb-deployer/${pom.version}/car
org.apache.geronimo.configs/client-deployer/${pom.version}/car
org.apache.geronimo.configs/axis-deployer/${pom.version}/car
-org.apache.geronimo.configs/jetty-deployer/${pom.version}/car
+org.apache.geronimo.configs/jetty6-deployer/${pom.version}/car
Copied: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (from r485918, geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?view=diff&rev=486002&p1=geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml&r1=485918&p2=geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml&r2=486002
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Mon Dec 11 19:32:14 2006
@@ -29,8 +29,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>geronimo-jetty-minimal</artifactId>
- <name>Geronimo Assemblies :: Minimal + Jetty</name>
+ <artifactId>geronimo-jetty6-minimal</artifactId>
+ <name>Geronimo Assemblies :: Minimal + Jetty6</name>
<packaging>application-assembly</packaging>
<description>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty</artifactId>
+ <artifactId>jetty6</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -90,17 +90,19 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty-deployer</artifactId>
+ <artifactId>jetty6-deployer</artifactId>
<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>
@@ -198,7 +200,7 @@
<artifactItems>
<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-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=486002&r1=485918&r2=486002
==============================================================================
--- 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 Mon Dec 11 19:32:14 2006
@@ -55,7 +55,7 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/jetty/${version}/car">
+ <module name="org.apache.geronimo.configs/jetty6/${version}/car">
<gbean name="JettyWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -65,10 +65,11 @@
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPSPortPrimary}</attribute>
</gbean>
- <gbean name="JettyAJP13Connector">
+<!-- <gbean name="JettyAJP13Connector">
<attribute name="host">0.0.0.0</attribute>
<attribute name="port">8009</attribute>
</gbean>
+-->
</module>
<module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
@@ -81,7 +82,7 @@
<module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/jetty-deployer/${version}/car"/>
+ <module name="org.apache.geronimo.configs/jetty6-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
@@ -96,7 +97,9 @@
</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/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list?view=diff&rev=486002&r1=485918&r2=486002
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/offline-deployer-list Mon Dec 11 19:32:14 2006
@@ -26,4 +26,4 @@
org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car
org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car
org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car
-org.apache.geronimo.configs/jetty-deployer/${pom.version}/car
+org.apache.geronimo.configs/jetty6-deployer/${pom.version}/car
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=486002&r1=486001&r2=486002
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Mon Dec 11 19:32:14 2006
@@ -72,7 +72,7 @@
<module>geronimo-boilerplate-j2ee</module>
<module>geronimo-boilerplate-jee5</module>
<module>geronimo-framework</module>
- <module>geronimo-jetty-minimal</module>
+ <module>geronimo-jetty6-minimal</module>
<module>geronimo-jetty6-jee5</module>
<module>geronimo-tomcat6-jee5</module>
<module>geronimo-tomcat6-minimal</module>
Modified: geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml?view=diff&rev=486002&r1=486001&r2=486002
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml Mon Dec 11 19:32:14 2006
@@ -56,7 +56,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>
@@ -73,7 +73,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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=486002&r1=486001&r2=486002
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Dec 11 19:32:14 2006
@@ -1267,7 +1267,7 @@
<assembly>
<id>jetty-minimal</id>
<groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-jetty-minimal</artifactId>
+ <artifactId>geronimo-jetty6-minimal</artifactId>
<version>${version}</version>
<classifier>bin</classifier>
<type>zip</type>