[jbossws-commits] JBossWS SVN: r16301 - in stack/cxf/branches/ropalka: modules/client and 3 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue May 22 08:18:30 EDT 2012
Author: ropalka
Date: 2012-05-22 08:18:28 -0400 (Tue, 22 May 2012)
New Revision: 16301
Modified:
stack/cxf/branches/ropalka/modules/client/pom.xml
stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
stack/cxf/branches/ropalka/modules/server/pom.xml
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java
stack/cxf/branches/ropalka/pom.xml
Log:
upgrade to Apache CXF 2.6.1, fix dependencies, update code to be compilable
Modified: stack/cxf/branches/ropalka/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/client/pom.xml 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/client/pom.xml 2012-05-22 12:18:28 UTC (rev 16301)
@@ -50,17 +50,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-coloc</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
Modified: stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java
===================================================================
--- stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSBusFactory.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -108,14 +108,12 @@
}
/** JBossWSNonSpringBusFactory methods **/
- @SuppressWarnings("rawtypes")
- public Bus createBus(Map<Class, Object> extensions)
+ public Bus createBus(Map<Class<?>, Object> extensions)
{
return getNonSpringBusFactory().createBus(extensions);
}
- @SuppressWarnings("rawtypes")
- public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties)
+ public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties)
{
return getNonSpringBusFactory().createBus(extensions, properties);
}
Modified: stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -38,12 +38,11 @@
*/
public class JBossWSNonSpringBusFactory extends CXFBusFactory
{
- @SuppressWarnings("rawtypes")
@Override
- public Bus createBus(Map<Class, Object> extensions, Map<String, Object> properties) {
+ public Bus createBus(Map<Class<?>, Object> extensions, Map<String, Object> properties) {
if (extensions == null)
{
- extensions = new HashMap<Class, Object>();
+ extensions = new HashMap<Class<?>, Object>();
}
if (!extensions.containsKey(Configurer.class))
{
Modified: stack/cxf/branches/ropalka/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/pom.xml 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/server/pom.xml 2012-05-22 12:18:28 UTC (rev 16301)
@@ -51,10 +51,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/AddressRewritingEndpointInfo.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -26,7 +26,7 @@
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
+import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.management.ServerConfig;
Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/SoapTransportFactoryExt.java 2012-05-22 12:18:28 UTC (rev 16301)
@@ -30,8 +30,8 @@
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
-import org.apache.cxf.tools.util.SOAPBindingUtil;
+import org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress;
+import org.apache.cxf.binding.soap.SOAPBindingUtil;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.management.ServerConfig;
Modified: stack/cxf/branches/ropalka/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/pom.xml 2012-05-21 17:18:47 UTC (rev 16300)
+++ stack/cxf/branches/ropalka/pom.xml 2012-05-22 12:18:28 UTC (rev 16301)
@@ -73,7 +73,7 @@
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.5.4-SNAPSHOT</cxf.version>
+ <cxf.version>2.6.1-SNAPSHOT</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -109,7 +109,7 @@
<xmlsec.version>1.5.1</xmlsec.version>
<wss4j.version>1.6.5</wss4j.version>
<wstx.version>3.2.9</wstx.version>
- <spring.version>3.0.6.RELEASE</spring.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
</properties>
@@ -240,21 +240,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-http</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jra</groupId>
- <artifactId>jra</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-object</artifactId>
<version>${cxf.version}</version>
</dependency>
More information about the jbossws-commits
mailing list