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/13 19:39:27 UTC
svn commit: r486790 - in /geronimo/server/branches/2.0-M1: ./ configs/
configs/dojo-jetty/ configs/dojo-jetty/src/ configs/dojo-jetty/src/main/
configs/dojo-jetty/src/main/resources/
configs/dojo-jetty/src/main/resources/META-INF/ configs/dojo-jetty/sr...
Author: jbohn
Date: Wed Dec 13 10:39:19 2006
New Revision: 486790
URL: http://svn.apache.org/viewvc?view=rev&rev=486790
Log:
updating poms to regress jetty removal rev. 486291
Added:
geronimo/server/branches/2.0-M1/configs/dojo-jetty/ (props changed)
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/LICENSE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/dojo-jetty/LICENSE.txt
geronimo/server/branches/2.0-M1/configs/dojo-jetty/NOTICE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/dojo-jetty/NOTICE.txt
geronimo/server/branches/2.0-M1/configs/dojo-jetty/pom.xml
- copied, changed from r486290, geronimo/server/trunk/configs/dojo-jetty/pom.xml
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/src/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/main/
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/src/main/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/main/resources/
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/src/main/resources/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/main/resources/META-INF/
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/src/main/resources/META-INF/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/dojo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/plan/
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/src/plan/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/plan/plan.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/dojo-jetty/src/plan/plan.xml
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/site/
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/src/site/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/site/apt/
- copied from r486290, geronimo/server/trunk/configs/dojo-jetty/src/site/apt/
geronimo/server/branches/2.0-M1/configs/dojo-jetty/src/site/site.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/dojo-jetty/src/site/site.xml
geronimo/server/branches/2.0-M1/configs/jetty/ (props changed)
- copied from r486290, geronimo/server/trunk/configs/jetty/
geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/ (props changed)
- copied from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/
geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/LICENSE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/LICENSE.txt
geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/NOTICE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/NOTICE.txt
geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/pom.xml
- copied, changed from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml
geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/src/
- copied from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/
geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/src/plan/
- copied from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/
geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/src/plan/plan.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/src/plan/plan.xml
geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/ (props changed)
- copied from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/
geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/LICENSE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/LICENSE.txt
geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/NOTICE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/NOTICE.txt
geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/pom.xml
- copied, changed from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml
geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/src/
- copied from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/src/
geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/src/plan/
- copied from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/
geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/src/plan/plan.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/src/plan/plan.xml
geronimo/server/branches/2.0-M1/configs/jetty/LICENSE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty/LICENSE.txt
geronimo/server/branches/2.0-M1/configs/jetty/NOTICE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty/NOTICE.txt
geronimo/server/branches/2.0-M1/configs/jetty/pom.xml
- copied, changed from r486290, geronimo/server/trunk/configs/jetty/pom.xml
geronimo/server/branches/2.0-M1/configs/jetty/src/
- copied from r486290, geronimo/server/trunk/configs/jetty/src/
geronimo/server/branches/2.0-M1/configs/jetty/src/main/
- copied from r486290, geronimo/server/trunk/configs/jetty/src/main/
geronimo/server/branches/2.0-M1/configs/jetty/src/main/resources/
- copied from r486290, geronimo/server/trunk/configs/jetty/src/main/resources/
geronimo/server/branches/2.0-M1/configs/jetty/src/main/resources/META-INF/
- copied from r486290, geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/
geronimo/server/branches/2.0-M1/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.0-M1/configs/jetty/src/plan/
- copied from r486290, geronimo/server/trunk/configs/jetty/src/plan/
geronimo/server/branches/2.0-M1/configs/jetty/src/plan/plan.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty/src/plan/plan.xml
geronimo/server/branches/2.0-M1/configs/jetty/src/site/
- copied from r486290, geronimo/server/trunk/configs/jetty/src/site/
geronimo/server/branches/2.0-M1/configs/jetty/src/site/apt/
- copied from r486290, geronimo/server/trunk/configs/jetty/src/site/apt/
geronimo/server/branches/2.0-M1/configs/jetty/src/site/site.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/jetty/src/site/site.xml
geronimo/server/branches/2.0-M1/configs/uddi-jetty/ (props changed)
- copied from r486290, geronimo/server/trunk/configs/uddi-jetty/
geronimo/server/branches/2.0-M1/configs/uddi-jetty/LICENSE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/uddi-jetty/LICENSE.txt
geronimo/server/branches/2.0-M1/configs/uddi-jetty/NOTICE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/uddi-jetty/NOTICE.txt
geronimo/server/branches/2.0-M1/configs/uddi-jetty/pom.xml
- copied, changed from r486290, geronimo/server/trunk/configs/uddi-jetty/pom.xml
geronimo/server/branches/2.0-M1/configs/uddi-jetty/src/
- copied from r486290, geronimo/server/trunk/configs/uddi-jetty/src/
geronimo/server/branches/2.0-M1/configs/uddi-jetty/src/plan/
- copied from r486290, geronimo/server/trunk/configs/uddi-jetty/src/plan/
geronimo/server/branches/2.0-M1/configs/uddi-jetty/src/plan/plan.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/uddi-jetty/src/plan/plan.xml
geronimo/server/branches/2.0-M1/configs/uddi-jetty/src/site/
- copied from r486290, geronimo/server/trunk/configs/uddi-jetty/src/site/
geronimo/server/branches/2.0-M1/configs/uddi-jetty/src/site/apt/
- copied from r486290, geronimo/server/trunk/configs/uddi-jetty/src/site/apt/
geronimo/server/branches/2.0-M1/configs/uddi-jetty/src/site/site.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/uddi-jetty/src/site/site.xml
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/ (props changed)
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/LICENSE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/webconsole-jetty/LICENSE.txt
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/NOTICE.txt
- copied unchanged from r486290, geronimo/server/trunk/configs/webconsole-jetty/NOTICE.txt
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/pom.xml
- copied, changed from r486290, geronimo/server/trunk/configs/webconsole-jetty/pom.xml
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/main/
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/main/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/main/resources/
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/main/resources/META-INF/
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/META-INF/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/main/resources/META-INF/geronimo-plugin.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/plan/
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/plan/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/plan/plan.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/site/
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/site/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/site/apt/
- copied from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/site/apt/
geronimo/server/branches/2.0-M1/configs/webconsole-jetty/src/site/site.xml
- copied unchanged from r486290, geronimo/server/trunk/configs/webconsole-jetty/src/site/site.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/ (props changed)
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/LICENSE.txt
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/LICENSE.txt
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/NOTICE.txt
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/NOTICE.txt
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/pom.xml
- copied, changed from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/java/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/java/org/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/java/org/apache/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/schema/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/schema/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/schema/geronimo-jetty-1.2.xsd
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/schema/geronimo-jetty-1.2.xsd
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/schema/geronimo-jetty-config-1.0.xsd
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/schema/geronimo-jetty-config-1.0.xsd
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/main/schema/xmlconfig.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/main/schema/xmlconfig.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/site/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/site/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/site/apt/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/site/apt/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/site/site.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/site/site.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Filter1.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Filter1.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Filter2.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Filter2.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Servlet1.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Servlet1.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Servlet2.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/app/Servlet2.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/MockResourceEnvironmentSetter.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/MockResourceEnvironmentSetter.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/StartupOrderComparatorTest.java
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/StartupOrderComparatorTest.java
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/data/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/data/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/data/groups.properties
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/data/groups.properties
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/data/login.config
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/data/login.config
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/data/users.properties
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/data/users.properties
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/foo/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/foo/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/foo/Foo.class
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/foo/Foo.class
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/servlet/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/servlet/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/servlet/Servlet.class
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/javax/servlet/Servlet.class
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/mx4j/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/mx4j/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/mx4j/MBeanDescription.class
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/cltest/mx4j/MBeanDescription.class
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/META-INF/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/META-INF/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/META-INF/MANIFEST.MF
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/META-INF/MANIFEST.MF
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/WEB-INF/web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/index.jsp
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war-spaces-in-context/index.jsp
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/WEB-INF/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/WEB-INF/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/WEB-INF/web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/WEB-INF/web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/hello.txt
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war1/hello.txt
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war2.war
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war2.war
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/WEB-INF/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/WEB-INF/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/WEB-INF/web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/WEB-INF/web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/auth/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/auth/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/auth/logon.html
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/auth/logon.html
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/auth/logonError.html
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/auth/logonError.html
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/protected/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/protected/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/protected/hello.txt
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war3/protected/hello.txt
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/WEB-INF/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/WEB-INF/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/WEB-INF/web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/WEB-INF/web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/war/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war4/war/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/WEB-INF/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/WEB-INF/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/WEB-INF/geronimo-jetty.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/WEB-INF/geronimo-jetty.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/WEB-INF/web.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war5/WEB-INF/web.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/deployables/war6.war
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/deployables/war6.war
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan1.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan1.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan1A.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan1A.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan1B.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan1B.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan1C.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan1C.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan2.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan2.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan3.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan3.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan4-converted.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan4-converted.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/plans/plan4.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/plans/plan4.xml
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/services/
- copied from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/services/
geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/src/test/resources/services/local.xml
- copied unchanged from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/src/test/resources/services/local.xml
Modified:
geronimo/server/branches/2.0-M1/configs/pom.xml
geronimo/server/branches/2.0-M1/modules/pom.xml
geronimo/server/branches/2.0-M1/pom.xml
Propchange: geronimo/server/branches/2.0-M1/configs/dojo-jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 10:39:19 2006
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Copied: geronimo/server/branches/2.0-M1/configs/dojo-jetty/pom.xml (from r486290, geronimo/server/trunk/configs/dojo-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/dojo-jetty/pom.xml?view=diff&rev=486790&p1=geronimo/server/trunk/configs/dojo-jetty/pom.xml&r1=486290&p2=geronimo/server/branches/2.0-M1/configs/dojo-jetty/pom.xml&r2=486790
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/dojo-jetty/pom.xml Wed Dec 13 10:39:19 2006
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Propchange: geronimo/server/branches/2.0-M1/configs/jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 10:39:19 2006
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Propchange: geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 10:39:19 2006
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Copied: geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/pom.xml (from r486290, geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/pom.xml?view=diff&rev=486790&p1=geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml&r1=486290&p2=geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/pom.xml&r2=486790
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/jetty-clustering-builder-wadi/pom.xml Wed Dec 13 10:39:19 2006
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Propchange: geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 10:39:19 2006
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Copied: geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/pom.xml (from r486290, geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/pom.xml?view=diff&rev=486790&p1=geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml&r1=486290&p2=geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/pom.xml&r2=486790
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/jetty-clustering-wadi/pom.xml Wed Dec 13 10:39:19 2006
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Copied: geronimo/server/branches/2.0-M1/configs/jetty/pom.xml (from r486290, geronimo/server/trunk/configs/jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/jetty/pom.xml?view=diff&rev=486790&p1=geronimo/server/trunk/configs/jetty/pom.xml&r1=486290&p2=geronimo/server/branches/2.0-M1/configs/jetty/pom.xml&r2=486790
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/jetty/pom.xml Wed Dec 13 10:39:19 2006
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: geronimo/server/branches/2.0-M1/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/pom.xml?view=diff&rev=486790&r1=486789&r2=486790
==============================================================================
--- geronimo/server/branches/2.0-M1/configs/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/pom.xml Wed Dec 13 10:39:19 2006
@@ -47,6 +47,7 @@
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
<tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
+ <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${version}/car</jettyDeployer>
<jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
<!-- Common plan properties -->
@@ -137,6 +138,10 @@
<module>j2ee-server</module>
<module>j2ee-system</module>
<module>javamail</module>
+ <module>jetty</module>
+ <module>jetty-clustering-builder-wadi</module>
+ <module>jetty-clustering-wadi</module>
+ <module>jetty-deployer</module>
<module>jsp-examples-jetty</module>
<module>jsp-examples-tomcat</module>
<module>ldap-demo-jetty</module>
@@ -157,6 +162,7 @@
<module>tomcat6</module>
<module>tomcat6-deployer</module>
<!--<module>transaction</module>-->
+ <module>uddi-jetty</module>
<module>uddi-tomcat</module>
<module>unavailable-client-deployer</module>
<module>unavailable-ejb-deployer</module>
@@ -164,9 +170,11 @@
<module>upgrade</module>
<module>upgrade-cli</module>
<module>wadi-clustering</module>
+ <module>webconsole-jetty</module>
<module>webconsole-tomcat</module>
<module>welcome-jetty</module>
<module>welcome-tomcat</module>
+ <module>dojo-jetty</module>
<module>dojo-tomcat</module>
<module>ca-helper-jetty</module>
<module>ca-helper-tomcat</module>
Propchange: geronimo/server/branches/2.0-M1/configs/uddi-jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 10:39:19 2006
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Copied: geronimo/server/branches/2.0-M1/configs/uddi-jetty/pom.xml (from r486290, geronimo/server/trunk/configs/uddi-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/uddi-jetty/pom.xml?view=diff&rev=486790&p1=geronimo/server/trunk/configs/uddi-jetty/pom.xml&r1=486290&p2=geronimo/server/branches/2.0-M1/configs/uddi-jetty/pom.xml&r2=486790
==============================================================================
--- geronimo/server/trunk/configs/uddi-jetty/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/uddi-jetty/pom.xml Wed Dec 13 10:39:19 2006
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Propchange: geronimo/server/branches/2.0-M1/configs/webconsole-jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 10:39:19 2006
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings
Copied: geronimo/server/branches/2.0-M1/configs/webconsole-jetty/pom.xml (from r486290, geronimo/server/trunk/configs/webconsole-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/configs/webconsole-jetty/pom.xml?view=diff&rev=486790&p1=geronimo/server/trunk/configs/webconsole-jetty/pom.xml&r1=486290&p2=geronimo/server/branches/2.0-M1/configs/webconsole-jetty/pom.xml&r2=486790
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/configs/webconsole-jetty/pom.xml Wed Dec 13 10:39:19 2006
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Propchange: geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 10:39:19 2006
@@ -0,0 +1,9 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+.settings
+target
+*.log
+junit*.properties
Copied: geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/pom.xml (from r486290, geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/pom.xml?view=diff&rev=486790&p1=geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml&r1=486290&p2=geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/pom.xml&r2=486790
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/modules/geronimo-jetty-builder/pom.xml Wed Dec 13 10:39:19 2006
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>modules</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: geronimo/server/branches/2.0-M1/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/modules/pom.xml?view=diff&rev=486790&r1=486789&r2=486790
==============================================================================
--- geronimo/server/branches/2.0-M1/modules/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/modules/pom.xml Wed Dec 13 10:39:19 2006
@@ -73,6 +73,9 @@
<module>geronimo-j2ee</module>
<module>geronimo-j2ee-builder</module>
<module>geronimo-j2ee-schema</module>
+ <module>geronimo-jetty</module>
+ <module>geronimo-jetty-clustering-wadi</module>
+ <module>geronimo-jetty-builder</module>
<module>geronimo-jmx-remoting</module>
<module>geronimo-kernel</module>
<module>geronimo-mail</module>
Modified: geronimo/server/branches/2.0-M1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/pom.xml?view=diff&rev=486790&r1=486789&r2=486790
==============================================================================
--- geronimo/server/branches/2.0-M1/pom.xml (original)
+++ geronimo/server/branches/2.0-M1/pom.xml Wed Dec 13 10:39:19 2006
@@ -72,6 +72,7 @@
HACK: Used by jsp and servlet example configs to point to the tomcat deployer
-->
<tomcatVersion>6.0.2-beta</tomcatVersion>
+ <tomcat5Version>5.5.15</tomcat5Version>
<!--
HACK: Used by uddi-jetty and uddi-tomcat config plans
@@ -844,6 +845,30 @@
</dependency>
<dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>5.1.11</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>${tomcat5Version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${tomcat5Version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${tomcat5Version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
<version>${tomcatVersion}</version>
@@ -967,6 +992,18 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <version>6.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>6.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
<version>6.1-SNAPSHOT</version>
</dependency>