October 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16817 - stack/cxf/trunk/modules/client/src/main/resources/META-INF.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-04 12:31:23 -0400 (Thu, 04 Oct 2012) New Revision: 16817 Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml Log: [JBWS-3554] Adding http://ws-i.org/profiles/basic/1.1 entry in jax-ws-catalog.xml Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml 2012-10-04 13:21:28 UTC (rev 16816) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml 2012-10-04 16:31:23 UTC (rev 16817) @@ -19,4 +19,5 @@ --> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/> + <rewriteSystem systemIdStartString="http://ws-i.org/profiles/basic/1.1" rewritePrefix="classpath:/schemas/wsdl"/> </catalog>

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16816 - stack/cxf/branches/jbossws-cxf-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-04 09:21:28 -0400 (Thu, 04 Oct 2012) New Revision: 16816 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Use latest jbossws-shared-testsuite Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-10-04 12:40:40 UTC (rev 16815) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-10-04 13:21:28 UTC (rev 16816) @@ -63,7 +63,7 @@ <jbossws.spi.version>2.0.4.GA</jbossws.spi.version> <jbossws.common.version>2.0.4.GA</jbossws.common.version> <jbossws.common.tools.version>1.0.2-SNAPSHOT</jbossws.common.tools.version> - <jbossws.shared.testsuite.version>4.0.6.GA</jbossws.shared.testsuite.version> + <jbossws.shared.testsuite.version>4.0.7.GA</jbossws.shared.testsuite.version> <jboss712.version>7.1.3.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.4.9-patch-01-SNAPSHOT</cxf.version>

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16815 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-10-04 08:40:40 -0400 (Thu, 04 Oct 2012) New Revision: 16815 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java Log: [JBWS-3552] enrich test case Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-10-04 11:25:53 UTC (rev 16814) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-10-04 12:40:40 UTC (rev 16815) @@ -55,6 +55,12 @@ return service.getPort(EndpointIface.class); } + public void testEchoCA() throws Exception { + EndpointIface endpoint = getProxy(); + AdaptedObjectCA aoCA = new AdaptedObjectCA("object message", "object description", 444, new ComplexObjectCA("a", "b")); + assertEquals("object message,object description,444,a b", endpoint.echoCA(aoCA).toString()); + } + public void testEchoFA() throws Exception { EndpointIface endpoint = getProxy(); AdaptedObjectFA aoFA = new AdaptedObjectFA("object message", "object description", 444, new ComplexObjectFA("a", "b")); @@ -73,6 +79,16 @@ assertEquals("object message,object description,444,a b", endpoint.echoMA(aoMA).toString()); } + public void testExceptionCA() throws Exception { + EndpointIface endpoint = getProxy(); + try { + endpoint.throwExceptionCA(); + fail("Expected exception not thrown"); + } catch (AdaptedExceptionCA e) { + assertEquals("exception message,exception description,666,c d", e.toString()); + } + } + public void testExceptionFA() throws Exception { EndpointIface endpoint = getProxy(); try {

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16814 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-10-04 07:25:53 -0400 (Thu, 04 Oct 2012) New Revision: 16814 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3552] exclude test for now until fix is available Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-04 10:40:34 UTC (rev 16813) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-04 11:25:53 UTC (rev 16814) @@ -690,6 +690,9 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes> </configuration> </plugin> @@ -749,6 +752,9 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes> </configuration> </plugin> @@ -807,6 +813,9 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes> </configuration> </plugin> @@ -863,6 +872,9 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes> </configuration> </plugin>

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16813 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-10-04 06:40:34 -0400 (Thu, 04 Oct 2012) New Revision: 16813 Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCAAdapter.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFAAdapter.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGAAdapter.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMA.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMAAdapter.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/package-info.java Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-3552] providing test case Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-10-04 09:49:10 UTC (rev 16812) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-10-04 10:40:34 UTC (rev 16813) @@ -1291,6 +1291,14 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3552.war" needxmlfile="false"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3552/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws3552/*TestCase.class" /> + </classes> + </war> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase2.war" needxmlfile="false"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws3367/EndpointIface.class"/> Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionCA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AdaptedExceptionCA extends Exception { + private String message; + private String description; + private int code; + private ComplexObjectCA complexObject; + + public AdaptedExceptionCA() { + } + + public AdaptedExceptionCA(String message, String description, int code, ComplexObjectCA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public String getMessage() { + return message; + } + + public String getDescription() { + return description; + } + + public int getCode() { + return code; + } + + public ComplexObjectCA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionFA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AdaptedExceptionFA extends Exception { + private String message; + private String description; + private int code; + @XmlJavaTypeAdapter(value = ComplexObjectFAAdapter.class) + private ComplexObjectFA complexObject; + + public AdaptedExceptionFA() { + } + + public AdaptedExceptionFA(String message, String description, int code, ComplexObjectFA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public String getMessage() { + return message; + } + + public String getDescription() { + return description; + } + + public int getCode() { + return code; + } + + public ComplexObjectFA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionGA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AdaptedExceptionGA extends Exception { + private String message; + private String description; + private int code; + private ComplexObjectGA complexObject; + + public AdaptedExceptionGA() { + } + + public AdaptedExceptionGA(String message, String description, int code, ComplexObjectGA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public String getMessage() { + return message; + } + + public String getDescription() { + return description; + } + + public int getCode() { + return code; + } + + public ComplexObjectGA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedExceptionMA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +(a)XmlAccessorType(XmlAccessType.PUBLIC_MEMBER) +public class AdaptedExceptionMA extends Exception { + private String message; + private String description; + private int code; + private ComplexObjectMA complexObject; + + public AdaptedExceptionMA() { + } + + public AdaptedExceptionMA(String message, String description, int code, ComplexObjectMA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } + + public void setCode(int code) { + this.code = code; + } + + public int getCode() { + return code; + } + + public void setComplexObject(ComplexObjectMA complexObject) { + this.complexObject = complexObject; + } + + @XmlJavaTypeAdapter(value = ComplexObjectMAAdapter.class) + public ComplexObjectMA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectCA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AdaptedObjectCA { + private String message; + private String description; + private int code; + private ComplexObjectCA complexObject; + + public AdaptedObjectCA() { + } + + public AdaptedObjectCA(String message, String description, int code, ComplexObjectCA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public String getMessage() { + return message; + } + + public String getDescription() { + return description; + } + + public int getCode() { + return code; + } + + public ComplexObjectCA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectFA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AdaptedObjectFA { + private String message; + private String description; + private int code; + @XmlJavaTypeAdapter(value = ComplexObjectFAAdapter.class) + private ComplexObjectFA complexObject; + + public AdaptedObjectFA() { + } + + public AdaptedObjectFA(String message, String description, int code, ComplexObjectFA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public String getMessage() { + return message; + } + + public String getDescription() { + return description; + } + + public int getCode() { + return code; + } + + public ComplexObjectFA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectGA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +public class AdaptedObjectGA { + private String message; + private String description; + private int code; + private ComplexObjectGA complexObject; + + public AdaptedObjectGA() { + } + + public AdaptedObjectGA(String message, String description, int code, ComplexObjectGA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public String getMessage() { + return message; + } + + public String getDescription() { + return description; + } + + public int getCode() { + return code; + } + + public ComplexObjectGA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/AdaptedObjectMA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +(a)XmlAccessorType(XmlAccessType.PUBLIC_MEMBER) +public class AdaptedObjectMA { + private String message; + private String description; + private int code; + private ComplexObjectMA complexObject; + + public AdaptedObjectMA() { + } + + public AdaptedObjectMA(String message, String description, int code, ComplexObjectMA complexObject) { + this.message = message; + this.description = description; + this.code = code; + this.complexObject = complexObject; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } + + public void setCode(int code) { + this.code = code; + } + + public int getCode() { + return code; + } + + public void setComplexObject(ComplexObjectMA complexObject) { + this.complexObject = complexObject; + } + + @XmlJavaTypeAdapter(value = ComplexObjectMAAdapter.class) + public ComplexObjectMA getComplexObject() { + return complexObject; + } + + public String toString() { + return message + "," + description + "," + code + "," + complexObject; + } +} \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +@XmlJavaTypeAdapter(value = ComplexObjectCAAdapter.class) +public class ComplexObjectCA { + + private String one; + private String two; + + public ComplexObjectCA() { + } + + public ComplexObjectCA(String one, String two) { + this.one = one; + this.two = two; + } + + public String toString() { + return one + " " + two; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCAAdapter.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCAAdapter.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectCAAdapter.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import java.util.StringTokenizer; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +public class ComplexObjectCAAdapter extends XmlAdapter<String, ComplexObjectCA> { + @Override + public String marshal(ComplexObjectCA v) throws Exception { + return v.toString(); + } + + @Override + public ComplexObjectCA unmarshal(String v) throws Exception { + StringTokenizer st = new StringTokenizer(v, " "); + return new ComplexObjectCA(st.nextToken(), st.nextToken()); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +public class ComplexObjectFA { + + private String one; + private String two; + + public ComplexObjectFA() { + } + + public ComplexObjectFA(String one, String two) { + this.one = one; + this.two = two; + } + + public String toString() { + return one + " " + two; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFAAdapter.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFAAdapter.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectFAAdapter.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import java.util.StringTokenizer; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +public class ComplexObjectFAAdapter extends XmlAdapter<String, ComplexObjectFA> { + @Override + public String marshal(ComplexObjectFA v) throws Exception { + return v.toString(); + } + + @Override + public ComplexObjectFA unmarshal(String v) throws Exception { + StringTokenizer st = new StringTokenizer(v, " "); + return new ComplexObjectFA(st.nextToken(), st.nextToken()); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +public class ComplexObjectGA { + + private String one; + private String two; + + public ComplexObjectGA() { + } + + public ComplexObjectGA(String one, String two) { + this.one = one; + this.two = two; + } + + public String toString() { + return one + " " + two; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGAAdapter.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGAAdapter.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectGAAdapter.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import java.util.StringTokenizer; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +public class ComplexObjectGAAdapter extends XmlAdapter<String, ComplexObjectGA> { + @Override + public String marshal(ComplexObjectGA v) throws Exception { + return v.toString(); + } + + @Override + public ComplexObjectGA unmarshal(String v) throws Exception { + StringTokenizer st = new StringTokenizer(v, " "); + return new ComplexObjectGA(st.nextToken(), st.nextToken()); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMA.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMA.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMA.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +public class ComplexObjectMA { + + private String one; + private String two; + + public ComplexObjectMA() { + } + + public ComplexObjectMA(String one, String two) { + this.one = one; + this.two = two; + } + + public String toString() { + return one + " " + two; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMAAdapter.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMAAdapter.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/ComplexObjectMAAdapter.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import java.util.StringTokenizer; + +import javax.xml.bind.annotation.adapters.XmlAdapter; + +public class ComplexObjectMAAdapter extends XmlAdapter<String, ComplexObjectMA> { + @Override + public String marshal(ComplexObjectMA v) throws Exception { + return v.toString(); + } + + @Override + public ComplexObjectMA unmarshal(String v) throws Exception { + StringTokenizer st = new StringTokenizer(v, " "); + return new ComplexObjectMA(st.nextToken(), st.nextToken()); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointIface.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.jws.WebService; + +@WebService +public interface EndpointIface { + AdaptedObjectCA echoCA(AdaptedObjectCA ao); + + AdaptedObjectFA echoFA(AdaptedObjectFA ao); + + AdaptedObjectGA echoGA(AdaptedObjectGA ao); + + AdaptedObjectMA echoMA(AdaptedObjectMA ao); + + void throwExceptionCA() throws AdaptedExceptionCA; + + void throwExceptionFA() throws AdaptedExceptionFA; + + void throwExceptionGA() throws AdaptedExceptionGA; + + void throwExceptionMA() throws AdaptedExceptionMA; +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/EndpointImpl.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.jws.WebService; + +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws3552.EndpointIface") +public class EndpointImpl { + public AdaptedObjectCA echoCA(AdaptedObjectCA ao) { + return ao; + } + + public AdaptedObjectFA echoFA(AdaptedObjectFA ao) { + return ao; + } + + public AdaptedObjectGA echoGA(AdaptedObjectGA ao) { + return ao; + } + + public AdaptedObjectMA echoMA(AdaptedObjectMA ao) { + return ao; + } + + public void throwExceptionCA() throws AdaptedExceptionCA { + throw new AdaptedExceptionCA("exception message", "exception description", 666, new ComplexObjectCA("c", "d")); + } + + public void throwExceptionFA() throws AdaptedExceptionFA { + throw new AdaptedExceptionFA("exception message", "exception description", 666, new ComplexObjectFA("c", "d")); + } + + public void throwExceptionGA() throws AdaptedExceptionGA { + throw new AdaptedExceptionGA("exception message", "exception description", 666, new ComplexObjectGA("c", "d")); + } + + public void throwExceptionMA() throws AdaptedExceptionMA { + throw new AdaptedExceptionMA("exception message", "exception description", 666, new ComplexObjectMA("c", "d")); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/JBWS3552TestCase.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3552; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-3552] @XmlJavaTypeAdapter ignored on exception classes. + * + * Suffixes abbreviations used in this test case in class names are: + * <ul> + * <li>CA - class level access</li> + * <li>FA - field level access</li> + * <li>MA - method level access</li> + * <li>GA - package level access</li> + * </ul> + * @author <a href="ropalka(a)redhat.com">Richard Opalka</a> + */ +public class JBWS3552TestCase extends JBossWSTest { + public static Test suite() { + return new JBossWSTestSetup(JBWS3552TestCase.class, "jaxws-jbws3552.war"); + } + + private EndpointIface getProxy() throws Exception { + final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3552/EndpointImpl?wsdl"); + final QName serviceName = new QName("http://jbws3552.jaxws.ws.test.jboss.org/", "EndpointImplService"); + final Service service = Service.create(wsdlURL, serviceName); + return service.getPort(EndpointIface.class); + } + + public void testEchoFA() throws Exception { + EndpointIface endpoint = getProxy(); + AdaptedObjectFA aoFA = new AdaptedObjectFA("object message", "object description", 444, new ComplexObjectFA("a", "b")); + assertEquals("object message,object description,444,a b", endpoint.echoFA(aoFA).toString()); + } + + public void testEchoGA() throws Exception { + EndpointIface endpoint = getProxy(); + AdaptedObjectGA aoGA = new AdaptedObjectGA("object message", "object description", 444, new ComplexObjectGA("a", "b")); + assertEquals("object message,object description,444,a b", endpoint.echoGA(aoGA).toString()); + } + + public void testEchoMA() throws Exception { + EndpointIface endpoint = getProxy(); + AdaptedObjectMA aoMA = new AdaptedObjectMA("object message", "object description", 444, new ComplexObjectMA("a", "b")); + assertEquals("object message,object description,444,a b", endpoint.echoMA(aoMA).toString()); + } + + public void testExceptionFA() throws Exception { + EndpointIface endpoint = getProxy(); + try { + endpoint.throwExceptionFA(); + fail("Expected exception not thrown"); + } catch (AdaptedExceptionFA e) { + assertEquals("exception message,exception description,666,c d", e.toString()); + } + } + + public void testExceptionGA() throws Exception { + EndpointIface endpoint = getProxy(); + try { + endpoint.throwExceptionGA(); + fail("Expected exception not thrown"); + } catch (AdaptedExceptionGA e) { + assertEquals("exception message,exception description,666,c d", e.toString()); + } + } + + public void testExceptionMA() throws Exception { + EndpointIface endpoint = getProxy(); + try { + endpoint.throwExceptionMA(); + fail("Expected exception not thrown"); + } catch (AdaptedExceptionMA e) { + assertEquals("exception message,exception description,666,c d", e.toString()); + } + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/package-info.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/package-info.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3552/package-info.java 2012-10-04 10:40:34 UTC (rev 16813) @@ -0,0 +1,27 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +@XmlJavaTypeAdapters({ @XmlJavaTypeAdapter(type = ComplexObjectGA.class, value = ComplexObjectGAAdapter.class) }) +package org.jboss.test.ws.jaxws.jbws3552; + +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; +

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16812 - stack/cxf/branches/jbossws-cxf-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-04 05:49:10 -0400 (Thu, 04 Oct 2012) New Revision: 16812 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Moving to latest snapshots of cxf and jbws common tools Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-10-04 09:45:41 UTC (rev 16811) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-10-04 09:49:10 UTC (rev 16812) @@ -62,11 +62,11 @@ <jbossws.api.version>1.0.0.GA</jbossws.api.version> <jbossws.spi.version>2.0.4.GA</jbossws.spi.version> <jbossws.common.version>2.0.4.GA</jbossws.common.version> - <jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version> + <jbossws.common.tools.version>1.0.2-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.6.GA</jbossws.shared.testsuite.version> <jboss712.version>7.1.3.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <cxf.version>2.4.9</cxf.version> + <cxf.version>2.4.9-patch-01-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>

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16811 - in common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools: cmd and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-04 05:45:41 -0400 (Thu, 04 Oct 2012) New Revision: 16811 Modified: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java Log: [JBPAPP-10060] svn merge -r 16809:16810 https://svn.jboss.org/repos/jbossws/common-tools/trunk . Modified: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java =================================================================== --- common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2012-10-04 09:43:31 UTC (rev 16810) +++ common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2012-10-04 09:45:41 UTC (rev 16811) @@ -54,7 +54,7 @@ * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> * <tr><td>extension</td><td>Enable SOAP 1.2 binding extension.</td><td>false</td></tr> - * <tr><td>target</td><td>The JAX-WS specification target. Allowed values are 2.0, 2.1 and 2.2</td><td></td></tr> + * <tr><td>target</td><td>The JAX-WS specification target. Allowed values are 2.1 and 2.2</td><td></td></tr> * <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr> * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> * </table> Modified: common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java =================================================================== --- common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2012-10-04 09:43:31 UTC (rev 16810) +++ common-tools/branches/jbossws-common-tools-1.0.x/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2012-10-04 09:45:41 UTC (rev 16811) @@ -52,7 +52,7 @@ * <tr><td>-w, --wsdlLocation=<loc> </td><td>Value to use for @(a)WebService.wsdlLocation</td></tr> * <tr><td>-o, --output=<directory> </td><td>The directory to put generated artifacts</td></tr> * <tr><td>-s, --source=<directory> </td><td>The directory to put Java source</td></tr> - * <tr><td>-t, --target=<2.0|2.1|2.2></td><td>The target specification target</td></tr> + * <tr><td>-t, --target=<2.1|2.2></td><td>The target specification target</td></tr> * <tr><td>-n, --nocompile </td><td>Do not compile generated sources</td></tr> * <tr><td>-q, --quiet </td><td>Be somewhat more quiet</td></tr> * <tr><td>-v, --verbose </td><td>Show full exception stack traces</td></tr> @@ -313,7 +313,7 @@ out.println(" -w --wsdlLocation=<loc> Value to use for @WebService.wsdlLocation"); out.println(" -o, --output=<directory> The directory to put generated artifacts"); out.println(" -s, --source=<directory> The directory to put Java source"); - out.println(" -t, --target=<2.0|2.1|2.2> The JAX-WS specification target"); + out.println(" -t, --target=<2.1|2.2> The JAX-WS specification target"); out.println(" -q, --quiet Be somewhat more quiet"); out.println(" -v, --verbose Show full exception stack traces"); out.println(" -l, --load-consumer Load the consumer and exit (debug utility)");

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16810 - in common-tools/trunk/src/main/java/org/jboss/ws/tools: cmd and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-04 05:43:31 -0400 (Thu, 04 Oct 2012) New Revision: 16810 Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java Log: [JBWS-3553] Removing 2.0 target from wsconsume help Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java =================================================================== --- common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2012-10-03 12:42:56 UTC (rev 16809) +++ common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2012-10-04 09:43:31 UTC (rev 16810) @@ -54,7 +54,7 @@ * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> * <tr><td>extension</td><td>Enable SOAP 1.2 binding extension.</td><td>false</td></tr> - * <tr><td>target</td><td>The JAX-WS specification target. Allowed values are 2.0, 2.1 and 2.2</td><td></td></tr> + * <tr><td>target</td><td>The JAX-WS specification target. Allowed values are 2.1 and 2.2</td><td></td></tr> * <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr> * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> * </table> Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java =================================================================== --- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2012-10-03 12:42:56 UTC (rev 16809) +++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2012-10-04 09:43:31 UTC (rev 16810) @@ -52,7 +52,7 @@ * <tr><td>-w, --wsdlLocation=<loc> </td><td>Value to use for @(a)WebService.wsdlLocation</td></tr> * <tr><td>-o, --output=<directory> </td><td>The directory to put generated artifacts</td></tr> * <tr><td>-s, --source=<directory> </td><td>The directory to put Java source</td></tr> - * <tr><td>-t, --target=<2.0|2.1|2.2></td><td>The target specification target</td></tr> + * <tr><td>-t, --target=<2.1|2.2></td><td>The target specification target</td></tr> * <tr><td>-n, --nocompile </td><td>Do not compile generated sources</td></tr> * <tr><td>-q, --quiet </td><td>Be somewhat more quiet</td></tr> * <tr><td>-v, --verbose </td><td>Show full exception stack traces</td></tr> @@ -313,7 +313,7 @@ out.println(" -w --wsdlLocation=<loc> Value to use for @WebService.wsdlLocation"); out.println(" -o, --output=<directory> The directory to put generated artifacts"); out.println(" -s, --source=<directory> The directory to put Java source"); - out.println(" -t, --target=<2.0|2.1|2.2> The JAX-WS specification target"); + out.println(" -t, --target=<2.1|2.2> The JAX-WS specification target"); out.println(" -q, --quiet Be somewhat more quiet"); out.println(" -v, --verbose Show full exception stack traces"); out.println(" -l, --load-consumer Load the consumer and exit (debug utility)");

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16809 - in thirdparty/cxf/branches/cxf-2.4.9: systests/wsdl_maven/codegen and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-03 08:42:56 -0400 (Wed, 03 Oct 2012) New Revision: 16809 Modified: thirdparty/cxf/branches/cxf-2.4.9/pom.xml thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/codegen/pom.xml thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/java2ws/pom.xml Log: Allow deploying artifacts to jboss repos Modified: thirdparty/cxf/branches/cxf-2.4.9/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.4.9/pom.xml 2012-10-03 11:16:40 UTC (rev 16808) +++ thirdparty/cxf/branches/cxf-2.4.9/pom.xml 2012-10-03 12:42:56 UTC (rev 16809) @@ -52,7 +52,17 @@ </properties> <distributionManagement> - <repository> + <repository> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url> + </repository> + <snapshotRepository> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url> + </snapshotRepository> + </snapshotRepository> <site> <id>apache.cxf.site</id> <url>scpexe://people.apache.org/www/cxf.apache.org/cxf/mvn_site</url> - </site> + </site>--> </distributionManagement> <repositories> <repository> Modified: thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/codegen/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/codegen/pom.xml 2012-10-03 11:16:40 UTC (rev 16808) +++ thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/codegen/pom.xml 2012-10-03 12:42:56 UTC (rev 16809) @@ -64,12 +64,12 @@ </build> <dependencies> - <dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> Modified: thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/java2ws/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/java2ws/pom.xml 2012-10-03 11:16:40 UTC (rev 16808) +++ thirdparty/cxf/branches/cxf-2.4.9/systests/wsdl_maven/java2ws/pom.xml 2012-10-03 12:42:56 UTC (rev 16809) @@ -31,7 +31,7 @@ </parent> <build> <plugins> - <plugin> + </plugins> </build>

11 years, 7 months

1
0
0 / 0

JBossWS SVN: r16808 - thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-03 07:16:40 -0400 (Wed, 03 Oct 2012) New Revision: 16808 Modified: thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Log: [JBPAPP-10048] Porting fix for CXF-4539 Modified: thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java =================================================================== --- thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java 2012-10-03 10:45:38 UTC (rev 16807) +++ thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java 2012-10-03 11:16:40 UTC (rev 16808) @@ -22,11 +22,11 @@ import java.net.URI; import java.net.URL; import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import javax.xml.namespace.QName; @@ -57,7 +57,8 @@ HEADERS.add(new QName(WSConstants.ENC_NS, "EncryptedData")); } - private Map<String, Object> properties = new HashMap<String, Object>(); + private Map<String, Object> properties = new ConcurrentHashMap<String, Object>(); + private Map<String, Crypto> cryptoMap = new ConcurrentHashMap<String, Crypto>(); private Set<String> before = new HashSet<String>(); private Set<String> after = new HashSet<String>(); private String phase; @@ -213,5 +214,49 @@ Thread.currentThread().setContextClassLoader(orig); } } + + // TODO Remove once we pick up WSS4J 1.6.8 + @Override + protected Crypto loadCrypto( + String cryptoPropertyFile, + String cryptoPropertyRefId, + RequestData requestData + ) throws WSSecurityException { + Object mc = requestData.getMsgContext(); + Crypto crypto = null; + + // + // Try the Property Ref Id first + // + String refId = getString(cryptoPropertyRefId, mc); + if (refId != null) { + crypto = cryptoMap.get(refId); + if (crypto == null) { + Object obj = getProperty(mc, refId); + if (obj instanceof Properties) { + crypto = CryptoFactory.getInstance((Properties)obj); + cryptoMap.put(refId, crypto); + } else if (obj instanceof Crypto) { + crypto = (Crypto)obj; + cryptoMap.put(refId, crypto); + } + } + } + + // + // Now try loading the properties file + // + if (crypto == null) { + String propFile = getString(cryptoPropertyFile, mc); + if (propFile != null) { + crypto = cryptoMap.get(propFile); + if (crypto == null) { + crypto = loadCryptoFromPropertiesFile(propFile, requestData); + cryptoMap.put(propFile, crypto); + } + } + } + return crypto; + } } Modified: thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java =================================================================== --- thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java 2012-10-03 10:45:38 UTC (rev 16807) +++ thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java 2012-10-03 11:16:40 UTC (rev 16808) @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import javax.xml.namespace.QName; @@ -91,6 +90,7 @@ import org.apache.ws.security.WSSecurityEngineResult; import org.apache.ws.security.WSSecurityException; import org.apache.ws.security.components.crypto.Crypto; +import org.apache.ws.security.components.crypto.CryptoFactory; import org.apache.ws.security.handler.RequestData; import org.apache.ws.security.handler.WSHandlerConstants; import org.apache.ws.security.message.token.Timestamp; @@ -100,7 +100,6 @@ * */ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor { - public static final String PROPERTIES_CACHE = "ws-security.properties.cache"; public static final PolicyBasedWSS4JInInterceptor INSTANCE = new PolicyBasedWSS4JInInterceptor(); private static final Logger LOG = LogUtils.getL7dLogger(PolicyBasedWSS4JInInterceptor.class); @@ -112,24 +111,8 @@ super(true); } - protected static Map<Object, Properties> getPropertiesCache(SoapMessage message) { - EndpointInfo info = message.getExchange().get(Endpoint.class).getEndpointInfo(); - synchronized (info) { - Map<Object, Properties> o = - CastUtils.cast((Map<?, ?>)message.getContextualProperty(PROPERTIES_CACHE)); - if (o == null) { - o = new ConcurrentHashMap<Object, Properties>(); - info.setProperty(PROPERTIES_CACHE, o); - } - return o; - } - } - private static Properties getProps(Object o, String propsKey, URL propsURL, SoapMessage message) { - Properties properties = getPropertiesCache(message).get(propsKey); - if (properties != null) { - return properties; - } + Properties properties = null; if (o instanceof Properties) { properties = (Properties)o; } else if (propsURL != null) { @@ -143,9 +126,6 @@ } } - if (properties != null) { - getPropertiesCache(message).put(propsKey, properties); - } return properties; } @@ -210,7 +190,7 @@ private String checkAsymmetricBinding( AssertionInfoMap aim, String action, SoapMessage message - ) { + ) throws WSSecurityException { Collection<AssertionInfo> ais = aim.get(SP12Constants.ASYMMETRIC_BINDING); if (ais == null || ais.isEmpty()) { return action; @@ -227,42 +207,33 @@ e = message.getContextualProperty(SecurityConstants.ENCRYPT_PROPERTIES); } - if (s != null) { - URL propsURL = getPropertiesFileURL(s, message); - String propsKey = s.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + propsKey); - if (s instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)s); - } else { - message.put("RefId-" + propsKey, getProps(s, propsKey, propsURL, message)); - } - if (e == null) { - e = s; - } + Crypto encrCrypto = getEncryptionCrypto(e, message); + Crypto signCrypto = null; + if (e != null && e.equals(s)) { + signCrypto = encrCrypto; + } else { + signCrypto = getSignatureCrypto(s, message); } - if (e != null) { - URL propsURL = getPropertiesFileURL(e, message); - String propsKey = e.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + propsKey); - if (e instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)e); - } else { - message.put("RefId-" + propsKey, getProps(e, propsKey, propsURL, message)); - } + + if (signCrypto != null) { + message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + signCrypto.hashCode()); + message.put("RefId-" + signCrypto.hashCode(), signCrypto); } + + if (encrCrypto != null) { + message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + encrCrypto.hashCode()); + message.put("RefId-" + encrCrypto.hashCode(), (Crypto)encrCrypto); + } else if (signCrypto != null) { + message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + signCrypto.hashCode()); + message.put("RefId-" + signCrypto.hashCode(), (Crypto)signCrypto); + } return action; } private String checkTransportBinding( AssertionInfoMap aim, String action, SoapMessage message - ) { + ) throws WSSecurityException { Collection<AssertionInfo> ais = aim.get(SP12Constants.TRANSPORT_BINDING); if (ais == null || ais.isEmpty()) { return action; @@ -279,42 +250,33 @@ e = message.getContextualProperty(SecurityConstants.ENCRYPT_PROPERTIES); } - if (s != null) { - URL propsURL = getPropertiesFileURL(s, message); - String propsKey = s.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + propsKey); - if (s instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)s); - } else { - message.put("RefId-" + propsKey, getProps(s, propsKey, propsURL, message)); - } - if (e == null) { - e = s; - } + Crypto encrCrypto = getEncryptionCrypto(e, message); + Crypto signCrypto = null; + if (e != null && e.equals(s)) { + signCrypto = encrCrypto; + } else { + signCrypto = getSignatureCrypto(s, message); } - if (e != null) { - URL propsURL = getPropertiesFileURL(e, message); - String propsKey = e.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + propsKey); - if (e instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)e); - } else { - message.put("RefId-" + propsKey, getProps(e, propsKey, propsURL, message)); - } + + if (signCrypto != null) { + message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + signCrypto.hashCode()); + message.put("RefId-" + signCrypto.hashCode(), signCrypto); } + + if (encrCrypto != null) { + message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + encrCrypto.hashCode()); + message.put("RefId-" + encrCrypto.hashCode(), (Crypto)encrCrypto); + } else if (signCrypto != null) { + message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + signCrypto.hashCode()); + message.put("RefId-" + signCrypto.hashCode(), (Crypto)signCrypto); + } return action; } private String checkSymmetricBinding( AssertionInfoMap aim, String action, SoapMessage message - ) { + ) throws WSSecurityException { Collection<AssertionInfo> ais = aim.get(SP12Constants.SYMMETRIC_BINDING); if (ais == null || ais.isEmpty()) { return action; @@ -331,71 +293,97 @@ e = message.getContextualProperty(SecurityConstants.ENCRYPT_PROPERTIES); } - if (e != null && s == null) { - s = e; - } else if (s != null && e == null) { - e = s; + Crypto encrCrypto = getEncryptionCrypto(e, message); + Crypto signCrypto = null; + if (e != null && e.equals(s)) { + signCrypto = encrCrypto; + } else { + signCrypto = getSignatureCrypto(s, message); } if (isRequestor(message)) { - if (e != null) { - URL propsURL = getPropertiesFileURL(e, message); - String propsKey = e.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + propsKey); - if (e instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)e); - } else { - message.put("RefId-" + propsKey, getProps(e, propsKey, propsURL, message)); - } + Crypto crypto = encrCrypto; + if (crypto == null) { + crypto = signCrypto; } - if (s != null) { - URL propsURL = getPropertiesFileURL(s, message); - String propsKey = s.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + propsKey); - if (s instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)s); - } else { - message.put("RefId-" + propsKey, getProps(s, propsKey, propsURL, message)); - } + if (crypto != null) { + message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + crypto.hashCode()); + message.put("RefId-" + crypto.hashCode(), crypto); } + + crypto = signCrypto; + if (crypto == null) { + crypto = encrCrypto; + } + if (crypto != null) { + message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + crypto.hashCode()); + message.put("RefId-" + crypto.hashCode(), crypto); + } } else { - if (s != null) { - URL propsURL = getPropertiesFileURL(s, message); - String propsKey = s.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + propsKey); - if (s instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)s); - } else { - message.put("RefId-" + propsKey, getProps(s, propsKey, propsURL, message)); - } + Crypto crypto = signCrypto; + if (crypto == null) { + crypto = encrCrypto; } - if (e != null) { - URL propsURL = getPropertiesFileURL(e, message); - String propsKey = e.toString(); - if (propsURL != null) { - propsKey = propsURL.getPath(); - } - message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + propsKey); - if (e instanceof Crypto) { - message.put("RefId-" + propsKey, (Crypto)e); - } else { - message.put("RefId-" + propsKey, getProps(e, propsKey, propsURL, message)); - } + if (crypto != null) { + message.put(WSHandlerConstants.SIG_PROP_REF_ID, "RefId-" + crypto.hashCode()); + message.put("RefId-" + crypto.hashCode(), crypto); } + + crypto = encrCrypto; + if (crypto == null) { + crypto = signCrypto; + } + if (crypto != null) { + message.put(WSHandlerConstants.DEC_PROP_REF_ID, "RefId-" + crypto.hashCode()); + message.put("RefId-" + crypto.hashCode(), crypto); + } } return action; } + private Crypto getEncryptionCrypto(Object e, SoapMessage message) throws WSSecurityException { + Crypto encrCrypto = null; + if (e instanceof Crypto) { + encrCrypto = (Crypto)e; + } else if (e != null) { + URL propsURL = getPropertiesFileURL(e, message); + String propsKey = e.toString(); + if (propsURL != null) { + propsKey = propsURL.getPath(); + } + Properties props = getProps(e, propsKey, propsURL, message); + encrCrypto = CryptoFactory.getInstance(props); + + EndpointInfo info = message.getExchange().get(Endpoint.class).getEndpointInfo(); + synchronized (info) { + info.setProperty(SecurityConstants.ENCRYPT_CRYPTO, encrCrypto); + } + } + return encrCrypto; + } + + private Crypto getSignatureCrypto(Object s, SoapMessage message) throws WSSecurityException { + Crypto signCrypto = null; + if (s instanceof Crypto) { + signCrypto = (Crypto)s; + } else if (s != null) { + URL propsURL = getPropertiesFileURL(s, message); + String propsKey = s.toString(); + if (propsURL != null) { + propsKey = propsURL.getPath(); + } + Properties props = getProps(s, propsKey, propsURL, message); + signCrypto = CryptoFactory.getInstance(props); + + EndpointInfo info = message.getExchange().get(Endpoint.class).getEndpointInfo(); + synchronized (info) { + info.setProperty(SecurityConstants.SIGNATURE_CRYPTO, signCrypto); + } + } + return signCrypto; + } + private boolean assertXPathTokens(AssertionInfoMap aim, QName name, Collection<WSDataRef> refs, @@ -482,7 +470,7 @@ return true; } - protected void computeAction(SoapMessage message, RequestData data) { + protected void computeAction(SoapMessage message, RequestData data) throws WSSecurityException { String action = getString(WSHandlerConstants.ACTION, message); if (action == null) { action = ""; Modified: thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java =================================================================== --- thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java 2012-10-03 10:45:38 UTC (rev 16807) +++ thirdparty/cxf/branches/cxf-2.4.9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java 2012-10-03 11:16:40 UTC (rev 16808) @@ -404,7 +404,7 @@ * @param msg * @param reqData */ - protected void computeAction(SoapMessage msg, RequestData reqData) { + protected void computeAction(SoapMessage msg, RequestData reqData) throws WSSecurityException { // // Try to get Crypto Provider from message context properties. // It gives a possibility to use external Crypto Provider

11 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits October 2012