geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r481585 - in /geronimo/server/trunk: ./ assemblies/ assemblies/geronimo-boilerplate-jee5/ assemblies/geronimo-boilerplate-jee5/src/ assemblies/geronimo-jetty6-jee5/ assemblies/geronimo-jetty6-jee5/src/ configs/ configs/cxf-deployer/ configs...
Date Sat, 02 Dec 2006 17:49:00 GMT
Author: djencks
Date: Sat Dec  2 09:48:56 2006
New Revision: 481585

URL: http://svn.apache.org/viewvc?view=rev&rev=481585
Log:
GERONIMO-2616 Copy jee5 work from sandbox, make it build in normal build

Added:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/
      - copied from r481196, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/
      - copied from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/src/
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/
      - copied from r481196, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/LICENSE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/NOTICE.txt
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/
      - copied from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/
    geronimo/server/trunk/configs/cxf/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/cxf/
    geronimo/server/trunk/configs/cxf-deployer/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/
    geronimo/server/trunk/configs/cxf-deployer/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml
    geronimo/server/trunk/configs/cxf-deployer/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/
    geronimo/server/trunk/configs/cxf/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml
    geronimo/server/trunk/configs/cxf/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/cxf/src/
    geronimo/server/trunk/configs/dojo-jetty6/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/
    geronimo/server/trunk/configs/dojo-jetty6/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/LICENSE.txt
    geronimo/server/trunk/configs/dojo-jetty6/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/NOTICE.txt
    geronimo/server/trunk/configs/dojo-jetty6/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml
    geronimo/server/trunk/configs/dojo-jetty6/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/src/
    geronimo/server/trunk/configs/jetty6/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/jetty6/
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/LICENSE.txt
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/NOTICE.txt
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/src/
    geronimo/server/trunk/configs/jetty6-clustering-wadi/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/
    geronimo/server/trunk/configs/jetty6-clustering-wadi/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/LICENSE.txt
    geronimo/server/trunk/configs/jetty6-clustering-wadi/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/NOTICE.txt
    geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/pom.xml
    geronimo/server/trunk/configs/jetty6-clustering-wadi/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/src/
    geronimo/server/trunk/configs/jetty6-deployer/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/
    geronimo/server/trunk/configs/jetty6-deployer/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/LICENSE.txt
    geronimo/server/trunk/configs/jetty6-deployer/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/NOTICE.txt
    geronimo/server/trunk/configs/jetty6-deployer/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/
    geronimo/server/trunk/configs/jetty6/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6/LICENSE.txt
    geronimo/server/trunk/configs/jetty6/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6/NOTICE.txt
    geronimo/server/trunk/configs/jetty6/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml
    geronimo/server/trunk/configs/jetty6/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6/src/
    geronimo/server/trunk/configs/transaction-jta11/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/
    geronimo/server/trunk/configs/transaction-jta11/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/LICENSE.txt
    geronimo/server/trunk/configs/transaction-jta11/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/NOTICE.txt
    geronimo/server/trunk/configs/transaction-jta11/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml
    geronimo/server/trunk/configs/transaction-jta11/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/src/
    geronimo/server/trunk/configs/uddi-jetty6/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/
    geronimo/server/trunk/configs/uddi-jetty6/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/LICENSE.txt
    geronimo/server/trunk/configs/uddi-jetty6/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/NOTICE.txt
    geronimo/server/trunk/configs/uddi-jetty6/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/pom.xml
    geronimo/server/trunk/configs/uddi-jetty6/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/src/
    geronimo/server/trunk/configs/webconsole-jetty6/
      - copied from r481196, geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/
    geronimo/server/trunk/configs/webconsole-jetty6/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/LICENSE.txt
    geronimo/server/trunk/configs/webconsole-jetty6/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/NOTICE.txt
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/src/
      - copied from r481584, geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/src/
    geronimo/server/trunk/modules/geronimo-cxf/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/
    geronimo/server/trunk/modules/geronimo-cxf-builder/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/
    geronimo/server/trunk/modules/geronimo-cxf-builder/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-cxf-builder/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-cxf-builder/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/
    geronimo/server/trunk/modules/geronimo-cxf/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-cxf/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-cxf/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml
    geronimo/server/trunk/modules/geronimo-cxf/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/
    geronimo/server/trunk/modules/geronimo-jetty6/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/
    geronimo/server/trunk/modules/geronimo-jetty6-builder/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/
    geronimo/server/trunk/modules/geronimo-jetty6-builder/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-builder/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/src/
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/src/
    geronimo/server/trunk/modules/geronimo-jetty6/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-jetty6/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/
    geronimo/server/trunk/modules/geronimo-transaction-jta11/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/
    geronimo/server/trunk/modules/geronimo-transaction-jta11/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-transaction-jta11/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml
    geronimo/server/trunk/modules/geronimo-transaction-jta11/project.properties
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/project.properties
    geronimo/server/trunk/modules/geronimo-transaction-jta11/project.xml
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/project.xml
    geronimo/server/trunk/modules/geronimo-transaction-jta11/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/src/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/
      - copied from r481196, geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/LICENSE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/NOTICE.txt
      - copied unchanged from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
      - copied, changed from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/
      - copied from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/src/
