geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r903980 - in /geronimo/server/trunk/plugins: ./ cxf/ cxf/cxf-deployer/ cxf/cxf-deployer/src/main/history/ cxf/cxf-ejb-deployer/src/main/history/ cxf/cxf-ejb-deployer/src/main/plan/ cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/...
Date Thu, 28 Jan 2010 07:28:43 GMT
Author: rwonly
Date: Thu Jan 28 07:28:41 2010
New Revision: 903980

URL: http://svn.apache.org/viewvc?rev=903980&view=rev
Log:
GERONIMO-5016: 3. make the rest cxf plugins be compiled except the tools which will be enable
after gshell refactor

Modified:
    geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
    geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
    geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java
    geronimo/server/trunk/plugins/cxf/pom.xml
    geronimo/server/trunk/plugins/pom.xml

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Thu Jan 28 07:28:41 2010
@@ -56,13 +56,15 @@
             <version>${version}</version>
             <scope>runtime</scope>
        </dependency>
-
+       
+<!-- why need this? --
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jaxws-sun-tools</artifactId>
             <type>car</type>
             <version>${version}</version>
         </dependency>
+-->
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/src/main/history/dependencies.xml Thu Jan
28 07:28:41 2010
@@ -6,7 +6,7 @@
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>cxf</artifactId>
         <type>car</type>
@@ -17,11 +17,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jaxws-sun-tools</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-cxf-builder</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/history/dependencies.xml Thu
Jan 28 07:28:41 2010
@@ -11,7 +11,7 @@
         <artifactId>cxf-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>cxf-ejb</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/src/main/plan/plan.xml Thu Jan 28 07:28:41
2010
@@ -20,7 +20,7 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="CXFEJBBuilder" class="org.apache.geronimo.cxf.builder.CXFEJBBuilder">
+    <gbean name="CXFEJBBuilder" class="org.apache.geronimo.cxf.ejb.builder.CXFEJBBuilder">
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
@@ -42,7 +42,7 @@
         </references>
     </gbean>
 
-    <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+    <gbean name="CXFModuleBuilderExtension" class="org.apache.geronimo.jaxws.ejb.builder.JAXWSEJBModuleBuilderExtension">
         <reference name="WebServiceBuilder">
             <name>CXFEJBBuilder</name>
         </reference>

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
(original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
Thu Jan 28 07:28:41 2010
@@ -52,8 +52,8 @@
 import org.apache.geronimo.jaxws.PortInfo;
 import org.apache.geronimo.jaxws.builder.JAXWSServiceBuilder;
 import org.apache.geronimo.jaxws.builder.WARWebServiceFinder;
-import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
-import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
 import org.apache.geronimo.kernel.repository.Environment;
 
 public class CXFBuilder extends JAXWSServiceBuilder {

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
Thu Jan 28 07:28:41 2010
@@ -37,6 +37,7 @@
 import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
 import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,11 +51,11 @@
     }
        
     public Object createService(ServiceRefType serviceRef, GerServiceRefType gerServiceRef,

-                                Module module, ClassLoader cl, Class serviceInterface, 
+                                Module module, Bundle bundle, Class serviceInterface, 
                                 QName serviceQName, URI wsdlURI, Class serviceReference,

                                 Map<Class, PortComponentRefType> portComponentRefMap)
throws DeploymentException {
         EndpointInfoBuilder builder = new EndpointInfoBuilder(serviceInterface,
-                gerServiceRef, portComponentRefMap, module, cl, 
+                gerServiceRef, portComponentRefMap, module, bundle, 
                 wsdlURI, serviceQName);
         builder.build();
 

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java
(original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/ejb/builder/CXFEJBBuilder.java
Thu Jan 28 07:28:41 2010
@@ -22,9 +22,10 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jaxws.builder.EJBWebServiceFinder;
-import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
+import org.apache.geronimo.jaxws.ejb.builder.EJBWebServiceFinder;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator;
 import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.cxf.builder.CXFBuilder;
 
 public class CXFEJBBuilder extends CXFBuilder {
 

Modified: geronimo/server/trunk/plugins/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/pom.xml?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/pom.xml Thu Jan 28 07:28:41 2010
@@ -41,13 +41,13 @@
         <module>cxf-deployer</module>
         <module>cxf-ejb</module>
         <module>cxf-ejb-deployer</module>
-        <module>cxf-jaxws-tools</module>
-        <module>cxf-tools</module>
+        <!--<module>cxf-jaxws-tools</module>-->
+        <!--<module>cxf-tools</module>-->
         <module>geronimo-cxf</module>
         <module>geronimo-cxf-builder</module>
         <module>geronimo-cxf-ejb</module>
         <module>geronimo-cxf-ejb-builder</module>
-        <module>geronimo-cxf-tools</module>
+        <!--<module>geronimo-cxf-tools</module>-->
     </modules>
 
     <dependencyManagement>
@@ -278,10 +278,6 @@
                         <artifactId>logkit</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>avalon-framework</groupId>
                         <artifactId>avalon-framework</artifactId>
                     </exclusion>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=903980&r1=903979&r2=903980&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Jan 28 07:28:41 2010
@@ -112,7 +112,7 @@
         <module>connector-1_6</module>
         <module>console</module>
         <!--<module>corba</module>-->
-        <!--<module>cxf</module>-->
+        <module>cxf</module>
         <module>dojo</module>
         <!--<module>debugviews</module>-->
         <module>hotdeploy</module>



Mime
View raw message