geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r464280 [1/2] - in /geronimo/sandbox/javaee5: ./ assemblies-jee5/geronimo-jetty5-jee5/ assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/ assemblies-jee5/geronimo-jetty6-jee5/ assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/...
Date Sun, 15 Oct 2006 20:46:30 GMT
Author: djencks
Date: Sun Oct 15 13:46:24 2006
New Revision: 464280

URL: http://svn.apache.org/viewvc?view=rev&rev=464280
Log:
GERONIMO-2492 start of cxf POJO ws builder with simple test app. Demonstrates that endpoint.publish() is not currently what we want to do

Added:
    geronimo/sandbox/javaee5/configs-jee5/cxf/
    geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/
    geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml   (with props)
    geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/
    geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/
    geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml   (with props)
    geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml   (with props)
    geronimo/sandbox/javaee5/configs-jee5/cxf/src/
    geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/
    geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml   (with props)
    geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/
    geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/pom.xml
      - copied, changed from r463518, geronimo/sandbox/javaee5/itests-jee5/jpa/pom.xml
    geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/
      - copied from r463518, geronimo/sandbox/javaee5/itests-jee5/jpa/war/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
      - copied, changed from r454516, incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/CeltixBuilder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/
      - copied from r454526, incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/container/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java   (with props)
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/PortInfo.java   (contents, props changed)
      - copied, changed from r454524, incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/PortInfo.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/GBeanInfoTest.java   (with props)
Removed:
    geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/src/main/java/
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CeltixWebServiceContainer.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoInputStreamMessageContext.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoOutputStreamServerMessageContext.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoServerTransport.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoTransportFactory.java
Modified:
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
    geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml
    geronimo/sandbox/javaee5/configs-jee5/pom.xml
    geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml
    geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/pom.xml
    geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml
    geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/persistence.xml
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java
    geronimo/sandbox/javaee5/modules-jee5/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
    geronimo/sandbox/javaee5/modules-jee5/pom.xml
    geronimo/sandbox/javaee5/pom.xml

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/pom.xml Sun Oct 15 13:46:24 2006
@@ -86,7 +86,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
+            <artifactId>cxf</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -198,7 +198,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
+            <artifactId>cxf-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml Sun Oct 15 13:46:24 2006
@@ -39,7 +39,7 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/cxf/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
         <gbean name="EJBNetworkService">
@@ -115,7 +115,7 @@
     
     <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
 
-    <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/cxf-deployer/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/javamail/${pom.version}/car">
         <gbean name="SMTPTransport">

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/pom.xml Sun Oct 15 13:46:24 2006
@@ -86,7 +86,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
+            <artifactId>cxf</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -212,7 +212,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
+            <artifactId>cxf-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/javaee5/assemblies-jee5/geronimo-jetty6-jee5/src/main/var/config/config.xml Sun Oct 15 13:46:24 2006
@@ -17,7 +17,7 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
         <gbean name="DownloadedPluginRepos">
-          <attribute name="repositoryList">http://people.apache.org/~ammulder/plugin-repository-list-1.2.txt</attribute>
+          <attribute name="repositoryList">http://geronimo.apache.org/plugins/plugin-repository-list-1.2.txt</attribute>
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
@@ -39,7 +39,7 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/cxf/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
         <gbean name="EJBNetworkService">
@@ -47,17 +47,18 @@
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
-    
-    <module name="org.apache.geronimo.configs/j2ee-corba/${pom.version}/car" load="false">
+
+    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${pom.version}/car" load="false">
         <gbean name="NameServer">
-            <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
+            <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
-        <gbean name="Server">
-            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
-        </gbean>
-        <gbean name="UnprotectedServer">
-            <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+    </module>
+
+    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${pom.version}/car" load="false">
+        <gbean name="NameServer">
+            <attribute name="port">${PlanCOSSunNamingPort}</attribute>
+            <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
     
@@ -141,10 +142,10 @@
     <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car">
     </module>
 
-    <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car">
-        <gbean name="AxisServiceRefBuilder">
-            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
-        </gbean>
+    <module name="org.apache.geronimo.configs/cxf-deployer/${pom.version}/car">
+        <!--<gbean name="CXFServiceRefBuilder">-->
+            <!--<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>-->
+        <!--</gbean>-->
     </module>
     
     <module name="org.apache.geronimo.configs/javamail/${pom.version}/car">