Modified:
    geronimo/server/trunk/assemblies/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/LifecycleCommand.java
    geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/GBeanInfoTest.java
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml

Copied: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml (from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml&r1=481584&p2=geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml Sat Dec  2 09:48:56 2006
@@ -26,7 +26,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
-        <artifactId>assemblies-jee5</artifactId>
+        <artifactId>assemblies</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (from r481584, geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml&r1=481584&p2=geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Sat Dec  2 09:48:56 2006
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
-        <artifactId>assemblies-jee5</artifactId>
+        <artifactId>assemblies</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Sat Dec  2 09:48:56 2006
@@ -70,9 +70,11 @@
     <modules>
         <module>geronimo-boilerplate-minimal</module>
         <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-tomcat-j2ee</module>
         <module>geronimo-tomcat-minimal</module>
     </modules>

Copied: geronimo/server/trunk/configs/cxf-deployer/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/cxf-deployer/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/configs/cxf/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/cxf/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/configs/dojo-jetty6/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/dojo-jetty6/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dojo-jetty6</artifactId>
-    <name>Geronimo Configs :: Dojo app jetty</name>
+    <name>Geronimo Configs :: Dojo app jetty6</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -58,6 +58,14 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     
     <build>

Copied: geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-builder-wadi/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-clustering-wadi/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/configs/jetty6-deployer/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/jetty6-deployer/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6-deployer/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/configs/jetty6/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/jetty6/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Sat Dec  2 09:48:56 2006
@@ -45,8 +45,10 @@
         <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
         <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
         <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/tomcat-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 -->
         <PlanServerHostname>0.0.0.0</PlanServerHostname>
@@ -126,8 +128,6 @@
         <module>client-transaction</module>
         <module>connector-deployer</module>
         <module>clustering</module>
-        <module>webconsole-jetty</module>
-        <module>webconsole-tomcat</module>
         <module>directory</module>
         <module>geronimo-gbean-deployer</module>
         <module>hot-deployer</module>
@@ -170,6 +170,8 @@
         <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>
@@ -180,6 +182,16 @@
         <module>transformer-agent</module>
         <module>persistence-jpa10-deployer</module>
         <module>openjpa</module>
+        <module>cxf</module>
+        <module>cxf-deployer</module>
+        <module>dojo-jetty6</module>
+        <module>jetty6</module>
+        <module>jetty6-clustering-builder-wadi</module>
+        <module>jetty6-clustering-wadi</module>
+        <module>jetty6-deployer</module>
+        <module>transaction-jta11</module>
+        <module>uddi-jetty6</module>
+        <module>webconsole-jetty6</module>
 
     </modules>
 

Copied: geronimo/server/trunk/configs/transaction-jta11/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction-jta11/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/transaction-jta11/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/transaction-jta11/pom.xml (original)
+++ geronimo/server/trunk/configs/transaction-jta11/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/configs/uddi-jetty6/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-jetty6/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/uddi-jetty6/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/uddi-jetty6/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -80,6 +80,22 @@
             <artifactId>scout</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     
     <build>

Copied: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (from r481584, geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml&r1=481584&p2=geronimo/server/trunk/configs/webconsole-jetty6/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs-jee5</artifactId>
+        <artifactId>configs</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>webconsole-jetty6</artifactId>
-    <name>Geronimo Configs :: WebConsole Jetty</name>
+    <name>Geronimo Configs :: WebConsole Jetty6</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -201,6 +201,14 @@
         <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>

Copied: geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/modules/geronimo-cxf/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-cxf/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-cxf/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java Sat Dec  2 09:48:56 2006
@@ -29,7 +29,7 @@
 import org.apache.geronimo.webservices.WebServiceContainerFactory;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class CXFWebServiceContainerFactoryGBean implements WebServiceContainerFactory {
 

Copied: geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/MockResourceEnvironmentSetter.java Sat Dec  2 09:48:56 2006
@@ -26,7 +26,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class MockResourceEnvironmentSetter implements ResourceEnvironmentSetter {
     public void setResourceEnvironment(ResourceEnvironmentBuilder builder, XmlObject[] resourceRefs, GerResourceRefType[] gerResourceRefs) {

Copied: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-wadi/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/modules/geronimo-jetty6/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-jetty6/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/LifecycleCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/LifecycleCommand.java?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/LifecycleCommand.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/LifecycleCommand.java Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 import org.mortbay.jetty.servlet.ServletHolder;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface LifecycleCommand {
 

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/GBeanInfoTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/GBeanInfoTest.java?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/GBeanInfoTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/GBeanInfoTest.java Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
 import junit.framework.TestCase;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class GBeanInfoTest extends TestCase {
 

Copied: geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-transaction-jta11/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction-jta11/pom.xml Sat Dec  2 09:48:56 2006
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Copied: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (from r481584, geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=481585&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/pom.xml&r1=481584&p2=geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml&r2=481585
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Sat Dec  2 09:48:56 2006
@@ -23,7 +23,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>modules-jee5</artifactId>
+        <artifactId>modules</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Sat Dec  2 09:48:56 2006
@@ -101,7 +101,14 @@
         <module>geronimo-transformer</module>
         <module>geronimo-persistence-jpa10</module>
         <module>geronimo-persistence-jpa10-builder</module>
-
+        <module>geronimo-cxf</module>
+        <module>geronimo-cxf-builder</module>
+        <module>geronimo-jetty6</module>
+        <module>geronimo-jetty6-builder</module>
+        <module>geronimo-jetty6-clustering-builder-wadi</module>
+        <module>geronimo-jetty6-clustering-wadi</module>
+        <module>geronimo-transaction-jta11</module>
+        <module>geronimo-web-2.5-builder</module>
 
     </modules>
     

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=481585&r1=481584&r2=481585
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Dec  2 09:48:56 2006
@@ -83,6 +83,13 @@
         <dependencies>
 
             <dependency>
+                <groupId>org.apache.geronimo.testsupport</groupId>
+                <artifactId>testsupport-common</artifactId>
+                <version>2.0-SNAPSHOT</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.0.2_spec</artifactId>
                 <version>1.1</version>
@@ -975,6 +982,225 @@
                 <artifactId>tribes</artifactId>
                 <version>0.9.5.2</version>
             </dependency>
+
+
+            <!--jee5 stuff -->
+            <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                 <version>1.0-SNAPSHOT</version>
+             </dependency>
+
+             <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-jta_1.1_spec</artifactId>
+                 <version>1.0-SNAPSHOT</version>
+             </dependency>
+
+             <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                 <!--  <version>1.0.1</version>   -->
+                 <version>1.1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                 <version>1.0-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                 <!--  <version>1.0</version>   -->
+                 <version>1.1-SNAPSHOT</version>
+             </dependency>
+
+             <!-- javamail 1.4 config -->
+             <!--<dependency>-->
+                 <!--<groupId>javax.mail</groupId>-->
+                 <!--<artifactId>mail</artifactId>-->
+                 <!--<version>1.4</version>-->
+             <!--</dependency>-->
+             <!--<dependency>-->
+                 <!--<groupId>javax.activation</groupId>-->
+                 <!--<artifactId>activation</artifactId>-->
+                 <!--<version>1.1</version>-->
+             <!--</dependency>-->
+             <dependency>
+                 <groupId>org.apache.geronimo.schema</groupId>
+                 <artifactId>geronimo-schema-jee_5</artifactId>
+                 <version>1.0-SNAPSHOT</version>
+             </dependency>
+
+             <dependency>
+                 <groupId>org.mortbay.jetty</groupId>
+                 <artifactId>jetty</artifactId>
+                 <version>6.1-SNAPSHOT</version>
+             </dependency>
+
+             <dependency>
+                 <groupId>org.mortbay.jetty</groupId>
+                 <artifactId>jetty-util</artifactId>
+                 <version>6.1-SNAPSHOT</version>
+             </dependency>
+
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-api</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-common-metacode</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-common-utilities</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-rt-core</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-rt-bindings-xml</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-rt-bindings-soap</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-rt-databinding-jaxb</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>javax.annotation</groupId>
+                         <artifactId>jsr250-api</artifactId>
+                     </exclusion>
+                     <exclusion>
+                         <groupId>javax.jws</groupId>
+                         <artifactId>jsr181-api</artifactId>
+                     </exclusion>
+                 </exclusions>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-rt-frontend-simple</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-rt-transports-http</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.cxf</groupId>
+                 <artifactId>cxf-tools-common</artifactId>
+                 <version>2.0-incubator-M1-SNAPSHOT</version>
+             </dependency>
+
+             <dependency>
+                 <groupId>stax</groupId>
+                 <artifactId>stax-api</artifactId>
+                 <version>1.0.1</version>
+             </dependency>
+             <dependency>
+                 <groupId>woodstox</groupId>
+                 <artifactId>wstx-asl</artifactId>
+                 <version>3.0.2</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.apache.ws.commons</groupId>
+                 <artifactId>XmlSchema</artifactId>
+                 <version>1.0.2</version>
+             </dependency>
+             <dependency>
+                 <groupId>javax.xml.soap</groupId>
+                 <artifactId>saaj-api</artifactId>
+                 <version>1.3</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>javax.activation</groupId>
+                         <artifactId>activation</artifactId>
+                     </exclusion>
+                 </exclusions>
+             </dependency>
+             <dependency>
+                 <groupId>javax.xml.bind</groupId>
+                 <artifactId>jaxb-api</artifactId>
+                 <version>2.0</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>javax.xml.bind</groupId>
+                         <artifactId>jsr173_api</artifactId>
+                     </exclusion>
+                 </exclusions>
+             </dependency>
+             <dependency>
+                 <groupId>com.sun.xml.messaging.saaj</groupId>
+                 <artifactId>saaj-impl</artifactId>
+                 <version>1.3</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>javax.activation</groupId>
+                         <artifactId>activation</artifactId>
+                     </exclusion>
+                 </exclusions>
+             </dependency>
+
+             <dependency>
+                 <groupId>com.sun.xml.bind</groupId>
+                 <artifactId>jaxb-impl</artifactId>
+                 <version>2.0.2</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>javax.xml.bind</groupId>
+                         <artifactId>jsr173_api</artifactId>
+                     </exclusion>
+                     <exclusion>
+                         <groupId>javax.xml.bind</groupId>
+                         <artifactId>activation</artifactId>
+                     </exclusion>
+                 </exclusions>
+             </dependency>
+             <dependency>
+                 <groupId>org.springframework</groupId>
+                 <artifactId>spring-core</artifactId>
+                 <version>2.0-rc2</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.springframework</groupId>
+                 <artifactId>spring-beans</artifactId>
+                 <version>2.0-rc2</version>
+             </dependency>
+             <dependency>
+                 <groupId>org.springframework</groupId>
+                 <artifactId>spring-context</artifactId>
+                 <version>2.0-rc2</version>
+             </dependency>
+             <dependency>
+                 <groupId>javax.xml.ws</groupId>
+                 <artifactId>jaxws-api</artifactId>
+                 <version>2.0</version>
+                 <exclusions>
+                     <exclusion>
+                         <groupId>javax.xml.bind</groupId>
+                         <artifactId>jsr173_api</artifactId>
+                     </exclusion>
+                 </exclusions>
+             </dependency>
+
 
         </dependencies>
     </dependencyManagement>



Mime
View raw message