JBossWS SVN: r17288 - in shared-testsuite/trunk/testsuite/src/test: resources/jaxws/complex/META-INF/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 10:48:20 -0500 (Fri, 08 Feb 2013)
New Revision: 17288
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
Log:
Minor enhancement to the "complex" sample to also include INOUT parameters (jaxws Holder)
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2013-02-08 15:05:19 UTC (rev 17287)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2013-02-08 15:48:20 UTC (rev 17288)
@@ -69,6 +69,10 @@
log.info("registering customer: " + customer);
return customer.getId();
}
+
+ public void echo(javax.xml.ws.Holder<org.jboss.test.ws.jaxws.complex.Customer> customer) {
+ log.info("customer: " + customer);
+ }
public List<Long> bulkRegister(List<Customer> customers, Object when) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
{
Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2013-02-08 15:05:19 UTC (rev 17287)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2013-02-08 15:48:20 UTC (rev 17288)
@@ -12,6 +12,8 @@
<xs:element name="Register" nillable="false" type="tns:Register"/>
<xs:element name="RegisterForInvoice" nillable="false" type="tns:RegisterForInvoice"/>
<xs:element name="RegisterForInvoiceResponse" nillable="false" type="tns:RegisterForInvoiceResponse"/>
+ <xs:element name="Echo" nillable="false" type="tns:Echo"/>
+ <xs:element name="EchoResponse" nillable="false" type="tns:EchoResponse"/>
<xs:element name="RegisterResponse" nillable="false" type="tns:RegisterResponse"/>
<xs:element name="ValidationFault" nillable="false" type="tns:ValidationFault"/>
<xs:complexType name="Register">
@@ -20,11 +22,21 @@
<xs:element name="When" nillable="true" type="xs:anySimpleType"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="Echo">
+ <xs:sequence>
+ <xs:element name="Customer" nillable="true" type="ns1:Customer"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="RegisterResponse">
<xs:sequence>
<xs:element name="RegisteredID" type="xs:long"/>
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="EchoResponse">
+ <xs:sequence>
+ <xs:element name="Customer" nillable="true" type="ns1:Customer"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="AlreadyRegisteredFault">
<xs:complexContent>
<xs:extension base="ns1:RegistrationFault">
@@ -134,6 +146,9 @@
<message name="Registration_RegisterForInvoiceResponse">
<part name="RegisterForInvoiceResponse" element="ns1:RegisterForInvoiceResponse"/>
</message>
+ <message name="Registration_EchoResponse">
+ <part name="EchoResponse" element="ns1:EchoResponse"/>
+ </message>
<message name="Registration_RegisterResponse">
<part name="RegisterResponse" element="ns1:RegisterResponse"/>
</message>
@@ -152,6 +167,9 @@
<message name="Registration_RegisterForInvoice">
<part name="RegisterForInvoice" element="ns1:RegisterForInvoice"/>
</message>
+ <message name="Registration_Echo">
+ <part name="Echo" element="ns1:Echo"/>
+ </message>
<message name="ValidationFault">
<part name="ValidationFault" element="ns1:ValidationFault"/>
</message>
@@ -184,6 +202,10 @@
<fault name="AlreadyRegisteredFault" message="ns1:AlreadyRegisteredFault"/>
<fault name="ValidationFault" message="ns1:ValidationFault"/>
</operation>
+ <operation name="Echo" parameterOrder="Echo">
+ <input message="ns1:Registration_Echo"/>
+ <output message="ns1:Registration_EchoResponse"/>
+ </operation>
</portType>
<binding name="RegistrationBinding" type="ns1:Registration">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
@@ -202,6 +224,15 @@
<soap:fault name="ValidationFault" use="literal"/>
</fault>
</operation>
+ <operation name="Echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
<operation name="GetStatistics">
<soap:operation soapAction=""/>
<input>
12 years, 1 month
JBossWS SVN: r17287 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 10:05:19 -0500 (Fri, 08 Feb 2013)
New Revision: 17287
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Further changes related to AS7-6344 to fix binary distribution testsuite
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-08 12:32:13 UTC (rev 17286)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-02-08 15:05:19 UTC (rev 17287)
@@ -107,11 +107,6 @@
<property name="jboss.lib" value="${jboss.home}/lib"/>
- <!-- Java Endorsed -->
- <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/">
- <isset property="jboss.home"/>
- </condition>
-
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
@@ -138,6 +133,11 @@
<target name="tests-classpath-jboss71x" depends="tests-prepare" if="jbossws.integration.jboss71x">
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/modules/javax/xml/ws/api/main/">
+ <isset property="jboss.home"/>
+ </condition>
+
<path id="integration.target.javac.classpath">
<fileset dir="${jboss.home}/modules/javax/activation/api/main/">
<include name="activation-*.jar"/>
@@ -293,32 +293,37 @@
<target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x">
+ <!-- Java Endorsed -->
+ <condition property="endorsed.dirs" value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/">
+ <isset property="jboss.home"/>
+ </condition>
+
<path id="integration.target.javac.classpath">
- <fileset dir="${jboss.home}/modules/javax/activation/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/activation/api/main/">
<include name="activation-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
<include name="mail-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
<include name="jboss-common-core-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
<include name="picketlink-core*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
<include name="jboss-ejb-api_3.1_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ejb3/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb3/main/">
<include name="jboss-ejb3-ext-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
<include name="jboss-servlet-api_3.0_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/annotation/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/">
<include name="jboss-annotations-api_1.1_spec-*.jar"/>
</fileset>
</path>
@@ -336,110 +341,110 @@
<pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
<pathelement location="${jboss.home}/jboss-modules.jar"/>
- <fileset dir="${jboss.home}/modules/org/jboss/logging/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
<include name="jboss-logging-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller/main/">
<include name="jboss-as-controller-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller-client/main/">
<include name="jboss-as-controller-client-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/server/main/">
<include name="jboss-as-server-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/protocol/main/">
<include name="jboss-as-protocol-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/dmr/main/">
<include name="jboss-dmr-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/main/">
<include name="jboss-marshalling-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/main/">
<include name="slf4j-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/">
<include name="jcl-over-slf4j-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/impl/main/">
<include name="slf4j-jboss-logmanager-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logmanager/main/">
<include name="jboss-logmanager-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/log4j/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/log4j/main/">
<include name="log4j-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/mail/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
<include name="mail-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/servlet/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
<include name="jboss-servlet-api_3.0_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/transaction/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/">
<include name="jboss-transaction-api_1.1_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/threads/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/">
<include name="jboss-threads-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketbox/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketbox/main/">
<include name="picketbox-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/picketlink/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
<include name="picketlink-core*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/ejb/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
<include name="jboss-ejb-api_3.1_spec-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/ejb-client/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb-client/main/">
<include name="jboss-ejb-client-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/xerces/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xerces/main/">
<include name="xercesImpl-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
<include name="jboss-common-core-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/javassist/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/javassist/main/">
<include name="javassist-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/javax/security/jacc/api/main/">
<include name="jboss-jacc-api*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting3/main/">
<include name="jboss-remoting-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/marshalling/river/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/river/main/">
<include name="jboss-marshalling-river-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remoting-jmx/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting-jmx/main/">
<include name="remoting-jmx-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/">
<include name="jboss-sasl-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/netty/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/netty/main/">
<include name="netty-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xb/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/">
<include name="jbossxb-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/joda/time/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/joda/time/main/">
<include name="joda-time-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xalan/main/">
<include name="serializer-*.jar"/>
<include name="xalan-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xnio/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/main/">
<include name="xnio-api-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/nio/main/">
<include name="xnio-nio-*.jar"/>
</fileset>
- <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/">
+ <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remote-naming/main/">
<include name="jboss-remote-naming-*.jar"/>
</fileset>
<pathelement location="${tools.jar}"/>
12 years, 1 month
JBossWS SVN: r17286 - thirdparty/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-02-08 07:32:13 -0500 (Fri, 08 Feb 2013)
New Revision: 17286
Added:
thirdparty/cxf/branches/cxf-2.2.12-patch-04_JBPAPP-10627/
Log:
[JBPAPP-10627] Create one off patch branch
12 years, 1 month
JBossWS SVN: r17285 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/addons and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 06:22:11 -0500 (Fri, 08 Feb 2013)
New Revision: 17285
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
Log:
Preparing for next dev cycle
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-08 11:15:09 UTC (rev 17284)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-08 11:22:11 UTC (rev 17285)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.1.3.Final</version>
+ <version>4.1.4-SNAPSHOT</version>
<!-- Parent -->
<parent>
12 years, 1 month
JBossWS SVN: r17283 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 06:11:47 -0500 (Fri, 08 Feb 2013)
New Revision: 17283
Added:
stack/cxf/tags/jbossws-cxf-4.1.3.Final/
Log:
Tagging jbossws-cxf-4.1.3.Final
12 years, 1 month
JBossWS SVN: r17282 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/addons and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 06:10:31 -0500 (Fri, 08 Feb 2013)
New Revision: 17282
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
Log:
Preparing for tagging
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-08 10:56:32 UTC (rev 17281)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-08 11:10:31 UTC (rev 17282)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.1.3-SNAPSHOT</version>
+ <version>4.1.3.Final</version>
<!-- Parent -->
<parent>
12 years, 1 month
JBossWS SVN: r17281 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 05:56:32 -0500 (Fri, 08 Feb 2013)
New Revision: 17281
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/
stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
Log:
Merged revisions 17279 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r17279 | alessio.soldano(a)jboss.com | 2013-02-08 11:21:52 +0100 (Fri, 08 Feb 2013) | 2 lines
[JBWS-3594] Make sure the classloader in CustomJavaFileManager does not implement Closeable
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Modified: svnmerge-integrated
- /stack/cxf/trunk:1-17199
+ /stack/cxf/trunk:1-17199,17279
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17279
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-02-08 10:22:12 UTC (rev 17280)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-02-08 10:56:32 UTC (rev 17281)
@@ -330,7 +330,10 @@
final class CustomJavaFileManager extends ForwardingJavaFileManager<JavaFileManager>
{
- private ClassLoader classLoader = Provider.provider().getClass().getClassLoader();
+ private ClassLoader classLoader = new ClassLoader(Provider.provider().getClass().getClassLoader())
+ {
+ //just prevent the classloader from being Closeable, as URLClassloader implements Closeable since JDK 1.7 u12 b08
+ };
protected CustomJavaFileManager(JavaFileManager fileManager)
{
12 years, 1 month
JBossWS SVN: r17280 - thirdparty/cxf/branches/cxf-2.4.6-patch01_BZ908807/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators.
by jbossws-commits＠lists.jboss.org
Author: mmusaji
Date: 2013-02-08 05:22:12 -0500 (Fri, 08 Feb 2013)
New Revision: 17280
Modified:
thirdparty/cxf/branches/cxf-2.4.6-patch01_BZ908807/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
Log:
[BZ908807] Merged changes from CXF-4789
Modified: thirdparty/cxf/branches/cxf-2.4.6-patch01_BZ908807/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.4.6-patch01_BZ908807/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java 2013-02-08 10:21:52 UTC (rev 17279)
+++ thirdparty/cxf/branches/cxf-2.4.6-patch01_BZ908807/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java 2013-02-08 10:22:12 UTC (rev 17280)
@@ -419,7 +419,7 @@
CastUtils.cast((List<?>)signedResult.get(
WSSecurityEngineResult.TAG_DATA_REF_URIS
));
- if (sl != null && sl.size() == 1) {
+ if (sl != null && sl.size() >= 1) {
for (WSDataRef dataRef : sl) {
QName signedQName = dataRef.getName();
if (WSSecurityEngine.SIGNATURE.equals(signedQName)
12 years, 1 month
JBossWS SVN: r17279 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 05:21:52 -0500 (Fri, 08 Feb 2013)
New Revision: 17279
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
Log:
[JBWS-3594] Make sure the classloader in CustomJavaFileManager does not implement Closeable
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-02-08 10:21:01 UTC (rev 17278)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-02-08 10:21:52 UTC (rev 17279)
@@ -318,7 +318,10 @@
final class CustomJavaFileManager extends ForwardingJavaFileManager<JavaFileManager>
{
- private ClassLoader classLoader = Provider.provider().getClass().getClassLoader();
+ private ClassLoader classLoader = new ClassLoader(Provider.provider().getClass().getClassLoader())
+ {
+ //just prevent the classloader from being Closeable, as URLClassloader implements Closeable since JDK 1.7 u12 b08
+ };
protected CustomJavaFileManager(JavaFileManager fileManager)
{
12 years, 1 month