geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r515312 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml configs/cxf/pom.xml configs/pom.xml modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java modules/pom.xml
Date Tue, 06 Mar 2007 21:38:04 GMT
Author: gawor
Date: Tue Mar  6 13:38:03 2007
New Revision: 515312

URL: http://svn.apache.org/viewvc?view=rev&rev=515312
Log:
re-enable cxf. lots of thanks to cxf folks

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/server/trunk/configs/cxf/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
    geronimo/server/trunk/modules/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=515312&r1=515311&r2=515312
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Tue
Mar  6 13:38:03 2007
@@ -174,10 +174,6 @@
         </gbean>
     </module>
     
-    <!--
-    FIXME: This is disabled for now because of issues with building the latest
-           cxf bits... should be fixed soon (I hope) and then can turn this back on.
-    
     <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" 
             condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') ==
'cxf'">
 
@@ -196,7 +192,6 @@
              </attribute>
         </gbean>
     </module>
-    -->
     
     <module name="org.apache.geronimo.configs/axis-deployer/${version}/car">
         <gbean name="AxisServiceRefBuilder">

Modified: geronimo/server/trunk/configs/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/pom.xml?view=diff&rev=515312&r1=515311&r2=515312
==============================================================================
--- geronimo/server/trunk/configs/cxf/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf/pom.xml Tue Mar  6 13:38:03 2007
@@ -144,6 +144,10 @@
              <groupId>org.springframework</groupId>
              <artifactId>spring-context</artifactId>
          </dependency>
+        <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=515312&r1=515311&r2=515312
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Mar  6 13:38:03 2007
@@ -172,10 +172,8 @@
         <module>openjpa</module>
         <module>axis2</module>
         <module>axis2-deployer</module>
-        <!--
         <module>cxf</module>
         <module>cxf-deployer</module>
-        -->
         <module>jaxws-deployer</module>
         <module>dojo-jetty6</module>
         <module>jetty6</module>

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java?view=diff&rev=515312&r1=515311&r2=515312
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestination.java
Tue Mar  6 13:38:03 2007
@@ -54,7 +54,7 @@
     public GeronimoDestination(Bus bus, 
                                ConduitInitiator conduitInitiator, 
                                EndpointInfo endpointInfo) throws IOException {
-        super(bus, conduitInitiator, endpointInfo);
+        super(bus, conduitInitiator, endpointInfo, true);
     }
 
     public EndpointInfo getEndpointInfo() {

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=515312&r1=515311&r2=515312
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Tue Mar  6 13:38:03 2007
@@ -105,10 +105,8 @@
         <module>geronimo-persistence-jpa10-builder</module>
         <module>geronimo-axis2</module>
         <module>geronimo-axis2-builder</module>
-        <!--
         <module>geronimo-cxf</module>
         <module>geronimo-cxf-builder</module>
-        -->
         <module>geronimo-jaxws</module>
         <module>geronimo-jaxws-builder</module>
         <module>geronimo-jetty6</module>



Mime
View raw message