Added: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml (added)
+++ geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml Sun Oct 15 13:46:24 2006
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-jee5</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>cxf-deployer</artifactId>
+    <name>Geronimo Configs :: CXF Deployer</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-cxf-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf</artifactId>
+            <type>car</type>
+            <version>${pom.version}</version>
+            <scope>compile</scope>
+       </dependency>
+
+    </dependencies>
+    
+</project>

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml (added)
+++ geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml Sun Oct 15 13:46:24 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="CXFBuilder" class="org.apache.geronimo.cxf.builder.CXFBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>cxf</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+</module>

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml (added)
+++ geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml Sun Oct 15 13:46:24 2006
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs-jee5</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>cxf</artifactId>
+    <name>Geronimo Configs :: CXF</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <type>car</type>
+            <version>${pom.version}</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-cxf</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-common-metacode</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-common-utilities</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-soap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-simple</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-tools-common</artifactId>
+        </dependency>
+
+        <dependency>
+             <groupId>stax</groupId>
+             <artifactId>stax-api</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>woodstox</groupId>
+             <artifactId>wstx-asl</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.apache.ws.commons</groupId>
+             <artifactId>XmlSchema</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>javax.xml.soap</groupId>
+             <artifactId>saaj-api</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>javax.xml.bind</groupId>
+             <artifactId>jaxb-api</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>com.sun.xml.messaging.saaj</groupId>
+             <artifactId>saaj-impl</artifactId>
+         </dependency>
+
+         <dependency>
+             <groupId>com.sun.xml.bind</groupId>
+             <artifactId>jaxb-impl</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-core</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-beans</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-context</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>javax.xml.ws</groupId>
+             <artifactId>jaxws-api</artifactId>
+         </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+        </dependency>
+    </dependencies>
+    
+</project>

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml (added)
+++ geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml Sun Oct 15 13:46:24 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+</module>

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/configs-jee5/cxf/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/dojo-jetty6/pom.xml Sun Oct 15 13:46:24 2006
@@ -41,6 +41,13 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
@@ -70,7 +77,7 @@
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
                         <deploymentConfig>${clientDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <deploymentConfig>${cxfDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/jetty6-deployer/src/plan/plan.xml Sun Oct 15 13:46:24 2006
@@ -42,7 +42,7 @@
         </reference>
         <references name="WebServiceBuilder">
             <pattern>
-                <name>WebServiceBuilder</name>
+                <name>CXFBuilder</name>
             </pattern>
             <pattern>
                 <name>UnavailableWebServiceBuilder</name>

Modified: geronimo/sandbox/javaee5/configs-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/pom.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/pom.xml Sun Oct 15 13:46:24 2006
@@ -45,6 +45,7 @@
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
         <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${pom.version}/car</connectorDeployer>
         <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
+        <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${pom.version}/car</cxfDeployer>
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
         <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${pom.version}/car</jetty6Deployer>
@@ -121,6 +122,8 @@
         <module>dojo-jetty6</module>
         <module>webconsole-jetty6</module>
         <module>openjpa</module>
+        <module>cxf</module>
+        <module>cxf-deployer</module>
     </modules>
     
 </project>

Modified: geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml (original)
+++ geronimo/sandbox/javaee5/configs-jee5/webconsole-jetty6/pom.xml Sun Oct 15 13:46:24 2006
@@ -48,7 +48,14 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -155,7 +162,7 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jetty6Deployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <deploymentConfig>${cxfDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.console</groupId>

Copied: geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/pom.xml (from r463518, geronimo/sandbox/javaee5/itests-jee5/jpa/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/pom.xml?view=diff&rev=464280&p1=geronimo/sandbox/javaee5/itests-jee5/jpa/pom.xml&r1=463518&p2=geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/pom.xml&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/itests-jee5/jpa/pom.xml (original)
+++ geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/pom.xml Sun Oct 15 13:46:24 2006
@@ -7,7 +7,7 @@
     </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.geronimo.itest</groupId>
-  <artifactId>jpa</artifactId>
+  <artifactId>cxf</artifactId>
   <packaging>pom</packaging>
   <!--<version>1.0-SNAPSHOT</version>-->
   <name>jpa itest</name>
@@ -21,8 +21,6 @@
     </dependency>
   </dependencies>
   <modules>
-    <module>ejb</module>
     <module>war</module>
-    <module>ear</module>
   </modules>
 </project>

Modified: geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/pom.xml?view=diff&rev=464280&r1=463518&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/pom.xml (original)
+++ geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/pom.xml Sun Oct 15 13:46:24 2006
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <project>
     <parent>
-        <artifactId>jpa</artifactId>
+        <artifactId>cxf</artifactId>
         <groupId>org.apache.geronimo.itest</groupId>
         <version>1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jpa-war</artifactId>
-    <name>jpa war</name>
+    <artifactId>cxf-pojo-war</artifactId>
+    <name>cxf pojo ws war</name>
     <packaging>war</packaging>
     <!--<version>1.0-SNAPSHOT</version>-->
     <url>http://maven.apache.org</url>
@@ -24,39 +24,15 @@
                 <configuration>
                     <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
                     <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                    <archiveClasses>true</archiveClasses>
-                    <archive>
-                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
                 </configuration>
             </plugin>
         </plugins>
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.itest</groupId>
-            <artifactId>jpa-ejb</artifactId>
-            <version>${pom.version}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_2.1_spec</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>1.2-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-testutils</artifactId>
+            <version>2.0-incubator-M1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml?view=diff&rev=464280&r1=463518&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/javaee5/itests-jee5/cxfPojoWS/war/src/main/webapp/WEB-INF/web.xml Sun Oct 15 13:46:24 2006
@@ -16,18 +16,18 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
+         version="2.5"
         >
 
-    <display-name>Geronimo EJBRef Itest War</display-name>
+    <display-name>Geronimo CXF POJO WS War</display-name>
 
     <servlet>
-        <display-name>Manifest ClassPath itest servlet</display-name>
+        <display-name>Geronimo CXF POJO WS</display-name>
         <servlet-name>servlet</servlet-name>
-        <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
+        <servlet-class>org.apache.hello_world_soap_http.GreeterImpl</servlet-class>
         <load-on-startup>0</load-on-startup>
     </servlet>
 
@@ -36,42 +36,4 @@
         <url-pattern>/servlet</url-pattern>
     </servlet-mapping>
 
-    <ejb-ref>
-        <ejb-ref-name>TestSession</ejb-ref-name>
-        <ejb-ref-type>Session</ejb-ref-type>
-        <home>org.apache.geronimo.itest.TestSessionHome</home>
-        <remote>org.apache.geronimo.itest.TestSession</remote>
-    </ejb-ref>
-
-<!--
-    <security-constraint>
-        <display-name>All</display-name>
-        <web-resource-collection>
-            <web-resource-name>secureServlet</web-resource-name>
-            <url-pattern>/servlet</url-pattern>
-            <http-method>GET</http-method>
-            <http-method>POST</http-method>
-        </web-resource-collection>
-        <auth-constraint>
-            <description>All Authenticated</description>
-            <role-name>Authenticated</role-name>
-            <role-name>Everybody</role-name>
-        </auth-constraint>
-        <user-data-constraint>
-            <transport-guarantee>NONE</transport-guarantee>
-        </user-data-constraint>
-    </security-constraint>
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>TestRealm</realm-name>
-    </login-config>
-    <security-role>
-        <role-name>Authenticated</role-name>
-    </security-role>
-    <security-role>
-        <role-name>Everybody</role-name>
-    </security-role>
--->
-
-
-</web-app>
\ No newline at end of file
+</web-app>

Modified: geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/openejb-jar.xml Sun Oct 15 13:46:24 2006
@@ -74,10 +74,10 @@
         <attribute name="persistenceProviderClassName">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>
         <attribute name="persistenceUnitTransactionType">JTA</attribute>
         <attribute name="properties">
-            org.apache.openjpa.jdbc.DBDictionary=org.apache.openjpa.jdbc.sql.DerbyDictionary
-            org.apache.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
-            org.apache.openjpa.TransactionMode=managed
-            org.apache.openjpa.ConnectionFactoryMode=managed
+            openjpa.jdbc.DBDictionary=org.apache.openjpa.jdbc.sql.DerbyDictionary
+            openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+            openjpa.TransactionMode=managed
+            openjpa.ConnectionFactoryMode=managed
         </attribute>
         <reference name="JtaDataSourceWrapper">
             <name>SystemDatasource</name>

Modified: geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/persistence.xml?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/sandbox/javaee5/itests-jee5/jpa/ejb/src/main/resources/META-INF/persistence.xml Sun Oct 15 13:46:24 2006
@@ -8,9 +8,9 @@
         <class>org.apache.geronimo.itest.jpa.AllFieldTypes</class>
         <exclude-unlisted-classes/>
         <properties>
-            <property name="org.apache.openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
-            <property name="org.apache.openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
-            <property name="org.apache.openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
+            <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
+            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+            <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
         </properties>
     </persistence-unit>
 </persistence>

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml Sun Oct 15 13:46:24 2006
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules-jee5</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-cxf-builder</artifactId>
+    <name>Geronimo :: CXF :: Builder</name>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-cxf</artifactId>
+            <version>${pom.version}</version>                                                                                                           
+        </dependency>
+
+        <!-- this is a dependency of geronimo-cxf.  Why isn't it picked up? -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        </dependency>
+
+
+    </dependencies>
+    
+    <build>
+    </build>
+
+</project>
+

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java (from r454516, incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/CeltixBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?view=diff&rev=464280&p1=incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/CeltixBuilder.java&r1=454516&p2=geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java&r2=464280
==============================================================================
--- incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/CeltixBuilder.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java Sun Oct 15 13:46:24 2006
@@ -1,13 +1,16 @@
-package org.objectweb.celtix.geronimo.builder;
+package org.apache.geronimo.cxf.builder;
 
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.FileNotFoundException;
 import java.net.URL;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Collections;
 import java.util.jar.JarFile;
 import java.util.logging.Logger;
 
@@ -17,167 +20,151 @@
 import javax.xml.bind.Unmarshaller;
 import javax.xml.ws.handler.Handler;
 
-import com.sun.java.xml.ns.j2ee.PortComponentType;
-import com.sun.java.xml.ns.j2ee.WebserviceDescriptionType;
-import com.sun.java.xml.ns.j2ee.WebservicesType;
+import org.apache.cxf.jaxws.javaee.PortComponentType;
+import org.apache.cxf.jaxws.javaee.WebserviceDescriptionType;
+import org.apache.cxf.jaxws.javaee.WebservicesType;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
+import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.StoredObject;
-import org.objectweb.celtix.Bus;
-import org.objectweb.celtix.geronimo.container.CeltixWebServiceContainer;
+import org.apache.geronimo.cxf.PortInfo;
+import org.apache.geronimo.cxf.CXFWebServiceContainerFactoryGBean;
+import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
+import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
+import org.apache.geronimo.deployment.util.DeploymentUtil;
 
 
-public class CeltixBuilder implements WebServiceBuilder {
+public class CXFBuilder implements WebServiceBuilder {
 
-    public static final GBeanInfo GBEAN_INFO;
-    static final String WEB_SERVICE_CONTAINER_ATTR = "webServiceContainer";
-    private static final String POJO_CLASS_ATTR = "pojoClassName"; 
-    private static final Logger LOG = Logger.getLogger(CeltixBuilder.class.getName());
-    
-    private final Bus bus;
+    private static final Logger LOG = Logger.getLogger(CXFBuilder.class.getName());
+
+    private final Environment defaultEnvironment;
     private JAXBContext ctx;
-    
-    
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CeltixBuilder.class, 
-                                                                     NameFactory.MODULE_BUILDER);
-        infoBuilder.addInterface(WebServiceBuilder.class);
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
 
 
-    public CeltixBuilder() {
-        this(Bus.getCurrent());
+    public CXFBuilder(Environment defaultEnvironment) {
+        this.defaultEnvironment = defaultEnvironment;
     }
 
-    CeltixBuilder(Bus aBus) {
-        bus = aBus;
+    public Map findWebServices(JarFile moduleFile, boolean isEJB, Map servletLocations, Environment environment) throws DeploymentException {
+        final String path = isEJB ? "META-INF/webservices.xml" : "WEB-INF/webservices.xml";
+        try {
+            URL wsDDUrl = DeploymentUtil.createJarURL(moduleFile, path);
+            Map result = parseWebServiceDescriptor(wsDDUrl, moduleFile, isEJB, servletLocations);
+            if (result != null) {
+                EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
+                return result;
+            }
+        } catch (MalformedURLException e) {
+            // The webservices.xml file doesn't exist.
+        }
+        return Collections.EMPTY_MAP;
     }
     
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
+    private Map<String, PortInfo> parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, boolean isEJB, Map correctedPortLocations) throws DeploymentException {
 
-    
-    public Map<String, PortInfo> parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, boolean isEJB, 
-                                         Map correctedPortLocations)
-        throws DeploymentException {
-            
         LOG.fine("parsing descriptor " + wsDDUrl);
-        
+
         Map<String, PortInfo> map = new HashMap<String, PortInfo>();
-        
-        try { 
+
+        try {
             InputStream in = wsDDUrl.openStream();
             if (in == null) {
                 throw new DeploymentException("unable to read descriptor " + wsDDUrl);
             }
-            
+
             Unmarshaller unmarshaller = getJAXBContext().createUnmarshaller();
             Object obj = unmarshaller.unmarshal(in);
-            
-            WebservicesType wst = null; 
+
+            WebservicesType wst = null;
             if (obj instanceof JAXBElement) {
-                wst = (WebservicesType)((JAXBElement)obj).getValue();
+                wst = (WebservicesType) ((JAXBElement) obj).getValue();
             }
-            
+
             for (WebserviceDescriptionType desc : wst.getWebserviceDescription()) {
                 final String wsdlFile = desc.getWsdlFile().getValue();
                 final String serviceName = desc.getWebserviceDescriptionName().getValue();
-                
+
                 for (PortComponentType port : desc.getPortComponent()) {
                     String servlet = port.getServiceImplBean().getServletLink().getValue();
                     String sei = port.getServiceEndpointInterface().getValue();
                     String portName = port.getPortComponentName().getValue();
-                    
+
                     PortInfo portInfo = new PortInfo();
-                    
-                    portInfo.setServiceName(serviceName);                    
+
+                    portInfo.setServiceName(serviceName);
                     portInfo.setServletLink(servlet);
                     portInfo.setServiceEndpointInterfaceName(sei);
                     portInfo.setPortName(portName);
                     portInfo.setWsdlFile(wsdlFile);
                     portInfo.setHandlers(port.getHandler());
- 
+
                     map.put(servlet, portInfo);
                 }
             }
-            
+
             return map;
-       
+        } catch (FileNotFoundException e) {
+            return Collections.EMPTY_MAP;
         } catch (IOException ex) {
             ex.printStackTrace();
             throw new DeploymentException("unable to read " + wsDDUrl, ex);
         } catch (JAXBException ex) {
-            ex.printStackTrace();
             throw new DeploymentException("unable to parse webservices.xml", ex);
         }
     }
 
-    
-    public synchronized void configurePOJO(GBeanData targetGBean, JarFile moduleFile, 
-                                           Object pi, String implClassName, ClassLoader classLoader)
-        throws DeploymentException {
+
+    public void configurePOJO(GBeanData targetGBean, Module module, Object pi, String seiClassName, DeploymentContext context) throws DeploymentException {
 
         assert pi instanceof PortInfo : "received incorrect portInfo object";
 
-        ClassLoader orig = Thread.currentThread().getContextClassLoader();
-        
-        try { 
-            Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-            PortInfo portInfo = (PortInfo)pi;
-            String seiClassName = portInfo.getServiceEndpointInterfaceName();
-            
-            LOG.info("configuring POJO webservice: " + pi + " sei: " + seiClassName);
-            
-            // verify that the class is loadable
-            loadSEI(seiClassName, classLoader);
-            targetGBean.setAttribute(POJO_CLASS_ATTR, implClassName);
-            // TODO: add support for handlers defined in the webservice.xml
-            
-            /*List<Handler> handlers =*/ buildHandlerChain(portInfo);
-            
-            CeltixWebServiceContainer container = new CeltixWebServiceContainer(portInfo);           
-            targetGBean.setAttribute(WEB_SERVICE_CONTAINER_ATTR, new StoredObject(container));
-            
-        } catch (IOException ex) {
-            throw new DeploymentException("unable to store CeltixWebServiceContainer", ex);
-        } finally {
-            Thread.currentThread().setContextClassLoader(orig);
+        PortInfo portInfo = (PortInfo) pi;
+
+        LOG.info("configuring POJO webservice: " + pi + " sei: " + seiClassName);
+
+        // verify that the class is loadable
+        ClassLoader classLoader = context.getClassLoader();
+        loadSEI(seiClassName, classLoader);
+
+        /*List<Handler> handlers =*/ buildHandlerChain(portInfo);
+        AbstractName servletName = targetGBean.getAbstractName();
+        AbstractName containerFactoryName = context.getNaming().createChildName(servletName, NameFactory.GERONIMO_SERVICE, "cxfWebServiceContainerFactory");
+        GBeanData containerFactoryData = new GBeanData(containerFactoryName, CXFWebServiceContainerFactoryGBean.GBEAN_INFO);
+        containerFactoryData.setAttribute("portInfo", portInfo);
+        containerFactoryData.setAttribute("endpointClassName", seiClassName);
+        try {
+            context.addGBean(containerFactoryData);
+        } catch (GBeanAlreadyExistsException e) {
+            throw new DeploymentException("Could not add web service container factory gbean", e);
         }
-    }
 
-    
-    public void configureEJB(GBeanData targetGBean, JarFile moduleFile, Object portInfo, 
-                             ClassLoader classLoader)
-        throws DeploymentException {
+        targetGBean.setReferencePattern("WebServiceContainerFactory", containerFactoryName);
 
-        throw new DeploymentException("configureEJB NYI");
     }
 
-    public void doStart() throws Exception {
-    }
 
-    public void doStop() throws Exception {
-    }
+    public void configureEJB(GBeanData targetGBean, JarFile moduleFile, Object portInfo,
+            ClassLoader classLoader)
+            throws DeploymentException {
 
-    public void doFail() {
-        // TODO Auto-generated method stub
-        
+        throw new DeploymentException("configureEJB NYI");
     }
-    
+
     private JAXBContext getJAXBContext() throws JAXBException {
         if (ctx == null) {
             ctx = JAXBContext.newInstance("com.sun.java.xml.ns.j2ee", getClass().getClassLoader());
         }
         return ctx;
     }
-    
+
     Class<?> loadSEI(String className, ClassLoader loader) throws DeploymentException {
         try {
             return loader.loadClass(className);
@@ -185,13 +172,25 @@
             throw new DeploymentException("unable to load Service Endpoint Interface: " + className, ex);
         }
     }
-    
+
     private List<Handler> buildHandlerChain(PortInfo portInfo) {
         return new ArrayList<Handler>();
     }
-    
-    protected Bus getBus() {
-        return bus;
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CXFBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addInterface(WebServiceBuilder.class);
+        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+
+        infoBuilder.setConstructor(new String[]{"defaultEnvironment"});
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
     }
-    
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
 }

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml Sun Oct 15 13:46:24 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules-jee5</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-cxf</artifactId>
+    <name>Geronimo :: CXF</name>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+    </build>
+
+</project>
+

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java Sun Oct 15 13:46:24 2006
@@ -0,0 +1,48 @@
+package org.apache.geronimo.cxf;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.binding.xml.XMLConstants;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.geronimo.webservices.WebServiceContainer;
+
+//TODO consider putting most of this in the CXFWebServiceContaInerFactoryGBean
+public class CXFWebServiceContainer implements WebServiceContainer {
+
+    private final GeronimoDestination destination;
+    private final Bus bus;
+
+
+    public CXFWebServiceContainer(PortInfo portInfo, Object target, Bus bus) {
+        //TODO actually use portInfo
+        this.bus = bus;
+        DestinationFactoryManager destinationFactoryManager = bus.getExtension(DestinationFactoryManager.class);
+        DestinationFactory factory = new GeronimoDestinationFactory();
+        destinationFactoryManager.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/http/", factory);
+        destinationFactoryManager.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/http", factory);
+        destinationFactoryManager.registerDestinationFactory(XMLConstants.NS_XML_FORMAT, factory);
+        EndpointImpl publishedEndpoint = publishEndpoint(target);
+        destination = (GeronimoDestination) publishedEndpoint.getServer().getDestination();
+    }
+
+    public void invoke(Request request, Response response) throws Exception {
+
+            destination.invoke(request, response);
+    }
+
+
+    public void getWsdl(Request request, Response response) throws Exception {
+    }
+
+    private  EndpointImpl publishEndpoint(Object target) {
+
+        assert target != null : "null target received";
+
+        EndpointImpl ep = new EndpointImpl(bus, target, (String)null);
+        ep.publish("meaningless");
+        return ep;
+
+    }
+
+}

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java Sun Oct 15 13:46:24 2006
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.cxf;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.webservices.WebServiceContainer;
+import org.apache.geronimo.webservices.WebServiceContainerFactory;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class CXFWebServiceContainerFactoryGBean implements WebServiceContainerFactory {
+
+    private final PortInfo portInfo;
+    private final Bus bus;
+    private final Object endpointInstance;
+
+    public CXFWebServiceContainerFactoryGBean(PortInfo portInfo, String endpointClassName, ClassLoader classLoader) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        this.portInfo = portInfo;
+        this.bus = new CXFBusFactory().getDefaultBus();
+        Class endpointClass = classLoader.loadClass(endpointClassName);
+        endpointInstance = endpointClass.newInstance();
+    }
+
+    public WebServiceContainer getWebServiceContainer() {
+        return new CXFWebServiceContainer(portInfo, endpointInstance, bus);
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CXFWebServiceContainerFactoryGBean.class, NameFactory.GERONIMO_SERVICE);
+        infoBuilder.addAttribute("portInfo", PortInfo.class, true, true);
+        infoBuilder.addAttribute("endpointClassName", String.class, true, true);
+        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
+        infoBuilder.setConstructor(new String[] {"portInfo", "endpointClassName", "classLoader"});
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java Sun Oct 15 13:46:24 2006
@@ -0,0 +1,172 @@
+package org.apache.geronimo.cxf;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.Destination;
+import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.geronimo.webservices.WebServiceContainer.Request;
+import org.apache.geronimo.webservices.WebServiceContainer.Response;
+
+public class GeronimoDestination extends AbstractHTTPDestination
+        implements Serializable {
+
+    private MessageObserver messageObserver;
+
+    public GeronimoDestination(Bus bus, ConduitInitiator conduitInitiator, EndpointInfo endpointInfo) throws IOException {
+        super(bus, conduitInitiator, endpointInfo);
+    }
+
+
+    public void invoke(Request request, Response response) {
+        Message message = new MessageImpl();
+        message.put(Request.class, request);
+        message.put(Response.class, response);
+        messageObserver.onMessage(message);
+    }
+
+    public Conduit getBackChannel(Message inMessage, Message partialResponse, EndpointReferenceType address) throws IOException {
+        Response response = inMessage.get(Response.class);
+        Conduit backChannel;
+        Exchange ex = inMessage.getExchange();
+        EndpointReferenceType target = address != null
+                ? address
+                : ex.get(EndpointReferenceType.class);
+        if (target == null) {
+            backChannel = new BackChannelConduit(response);
+        } else {
+            throw new IllegalArgumentException("RM not yet implemented");
+        }
+        return backChannel;
+    }
+
+    public void shutdown() {
+    }
+
+    @Override
+    protected void copyRequestHeaders(Message message, Map<String, List<String>> headers) {
+        Request req = message.get(Request.class);
+
+        // no map of headers so just find all static field constants that begin with HEADER_, get
+        // its value and get the corresponding header.
+        for (Field field : Request.class.getFields()) {
+            if (field.getName().startsWith("HEADER_")) {
+                try {
+                    assert field.getType().equals(String.class) : "unexpected field type";
+                    String headerName = (String) field.get(null);
+                    String headerValue = req.getHeader(headerName);
+                    if (headerValue != null) {
+                        List<String> values = headers.get(headerName);
+                        if (values == null) {
+                            values = new LinkedList<String>();
+                            headers.put(headerName, values);
+                        }
+                        values.addAll(splitMultipleHeaderValues(headerValue));
+                    }
+                } catch (IllegalAccessException ex) {
+                    // ignore 
+                }
+            }
+        }
+    }
+
+    private List<String> splitMultipleHeaderValues(String value) {
+
+        List<String> allValues = new LinkedList<String>();
+        if (value.contains(",")) {
+            StringTokenizer st = new StringTokenizer(value, ",");
+            while (st.hasMoreTokens()) {
+                allValues.add(st.nextToken().trim());
+            }
+
+        } else {
+            allValues.add(value);
+        }
+        return allValues;
+    }
+
+
+    public void setMessageObserver(MessageObserver messageObserver) {
+        this.messageObserver = messageObserver;
+    }
+
+    protected class BackChannelConduit implements Conduit {
+
+        //TODO this will soon be publically available from somewhere in CXF
+        private static final String ANONYMOUS_ADDRESS =
+                "http://www.w3.org/2005/08/addressing/anonymous";
+        protected Response response;
+        protected EndpointReferenceType target;
+
+        BackChannelConduit(Response resp) {
+            response = resp;
+            target = EndpointReferenceUtils.getEndpointReference(ANONYMOUS_ADDRESS);
+        }
+
+        public void close(Message msg) throws IOException {
+            msg.getContent(OutputStream.class).close();
+        }
+
+        /**
+         * Register a message observer for incoming messages.
+         *
+         * @param observer the observer to notify on receipt of incoming
+         */
+        public void setMessageObserver(MessageObserver observer) {
+            // shouldn't be called for a back channel conduit
+        }
+
+        /**
+         * Send an outbound message, assumed to contain all the name-value
+         * mappings of the corresponding input message (if any).
+         *
+         * @param message the message to be sent.
+         */
+        public void send(Message message) throws IOException {
+            message.put(Response.class, response);
+            //TODO gregw says this should work: current cxf-jetty code wraps output stream.
+            //if this doesn't work, we'd see an error from jetty saying you cant write headers to the output stream.
+            message.setContent(OutputStream.class, response.getOutputStream());
+        }
+
+        /**
+         * @return the reference associated with the target Destination
+         */
+        public EndpointReferenceType getTarget() {
+            return target;
+        }
+
+        /**
+         * Retreive the back-channel Destination.
+         *
+         * @return the backchannel Destination (or null if the backchannel is
+         *         built-in)
+         */
+        public Destination getBackChannel() {
+            return null;
+        }
+
+        /**
+         * Close the conduit
+         */
+        public void close() {
+        }
+    }
+
+}

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java?view=auto&rev=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java (added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java Sun Oct 15 13:46:24 2006
@@ -0,0 +1,22 @@
+package org.apache.geronimo.cxf;
+
+import java.io.IOException;
+
+import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.transport.Destination;
+import org.apache.cxf.transport.http.HTTPTransportFactory;
+
+public class GeronimoDestinationFactory extends HTTPTransportFactory {
+
+    public Destination getDestination(EndpointInfo endpointInfo)
+        throws IOException {
+        GeronimoDestination destination = new GeronimoDestination(getBus(), this, endpointInfo);
+        Configurer configurer = getBus().getExtension(Configurer.class);
+        if (null != configurer) {
+            configurer.configureBean(destination);
+        }
+        return destination;
+    }
+
+}

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/PortInfo.java (from r454524, incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/PortInfo.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/PortInfo.java?view=diff&rev=464280&p1=incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/PortInfo.java&r1=454524&p2=geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/PortInfo.java&r2=464280
==============================================================================
--- incubator/cxf/tags/celtix/pre_apache/geronimo/src/main/java/org/objectweb/celtix/geronimo/builder/PortInfo.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/PortInfo.java Sun Oct 15 13:46:24 2006
@@ -1,9 +1,9 @@
-package org.objectweb.celtix.geronimo.builder;
+package org.apache.geronimo.cxf;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.sun.java.xml.ns.j2ee.PortComponentHandlerType;
+import org.apache.cxf.jaxws.javaee.PortComponentHandlerType;
 
 public class PortInfo implements Serializable {
 

Propchange: geronimo/sandbox/javaee5/modules-jee5/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/PortInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java Sun Oct 15 13:46:24 2006
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.Permission;
 import java.security.PermissionCollection;
@@ -247,7 +246,7 @@
 
         Map servletNameToPathMap = buildServletNameToPathMap(webApp, contextRoot);
 
-        Map portMap = getWebServiceBuilder().findWebServices(moduleFile, false, servletNameToPathMap);        AbstractName moduleName;
+        Map portMap = getWebServiceBuilder().findWebServices(moduleFile, false, servletNameToPathMap, environment);        AbstractName moduleName;
         if (earName == null) {
             earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
             moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.WEB_MODULE);
@@ -483,7 +482,7 @@
             Map portMap = webModule.getPortMap();
 
             ServletType[] servletTypes = webApp.getServletArray();
-            addServlets(moduleName, webModule.getModuleFile(), servletTypes, servletMappings, securityRoles, rolePermissions, portMap, moduleClassLoader, moduleContext);
+            addServlets(moduleName, webModule, servletTypes, servletMappings, securityRoles, rolePermissions, portMap, moduleContext);
 
             if (jettyWebApp.isSetSecurityRealmName()) {
                 configureSecurityRealm(earContext, webApp, jettyWebApp, webModuleData, securityRoles, rolePermissions);
@@ -860,24 +859,22 @@
      * Adds the provided servlets, taking into account the load-on-startup ordering.
      *
      * @param webModuleName   an <code>ObjectName</code> value
-     * @param moduleFile      a <code>JarFile</code> value
+     * @param module          a <code>Module</code> value
      * @param servletTypes    a <code>ServletType[]</code> value, contains the <code>servlet</code> entries from <code>web.xml</code>.
      * @param servletMappings a <code>Map</code> value
      * @param securityRoles   a <code>Set</code> value
      * @param rolePermissions a <code>Map</code> value
      * @param portMap         a <code>Map</code> value
-     * @param webClassLoader  a <code>ClassLoader</code> value
-     * @param earContext      an <code>EARContext</code> value
+     * @param moduleContext      an <code>EARContext</code> value
      * @throws DeploymentException if an error occurs
      */
     private void addServlets(AbstractName webModuleName,
-            JarFile moduleFile,
+            Module module,
             ServletType[] servletTypes,
             Map servletMappings,
             Set securityRoles,
             Map rolePermissions, Map portMap,
-            ClassLoader webClassLoader,
-            EARContext earContext) throws DeploymentException {
+            EARContext moduleContext) throws DeploymentException {
 
         // this TreeSet will order the ServletTypes based on whether
         // they have a load-on-startup element and what its value is
@@ -900,7 +897,7 @@
         AbstractName previousServlet = null;
         for (Iterator servlets = loadOrder.iterator(); servlets.hasNext();) {
             ServletType servletType = (ServletType) servlets.next();
-            previousServlet = addServlet(webModuleName, moduleFile, previousServlet, servletType, servletMappings, securityRoles, rolePermissions, portMap, webClassLoader, earContext);
+            previousServlet = addServlet(webModuleName, module, previousServlet, servletType, servletMappings, securityRoles, rolePermissions, portMap, moduleContext);
         }
 
         // JACC v1.0 secion B.19
@@ -909,32 +906,31 @@
 
     /**
      * @param webModuleName
-     * @param moduleFile
+     * @param module
      * @param previousServlet
      * @param servletType
      * @param servletMappings
      * @param securityRoles
      * @param rolePermissions
      * @param portMap
-     * @param webClassLoader
-     * @param earContext
+     * @param moduleContext
      * @return AbstractName of servlet gbean added
      * @throws DeploymentException
      */
     private AbstractName addServlet(AbstractName webModuleName,
-            JarFile moduleFile,
+            Module module,
             AbstractName previousServlet,
             ServletType servletType,
             Map servletMappings,
             Set securityRoles,
             Map rolePermissions, Map portMap,
-            ClassLoader webClassLoader,
-            EARContext earContext) throws DeploymentException {
+            EARContext moduleContext) throws DeploymentException {
         String servletName = servletType.getServletName().getStringValue().trim();
-        AbstractName servletAbstractName = earContext.getNaming().createChildName(webModuleName, servletName, NameFactory.SERVLET);
+        AbstractName servletAbstractName = moduleContext.getNaming().createChildName(webModuleName, servletName, NameFactory.SERVLET);
         GBeanData servletData;
         Map initParams = new HashMap();
         if (servletType.isSetServletClass()) {
+            ClassLoader webClassLoader = moduleContext.getClassLoader();
             String servletClassName = servletType.getServletClass().getStringValue().trim();
             Class servletClass;
             try {
@@ -956,10 +952,10 @@
                 servletData.setAbstractName(servletAbstractName);
                 //let the web service builder deal with configuring the gbean with the web service stack
                 Object portInfo = portMap.get(servletName);
-                if (portInfo == null) {
-                    throw new DeploymentException("No web service deployment info for servlet name " + servletName); // TODO identify web app in message
-                }
-                getWebServiceBuilder().configurePOJO(servletData, moduleFile, portInfo, servletClassName, webClassLoader);
+//                if (portInfo == null) {
+//                    throw new DeploymentException("No web service deployment info for servlet name " + servletName); // TODO identify web app in message
+//                }
+                getWebServiceBuilder().configurePOJO(servletData, module, portInfo, servletClassName, moduleContext);
             }
         } else if (servletType.isSetJspFile()) {
             servletData = new GBeanData(servletAbstractName, JettyServletHolder.GBEAN_INFO);
@@ -1003,7 +999,7 @@
         processRoleRefPermissions(servletType, securityRoles, rolePermissions);
 
         try {
-            earContext.addGBean(servletData);
+            moduleContext.addGBean(servletData);
         } catch (GBeanAlreadyExistsException e) {
             throw new DeploymentException("Could not add servlet gbean to context", e); // TODO identify web app in message
         }

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java?view=diff&rev=464280&r1=464279&r2=464280
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java (original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyPOJOWebServiceHolder.java Sun Oct 15 13:46:24 2006
@@ -35,6 +35,7 @@
 import org.apache.geronimo.webservices.POJOWebServiceServlet;
 import org.apache.geronimo.webservices.WebServiceContainer;
 import org.apache.geronimo.webservices.WebServiceContainerInvoker;
+import org.apache.geronimo.webservices.WebServiceContainerFactory;
 import org.mortbay.jetty.Request;
 import org.mortbay.jetty.servlet.ServletHolder;
 
@@ -66,14 +67,14 @@
             Map initParams,
             Integer loadOnStartup,
             Set servletMappings,
-            WebServiceContainer webServiceContainer,
+            WebServiceContainerFactory webServiceContainerFactory,
             JettyServletRegistration context) throws Exception {
         servletHolder = new ServletHolder();
         //context will be null only for use as "default servlet info holder" in deployer.
 
         this.pojoClassName = pojoClassName;
         this.context = context;
-        this.webServiceContainer = webServiceContainer;
+        this.webServiceContainer = webServiceContainerFactory == null? null: webServiceContainerFactory.getWebServiceContainer();
         this.servletMappings = servletMappings;
         if (context != null) {
             servletHolder.setName(servletName);
@@ -160,7 +161,7 @@
         infoBuilder.addAttribute("initParams", Map.class, true);
         infoBuilder.addAttribute("loadOnStartup", Integer.class, true);
         infoBuilder.addAttribute("servletMappings", Set.class, true);
-        infoBuilder.addAttribute("webServiceContainer", WebServiceContainer.class, true);
+        infoBuilder.addReference("WebServiceContainerFactory", WebServiceContainerFactory.class);
         infoBuilder.addReference("JettyServletRegistration", JettyServletRegistration.class);
 
         infoBuilder.setConstructor(new String[]{"pojoClassName",
@@ -168,7 +169,7 @@
                 "initParams",
                 "loadOnStartup",
                 "servletMappings",
-                "webServiceContainer",
+                "WebServiceContainerFactory",
                 "JettyServletRegistration"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();



Mime
View raw message