JBossWS SVN: r9643 - in stack/cxf/trunk: modules/client and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-20 14:49:06 -0400 (Fri, 20 Mar 2009)
New Revision: 9643
Added:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-ws-security.xml
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-corba.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.fixml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-corba.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-javascript-client.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.fixml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.fixml
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-2577] Moving to Apache CXF 2.2
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/client/pom.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -112,6 +112,10 @@
<artifactId>cxf-xjc-ts</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-wstx-msv-validation</artifactId>
+ </dependency>
+ <dependency>
<groupId>apache-velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -76,5 +76,6 @@
<extension class="org.apache.cxf.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
<namespace>http://apache.org/cxf/binding/jaxrs</namespace>
</extension>
+ <extension class="org.apache.cxf.wstx_msv_validation.WoodstoxValidationImpl" interface="org.apache.cxf.staxutils.StaxValidationManager"/>
</extensions>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-corba.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-javascript-client.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxrs-binding.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.fixml
===================================================================
(Binary files differ)
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -29,12 +29,8 @@
<property name="idsProperty" value="knownElements"/>
</bean>
</constructor-arg>
- <property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.PolicyConstants"
- id="org.apache.cxf.ws.policy.PolicyConstants"/>
-
<bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl">
<constructor-arg>
<bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap">
@@ -78,9 +74,7 @@
<!-- MTOM Policy Support -->
<bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"
- id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
- <property name="bus" ref="cxf"/>
- </bean>
+ id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"/>
<bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"
id="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
</beans>
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.fixml
===================================================================
(Binary files differ)
Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -53,12 +53,10 @@
<bean id="org.apache.cxf.binding.soap.customEditorConfigurer"
class="org.springframework.beans.factory.config.CustomEditorConfigurer">
- <property name="customEditors">
- <map>
- <entry key="org.apache.cxf.binding.soap.SoapVersion">
- <bean class="org.apache.cxf.binding.soap.SoapVersionEditor"/>
- </entry>
- </map>
+ <property name="propertyEditorRegistrars">
+ <list>
+ <bean class="org.apache.cxf.binding.soap.spring.SoapVersionRegistrar"/>
+ </list>
</property>
</bean>
</beans>
Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="org.apache.cxf.ws.security.policy.WSSecurityPolicyLoader"
+ class="org.apache.cxf.ws.security.policy.WSSecurityPolicyLoader">
+ <property name="bus" ref="cxf"/>
+ </bean>
+</beans>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-ws-security.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.fixml
===================================================================
(Binary files differ)
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2009-03-20 18:49:06 UTC (rev 9643)
@@ -56,11 +56,14 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-common-utilities.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-corba.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-http.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-object.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-soap.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-xml.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-core.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-management.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-common.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-validator.jar
@@ -69,6 +72,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-frontend-jaxws.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-dv.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-ts.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-wstx-msv-validation.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2009-03-20 18:49:06 UTC (rev 9643)
@@ -90,11 +90,14 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-common-utilities.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-bindings-corba.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-bindings-http.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-bindings-object.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-bindings-soap.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-bindings-xml.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-core.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-management.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-jms.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-local.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-rt-transports-http.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-common.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-validator.jar"
@@ -103,6 +106,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-frontend-jaxws.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-dv.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-ts.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-wstx-msv-validation.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-ejb3x.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-03-20 18:49:06 UTC (rev 9643)
@@ -52,7 +52,9 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-common-utilities.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-corba.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-http.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-xml.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-object.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-bindings-soap.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-core.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-databinding-jaxb.jar
@@ -64,11 +66,13 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-http-jetty.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-jms.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-transports-local.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-addr.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-policy.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-rt-ws-rm.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-java2ws.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-common.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/cxf-wstx-msv-validation.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-collections.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-03-20 18:49:06 UTC (rev 9643)
@@ -89,6 +89,8 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-common-utilities.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-corba.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-xml.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-http.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-object.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-bindings-soap.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-core.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-databinding-jaxb.jar"
@@ -100,11 +102,13 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-http-jetty.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-jms.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-transports-local.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-addr.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-policy.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-rt-ws-rm.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-tools-java2ws.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-tools-common.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/cxf-wstx-msv-validation.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-collections.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-lang.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-logging.jar"
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -117,6 +117,10 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-wstx-msv-validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-ts</artifactId>
</dependency>
<dependency>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,65 +16,66 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-<extensions xmlns="http://cxf.apache.org/bus/extension">
- <!-- <extension class="org.apache.cxf.binding.BindingFactoryManagerImpl"-->
- <!-- interface="org.apache.cxf.binding.BindingFactoryManager"/>-->
- <!-- <extension class="org.apache.cxf.transport.DestinationFactoryManagerImpl"-->
- <!-- interface="org.apache.cxf.transport.DestinationFactoryManager"/>-->
- <!-- <extension class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"-->
- <!-- interface="org.apache.cxf.transport.ConduitInitiatorManager"/>-->
- <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager" />
- <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager" />
- <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager" />
- <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager" />
- <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry" />
- <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry" />
- <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry" />
- <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager" />
- <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager" />
- <extension class="org.apache.cxf.binding.corba.CorbaBindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/bindings/corba</namespace>
- <namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- </extension>
- <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
- <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
- <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true">
- <namespace>http://cxf.apache.org/transports/jms</namespace>
- <namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/binding/object/</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/http</namespace>
- </extension>
- <extension class="org.apache.cxf.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
- </extension>
-</extensions>
-
+-->
+<extensions xmlns="http://cxf.apache.org/bus/extension">
+ <!-- <extension class="org.apache.cxf.binding.BindingFactoryManagerImpl"-->
+ <!-- interface="org.apache.cxf.binding.BindingFactoryManager"/>-->
+ <!-- <extension class="org.apache.cxf.transport.DestinationFactoryManagerImpl"-->
+ <!-- interface="org.apache.cxf.transport.DestinationFactoryManager"/>-->
+ <!-- <extension class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"-->
+ <!-- interface="org.apache.cxf.transport.ConduitInitiatorManager"/>-->
+ <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager" />
+ <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager" />
+ <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager" />
+ <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager" />
+ <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry" />
+ <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry" />
+ <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry" />
+ <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager" />
+ <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager" />
+ <extension class="org.apache.cxf.binding.corba.CorbaBindingFactory" deferred="true">
+ <namespace>http://cxf.apache.org/bindings/corba</namespace>
+ <namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
+ </extension>
+ <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+ <namespace>http://schemas.xmlsoap.org/soap/</namespace>
+ <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
+ <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+ <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
+ <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+ </extension>
+ <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true">
+ <namespace>http://schemas.xmlsoap.org/soap/</namespace>
+ <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
+ <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+ </extension>
+ <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true">
+ <namespace>http://cxf.apache.org/bindings/xformat</namespace>
+ <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
+ <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+ </extension>
+ <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
+ <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
+ <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+ <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
+ <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
+ <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+ <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
+ <namespace>http://cxf.apache.org/bindings/xformat</namespace>
+ </extension>
+ <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true">
+ <namespace>http://cxf.apache.org/transports/jms</namespace>
+ <namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
+ </extension>
+ <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+ <namespace>http://cxf.apache.org/binding/object/</namespace>
+ </extension>
+ <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+ <namespace>http://apache.org/cxf/binding/http</namespace>
+ </extension>
+ <extension class="org.apache.cxf.jaxrs.JAXRSBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+ <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
+ </extension>
+ <extension class="org.apache.cxf.wstx_msv_validation.WoodstoxValidationImpl" interface="org.apache.cxf.staxutils.StaxValidationManager"/>
+</extensions>
+
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-corba.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-jetty.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-javascript-client.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxrs-binding.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.fixml
===================================================================
(Binary files differ)
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -29,12 +29,8 @@
<property name="idsProperty" value="knownElements"/>
</bean>
</constructor-arg>
- <property name="bus" ref="cxf"/>
</bean>
- <bean class="org.apache.cxf.ws.policy.PolicyConstants"
- id="org.apache.cxf.ws.policy.PolicyConstants"/>
-
<bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl">
<constructor-arg>
<bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap">
@@ -78,9 +74,7 @@
<!-- MTOM Policy Support -->
<bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"
- id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder">
- <property name="bus" ref="cxf"/>
- </bean>
+ id="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"/>
<bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"
id="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/>
</beans>
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.fixml
===================================================================
(Binary files differ)
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -53,12 +53,10 @@
<bean id="org.apache.cxf.binding.soap.customEditorConfigurer"
class="org.springframework.beans.factory.config.CustomEditorConfigurer">
- <property name="customEditors">
- <map>
- <entry key="org.apache.cxf.binding.soap.SoapVersion">
- <bean class="org.apache.cxf.binding.soap.SoapVersionEditor"/>
- </entry>
- </map>
+ <property name="propertyEditorRegistrars">
+ <list>
+ <bean class="org.apache.cxf.binding.soap.spring.SoapVersionRegistrar"/>
+ </list>
</property>
</bean>
</beans>
Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-ws-security.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-ws-security.xml (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-ws-security.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:foo="http://cxf.apache.org/configuration/foo"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <bean id="org.apache.cxf.ws.security.policy.WSSecurityPolicyLoader"
+ class="org.apache.cxf.ws.security.policy.WSSecurityPolicyLoader">
+ <property name="bus" ref="cxf"/>
+ </bean>
+</beans>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-ws-security.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.fixml
===================================================================
(Binary files differ)
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.fixml
===================================================================
(Binary files differ)
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-03-20 18:45:53 UTC (rev 9642)
+++ stack/cxf/trunk/pom.xml 2009-03-20 18:49:06 UTC (rev 9643)
@@ -57,7 +57,8 @@
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
-->
<!-- END -->
- <cxf.version>2.1.4</cxf.version>
+ <cxf.version>2.2</cxf.version>
+ <cxf.anttasks.version>2.1.4</cxf.anttasks.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<fastinfoset.api.version>1.2.2</fastinfoset.api.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
@@ -188,7 +189,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-anttasks</artifactId>
- <version>${cxf.version}</version>
+ <version>${cxf.anttasks.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -291,6 +292,11 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-wstx-msv-validation</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
<version>${jaxrpc.api.version}</version>
17 years, 1 month
JBossWS SVN: r9642 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-20 14:45:53 -0400 (Fri, 20 Mar 2009)
New Revision: 9642
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2582][JBWS-2577] Excluding tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-20 16:24:17 UTC (rev 9641)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-03-20 18:45:53 UTC (rev 9642)
@@ -85,3 +85,7 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
+# used when wsdl contains mutiple schemas
+org/jboss/test/ws/jaxws/complex/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-20 16:24:17 UTC (rev 9641)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-03-20 18:45:53 UTC (rev 9642)
@@ -61,3 +61,7 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
+# used when wsdl contains mutiple schemas
+org/jboss/test/ws/jaxws/complex/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-20 16:24:17 UTC (rev 9641)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-03-20 18:45:53 UTC (rev 9642)
@@ -61,3 +61,7 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
+# used when wsdl contains mutiple schemas
+org/jboss/test/ws/jaxws/complex/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-20 16:24:17 UTC (rev 9641)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-03-20 18:45:53 UTC (rev 9642)
@@ -61,3 +61,7 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
+# used when wsdl contains mutiple schemas
+org/jboss/test/ws/jaxws/complex/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-20 16:24:17 UTC (rev 9641)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-03-20 18:45:53 UTC (rev 9642)
@@ -61,3 +61,7 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2582] org.apache.cxf.tools.common.ToolException: -p option cannot be
+# used when wsdl contains mutiple schemas
+org/jboss/test/ws/jaxws/complex/**
17 years, 1 month
JBossWS SVN: r9641 - stack/native/branches/jbossws-native-2.0.1.SP2_CP.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-20 12:24:17 -0400 (Fri, 20 Mar 2009)
New Revision: 9641
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties
Log:
[JBPAPP-1655] Switch to SNAPSHOT of Framework.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2009-03-20 16:23:35 UTC (rev 9640)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/version.properties 2009-03-20 16:24:17 UTC (rev 9641)
@@ -26,7 +26,7 @@
# Dependend integration projects
jbossws-spi=1.0.0.GA_CP-SNAPSHOT
jbossws-common=1.0.0.GA_CP-SNAPSHOT
-jbossws-framework=2.0.1.GA_CP03-brew
+jbossws-framework=2.0.1.GA_CP-SNAPSHOT
jbossws-jboss40=2.0.1.GA
jbossws-jboss42=2.0.1.GA_CP01
17 years, 1 month
JBossWS SVN: r9640 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-20 12:23:35 -0400 (Fri, 20 Mar 2009)
New Revision: 9640
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
Log:
[JBPAPP-1784] WS throws NPE when started with -Dcom.sun.management.jmxremote
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-03-20 15:12:37 UTC (rev 9639)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2009-03-20 16:23:35 UTC (rev 9640)
@@ -605,11 +605,16 @@
private MBeanServer getJMXServer()
{
MBeanServer server = null;
- ArrayList servers = MBeanServerFactory.findMBeanServer(null);
- if (servers.size() > 0)
+ ArrayList<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
+ for (MBeanServer current : servers)
{
- server = (MBeanServer)servers.get(0);
+ if (current.getClass().getName().startsWith("org.jboss")) // JBWS-2580
+ {
+ server = current;
+ break;
+ }
}
+
return server;
}
17 years, 1 month
JBossWS SVN: r9639 - framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-20 11:12:37 -0400 (Fri, 20 Mar 2009)
New Revision: 9639
Modified:
framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java
Log:
[JBPAPP-1784] WS throws NPE when started with -Dcom.sun.management.jmxremote
Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java
===================================================================
--- framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java 2009-03-20 14:33:46 UTC (rev 9638)
+++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java 2009-03-20 15:12:37 UTC (rev 9639)
@@ -46,7 +46,10 @@
for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
{
mbeanServer = (MBeanServer)i.next();
- break;
+ if (mbeanServer.getClass().getName().startsWith("org.jboss")) // JBWS-2580
+ {
+ break;
+ }
}
}
return mbeanServer;
17 years, 1 month
JBossWS SVN: r9638 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-20 10:33:46 -0400 (Fri, 20 Mar 2009)
New Revision: 9638
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
Log:
[JBPAPP-1704] org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.AddressingReplyToTestCase failure.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2009-03-20 14:14:24 UTC (rev 9637)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2009-03-20 14:33:46 UTC (rev 9638)
@@ -93,15 +93,12 @@
assertEquals("ReplyTo", replyto.getLastMessage());
}
- public void testInital() throws Exception
+ public void testReplyTo() throws Exception
{
String message = initial.sayHello("Addressing TestCase");
assertNull("Expected null, but was: " + message, message);
- }
- public void testReplyTo() throws Exception
- {
- String message = replyto.getLastMessage();
- assertEquals("Hello Addressing TestCase", message);
+ String reply = replyto.getLastMessage();
+ assertEquals("Hello Addressing TestCase", reply);
}
}
17 years, 1 month
JBossWS SVN: r9637 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-03-20 10:14:24 -0400 (Fri, 20 Mar 2009)
New Revision: 9637
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1798/
Log:
[JBPAPP-1798] Branch for patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP04_JBPAPP-1798 (from rev 9636, stack/native/tags/jbossws-native-2.0.1.SP2_CP04)
17 years, 1 month
JBossWS SVN: r9636 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-03-20 06:47:20 -0400 (Fri, 20 Mar 2009)
New Revision: 9636
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
Log:
[JBWS-2581] fixing NPE
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-03-20 10:39:17 UTC (rev 9635)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-03-20 10:47:20 UTC (rev 9636)
@@ -235,10 +235,13 @@
List<?> list = (List<?>) ctx.get(Header.HEADER_LIST);
if (list != null && !list.isEmpty()) {
SoapMessage sm = (SoapMessage) createResponseMessage(exchange);
- Iterator<?> iter = list.iterator();
- while (iter.hasNext())
+ if (sm != null)
{
- sm.getHeaders().add((Header) iter.next());
+ Iterator<?> iter = list.iterator();
+ while (iter.hasNext())
+ {
+ sm.getHeaders().add((Header) iter.next());
+ }
}
}
}
17 years, 1 month