April 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16146 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 07:49:04 -0400 (Tue, 10 Apr 2012) New Revision: 16146 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml Log: [JBPAPP-8667] Merged revisions 16067,16086 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r16067 | ropalka | 2012-03-29 14:05:33 +0200 (Thu, 29 Mar 2012) | 1 line [JBWS-3474] updating excludes ....... r16086 | ropalka | 2012-04-04 07:20:26 +0200 (Wed, 04 Apr 2012) | 1 line upgrade config version ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16086 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-04-10 11:17:33 UTC (rev 16145) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-04-10 11:49:04 UTC (rev 16146) @@ -788,6 +788,10 @@  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> </excludes> </configuration> </plugin> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10 11:17:33 UTC (rev 16145) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10 11:49:04 UTC (rev 16146) @@ -20,7 +20,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<server xmlns="urn:jboss:domain:1.2"> +<server xmlns="urn:jboss:domain:1.3"> <extensions> <extension module="org.jboss.as.connector"/>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16145 - in shared-testsuite/branches/jbossws-shared-testsuite-4.0.x: testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 07:17:33 -0400 (Tue, 10 Apr 2012) New Revision: 16145 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java Log: [JBPAPP-8668] fixing test : merge -r 16067:16068 https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk Property changes on: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x ___________________________________________________________________ Modified: svn:mergeinfo - /shared-testsuite/branches/asoldano:14040-14045 /shared-testsuite/trunk:15976,16022,16066 + /shared-testsuite/branches/asoldano:14040-14045 /shared-testsuite/trunk:15976,16022,16066,16068 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2012-04-10 11:15:51 UTC (rev 16144) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2012-04-10 11:17:33 UTC (rev 16145) @@ -21,8 +21,8 @@ */ package org.jboss.test.ws.jaxws.jbws2259; +import java.awt.Image; import java.io.IOException; -import java.io.InputStream; import javax.jws.WebService; import javax.xml.ws.BindingType; @@ -63,7 +63,7 @@ { Object content = dh.getContent(); log.info("Content - " + content.toString()); - if (content instanceof InputStream == false) + if (content instanceof Image == false) { throw new WebServiceException("Unexpected content '" + content.getClass().getName() + "'"); }

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16144 - in shared-testsuite/branches/jbossws-shared-testsuite-4.0.x: testsuite/src/test/ant-import and 15 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 07:15:51 -0400 (Tue, 10 Apr 2012) New Revision: 16144 Added: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/wsf.png Removed: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/wsf.png Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: [JBPAPP-8668] refactoring generic JAXWS tests to shared test suite : merge -r 16065:16066 https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk Property changes on: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x ___________________________________________________________________ Modified: svn:mergeinfo - /shared-testsuite/branches/asoldano:14040-14045 /shared-testsuite/trunk:15976,16022 + /shared-testsuite/branches/asoldano:14040-14045 /shared-testsuite/trunk:15976,16022,16066 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-04-10 10:15:49 UTC (rev 16143) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -411,6 +411,15 @@ </webinf> </war> +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws1809/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class" /> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" /> + </jar> +  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF/MANIFEST.MF"> <fileset dir="${tests.output.dir}/test-classes"> @@ -707,6 +716,22 @@ </metainf> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2259.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2259/Endpoint.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2259/CustomHandler.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2259/Photo.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF"> + <include name="jaxws-endpoint-config.xml" /> + </webinf> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> + </manifest> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2268.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2268/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -949,6 +974,19 @@ </fileset> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbers.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.class" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF"> + <include name="jboss-web.xml" /> + </webinf> + </war> +  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2999.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -1066,6 +1104,14 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" /> + <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" /> + </classes> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3282.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.jbws1809; - -/** - * @author Heiko.Braun(a)jboss.com - */ -public class DocRequest -{ - String value; - - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocRequest.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.jbws1809; + +/** + * @author Heiko.Braun(a)jboss.com + */ +public class DocRequest +{ + String value; + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.jbws1809; - -/** - * @author Heiko.Braun(a)jboss.com - */ -public class DocResponse -{ - String value; - - - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/DocResponse.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.jbws1809; + +/** + * @author Heiko.Braun(a)jboss.com + */ +public class DocResponse +{ + String value; + + + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.jbws1809; - -import javax.ejb.Remote; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * @author Heiko.Braun(a)jboss.com - */ -@Remote -@WebService(targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl") -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) -public interface Endpoint -{ - DocResponse processDocument(DocRequest req); -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/Endpoint.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.jbws1809; + +import javax.ejb.Remote; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + */ +@Remote +@WebService(targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl") +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) +public interface Endpoint +{ + DocResponse processDocument(DocRequest req); +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.jbws1809; - -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * @author Heiko.Braun(a)jboss.com - */ -@Stateless -@WebService( - targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl", - endpointInterface = "org.jboss.test.ws.jaxws.jbws1809.Endpoint" -) -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) -public class EndpointImpl implements Endpoint -{ - public DocResponse processDocument(DocRequest req) - { - DocResponse res = new DocResponse(); - res.setValue(req.getValue()+"Response"); - return res; - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/EndpointImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.jbws1809; + +import javax.ejb.Stateless; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * @author Heiko.Braun(a)jboss.com + */ +@Stateless +@WebService( + targetNamespace = "http://org.jboss.ws/jaxbintro/wsdl", + endpointInterface = "org.jboss.test.ws.jaxws.jbws1809.Endpoint" +) +@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) +public class EndpointImpl implements Endpoint +{ + public DocResponse processDocument(DocRequest req) + { + DocResponse res = new DocResponse(); + res.setValue(req.getValue()+"Response"); + return res; + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.jbws1809; - -import junit.framework.Test; - -import org.jboss.ws.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import java.net.URL; -import java.util.Iterator; - -/** - * Test the JAXBIntroduction features. - * - * Check if the WSDL is generated correctly. - * The introduction should turn a property into a xsd:attribute declaration. - * - * @author heiko.braun(a)jboss.com - */ -public class JBWS1809TestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(JBWS1809TestCase.class, "jaxws-jbws1809.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1809/EndpointImpl?wsdl"); - - Document doc = DOMUtils.getDocumentBuilder().parse(wsdlURL.toString()); - Element types = (Element)((Element)doc.getDocumentElement() - .getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/", "types").item(0)) - .getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "schema").item(0); - Iterator it = DOMUtils.getChildElements(types, "complexType"); - - boolean foundAttributeDeclaration = false; - while(it.hasNext()) - { - Element next = (Element)it.next(); - if(DOMUtils.getAttributeValue(next, "name").equals("docRequest")) - { - Iterator it2 = DOMUtils.getChildElements(next, "attribute"); - - while(it2.hasNext()) - { - Element next2 = (Element)it2.next(); - if(DOMUtils.getAttributeValue(next2, "name").equals("value")) - { - foundAttributeDeclaration = true; - } - } - } - } - - assertTrue("JAXBIntros should turn the 'docRequest.name' property into a XML attribute", foundAttributeDeclaration); - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1809/JBWS1809TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.jbws1809; + +import junit.framework.Test; + +import org.jboss.ws.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import java.net.URL; +import java.util.Iterator; + +/** + * Test the JAXBIntroduction features. + * + * Check if the WSDL is generated correctly. + * The introduction should turn a property into a xsd:attribute declaration. + * + * @author heiko.braun(a)jboss.com + */ +public class JBWS1809TestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(JBWS1809TestCase.class, "jaxws-jbws1809.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1809/EndpointImpl?wsdl"); + + Document doc = DOMUtils.getDocumentBuilder().parse(wsdlURL.toString()); + Element types = (Element)((Element)doc.getDocumentElement() + .getElementsByTagNameNS("http://schemas.xmlsoap.org/wsdl/", "types").item(0)) + .getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "schema").item(0); + Iterator it = DOMUtils.getChildElements(types, "complexType"); + + boolean foundAttributeDeclaration = false; + while(it.hasNext()) + { + Element next = (Element)it.next(); + if(DOMUtils.getAttributeValue(next, "name").equals("docRequest")) + { + Iterator it2 = DOMUtils.getChildElements(next, "attribute"); + + while(it2.hasNext()) + { + Element next2 = (Element)it2.next(); + if(DOMUtils.getAttributeValue(next2, "name").equals("value")) + { + foundAttributeDeclaration = true; + } + } + } + } + + assertTrue("JAXBIntros should turn the 'docRequest.name' property into a XML attribute", foundAttributeDeclaration); + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, 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.jbws2259; - -import java.io.ByteArrayOutputStream; - -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.logging.Logger; -import org.jboss.ws.api.handler.GenericSOAPHandler; - -/** - * Test handker to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -public class CustomHandler extends GenericSOAPHandler -{ - private static final Logger log = Logger.getLogger(CustomHandler.class); - - public boolean handleMessage(final MessageContext msgContext) - { - - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - try - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - soapMessage.writeTo(baos); - log.info("Wrote message."); - } - catch (Exception e) - { - throw new WebServiceException("Unable to write message.", e); - } - - return true; - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.jbws2259; + +import java.io.ByteArrayOutputStream; + +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.handler.GenericSOAPHandler; + +/** + * Test handker to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +public class CustomHandler extends GenericSOAPHandler +{ + private static final Logger log = Logger.getLogger(CustomHandler.class); + + public boolean handleMessage(final MessageContext msgContext) + { + + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + soapMessage.writeTo(baos); + log.info("Wrote message."); + } + catch (Exception e) + { + throw new WebServiceException("Unable to write message.", e); + } + + return true; + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, 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.jbws2259; - -import javax.jws.WebService; -import javax.xml.ws.BindingType; - -/** - * Test Endpoint to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2259") -@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") -public interface Endpoint -{ - - public Photo echo(final Photo photo); - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.jbws2259; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; + +/** + * Test Endpoint to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2259") +@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public interface Endpoint +{ + + public Photo echo(final Photo photo); + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, 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.jbws2259; - -import java.io.IOException; -import java.io.InputStream; - -import javax.jws.WebService; -import javax.xml.ws.BindingType; -import javax.xml.ws.WebServiceException; -import javax.activation.DataHandler; - -import org.jboss.logging.Logger; - -/** - * Test Endpoint to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2259", endpointInterface = "org.jboss.test.ws.jaxws.jbws2259.Endpoint") -@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") -public class EndpointImpl implements Endpoint -{ - - private static final Logger log = Logger.getLogger(EndpointImpl.class); - - public Photo echo(Photo photo) - { - - DataHandler dh = photo.getImage(); - String contentType = dh.getContentType(); - log.info("Actual content-type " + contentType); - String expectedContentType = photo.getExpectedContentType(); - log.info("Expected content-type " + expectedContentType); - - if (expectedContentType.equals(contentType) == false) - { - throw new WebServiceException("Expected content-type '" + expectedContentType + "' Actual content-type '" + contentType + "'"); - } - - try - { - Object content = dh.getContent(); - log.info("Content - " + content.toString()); - if (content instanceof InputStream == false) - { - throw new WebServiceException("Unexpected content '" + content.getClass().getName() + "'"); - } - } - catch (IOException e) - { - throw new WebServiceException("Unable to getContent()", e); - } - - return photo; - } - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.jbws2259; + +import java.io.IOException; +import java.io.InputStream; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; +import javax.xml.ws.WebServiceException; +import javax.activation.DataHandler; + +import org.jboss.logging.Logger; + +/** + * Test Endpoint to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2259", endpointInterface = "org.jboss.test.ws.jaxws.jbws2259.Endpoint") +@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public class EndpointImpl implements Endpoint +{ + + private static final Logger log = Logger.getLogger(EndpointImpl.class); + + public Photo echo(Photo photo) + { + + DataHandler dh = photo.getImage(); + String contentType = dh.getContentType(); + log.info("Actual content-type " + contentType); + String expectedContentType = photo.getExpectedContentType(); + log.info("Expected content-type " + expectedContentType); + + if (expectedContentType.equals(contentType) == false) + { + throw new WebServiceException("Expected content-type '" + expectedContentType + "' Actual content-type '" + contentType + "'"); + } + + try + { + Object content = dh.getContent(); + log.info("Content - " + content.toString()); + if (content instanceof InputStream == false) + { + throw new WebServiceException("Unexpected content '" + content.getClass().getName() + "'"); + } + } + catch (IOException e) + { + throw new WebServiceException("Unable to getContent()", e); + } + + return photo; + } + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,85 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2009, 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.jbws2259; - -import java.io.File; -import java.net.URL; - -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.activation.FileDataSource; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test case to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 30th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -public class JBWS2259TestCase extends JBossWSTest -{ - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2259TestCase.class, "jaxws-jbws2259.war"); - } - - public void testCall() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2259?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2259", "EndpointService"); - - Service service = Service.create(wsdlURL, serviceName); - Endpoint port = service.getPort(Endpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - SOAPBinding soapBinding = (SOAPBinding)bindingProvider.getBinding(); - soapBinding.setMTOMEnabled(true); - - File sharkFile = getResourceFile("jaxws/jbws2259/attach.jpeg"); - DataSource ds = new FileDataSource(sharkFile); - DataHandler handler = new DataHandler(ds); - - String expectedContentType = "image/jpeg"; - - Photo p = new Photo(); - p.setCaption("JBWS2259 Smile :-)"); - p.setExpectedContentType(expectedContentType); - p.setImage(handler); - - Photo reponse = port.echo(p); - DataHandler dhResponse = reponse.getImage(); - - String contentType = dhResponse.getContentType(); - assertEquals("content-type", expectedContentType, contentType); - } - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,85 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2009, 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.jbws2259; + +import java.io.File; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.activation.FileDataSource; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 30th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +public class JBWS2259TestCase extends JBossWSTest +{ + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2259TestCase.class, "jaxws-jbws2259.war"); + } + + public void testCall() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2259?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2259", "EndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = service.getPort(Endpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + SOAPBinding soapBinding = (SOAPBinding)bindingProvider.getBinding(); + soapBinding.setMTOMEnabled(true); + + File sharkFile = getResourceFile("jaxws/jbws2259/attach.jpeg"); + DataSource ds = new FileDataSource(sharkFile); + DataHandler handler = new DataHandler(ds); + + String expectedContentType = "image/jpeg"; + + Photo p = new Photo(); + p.setCaption("JBWS2259 Smile :-)"); + p.setExpectedContentType(expectedContentType); + p.setImage(handler); + + Photo reponse = port.echo(p); + DataHandler dhResponse = reponse.getImage(); + + String contentType = dhResponse.getContentType(); + assertEquals("content-type", expectedContentType, contentType); + } + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, 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.jbws2259; - -import javax.activation.DataHandler; -import javax.xml.bind.annotation.XmlMimeType; - -/** - * Representation of a photo to test marshalling. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - */ -public class Photo -{ - - private String caption; - - private String expectedContentType; - - private DataHandler image; - - public String getCaption() - { - return caption; - } - - public void setCaption(String caption) - { - this.caption = caption; - } - - public String getExpectedContentType() - { - return expectedContentType; - } - - public void setExpectedContentType(String expectedContentType) - { - this.expectedContentType = expectedContentType; - } - - @XmlMimeType("*/*") - public DataHandler getImage() - { - return image; - } - - public void setImage(DataHandler image) - { - this.image = image; - } - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.jbws2259; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; + +/** + * Representation of a photo to test marshalling. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + */ +public class Photo +{ + + private String caption; + + private String expectedContentType; + + private DataHandler image; + + public String getCaption() + { + return caption; + } + + public void setCaption(String caption) + { + this.caption = caption; + } + + public String getExpectedContentType() + { + return expectedContentType; + } + + public void setExpectedContentType(String expectedContentType) + { + this.expectedContentType = expectedContentType; + } + + @XmlMimeType("*/*") + public DataHandler getImage() + { + return image; + } + + public void setImage(DataHandler image) + { + this.image = image; + } + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2978; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.WebResult; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -@WebService(name = "AddNumbers", targetNamespace = "http://ws.jboss.org") -public interface AddNumbers { - @WebMethod - @WebResult(targetNamespace = "") - @RequestWrapper(localName = "addNumbersRequest", targetNamespace = "http://ws.jboss.org", className = "org.jboss.test.ws.jaxws.jbws2978.AddNumbersRequest") - @ResponseWrapper(localName = "addNumbersResponse", targetNamespace = "http://ws.jboss.org", className = "org.jboss.test.ws.jaxws.jbws2978.AddNumbersResponse") - public int addNumbersFault1( - @WebParam(name = "arg0", targetNamespace = "") - int arg0, - @WebParam(name = "arg1", targetNamespace = "") - int arg1); -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbers.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2978; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.WebResult; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +@WebService(name = "AddNumbers", targetNamespace = "http://ws.jboss.org") +public interface AddNumbers { + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "addNumbersRequest", targetNamespace = "http://ws.jboss.org", className = "org.jboss.test.ws.jaxws.jbws2978.AddNumbersRequest") + @ResponseWrapper(localName = "addNumbersResponse", targetNamespace = "http://ws.jboss.org", className = "org.jboss.test.ws.jaxws.jbws2978.AddNumbersResponse") + public int addNumbersFault1( + @WebParam(name = "arg0", targetNamespace = "") + int arg0, + @WebParam(name = "arg1", targetNamespace = "") + int arg1); +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2978; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.xml.ws.Action; -import javax.xml.ws.soap.Addressing; -@WebService(name = "AddNumbers", portName = "AddNumbersPort", serviceName = "AddNumbers", targetNamespace = "http://ws.jboss.org") -@Addressing(enabled = true, required = true) -public class AddNumbersImpl -{ - - @Action(input = "inputAction", output = "outputAction") - public int addNumbers2(@WebParam(name = "number1") int number1, @WebParam(name = "number2") int number2) - { - return number1 + number2; - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2978; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.xml.ws.Action; +import javax.xml.ws.soap.Addressing; +@WebService(name = "AddNumbers", portName = "AddNumbersPort", serviceName = "AddNumbers", targetNamespace = "http://ws.jboss.org") +@Addressing(enabled = true, required = true) +public class AddNumbersImpl +{ + + @Action(input = "inputAction", output = "outputAction") + public int addNumbers2(@WebParam(name = "number1") int number1, @WebParam(name = "number2") int number2) + { + return number1 + number2; + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,70 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2978; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "addNumbersRequest", propOrder = { - "arg0", - "arg1" -}) -public class AddNumbersRequest { - - protected int arg0; - protected int arg1; - - /** - * Gets the value of the arg0 property. - * - */ - public int getArg0() { - return arg0; - } - - /** - * Sets the value of the arg0 property. - * - */ - public void setArg0(int value) { - this.arg0 = value; - } - - /** - * Gets the value of the arg1 property. - * - */ - public int getArg1() { - return arg1; - } - - /** - * Sets the value of the arg1 property. - * - */ - public void setArg1(int value) { - this.arg1 = value; - } - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2978; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addNumbersRequest", propOrder = { + "arg0", + "arg1" +}) +public class AddNumbersRequest { + + protected int arg0; + protected int arg1; + + /** + * Gets the value of the arg0 property. + * + */ + public int getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + */ + public void setArg0(int value) { + this.arg0 = value; + } + + /** + * Gets the value of the arg1 property. + * + */ + public int getArg1() { + return arg1; + } + + /** + * Sets the value of the arg1 property. + * + */ + public void setArg1(int value) { + this.arg1 = value; + } + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2978; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "addNumbersResponse", propOrder = { - "_return" -}) -public class AddNumbersResponse { - - @XmlElement(name = "return") - protected int _return; - - /** - * Gets the value of the return property. - * - */ - public int getReturn() { - return _return; - } - - /** - * Sets the value of the return property. - * - */ - public void setReturn(int value) { - this._return = value; - } - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2978; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addNumbersResponse", propOrder = { + "_return" +}) +public class AddNumbersResponse { + + @XmlElement(name = "return") + protected int _return; + + /** + * Gets the value of the return property. + * + */ + public int getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + */ + public void setReturn(int value) { + this._return = value; + } + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws2978; - -import java.io.ByteArrayInputStream; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Dispatch; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPFaultException; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * JBWS2978TestCase. - * - * @author <a href="ema(a)redhat.com">Jim Ma</a> - */ -public class JBWS2978TestCase extends JBossWSTest -{ - - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2978"; - - private final String requestMessage = "<S:Envelope xmlns:S='http://schemas.xmlsoap.org/soap/envelope/'><S:Header><To xmlns='http://www.w3.org/2005/08/addressing'>" - + TARGET_ENDPOINT_ADDRESS - + "</To><Action xmlns='http://www.w3.org/2005/08/addressing'>inputAction</Action>" - + "<MessageID xmlns='http://www.w3.org/2005/08/addressing'>uuid:56d586f8-980c-48cf-982d-77a2f56e5c5b</MessageID>" - + "<ReplyTo xmlns='http://www.w3.org/2005/08/addressing'><Address>http://www.w3.org/2005/08/addressing/anonymous</Address></ReplyTo>" - + "</S:Header><S:Body><ns1:addNumbers xmlns:ns1='http://ws.jboss.org'><arg0>10</arg0><arg1>10</arg1></ns1:addNumbers></S:Body></S:Envelope>"; - - public Service service = null; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2978TestCase.class, "jaxws-jbws2978.war"); - } - - public void setUp() throws Exception - { - super.setUp(); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://ws.jboss.org", "AddNumbers"); - service = Service.create(wsdlURL, serviceName); - } - - public void testCall() throws Exception - { - try - { - Dispatch dispatch = service.createDispatch(new QName("http://ws.jboss.org", "AddNumbersPort"), SOAPMessage.class , - Service.Mode.MESSAGE); - SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, - new ByteArrayInputStream(requestMessage.getBytes())); - BindingProvider bp = (BindingProvider)dispatch; - java.util.Map<String, Object> requestContext = bp.getRequestContext(); - requestContext.put(BindingProvider.SOAPACTION_URI_PROPERTY, "mismatchAction"); - dispatch.invoke(reqMsg); - fail("Should throw SOAPFaultExceptoin"); - } - catch (SOAPFaultException e) - { - assertEquals(true, e.getFault().getFaultCode().indexOf("ActionMismatch") > -1); - } - } -} \ No newline at end of file Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws2978; + +import java.io.ByteArrayInputStream; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Dispatch; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPFaultException; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * JBWS2978TestCase. + * + * @author <a href="ema(a)redhat.com">Jim Ma</a> + */ +public class JBWS2978TestCase extends JBossWSTest +{ + + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2978"; + + private final String requestMessage = "<S:Envelope xmlns:S='http://schemas.xmlsoap.org/soap/envelope/'><S:Header><To xmlns='http://www.w3.org/2005/08/addressing'>" + + TARGET_ENDPOINT_ADDRESS + + "</To><Action xmlns='http://www.w3.org/2005/08/addressing'>inputAction</Action>" + + "<MessageID xmlns='http://www.w3.org/2005/08/addressing'>uuid:56d586f8-980c-48cf-982d-77a2f56e5c5b</MessageID>" + + "<ReplyTo xmlns='http://www.w3.org/2005/08/addressing'><Address>http://www.w3.org/2005/08/addressing/anonymous</Address></ReplyTo>" + + "</S:Header><S:Body><ns1:addNumbers xmlns:ns1='http://ws.jboss.org'><arg0>10</arg0><arg1>10</arg1></ns1:addNumbers></S:Body></S:Envelope>"; + + public Service service = null; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2978TestCase.class, "jaxws-jbws2978.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.jboss.org", "AddNumbers"); + service = Service.create(wsdlURL, serviceName); + } + + public void testCall() throws Exception + { + try + { + Dispatch dispatch = service.createDispatch(new QName("http://ws.jboss.org", "AddNumbersPort"), SOAPMessage.class , + Service.Mode.MESSAGE); + SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, + new ByteArrayInputStream(requestMessage.getBytes())); + BindingProvider bp = (BindingProvider)dispatch; + java.util.Map<String, Object> requestContext = bp.getRequestContext(); + requestContext.put(BindingProvider.SOAPACTION_URI_PROPERTY, "mismatchAction"); + dispatch.invoke(reqMsg); + fail("Should throw SOAPFaultExceptoin"); + } + catch (SOAPFaultException e) + { + assertEquals(true, e.getFault().getFaultCode().indexOf("ActionMismatch") > -1); + } + } +} \ No newline at end of file Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, 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.jbws3124; - -import java.io.StringReader; - -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.EndpointReference; - -import org.jboss.ws.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; - -/** - * [JBWS-2942] Do not add empty Metadata tag to EndpointReference. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class JBWS3124TestCase extends JBossWSTest -{ - private final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + - "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" + - " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" + - " <Metadata/>\n" + - "</EndpointReference>\n"; - - public void testToString() throws Exception - { - assertTrue("Lost empty <Metadata/>", this.getXML(XML_SOURCE).indexOf("<Metadata") != -1); - StreamSource source = new StreamSource(new StringReader(XML_SOURCE)); - EndpointReference epRef = EndpointReference.readFrom(source); - assertTrue("Empty <Metadata/> serialized", epRef.toString().indexOf("<Metadata") == -1); - } - - private String getXML(final String s) throws Exception - { - return DOMUtils.node2String(DOMUtils.parse(s)); - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3124/JBWS3124TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, 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.jbws3124; + +import java.io.StringReader; + +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.EndpointReference; + +import org.jboss.ws.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-2942] Do not add empty Metadata tag to EndpointReference. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBWS3124TestCase extends JBossWSTest +{ + private final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + + "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" + + " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" + + " <Metadata/>\n" + + "</EndpointReference>\n"; + + public void testToString() throws Exception + { + assertTrue("Lost empty <Metadata/>", this.getXML(XML_SOURCE).indexOf("<Metadata") != -1); + StreamSource source = new StreamSource(new StringReader(XML_SOURCE)); + EndpointReference epRef = EndpointReference.readFrom(source); + assertTrue("Empty <Metadata/> serialized", epRef.toString().indexOf("<Metadata") == -1); + } + + private String getXML(final String s) throws Exception + { + return DOMUtils.node2String(DOMUtils.parse(s)); + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jbws3250; - -import javax.jws.WebService; - -@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3250") -public interface Endpoint -{ - public MTOMResponse echo(MTOMRequest message); - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/Endpoint.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.jws.WebService; + +@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws3250") +public interface Endpoint +{ + public MTOMResponse echo(MTOMRequest message); + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jbws3250; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.BindingType; - - -@WebService( - name = "TestEndpoint", - targetNamespace = "http://ws.jboss.org/jbws3250", - serviceName = "TestEndpointService", - endpointInterface = "org.jboss.test.ws.jaxws.jbws3250.Endpoint") -@SOAPBinding(style = SOAPBinding.Style.RPC, - use = SOAPBinding.Use.LITERAL) -@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") - -public class EndpointImpl implements Endpoint -{ - public MTOMResponse echo(MTOMRequest message) { - MTOMResponse response = new MTOMResponse(); - response.setContent(message.getContent()); - response.setResponse("Response for requestID:" + message.getId()); - return response; - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/EndpointImpl.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.BindingType; + + +@WebService( + name = "TestEndpoint", + targetNamespace = "http://ws.jboss.org/jbws3250", + serviceName = "TestEndpointService", + endpointInterface = "org.jboss.test.ws.jaxws.jbws3250.Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC, + use = SOAPBinding.Use.LITERAL) +@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") + +public class EndpointImpl implements Endpoint +{ + public MTOMResponse echo(MTOMRequest message) { + MTOMResponse response = new MTOMResponse(); + response.setContent(message.getContent()); + response.setResponse("Response for requestID:" + message.getId()); + return response; + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jbws3250; - -import java.net.URL; - -import javax.activation.DataHandler; -import javax.activation.URLDataSource; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import junit.framework.Assert; -import junit.framework.Test; - -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -public class JBWS3250TestCase extends JBossWSTest -{ - private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250"; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war"); - } - - public void testMtomSawpFile() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws3250", "TestEndpointService"); - Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); - SOAPBinding binding =(SOAPBinding)((BindingProvider)port).getBinding(); - binding.setMTOMEnabled(true); - URL url = JBossWSTestHelper.getResourceURL("jaxws/jbws3250/wsf.png"); - URLDataSource urlDatasource = new URLDataSource(url); - javax.activation.DataHandler dh = new DataHandler(urlDatasource); - MTOMRequest request = new MTOMRequest(); - request.setContent(dh); - request.setId("largeSize_mtom_request"); - MTOMResponse mtomResponse = port.echo(request); - Assert.assertEquals("Response for requestID:largeSize_mtom_request", mtomResponse.getResponse()); - byte[] responseBytes = IOUtils.convertToBytes(mtomResponse.getContent()); - Assert.assertTrue(responseBytes.length > 65536); - } - -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/JBWS3250TestCase.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import java.net.URL; + +import javax.activation.DataHandler; +import javax.activation.URLDataSource; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import junit.framework.Assert; +import junit.framework.Test; + +import org.jboss.ws.common.IOUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +public class JBWS3250TestCase extends JBossWSTest +{ + private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws3250"; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS3250TestCase.class, "jaxws-jbws3250.war"); + } + + public void testMtomSawpFile() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws3250", "TestEndpointService"); + Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class); + SOAPBinding binding =(SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); + URL url = JBossWSTestHelper.getResourceURL("jaxws/jbws3250/wsf.png"); + URLDataSource urlDatasource = new URLDataSource(url); + javax.activation.DataHandler dh = new DataHandler(urlDatasource); + MTOMRequest request = new MTOMRequest(); + request.setContent(dh); + request.setId("largeSize_mtom_request"); + MTOMResponse mtomResponse = port.echo(request); + Assert.assertEquals("Response for requestID:largeSize_mtom_request", mtomResponse.getResponse()); + byte[] responseBytes = IOUtils.convertToBytes(mtomResponse.getContent()); + Assert.assertTrue(responseBytes.length > 65536); + } + +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jbws3250; - -import javax.activation.DataHandler; -import javax.xml.bind.annotation.XmlMimeType; - -public class MTOMRequest -{ - private DataHandler content; - - private String id; - - @XmlMimeType("*/*") - public DataHandler getContent() - { - return content; - } - - public void setContent(DataHandler content) - { - this.content = content; - } - - public String getId() - { - return id; - } - - public void setId(String id) - { - this.id = id; - } - -} \ No newline at end of file Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMRequest.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; + +public class MTOMRequest +{ + private DataHandler content; + + private String id; + + @XmlMimeType("*/*") + public DataHandler getContent() + { + return content; + } + + public void setContent(DataHandler content) + { + this.content = content; + } + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + +} \ No newline at end of file Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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.jbws3250; - -import javax.activation.DataHandler; -import javax.xml.bind.annotation.XmlMimeType; - -public class MTOMResponse -{ - private DataHandler content; - - private String response; - - @XmlMimeType("*/*") - public DataHandler getContent() - { - return content; - } - - public void setContent(DataHandler content) - { - this.content = content; - } - - public String getResponse() - { - return response; - } - - public void setResponse(String res) - { - this.response = res; - } -} Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java (from rev 16066, shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3250/MTOMResponse.java 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.jbws3250; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; + +public class MTOMResponse +{ + private DataHandler content; + + private String response; + + @XmlMimeType("*/*") + public DataHandler getContent() + { + return content; + } + + public void setContent(DataHandler content) + { + this.content = content; + } + + public String getResponse() + { + return response; + } + + public void setResponse(String res) + { + this.response = res; + } +} Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,26 +0,0 @@ -<?xml version = "1.0" encoding = "UTF-8"?> -<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros" default-namespace="http://org.jboss.ws/jaxbintro/wsdl"> - -  - -  - -  - <Class name="org.jboss.test.ws.jaxws.jbws1809.DocRequest"> - <XmlAccessorType value="FIELD"/> - <XmlRootElement name="request" namespace="http://org.jboss.ws/jaxbintro/wsdl"/> - - <Field name="value"> - <XmlAttribute /> - </Field> - </Class> - -</jaxb-intros> Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws1809/META-INF/jaxb-intros.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,26 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros" default-namespace="http://org.jboss.ws/jaxbintro/wsdl"> + +  + +  + +  + <Class name="org.jboss.test.ws.jaxws.jbws1809.DocRequest"> + <XmlAccessorType value="FIELD"/> + <XmlRootElement name="request" namespace="http://org.jboss.ws/jaxbintro/wsdl"/> + + <Field name="value"> + <XmlAttribute /> + </Field> + </Class> + +</jaxb-intros> Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Custom Server Config</config-name> - - <post-handler-chains> - <javaee:handler-chain> - <javaee:handler> - <javaee:handler-name> CustomHandler </javaee:handler-name> - <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2259.CustomHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - -</jaxws-config> Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Custom Server Config</config-name> + + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name> CustomHandler </javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2259.CustomHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws2259.EndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - - -</web-app> - Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2259.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + +</web-app> + Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg =================================================================== (Binary files differ) Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2259/attach.jpeg) =================================================================== (Binary files differ) Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - <context-root>/jaxws-jbws2978</context-root> -</jboss-web> \ No newline at end of file Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/jboss-web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> + +<jboss-web> + <context-root>/jaxws-jbws2978</context-root> +</jboss-web> \ No newline at end of file Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>Endpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws2978.AddNumbersImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Endpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws2978/WEB-INF/web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>Endpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2978.AddNumbersImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Endpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2012-03-29 12:02:55 UTC (rev 16066) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws3250.EndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> \ No newline at end of file Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml) =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml (rev 0) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/WEB-INF/web.xml 2012-04-10 11:15:51 UTC (rev 16144) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3250.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> \ No newline at end of file Deleted: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/wsf.png =================================================================== (Binary files differ) Copied: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxws/jbws3250/wsf.png (from rev 16066, shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3250/wsf.png) =================================================================== (Binary files differ)

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16143 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 06:15:49 -0400 (Tue, 10 Apr 2012) New Revision: 16143 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-8667] Merged revisions 16105 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16105 | ropalka | 2012-04-05 16:16:06 +0200 (Thu, 05 Apr 2012) | 1 line [JBWS-3462] reviewed Native maven dependencies ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16104 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 10:05:15 UTC (rev 16142) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 10:15:49 UTC (rev 16143) @@ -15,17 +15,19 @@  <dependencies> - -  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> + <artifactId>jbossws-api</artifactId> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.rpc</groupId> <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> </dependency> @@ -38,48 +40,35 @@ <artifactId>jbossws-native-factories</artifactId> <version>${project.version}</version> </dependency> -  <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <scope>provided</scope> </dependency> -  <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <scope>provided</scope> </dependency> <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>provided</scope> </dependency> -  <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </dependency> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> @@ -88,17 +77,9 @@ <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> </dependencies>  Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 10:05:15 UTC (rev 16142) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 10:15:49 UTC (rev 16143) @@ -37,10 +37,8 @@ <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> - <include>javax.xml.stream:stax-api:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.jboss.netty:netty:jar</include> - <include>commons-beanutils:commons-beanutils:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useProjectArtifact>false</useProjectArtifact> @@ -72,16 +70,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <includes> - <include>org.codehaus.woodstox:wstx-lgpl:jar</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping> <includes> <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 10:05:15 UTC (rev 16142) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 10:15:49 UTC (rev 16143) @@ -15,17 +15,13 @@  <properties> - <surefire.security.args></surefire.security.args> -  <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> - <surefire.gc.args>-Xmx512m -XX:MaxPermSize=256m</surefire.gc.args> - <surefire.management.args>-Dcom.sun.management.jmxremote</surefire.management.args> + <surefire.gc.args>-Xmx256m -XX:MaxPermSize=128m</surefire.gc.args> <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> - <hornetq.version>2.1.0.BETA3</hornetq.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir> </properties> @@ -38,10 +34,6 @@  <dependencies> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> - <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-core</artifactId> <version>${project.version}</version> @@ -51,16 +43,6 @@ <artifactId>jbossws-shared-testsuite</artifactId> </dependency> <dependency> - <groupId>gnu-getopt</groupId> - <artifactId>getopt</artifactId> - <version>1.0.13</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> @@ -77,11 +59,6 @@ <version>${jboss.javaee.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>test</scope> - </dependency> </dependencies>  @@ -265,7 +242,7 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.jdwp.args} ${surefire.gc.args}</surefire.jvm.args> </properties> </profile> <profile> @@ -276,38 +253,11 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.gc.args}</surefire.jvm.args> </properties> </profile>  - <profile> - <id>management</id> - <activation> - <property> - <name>management</name> - </property> - </activation> - <properties> - <surefire.jvm.management.args>${surefire.management.args}</surefire.jvm.management.args> - </properties> - </profile> - <profile> - <id>no-management</id> - <activation> - <property> - <name>!management</name> - </property> - </activation> - <properties> - <surefire.jvm.management.args> </surefire.jvm.management.args> - </properties> - </profile> - -  @@ -354,6 +304,10 @@ <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-security</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -362,10 +316,6 @@ <version>1.0.2.Final</version> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> <version>1.0.4.Final</version> @@ -380,32 +330,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency>  <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> <version>2.0.0-beta-1</version> </dependency> -  <dependency> - <groupId>apache-xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> - <groupId>apache-xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> <version>1.0.2.Final</version> @@ -429,7 +360,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes>  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 10:05:15 UTC (rev 16142) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 10:15:49 UTC (rev 16143) @@ -63,16 +63,13 @@ <jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.3.GA</jbossws.shared.testsuite.version> <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> + <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <commons.logging.version>1.1.1</commons.logging.version> - <javassist.version>3.15.0-GA</javassist.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <saaj.api.version>1.0.1.Final</saaj.api.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> <netty.version>3.2.6.Final</netty.version> - <stax.api.version>1.0-2</stax.api.version> - <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> @@ -92,6 +89,16 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> <version>${jbossws.common.version}</version> + <exclusions> + <exclusion> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -102,6 +109,12 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> <version>${jbossws.spi.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.as</groupId> @@ -110,6 +123,11 @@ </dependency>  <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1</version> @@ -139,7 +157,6 @@ <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>${jboss.common.core.version}</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>org.jboss.logging</groupId> @@ -147,18 +164,8 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> - </dependency>  <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> <version>${ejb.api.version}</version> @@ -167,6 +174,12 @@ <groupId>org.jboss.spec.javax.xml.rpc</groupId> <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> <version>${jaxrpc.api.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.soap</groupId> @@ -174,27 +187,11 @@ <version>${saaj.api.version}</version> </dependency> <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>${stax.api.version}</version> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>${jboss.logging.version}</version> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> - <version>${woodstox.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> <version>${wsdl4j.version}</version> @@ -215,10 +212,14 @@ <version>${jbossxb.version}</version> <exclusions> <exclusion> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </exclusion> <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + </exclusion> + <exclusion> <groupId>apache-xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> @@ -235,9 +236,21 @@ <artifactId>jboss-logging-log4j</artifactId> </exclusion> <exclusion> - <groupId>apache-xerces</groupId> + <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.wutka</groupId> + <artifactId>dtdparser</artifactId> + </exclusion> </exclusions> </dependency> <dependency>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16142 - stack/native/branches/jbossws-native-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 06:05:15 -0400 (Tue, 10 Apr 2012) New Revision: 16142 Modified: stack/native/branches/jbossws-native-4.0.x/ Log: updating excludes Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-blocked - https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16141 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/ws/core and 16 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 06:00:53 -0400 (Tue, 10 Apr 2012) New Revision: 16141 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml Log: [JBPAPP-8667] Merged revisions 16104 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16104 | ropalka | 2012-04-05 14:45:05 +0200 (Thu, 05 Apr 2012) | 1 line [JBWS-3462] removing configurability ability ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16104 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -21,12 +21,8 @@ */ package org.jboss.ws.core; -import java.util.Observable; - -import org.jboss.logging.Logger; import org.jboss.ws.core.jaxrpc.SOAP11BindingJAXRPC; import org.jboss.ws.core.jaxrpc.SOAP12BindingJAXRPC; -import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.EndpointMetaData; /** @@ -36,9 +32,8 @@ * @author Heiko.Braun(a)jboss.com * @since 04-Jul-2006 */ -public class CommonBindingProvider implements Configurable +public class CommonBindingProvider { - private static Logger log = Logger.getLogger(CommonBindingProvider.class); /** * A constant representing the identity of the SOAP 1.1 over HTTP binding. */ @@ -56,25 +51,13 @@ { this.epMetaData = epMetaData; initBinding(epMetaData.getBindingId()); - - this.epMetaData.registerConfigObserver(this); - configure(); } public CommonBindingProvider(String bindingId) { initBinding(bindingId); - configure(); } - private void configure() - { - if (epMetaData != null) - { - epMetaData.configure(this); - } - } - protected void initBinding(String bindingId) { if (SOAP11HTTP_BINDING.equals(bindingId)) @@ -91,10 +74,4 @@ { return binding; } - - public void update(Observable observable, Object object) - { - if(log.isDebugEnabled()) log.debug("Update config: " + object); - configure(); - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -613,23 +613,4 @@ throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_CREATE_ATTACHMENT_PART")); } } - - public String getConfigName() - { - EndpointMetaData epMetaData = getEndpointMetaData(); - return epMetaData.getConfigName(); - } - - public void setConfigName(String configName) - { - setConfigName(configName, null); - } - - public abstract void setConfigName(String configName, String configFile); - - public String getConfigFile() - { - EndpointMetaData epMetaData = getEndpointMetaData(); - return epMetaData.getConfigFile(); - } } Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.core; - -/** - * Provides configuration for JAXRPC/JAXWS ports - * - * @author Thomas.Diesler(a)jboss.com - * @since 17-Jan-2006 - */ -public interface ConfigProvider -{ - /** - * Get the port configuration file - */ - String getConfigFile(); - - /** - * Get the port configuration name - */ - String getConfigName(); - - /** - * Set the port configuration name - */ - void setConfigName(String configName); - - /** - * Set the port configuration name and file - */ - void setConfigName(String configName, String configFile); -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -33,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 17-Jan-2007 */ -public interface StubExt extends ConfigProvider, EndpointMetadataProvider +public interface StubExt extends EndpointMetadataProvider { /** ClientTimeout property: org.jboss.ws.timeout */ static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout"; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -55,18 +55,6 @@ properties.put(key, val); } } - - // Add the endpoint properties - Properties epProps = epMetaData.getProperties(); - Iterator it = epProps.entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Map.Entry)it.next(); - String key = (String)entry.getKey(); - Object val = entry.getValue(); - properties.put(key, val); - } - } public Map<String, Object> getProperties() Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -54,17 +54,12 @@ import org.jboss.netty.handler.ssl.SslHandler; import org.jboss.util.Base64; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.WSTimeoutException; import org.jboss.ws.core.client.Marshaller; import org.jboss.ws.core.client.UnMarshaller; import org.jboss.ws.core.client.ssl.SSLContextFactory; import org.jboss.ws.core.client.transport.WSResponseHandler.Result; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.config.EndpointProperty; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.wsf.spi.metadata.config.CommonConfig; /** * A http client using Netty @@ -344,17 +339,6 @@ { if (HttpMethod.POST.equals(message.getMethod())) { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - //Overwrite, through endpoint config - if (msgContext != null) - { - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - CommonConfig config = epMetaData.getConfig(); - - String sizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE); - if (sizeValue != null) - chunkSize = Integer.valueOf(sizeValue); - } //override using call props try { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -661,16 +661,6 @@ } } - @Override - public void setConfigName(String configName, String configFile) - { - EndpointMetaData epMetaData = getEndpointMetaData(); - epMetaData.setConfigName(configName, configFile); - - // Reinitialize the client handler chain - jaxrpcService.setupHandlerChain(epMetaData); - } - public Set<QName> getHeaders() { HandlerChainBaseImpl handlerChain = (HandlerChainBaseImpl)jaxrpcService.getHandlerChain(epMetaData.getPortName()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Observable; import java.util.Set; import javax.xml.namespace.QName; @@ -67,7 +66,6 @@ public HandlerDelegateJAXRPC(ServerEndpointMetaData sepMetaData) { super(sepMetaData); - sepMetaData.registerConfigObserver(this); } /** @@ -214,8 +212,4 @@ { return headers; } - - public void update(Observable observable, Object object) - { - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -22,7 +22,6 @@ package org.jboss.ws.core.server; import org.jboss.ws.core.HeaderSource; -import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -30,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 19-Jan-2005 */ -public abstract class ServerHandlerDelegate implements Configurable, HeaderSource +public abstract class ServerHandlerDelegate implements HeaderSource { private ServerEndpointMetaData sepMetaData; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -174,15 +174,6 @@ epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); serviceMetaData.addEndpoint(epMetaData); - // config-name, config-file - if (serviceRefMetaData != null) - { - String configName= serviceRefMetaData.getConfigName(); - String configFile = serviceRefMetaData.getConfigFile(); - if (configName != null || configFile != null) - epMetaData.setConfigName(configName, configFile); - } - // Init the endpoint binding initEndpointBinding(wsdlBinding, epMetaData); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -157,11 +157,6 @@ if (bmd == null) throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_UNIFIEDBEANMETADATA", linkName)); - String configName = apMetaData.getConfigName(); - String configFile = apMetaData.getConfigFile(); - if (configName != null || configFile != null) - sepMetaData.setConfigName(configName, configFile); - EJBSecurityMetaData smd = bmd.getSecurityMetaData(); if (smd != null) { @@ -184,12 +179,6 @@ String wsdName = serviceMetaData.getWebserviceDescriptionName(); String wsdlPublishLocation = webMetaData.getWsdlPublishLocationByName(wsdName); serviceMetaData.setWsdlPublishLocation(wsdlPublishLocation); - - String configName = webMetaData.getConfigName(); - String configFile = webMetaData.getConfigFile(); - if (configName != null || configFile != null) - sepMetaData.setConfigName(configName, configFile); - initTransportGuaranteeJSE(dep, sepMetaData, linkName); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -23,7 +23,6 @@ import javax.xml.namespace.QName; -import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -37,19 +36,9 @@ // The endpoint address private String endpointAddress; - ClientEndpointMetaData() - { - } - public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName) { super(service, qname, portTypeName); - String configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; - String configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; - - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - ecmd.setConfigName(configName); - ecmd.setConfigFile(configFile); } public String getEndpointAddress() @@ -62,11 +51,6 @@ this.endpointAddress = endpointAddress; } - public EndpointConfigMetaData createEndpointConfigMetaData(String configName, String configFile) - { - return super.createEndpointConfigMetaData(configName, configFile); - } - public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); @@ -74,10 +58,7 @@ buffer.append("\n address=").append(getEndpointAddress()); buffer.append("\n binding=").append(getBindingId()); buffer.append("\n seiName=").append(getServiceEndpointInterfaceName()); - buffer.append("\n configFile=").append(getConfigFile()); - buffer.append("\n configName=").append(getConfigName()); buffer.append("\n authMethod=").append(getAuthMethod()); - buffer.append("\n properties=").append(getProperties()); for (OperationMetaData opMetaData : getOperations()) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -25,10 +25,6 @@ import java.util.List; import org.jboss.logging.Logger; -import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; -import org.jboss.wsf.spi.metadata.config.CommonConfig; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -48,14 +44,6 @@ private static Logger log = Logger.getLogger(EndpointConfigMetaData.class); private final EndpointMetaData epMetaData; - // The REQUIRED config-name - protected String configName; - // The REQUIRED config-file - protected String configFile; - - // The REQUIRED endpoint config - private CommonConfig config; - // The optional handlers private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); // True if the handlers are initialized @@ -113,40 +101,8 @@ List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); clearHandlers(); - List<HandlerMetaData> preHandlers = getHandlers(epMetaData, HandlerType.PRE); - List<HandlerMetaData> postHandlers = getHandlers(epMetaData, HandlerType.POST); - - addHandlers(preHandlers); addHandlers(sepHandlers); - addHandlers(postHandlers); - - if (log.isDebugEnabled()) - { - log.debug("Added " + preHandlers.size() + " PRE handlers"); - log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers"); - log.debug("Added " + postHandlers.size() + " POST handlers"); - } } - - private List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) - { - List<UnifiedHandlerChainMetaData> handlerChains = config.getHandlers(type); - boolean isJAXRPCConfig = (config instanceof CommonConfigJAXRPC); - List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - if (handlerChains != null) - { - for (UnifiedHandlerChainMetaData handlerChain : handlerChains) - { - for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) - { - HandlerMetaData hmd = isJAXRPCConfig ? HandlerMetaDataJAXRPC.newInstance(uhmd, type) : HandlerMetaDataJAXWS.newInstance(uhmd, type); - hmd.setEndpointMetaData(epMetaData); - handlers.add(hmd); - } - } - } - return handlers; - } public EndpointMetaData getEndpointMetaData() { @@ -159,34 +115,4 @@ for (HandlerMetaData handler : handlers) handler.eagerInitialize(); } - - public CommonConfig getConfig() - { - return config; - } - - void setConfig(CommonConfig config) - { - this.config = config; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -21,9 +21,6 @@ */ package org.jboss.ws.metadata.umdm; -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; -import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -31,9 +28,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Observable; -import java.util.Observer; -import java.util.Properties; import java.util.ResourceBundle; import java.util.Set; @@ -54,11 +48,6 @@ import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.accessor.AccessorFactory; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; -import org.jboss.ws.metadata.config.Configurable; -import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.metadata.config.CommonConfig; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; @@ -68,7 +57,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2005 */ -public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider, InitalizableMetaData +public abstract class EndpointMetaData extends ExtensibleMetaData implements InitalizableMetaData { private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointMetaData.class); // provide logging @@ -99,8 +88,6 @@ private Class seiClass; // The optional authentication method private String authMethod; - // Arbitrary properties given by <call-property> - private Properties properties; // The SOAPBinding style private Style style; // The SOAPBinding use @@ -112,14 +99,8 @@ // Maps the java method to the operation meta data private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); - private ConfigObservable configObservable = new ConfigObservable(); - private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); - EndpointMetaData() - { - } - public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName) { this.serviceMetaData = service; @@ -287,18 +268,6 @@ this.authMethod = authMethod; } - public Properties getProperties() - { - if (null == this.properties) - this.properties = new Properties(); - return this.properties; - } - - public void setProperties(Properties properties) - { - this.properties = properties; - } - public List<OperationMetaData> getOperations() { return new ArrayList<OperationMetaData>(operations); @@ -577,38 +546,6 @@ } } - // --------------------------------------------------------------- - // Configuration provider impl - - /** - * Callback for components that require configuration through jbossws-dd - */ - public void configure(Configurable configurable) - { - CommonConfig config = getConfig(); - // TODO: remove this method - } - - public UnifiedVirtualFile getRootFile() - { - return getServiceMetaData().getUnifiedMetaData().getRootFile(); - } - - public void registerConfigObserver(Configurable observer) - { - configObservable.addObserver(observer); - } - - public String getConfigFile() - { - return getEndpointConfigMetaData().getConfigFile(); - } - - public String getConfigName() - { - return getEndpointConfigMetaData().getConfigName(); - } - public EndpointConfigMetaData getEndpointConfigMetaData() { if (configMetaData == null) @@ -617,161 +554,6 @@ return this.configMetaData; } - public CommonConfig getConfig() - { - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - CommonConfig config = ecmd.getConfig(); - - // Make sure we have a configuration - if (config == null) - { - // No base configuration. - initEndpointConfigMetaData(ecmd); - config = ecmd.getConfig(); - } - - return config; - } - - public void setConfigName(String configName) - { - setConfigNameInternal(configName, null); - } - - public void setConfigName(String configName, String configFile) - { - setConfigNameInternal(configName, configFile); - } - - private void setConfigNameInternal(String configName, String configFile) - { - if (configName == null) - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CONFIG_NAME_CANNOT_BE_NULL")); - - if (configFile == null) - { - configFile = getEndpointConfigMetaData().getConfigFile(); - } - - if (configName.equals(getEndpointConfigMetaData().getConfigName()) == false || configFile.equals(getEndpointConfigMetaData().getConfigFile()) == false) - { - if (log.isDebugEnabled()) - log.debug("Reconfiguration forced, new config is '" + configName + "' file is '" + configFile + "'"); - - this.configMetaData = createEndpointConfigMetaData(configName, configFile); - configObservable.doNotify(configName); - } - } - - /** - * The factory method to create and initialise a new EndpointConfigMetaData, the current - * EndpointConfigMetaData will be used as the base to backup the RMMD. - * - * This method does not set the EndpointConfigMetaData as it can be used by clients to create - * a local configuration not stored in the EndpointMetaData. - */ - protected EndpointConfigMetaData createEndpointConfigMetaData(String configName, String configFile) - { - EndpointConfigMetaData ecmd = new EndpointConfigMetaData(this); - ecmd.setConfigName(configName); - ecmd.setConfigFile(configFile); - - initEndpointConfigMetaData(ecmd); - - return ecmd; - } - - public void initEndpointConfig() - { - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - initEndpointConfigMetaData(ecmd); - } - - /** - * Initialise the EndpointConfigMeta. - * - * @param toInitialise - The EndpointConfigMetaData to initialise. - */ - private void initEndpointConfigMetaData(EndpointConfigMetaData toInitialise) - { - String configName = toInitialise.getConfigName(); - String configFile = toInitialise.getConfigFile(); - - if (log.isDebugEnabled()) - log.debug("Create new config [name=" + configName + ",file=" + configFile + "]"); - - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(getClassLoader()); - CommonConfig config = factory.getConfig(getRootFile(), configName, configFile); - toInitialise.setConfig(config); - - toInitialise.configHandlerMetaData(); - } - - class ConfigObservable extends Observable - { - - private ReferenceQueue<WeakReference<Observer>> queue = new ReferenceQueue<WeakReference<Observer>>(); - private List<WeakReference<Observer>> observer = new ArrayList<WeakReference<Observer>>(); - - public void doNotify(Object object) - { - setChanged(); - notifyObservers(object); - } - - public synchronized void addObserver(Observer o) - { - clearCollected(); - observer.add(new WeakReference(o, queue)); - } - - public synchronized void deleteObserver(Observer o) - { - clearCollected(); - for (WeakReference<Observer> w : observer) - { - Observer tmp = w.get(); - if (tmp != null && tmp.equals(o)) - { - observer.remove(o); - break; - } - - } - } - - public void notifyObservers() - { - notifyObservers(null); - } - - public void notifyObservers(Object arg) - { - clearCollected(); - if (hasChanged()) - { - for (WeakReference<Observer> w : observer) - { - Observer tmp = w.get(); - if (tmp != null) - { - tmp.update(this, arg); - } - } - } - } - - private void clearCollected() - { - Reference ref; - while ((ref = queue.poll()) != null) - { - observer.remove(ref); - } - - } - } - public List<UnifiedPortComponentRefMetaData> getServiceRefContrib() { return serviceRefContrib; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -41,7 +41,6 @@ import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; import org.jboss.ws.metadata.accessor.ReflectiveMethodAccessorFactoryCreator; -import org.jboss.ws.metadata.config.EndpointFeature; /** * A request/response parameter that a given operation supports. @@ -410,14 +409,7 @@ public String getPartName() { - // [JBWS-771] Use part names that are friendly to .NET - String auxPartName = partName; - if (opMetaData.getEndpointMetaData().getConfig().hasFeature(EndpointFeature.BINDING_WSDL_DOTNET)) - { - if (opMetaData.isDocumentWrapped() && inHeader == false) - auxPartName = "parameters"; - } - return auxPartName; + return partName; } public void setPartName(String partName) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -28,7 +28,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -72,13 +71,6 @@ { super(service, portName, portTypeName); this.endpoint = endpoint; - - String configName = ConfigurationProvider.DEFAULT_ENDPOINT_CONFIG_NAME; - String configFile = ConfigurationProvider.DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE; - - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - ecmd.setConfigName(configName); - ecmd.setConfigFile(configFile); } public Endpoint getEndpoint() @@ -205,12 +197,9 @@ buffer.append("\n portComponentName=").append(getPortComponentName()); buffer.append("\n contextRoot=").append(getContextRoot()); buffer.append("\n urlPattern=").append(getURLPattern()); - buffer.append("\n configFile=").append(getConfigFile()); - buffer.append("\n configName=").append(getConfigName()); buffer.append("\n authMethod=").append(getAuthMethod()); buffer.append("\n transportGuarantee=").append(getTransportGuarantee()); buffer.append("\n secureWSDLAccess=").append(isSecureWSDLAccess()); - buffer.append("\n properties=").append(getProperties()); for (OperationMetaData opMetaData : getOperations()) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -25,7 +25,6 @@ import java.util.LinkedList; import java.util.List; -import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -66,17 +65,7 @@ return new WebAppResolver(contextPath, servletName); } - /** - * Post init phase hook using template method - * @param servletConfig servlet config - */ @Override - protected final void postInit(ServletConfig servletConfig) - { - ServletConfigHelper.initEndpointConfig(servletConfig, endpoint); - } - - @Override protected final void postService() { registerForPreDestroy(endpoint); Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.wsf.stack.jbws; - -import java.util.ResourceBundle; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; - -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.metadata.config.CommonConfig; - -/** - * Native servlet configuration helper - * @author richard.opalka(a)jboss.com - */ -public final class ServletConfigHelper -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(ServletConfigHelper.class); - - /** - * Constructor - */ - private ServletConfigHelper() {} - - /** - * Reads the config name/file from web.xml - * @param servletConfig servlet config - * @param endpoint endpoint instance - */ - public static void initEndpointConfig(ServletConfig servletConfig, Endpoint endpoint) - { - final ServletContext servletContext = servletConfig.getServletContext(); - final String configName = servletContext.getInitParameter(CommonConfig.JBOSSWS_CONFIG_NAME); - final String configFile = servletContext.getInitParameter(CommonConfig.JBOSSWS_CONFIG_FILE); - - if (configName != null || configFile != null) - { - ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); - if (epMetaData == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_ENDPOINTMD")); - - epMetaData.setConfigName(configName, configFile); - } - } - -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,6 +1,3 @@ -urn\:jboss\:jaxrpc-config\:2.0=schema/jaxrpc-config_2_0.xsd -urn\:jboss\:jaxws-config\:2.0=schema/jaxws-config_2_0.xsd -http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 schema/jaxrpc-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - </client-config> - -</jaxrpc-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 schema/jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - -</jaxrpc-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature> - <property> - <property-name>http://org.jboss.ws/http#chunksize</property-name> - <property-value>2048</property-value> - </property> - </client-config> - - <client-config> - <config-name>HTTP 1.0 Client</config-name> - <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature> - </client-config> - -</jaxws-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - </endpoint-config> - -  - <endpoint-config> - <config-name>.NET friendly Endpoint</config-name> - <feature><feature-name>http://org.jboss.ws/binding/wsdl/dotnet</feature-name></feature> - </endpoint-config> - -</jaxws-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:jboss:jaxrpc-config:2.0" xmlns:tns="urn:jboss:jaxrpc-config:2.0" - xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - attributeFormDefault="unqualified" version="1.1"> - - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - This is the schema definition for JBossWS configurations JAXRPC. - It relies on the handler definitions that are part of the standard J2EE-1.4 deployment descriptors. - ]]> - </xsd:documentation> - </xsd:annotation> - - <xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_web_services_1_1.xsd"/> - - <xsd:complexType name="jaxrpcConfigType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:choice> - <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:choice> - </xsd:complexType> - - <xsd:element name="jaxrpc-config" type="tns:jaxrpcConfigType"/> - - <xsd:complexType name="endpointConfigType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSEndpointConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="clientConfigType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSClientConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="commonConfigType"> - <xsd:sequence> - <xsd:element name="config-name" type="xsd:string"/> - <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/> - <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/> - <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="handlerChainType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSHandlerChainConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:sequence> - <xsd:element name="handler-chain-name" type="xsd:string"/> - <xsd:element name="handler" type="j2ee:port-component_handlerType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="propertyType"> - <xsd:sequence> - <xsd:element name="property-name" type="xsd:string"/> - <xsd:element name="property-value" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="urn:jboss:jaxws-config:2.0" - xmlns:tns="urn:jboss:jaxws-config:2.0" - xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - attributeFormDefault="unqualified" - version="1.1"> - - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - This is the schema definition for JBossWS configurations JAXWS. - It relies on the handler definitions that are part of the standard J2EE-1.5 deployment descriptors. - ]]> - </xsd:documentation> - </xsd:annotation> - - <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="javaee_web_services_1_2.xsd"/> - - <xsd:element name="jaxws-config" type="tns:jaxwsConfigType"/> - <xsd:complexType name="jaxwsConfigType"> - <xsd:choice> - <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:choice> - </xsd:complexType> - - <xsd:complexType name="endpointConfigType"> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="clientConfigType"> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="commonConfigType"> - <xsd:sequence> - <xsd:element name="config-name" type="xsd:string"/> - <xsd:element name="pre-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> - <xsd:element name="post-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> - <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="propertyType"> - <xsd:sequence> - <xsd:element name="property-name" type="xsd:anyURI"/> - <xsd:element name="property-value" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,286 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.jboss.org/jbossws-tools" targetNamespace="http://www.jboss.org/jbossws-tools" elementFormDefault="qualified" attributeFormDefault="unqualified"> - <xs:element name="configuration" type="ns1:configurationType"> - <xs:annotation> - <xs:documentation>Configuration Element</xs:documentation> - </xs:annotation> - </xs:element> -  - <xs:complexType name="configurationType"> - <xs:sequence> - <xs:element name="global" type="ns1:globalType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Represents global options</xs:documentation> - </xs:annotation> - </xs:element> - <xs:choice> - <xs:element name="java-wsdl" type="ns1:javaToWsdlType"> - <xs:annotation> - <xs:documentation>Generates a WSDL file from a JSR-109 service endpoint interface. Additionally, a webservices.xml and a JSR-109 mapping file can also be generated</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="wsdl-java" type="ns1:wsdlToJavaType"> - <xs:annotation> - <xs:documentation>Generates a JSR-109 service endpoint interface, and optionally a JSR-109 mapping file</xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - </xs:sequence> - </xs:complexType> - <xs:complexType name="globalType"> - <xs:sequence> - <xs:element name="package-namespace" type="ns1:pkgNSType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>Allows customization of the java package name to xml namespace mapping. This is specified in package/namespace element pairs.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="pkgNSType"> - <xs:annotation> - <xs:documentation>A package namespace pair.</xs:documentation> - </xs:annotation> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute name="package"> - <xs:annotation> - <xs:documentation>Package Name</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="namespace"> - <xs:annotation> - <xs:documentation>XML Namespace</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - <xs:complexType name="serviceType"> - <xs:sequence> - <xs:element name="operation" type="ns1:operationType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>Used to customize a WSDL operation. This chlid elements of this tag are mapped to a Java method on the endpoint interface. The name and parameter types must be specified in order to locate the method.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="name" use="required"> - <xs:annotation> - <xs:documentation>Name of the service. This will appear in the service element of the generated WSDL file.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="endpoint" use="required"> - <xs:annotation> - <xs:documentation>The fully qualified Java interface name of the service endpoint interface.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="style" use="optional" default="rpc"> - <xs:annotation> - <xs:documentation>The style of the web service. The "rpc" style indicates multiple parts where each part is a separate schema document instance. The "document" style indicates that the body of the message is represented by a single part.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="rpc"/> - <xs:enumeration value="document"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="parameter-style" use="optional" default="wrapped"> - <xs:annotation> - <xs:documentation>The parameter style convention to use when using document/literal. The "bare" convention requires that the Java method have a single parameter that represents the full request message body, and a single return value that represents the full response message body. The "wrapped" convention allows any Java method signature because it wraps all parameter in a single schema type.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="bare"/> - <xs:enumeration value="wrapped"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - <xs:complexType name="namespacesType"> - <xs:attribute name="target-namespace" use="required"> - <xs:annotation> - <xs:documentation>The target namespace of the WSDL. By default, it will be derived from the package name of the java endpoint.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:anyURI"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="type-namespace" use="required"> - <xs:annotation> - <xs:documentation>The namespace to be used for the schema types.By default, will be the same as the target namespace of the WSDL file.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:anyURI"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - <xs:complexType name="mappingType"> - <xs:attribute name="file" use="optional" default="jaxrpc-mapping.xml"> - <xs:annotation> - <xs:documentation>The JSR-109 mapping file to generate. This defaults to jaxrpc-mapping.xml</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - <xs:complexType name="operationType"> - <xs:sequence> - <xs:element name="parameter" type="ns1:parameterType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>Represents a method parameter. It must be in the exact order of the Java method signature.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="name" use="required"> - <xs:annotation> - <xs:documentation>The Java method name.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="one-way" use="optional"> - <xs:annotation> - <xs:documentation>If true, the generated WSDL operation should have no response message.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="return-xml-name" type="xs:QName" use="optional"> - <xs:annotation> - <xs:documentation>The name of the return value in the response message.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="wsxmlType"> - <xs:attribute name="servlet-link" use="optional"> - <xs:annotation> - <xs:documentation>Specifies the web.xml servlet-link that is used by Java Service Endpoints (WAR style deployments)</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="ejb-link" use="optional"> - <xs:annotation> - <xs:documentation>Specifies the ejb-jar.xml ejb-link for Stateless Session Bean endpoints</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="append" type="xs:boolean" use="optional" /> - </xs:complexType> - <xs:complexType name="javaToWsdlType"> - <xs:sequence> - <xs:element name="service" type="ns1:serviceType"/> - <xs:element name="namespaces" type="ns1:namespacesType"> - <xs:annotation> - <xs:documentation>Namespaces to use when generating the WSDL file.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="mapping" type="ns1:mappingType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies the JSR-109 mapping file to generate.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="webservices" type="ns1:wsxmlType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Used to generate the JSR-109 webservices.xml file</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="wsdlToJavaType"> - <xs:sequence> - <xs:element name="mapping" type="ns1:mappingType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies the JSR-109 mapping file to generate.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="webservices" type="ns1:wsxmlType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Used to generate the JSR-109 webservices.xml file</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="location" type="xs:anyURI" use="required"> - <xs:annotation> - <xs:documentation>Specifies the location of the WSDL file as a URL. The URL may be either absolute or relative to the current directory. Remote protocols such as http are supported.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="parameter-style" use="optional" default="wrapped"> - <xs:annotation> - <xs:documentation>The parameter style convention to use when using document/literal. The "bare" convention requires that the Java method have a single parameter that represents the full request message body, and a single return value that represents the full response message body. The "wrapped" convention allows any Java method signature because it wraps all parameter in a single schema type.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="bare"/> - <xs:enumeration value="wrapped"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="serializable-types" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Should generated types implement java.io.Serializable, default to false.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="parameterType"> - <xs:attribute name="type" use="required"> - <xs:annotation> - <xs:documentation>The fully qualified Java class name of the method parameter type.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="xml-name" type="xs:QName" use="optional"> - <xs:annotation> - <xs:documentation>Used to customize the name of the parameter that is used in the generated WSDL file.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="mode" use="optional" default="IN"> - <xs:annotation> - <xs:documentation>Indicates the in/out mode of the parameter. The "IN" mode is a normal java parameter. The "OUT" mode is a holder parameter that is used to pass multiple return values. The "INOUT" mode is a holder parameter that is used to receive as well as return values. The default is "IN".</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - <xs:enumeration value="IN"/> - <xs:enumeration value="OUT"/> - <xs:enumeration value="INOUT"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="header" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Indicates whether this parameter should be mapped to a SOAP header instead of a SOAP body part.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> -</xs:schema> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -2856,41 +2856,6 @@ </manifest> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws1653-appclient.jar"/> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -2901,7 +2866,6 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> - <include name="custom-endpoint-config.xml"/> <include name="wsdl/**"/> </webinf> </war> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - -</jaxrpc-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - -</jaxws-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml 2012-04-10 09:54:01 UTC (rev 16140) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml 2012-04-10 10:00:53 UTC (rev 16141) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Custom Endpoint Config</config-name> - <pre-handler-chain> - <handler-chain-name>Custom Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>Custom Handler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.test.ws.jaxrpc.jbws1792.TestHandler</j2ee:handler-class> - <j2ee:init-param> - <j2ee:param-name>TestParameter</j2ee:param-name> - <j2ee:param-value>TestValue</j2ee:param-value> - </j2ee:init-param> - </handler> - </pre-handler-chain> - </endpoint-config> - -</jaxrpc-config>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16140 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 18 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 05:54:01 -0400 (Tue, 10 Apr 2012) New Revision: 16140 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws358/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1179/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-8668] Merged revisions 16091-16093,16095,16103 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16091 | ropalka | 2012-04-04 12:19:40 +0200 (Wed, 04 Apr 2012) | 1 line [JBWS-3474] removing javax.jws dependency ....... r16092 | ropalka | 2012-04-04 12:56:53 +0200 (Wed, 04 Apr 2012) | 1 line [JBWS-3474] trim down jaxws-api dependencies ....... r16093 | ropalka | 2012-04-04 14:41:50 +0200 (Wed, 04 Apr 2012) | 1 line [JBWS-3474] removing jaxws-api dependencies ....... r16095 | ropalka | 2012-04-04 15:05:15 +0200 (Wed, 04 Apr 2012) | 1 line removing tests that will never be fixed ....... r16103 | ropalka | 2012-04-05 10:34:35 +0200 (Thu, 05 Apr 2012) | 1 line [JBWS-3474] fixing regression ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -13,13 +13,9 @@ <relativePath>../../pom.xml</relativePath> </parent> - <properties> - <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version> - </properties> -  <dependencies> - +  <dependency> <groupId>org.jboss.ws</groupId> @@ -74,16 +70,8 @@ <artifactId>xercesImpl</artifactId> <scope>provided</scope> </dependency> -  +  <dependency> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - </dependency> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -116,37 +104,6 @@  <build> <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <showDeprecation>false</showDeprecation> - <compilerArguments> - <endorseddirs>${project.build.directory}/endorsed</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin>  <plugin> <artifactId>maven-antrun-plugin</artifactId> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -23,9 +23,6 @@ import java.util.Observable; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.soap.SOAPBinding; - import org.jboss.logging.Logger; import org.jboss.ws.core.jaxrpc.SOAP11BindingJAXRPC; import org.jboss.ws.core.jaxrpc.SOAP12BindingJAXRPC; @@ -42,7 +39,16 @@ public class CommonBindingProvider implements Configurable { private static Logger log = Logger.getLogger(CommonBindingProvider.class); + /** + * A constant representing the identity of the SOAP 1.1 over HTTP binding. + */ + private static final String SOAP11HTTP_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http"; + /** + * A constant representing the identity of the SOAP 1.2 over HTTP binding. + */ + private static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/"; + protected EndpointMetaData epMetaData; protected CommonBinding binding; @@ -71,11 +77,11 @@ protected void initBinding(String bindingId) { - if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId)) + if (SOAP11HTTP_BINDING.equals(bindingId)) { binding = new SOAP11BindingJAXRPC(); } - else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) + else if (SOAP12HTTP_BINDING.equals(bindingId)) { binding = new SOAP12BindingJAXRPC(); } @@ -86,11 +92,6 @@ return binding; } - public EndpointReference getEndpointReference() - { - throw new UnsupportedOperationException(); - } - public void update(Observable observable, Object object) { if(log.isDebugEnabled()) log.debug("Update config: " + object); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -35,8 +35,6 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPException; -import javax.xml.ws.ProtocolException; -import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -312,13 +310,9 @@ if (maintainSession) addSessionInfo(reqMessage, callProps); - propagateRequestHeaders(reqMessage, msgContext); - RemoteConnection remoteConnection = new RemoteConnectionFactory().getRemoteConnection(epInfo); MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway); - propagateResponseHeaders(callProps, msgContext); - if (maintainSession) saveSessionInfo(callProps, requestCtx); @@ -374,25 +368,16 @@ } catch (Exception ex) { - Boolean isOutbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY); - if (oneway && isOutbound && ex instanceof ProtocolException) - { - //swallow the outbound SOAPException threw in hanlders - return null; - } - else - { - log.error(BundleUtils.getMessage(bundle, "EXCEPTION_CAUGHT_WHILE_(PREPARING_FOR)_PERFORMING_THE_INVOCATION"), ex); - // Reverse the message direction - processPivotInternal(msgContext, direction); - if (faultType[2] != null) - callFaultHandlerChain(portName, faultType[2], ex); - if (faultType[1] != null) - callFaultHandlerChain(portName, faultType[1], ex); - if (faultType[0] != null) - callFaultHandlerChain(portName, faultType[0], ex); - throw ex; - } + log.error(BundleUtils.getMessage(bundle, "EXCEPTION_CAUGHT_WHILE_(PREPARING_FOR)_PERFORMING_THE_INVOCATION"), ex); + // Reverse the message direction + processPivotInternal(msgContext, direction); + if (faultType[2] != null) + callFaultHandlerChain(portName, faultType[2], ex); + if (faultType[1] != null) + callFaultHandlerChain(portName, faultType[1], ex); + if (faultType[0] != null) + callFaultHandlerChain(portName, faultType[0], ex); + throw ex; } finally { @@ -402,11 +387,6 @@ } } - private void propagateResponseHeaders(Map<String, Object> remotingMetadata, Map<String, Object> responseContext) - { - responseContext.put(MessageContext.HTTP_RESPONSE_HEADERS, remotingMetadata.get(NettyClient.RESPONSE_HEADERS)); - } - @SuppressWarnings({"unchecked", "rawtypes"}) private void saveSessionInfo(Map<String, Object> remotingMetadata, Map<String, Object> requestContext) { @@ -463,35 +443,6 @@ } } - @SuppressWarnings("unchecked") - private void propagateRequestHeaders(MessageAbstraction reqMessage, CommonMessageContext callProperties) - { - Map<String, List<String>> requestHeaders = (Map<String, List<String>>)callProperties.get(MessageContext.HTTP_REQUEST_HEADERS); - if (requestHeaders != null) - { - for (Map.Entry<String, List<String>> header : requestHeaders.entrySet()) - { - final String key = header.getKey(); - final List<String> values = header.getValue(); - - if (key != null) - { - final StringBuilder sb = new StringBuilder(); - for (int i = 0; i < values.size(); i++) - { - boolean addLWS = (i != (values.size() - 1)); - sb.append(values.get(i)); - if (addLWS) - { - sb.append("\r\n "); - } - } - reqMessage.getMimeHeaders().addHeader(key, sb.toString()); - } - } - } - } - private CommonMessageContext processPivotInternal(CommonMessageContext msgContext, DirectionHolder direction) { if (direction.getDirection() == Direction.OutBound) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.ResourceBundle; @@ -32,7 +31,6 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -64,12 +62,9 @@ // The Message in this message context private MessageAbstraction message; // The map of scoped properties - protected Map<String, ScopedProperty> scopedProps = new HashMap<String, ScopedProperty>(); - // The current property scope - protected Scope currentScope = Scope.APPLICATION; + protected Map<String, Object> props = new HashMap<String, Object>(); private boolean isModified; - private Throwable currentException; public CommonMessageContext() { @@ -82,30 +77,9 @@ this.opMetaData = msgContext.opMetaData; this.message = msgContext.message; this.serContext = msgContext.serContext; - this.scopedProps = new HashMap<String, ScopedProperty>(msgContext.scopedProps); - this.currentScope = msgContext.currentScope; + this.props = new HashMap<String, Object>(msgContext.props); } - public Throwable getCurrentException() - { - return currentException; - } - - public void setCurrentException(Throwable t) - { - this.currentException = t; - } - - public Scope getCurrentScope() - { - return currentScope; - } - - public void setCurrentScope(Scope currentScope) - { - this.currentScope = currentScope; - } - public EndpointMetaData getEndpointMetaData() { if (epMetaData == null && opMetaData != null) @@ -174,73 +148,62 @@ return getSerializationContext().getNamespaceRegistry(); } + public boolean isModified() + { + return isModified; + } + + /** + * Mark a message as 'modified' when the SAAJ model becomes stale. + * This may be the case when: + * <ul> + * <li>the complete message is replaced at MessageContext level + * <li>the payload is set on a LogicalMessage + * <li>The SAAJ model is changed though the DOM or SAAJ API (handler) + * </ul> + * + * In any of these cases another 'unbind' invocation is required. + */ + public void setModified(boolean modified) + { + isModified = modified; + } + // Map interface public int size() { - return scopedProps.size(); + return props.size(); } public boolean isEmpty() { - return scopedProps.isEmpty(); + return props.isEmpty(); } public boolean containsKey(Object key) { - ScopedProperty prop = scopedProps.get(key); - return isValidInScope(prop); + return props.containsKey(key); } public boolean containsValue(Object value) { - boolean valueFound = false; - for (ScopedProperty prop : scopedProps.values()) - { - if (prop.getValue().equals(value) && isValidInScope(prop)) - { - valueFound = true; - break; - } - } - return valueFound; + return props.containsValue(value); } public Object get(Object key) { - Object value = null; - - ScopedProperty scopedProp = scopedProps.get(key); - if (log.isTraceEnabled()) - log.trace("get(" + key + "): " + scopedProp); - - if (isValidInScope(scopedProp)) - value = scopedProp.getValue(); - - return value; + return props.get(key); } public Object put(String key, Object value) { - ScopedProperty prevProp = scopedProps.get(key); - if (prevProp != null && !isValidInScope(prevProp)) - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_SET_VALUE_FOR_HANDLER_SCOPED_PROPERTY", key)); - - ScopedProperty newProp = new ScopedProperty(key, value, currentScope); - if (log.isTraceEnabled()) - log.trace("put: " + newProp); - - scopedProps.put(key, newProp); - return prevProp != null ? prevProp.getValue() : null; + return props.put(key, value); } public Object remove(Object key) { - ScopedProperty prevProp = scopedProps.get(key); - if (prevProp != null && !isValidInScope(prevProp)) - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_SET_REMOVE_FOR_HANDLER_SCOPED_PROPERTY", key)); - - return scopedProps.remove(key); + return props.remove(key); } public void putAll(Map<? extends String, ? extends Object> srcMap) @@ -262,75 +225,23 @@ public void clear() { - scopedProps.clear(); + props.clear(); } - - public boolean isModified() - { - return isModified; - } - - /** - * Mark a message as 'modified' when the SAAJ model becomes stale. - * This may be the case when: - * <ul> - * <li>the complete message is replaced at MessageContext level - * <li>the payload is set on a LogicalMessage - * <li>The SAAJ model is changed though the DOM or SAAJ API (handler) - * </ul> - * - * In any of these cases another 'unbind' invocation is required. - */ - public void setModified(boolean modified) - { - isModified = modified; - } - public Set<String> keySet() { - Set<String> keys = new HashSet<String>(scopedProps.size()); - for (ScopedProperty prop : scopedProps.values()) - { - if (isValidInScope(prop)) - keys.add(prop.getName()); - } - return keys; + return props.keySet(); } public Collection<Object> values() { - Collection<Object> values = new HashSet<Object>(scopedProps.size()); - for (ScopedProperty prop : scopedProps.values()) - { - if (isValidInScope(prop)) - values.add(prop.getValue()); - } - return values; + return props.values(); } public Set<Entry<String, Object>> entrySet() { - Set<Entry<String, Object>> entries = new HashSet<Entry<String, Object>>(); - for (ScopedProperty prop : scopedProps.values()) - { - if (isValidInScope(prop)) - { - String name = prop.getName(); - Object value = prop.getValue(); - Entry<String, Object> entry = new ImmutableEntry<String, Object>(name, value); - entries.add(entry); - } - } - return entries; + return props.entrySet(); } - private boolean isValidInScope(ScopedProperty prop) - { - // A property of scope APPLICATION is always visible - boolean valid = (prop != null && (prop.getScope() == Scope.APPLICATION || currentScope == Scope.HANDLER)); - return valid; - } - public static void cleanupAttachments(CommonMessageContext messageContext) { // cleanup attachments @@ -357,65 +268,4 @@ } } } - - private static class ImmutableEntry<K, V> implements Map.Entry<K, V> - { - final K k; - final V v; - - ImmutableEntry(K key, V value) - { - k = key; - v = value; - } - - public K getKey() - { - return k; - } - - public V getValue() - { - return v; - } - - public V setValue(V value) - { - throw new UnsupportedOperationException(); - } - } - - public static class ScopedProperty - { - private Scope scope; - private String name; - private Object value; - - public ScopedProperty(String name, Object value, Scope scope) - { - this.scope = scope; - this.name = name; - this.value = value; - } - - public String getName() - { - return name; - } - - public Scope getScope() - { - return scope; - } - - public Object getValue() - { - return value; - } - - public String toString() - { - return scope + ":" + name + "=" + value; - } - } } Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageAbstraction.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.core; - -/** - * A generic HTTP message - * - * @author Thomas.Diesler(a)jboss.com - * @since 02-Apr-2007 - */ -public interface HTTPMessageAbstraction extends MessageAbstraction -{ - -} Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/HTTPMessageImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.core; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.MimeHeaders; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; - -import org.jboss.util.NotImplementedException; -import org.jboss.ws.core.soap.XMLFragment; -import org.jboss.ws.core.soap.attachment.MimeConstants; - -/** - * A generic HTTP message - * - * @author Thomas.Diesler(a)jboss.com - * @since 02-Apr-2007 - */ -public class HTTPMessageImpl implements HTTPMessageAbstraction -{ - private MimeHeaders mimeHeaders; - private XMLFragment xmlFragment; - - public HTTPMessageImpl(MimeHeaders mimeHeaders, InputStream inputStream) - { - this.mimeHeaders = mimeHeaders; - this.xmlFragment = new XMLFragment(new StreamSource(inputStream)); - } - - public HTTPMessageImpl(Source source) - { - this.mimeHeaders = new MimeHeaders(); - this.xmlFragment = new XMLFragment(source); - - initDefaultMimeHeaders(); - } - - public HTTPMessageImpl(Result result) - { - this.mimeHeaders = new MimeHeaders(); - this.xmlFragment = new XMLFragment(result); - - initDefaultMimeHeaders(); - } - - // TCL requirement - public boolean doValidate() - { - this.xmlFragment.toElement(); - return true; - } - - private void initDefaultMimeHeaders() - { - mimeHeaders.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_XML_UTF8); - } - - public XMLFragment getXmlFragment() - { - return xmlFragment; - } - - public void setXmlFragment(XMLFragment xmlFragment) - { - this.xmlFragment = xmlFragment; - } - - public MimeHeaders getMimeHeaders() - { - if (mimeHeaders == null) - mimeHeaders = new MimeHeaders(); - - return mimeHeaders; - } - - public void setMimeHeaders(MimeHeaders mimeHeaders) - { - this.mimeHeaders = mimeHeaders; - } - - public void writeTo(OutputStream outputStream) throws IOException - { - xmlFragment.writeTo(outputStream); - } - - public boolean isFaultMessage() - { - return false; - } - - public void addAttachmentPart(AttachmentPart part) - { - throw new NotImplementedException(); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/MessageTrace.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -73,13 +73,6 @@ msgLog.error(BundleUtils.getMessage(bundle, "CANNOT_TRACE_SOAPMESSAGE"), ex); } } - else if (message instanceof HTTPMessageImpl) - { - HTTPMessageImpl httpMessage = (HTTPMessageImpl)message; - Element root = httpMessage.getXmlFragment().toElement(); - String xmlString = DOMWriter.printNode(root, true); - msgLog.trace(messagePrefix + "\n" + xmlString); - } else if (message instanceof byte[]) { Element root = new XMLFragment(new StreamSource(new ByteArrayInputStream((byte[])message))).toElement(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -25,10 +25,7 @@ import java.util.Map; import java.util.Properties; -import javax.xml.ws.WebServiceFeature; - import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.FeatureSet; /** A wrapper object that associates the target address with some metadata * @@ -39,11 +36,9 @@ { private String targetAddress; private Map<String, Object> properties; - private FeatureSet features; public EndpointInfo(EndpointMetaData epMetaData, String targetAddress, Map<String, Object> callProps) { - this.features = epMetaData.getFeatures(); this.targetAddress = this.lowerCaseProtocol(targetAddress); this.properties = callProps; @@ -84,11 +79,6 @@ return targetAddress; } - public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) - { - return features.isFeatureEnabled(key); - } - public boolean equals(Object obj) { if (!(obj instanceof EndpointInfo)) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -38,7 +38,6 @@ import javax.net.ssl.SSLEngine; import javax.xml.rpc.Stub; -import javax.xml.ws.BindingProvider; import org.jboss.logging.Logger; import org.jboss.netty.buffer.ChannelBuffer; @@ -398,11 +397,6 @@ authType = StubExt.PROPERTY_AUTH_TYPE_BASIC; String username = (String)callProps.get(Stub.USERNAME_PROPERTY); String password = (String)callProps.get(Stub.PASSWORD_PROPERTY); - if (username == null || password == null) - { - username = (String)callProps.get(BindingProvider.USERNAME_PROPERTY); - password = (String)callProps.get(BindingProvider.PASSWORD_PROPERTY); - } if (username != null && password != null) { if (authType.equals(StubExt.PROPERTY_AUTH_TYPE_BASIC)) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/Message.properties 2012-04-10 09:54:01 UTC (rev 16140) @@ -3,7 +3,7 @@ INVALID_NAMESPACE_FOR_TYPE=Invalid namespace for type: {0} MESSAGECONTEXT_NOT_AVAILABLE=MessageContext not available UNEXPECTED_STYLE=Unexpected style: {0} -UNEXPECTED_PARAMETER_STYLE=Unexpected parameter style: {0} +UNEXPECTED_PARAMETER_STYLE=Unexpected parameter style CANNOT_WRAP_REQUEST_STRUCTURE=Cannot wrap request structure: {0} REQUEST_STRUCT_CANNOT_BE_NULL=Request struct cannot be null CANNOT_UNWRAP_REQUEST_STRUCTURE=Cannot unwrap request structure: {0} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -35,7 +35,6 @@ import javassist.LoaderClassPath; import javassist.Modifier; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import org.jboss.logging.Logger; @@ -73,8 +72,8 @@ if (opMetaData.getStyle() != Style.DOCUMENT) throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_STYLE", opMetaData.getStyle())); - if (opMetaData.getParameterStyle() != ParameterStyle.WRAPPED) - throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_PARAMETER_STYLE", opMetaData.getParameterStyle())); + if (!opMetaData.isWrappedParameterStyle()) + throw new WSException(BundleUtils.getMessage(bundle, "UNEXPECTED_PARAMETER_STYLE")); } private static Object holderValue(Object holder) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -41,7 +41,6 @@ import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; -import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -79,6 +78,10 @@ private static final ResourceBundle bundle = BundleUtils.getBundle(SOAPFaultHelperJAXRPC.class); // provide logging private static Logger log = Logger.getLogger(SOAPFaultHelperJAXRPC.class); + /** + * A constant representing the identity of the SOAP 1.2 over HTTP binding. + */ + private static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/"; private static List<QName> allowedFaultCodes = new ArrayList<QName>(); static @@ -326,7 +329,7 @@ { EndpointMetaData emd = msgContext.getEndpointMetaData(); String bindingId = emd.getBindingId(); - if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) + if (SOAP12HTTP_BINDING.equals(bindingId)) { return true; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -33,7 +33,6 @@ import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPHeader; -import javax.xml.ws.http.HTTPBinding; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -58,13 +57,10 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationContext; import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** An implementation handles invocations on the endpoint @@ -82,14 +78,6 @@ protected CommonBindingProvider bindingProvider; protected ServerHandlerDelegate delegate; - private WebServiceContextFactory contextFactory; - - public ServiceEndpointInvoker() - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - contextFactory = spiProvider.getSPI(WebServiceContextFactory.class); - } - /** Initialize the service endpoint */ public void init(Endpoint endpoint) { @@ -368,51 +356,39 @@ { OperationMetaData opMetaData; - String bindingID = epMetaData.getBindingId(); - if (HTTPBinding.HTTP_BINDING.equals(bindingID)) - { - if (epMetaData.getOperations().size() != 1) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "MULTIPLE_OPERATIONS_NOT_SUPPORTED")); + SOAPMessageImpl soapMessage = (SOAPMessageImpl)reqMessage; + opMetaData = soapMessage.getOperationMetaData(epMetaData); + SOAPHeader soapHeader = soapMessage.getSOAPHeader(); - opMetaData = epMetaData.getOperations().get(0); - } - else + // Report a MustUnderstand fault + if (opMetaData == null) { - SOAPMessageImpl soapMessage = (SOAPMessageImpl)reqMessage; + String faultString; - opMetaData = soapMessage.getOperationMetaData(epMetaData); - SOAPHeader soapHeader = soapMessage.getSOAPHeader(); + SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); + SOAPBodyElement soapBodyElement = soapBody.getBodyElement(); + if (soapBodyElement != null) + { + Name soapName = soapBodyElement.getElementName(); + faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; + } + else + { + faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for empty soap body"; + } - // Report a MustUnderstand fault - if (opMetaData == null) - { - String faultString; - - SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody(); - SOAPBodyElement soapBodyElement = soapBody.getBodyElement(); - if (soapBodyElement != null) - { - Name soapName = soapBodyElement.getElementName(); - faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for: " + soapName; - } - else - { - faultString = "Endpoint " + epMetaData.getPortName() + " does not contain operation meta data for empty soap body"; - } - - // R2724 If an INSTANCE receives a message that is inconsistent with its WSDL description, it SHOULD generate a soap:Fault - // with a faultcode of "Client", unless a "MustUnderstand" or "VersionMismatch" fault is generated. - if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext()) - { - QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND; - throw new CommonSOAPFaultException(faultCode, faultString); - } - else - { - QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; - throw new CommonSOAPFaultException(faultCode, faultString); - } - } + // R2724 If an INSTANCE receives a message that is inconsistent with its WSDL description, it SHOULD generate a soap:Fault + // with a faultcode of "Client", unless a "MustUnderstand" or "VersionMismatch" fault is generated. + if (soapHeader != null && soapHeader.examineMustUnderstandHeaderElements(Constants.URI_SOAP11_NEXT_ACTOR).hasNext()) + { + QName faultCode = Constants.SOAP11_FAULT_CODE_MUST_UNDERSTAND; + throw new CommonSOAPFaultException(faultCode, faultString); + } + else + { + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, faultString); + } } return opMetaData; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -38,8 +38,6 @@ import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.WebServiceFeature; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -48,7 +46,6 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder; -import org.jboss.ws.metadata.umdm.FeatureSet; /** * MessageFactory implementation @@ -63,12 +60,8 @@ // The envelope namespace used by the MessageFactory private String envNamespace; - // The JAXWS ServiceMode - private Mode serviceMode; // The style used by this MessageFactory private Style style; - // The features used by this MessageFactory - private FeatureSet features = new FeatureSet(); // Used if the style is dynamic private boolean dynamic; @@ -127,26 +120,6 @@ this.style = style; } - public Mode getServiceMode() - { - return serviceMode; - } - - public void setServiceMode(Mode serviceMode) - { - this.serviceMode = serviceMode; - } - - public void addFeature(WebServiceFeature feature) - { - this.features.addFeature(feature); - } - - public void setFeatures(FeatureSet features) - { - this.features = features; - } - /** * Creates a new SOAPMessage object with the default SOAPPart, SOAPEnvelope, * SOAPBody, and SOAPHeader objects. Profile-specific message factories can Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -55,13 +55,6 @@ OperationMetaData opMetaData = null; boolean debugEnabled = log.isDebugEnabled(); - // Dispatch to JAXWS Provider - if (opMetaData == null && epMetaData.getServiceMode() != null) - { - QName xmlName = new QName(epMetaData.getPortName().getNamespaceURI(), "invoke"); - opMetaData = epMetaData.getOperation(xmlName); - } - // Dispatch based on SOAPBodyElement name if (opMetaData == null) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/HolderUtils.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -22,7 +22,6 @@ package org.jboss.ws.core.utils; import java.lang.reflect.Field; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.math.BigDecimal; import java.math.BigInteger; @@ -72,7 +71,7 @@ /** True if the given type is a holder. */ public static boolean isHolderType(Class javaType) { - return javax.xml.rpc.holders.Holder.class.isAssignableFrom(javaType) || javax.xml.ws.Holder.class.isAssignableFrom(javaType); + return javax.xml.rpc.holders.Holder.class.isAssignableFrom(javaType); } /** True if the given type is a holder. */ @@ -154,13 +153,9 @@ Class holderClass = JavaUtils.erasure(holderType); boolean jaxrpcHolder = javax.xml.rpc.holders.Holder.class.isAssignableFrom(holderClass); - boolean jaxwsHolder = javax.xml.ws.Holder.class.isAssignableFrom(holderClass); - if (!jaxrpcHolder && !jaxwsHolder) + if (!jaxrpcHolder) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holderClass.getName())); - if (jaxwsHolder) - return JavaUtils.erasure(getGenericValueType(holderType)); - // Holder is supposed to have a public value field. Field field; try @@ -186,14 +181,9 @@ public static Class getValueType(Class holderClass) { boolean jaxrpcHolder = javax.xml.rpc.holders.Holder.class.isAssignableFrom(holderClass); - boolean jaxwsHolder = javax.xml.ws.Holder.class.isAssignableFrom(holderClass); - if (!jaxrpcHolder && !jaxwsHolder) + if (!jaxrpcHolder) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holderClass.getName())); - // No generic info - if (jaxwsHolder) - return Object.class; - // Holder is supposed to have a public value field. Field field; try @@ -219,7 +209,7 @@ if (holder == null) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "ILLEGAL_NULL_PARAMETER")); - if (!javax.xml.rpc.holders.Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) + if (!javax.xml.rpc.holders.Holder.class.isInstance(holder)) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holder)); try @@ -251,7 +241,7 @@ if (holder == null) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "HOLDER_INSTANCE_WAS_NULL")); - if (!javax.xml.rpc.holders.Holder.class.isInstance(holder) && !javax.xml.ws.Holder.class.isInstance(holder)) + if (!javax.xml.rpc.holders.Holder.class.isInstance(holder)) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "IS_NOT_A_HOLDER", holder)); Class valueType = getValueType(holder.getClass()); @@ -279,24 +269,6 @@ } /** - * Gets the generic value type of a JAX-WS Holder. - * If there is no generic information, Object.class will be returned - * - * @param holder JAX-WS holder type - * @return generic value type - */ - public static Type getGenericValueType(Type holder) - { - // For some reason the JDK 4 bytecode verifier trips up on this function if you use the ternary operator - // The only difference between it and the working form here is the use of a goto instruction. JDK bug perhaps? - if (holder instanceof ParameterizedType) - return ((ParameterizedType)holder).getActualTypeArguments()[0]; - - return Object.class; - } - - - /** * Creates a JAX-WS or JAX-RPC holder instance. * * @param value the value instance Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -27,7 +27,6 @@ import java.util.Map; import java.util.ResourceBundle; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.rpc.encoding.TypeMappingRegistry; @@ -590,7 +589,7 @@ // Check if we need to wrap the parameters boolean isWrapped = isWrapped(seiMethodMapping, javaTypeName); - operation.getEndpointMetaData().setParameterStyle(isWrapped ? ParameterStyle.WRAPPED : ParameterStyle.BARE); + operation.getEndpointMetaData().setWrappedParameterStyle(Boolean.valueOf(isWrapped)); ParameterMetaData inMetaData = new ParameterMetaData(operation, xmlName, xmlType, javaTypeName); operation.addParameter(inMetaData); @@ -852,7 +851,7 @@ else { // Set the default to bare in case there isn't an input object, revisit this - opMetaData.getEndpointMetaData().setParameterStyle(ParameterStyle.BARE); + opMetaData.getEndpointMetaData().setWrappedParameterStyle(Boolean.FALSE); } if (wsdlOperation.getOutputs().length > 0) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -37,11 +37,8 @@ import java.util.ResourceBundle; import java.util.Set; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; -import javax.xml.ws.WebServiceFeature; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -109,15 +106,11 @@ // The SOAPBinding use private Use use; // The SOAPBinding parameter style - private ParameterStyle parameterStyle; - // The JAXWS ServiceMode - private Mode serviceMode; + private Boolean wrappedParameterStyle; // The list of service meta data private List<OperationMetaData> operations = new ArrayList<OperationMetaData>(); // Maps the java method to the operation meta data private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); - // The features defined for this endpoint - private FeatureSet features = new FeatureSet(); private ConfigObservable configObservable = new ConfigObservable(); @@ -267,37 +260,23 @@ this.style = value; } - public ParameterStyle getParameterStyle() + public boolean isWrappedParameterStyle() { - if (parameterStyle == null) + if (wrappedParameterStyle == null) { - parameterStyle = ParameterStyle.WRAPPED; - if (log.isDebugEnabled()) - log.debug("Using default parameter style: " + parameterStyle); + wrappedParameterStyle = Boolean.TRUE; } - return parameterStyle; + return wrappedParameterStyle; } - public void setParameterStyle(ParameterStyle value) + public void setWrappedParameterStyle(final Boolean value) { - if (value != null && parameterStyle != null && !parameterStyle.equals(value)) + if (value != null && wrappedParameterStyle != null && !wrappedParameterStyle.equals(value)) throw new WSException(BundleUtils.getMessage(bundle, "MIXED_SOAP_PARAMETER_STYLES_NOT_SUPPORTED")); - if (log.isDebugEnabled()) - log.debug("setParameterStyle: " + value); - this.parameterStyle = value; + this.wrappedParameterStyle = value; } - public Mode getServiceMode() - { - return serviceMode; - } - - public void setServiceMode(Mode serviceMode) - { - this.serviceMode = serviceMode; - } - public String getAuthMethod() { return authMethod; @@ -320,26 +299,6 @@ this.properties = properties; } - public <T extends WebServiceFeature> T getFeature(Class<T> key) - { - return features.getFeature(key); - } - - public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) - { - return features.isFeatureEnabled(key); - } - - public FeatureSet getFeatures() - { - return features; - } - - public void addFeature(WebServiceFeature feature) - { - this.features.addFeature(feature); - } - public List<OperationMetaData> getOperations() { return new ArrayList<OperationMetaData>(operations); @@ -523,6 +482,7 @@ { TypeMappingImpl typeMapping = serviceMetaData.getTypeMapping(); List<TypeMappingMetaData> typeMappings = serviceMetaData.getTypesMetaData().getTypeMappings(); + List<Class> registeredTypes = new ArrayList<Class>(typeMappings.size()); for (TypeMappingMetaData tmMetaData : typeMappings) { String javaTypeName = tmMetaData.getJavaTypeName(); @@ -531,27 +491,44 @@ { List<Class> types = typeMapping.getJavaTypes(xmlType); - try + // TODO: Clarification. In which cases is the type already registered? + boolean registered = false; + for (Class current : types) { - ClassLoader classLoader = getClassLoader(); - Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + if (current.getName().equals(javaTypeName)) + { + registeredTypes.add(current); + registered = true; + break; + } + } - if (JavaUtils.isPrimitive(javaTypeName)) - javaType = JavaUtils.getWrapperType(javaType); - - if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + if (registered == false) + { + try { - typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); + ClassLoader classLoader = getClassLoader(); + Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + + if (JavaUtils.isPrimitive(javaTypeName)) + javaType = JavaUtils.getWrapperType(javaType); + + registeredTypes.add(javaType); + + if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + { + typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); + } + else + { + typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); + } } - else + catch (ClassNotFoundException e) { - typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); + log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); } } - catch (ClassNotFoundException e) - { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); - } } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -28,7 +28,6 @@ import java.util.ResourceBundle; import javax.xml.namespace.QName; -import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -228,7 +227,7 @@ } catch (InstantiationException e) { - throw new WebServiceException(BundleUtils.getMessage(bundle, "FAULT_BEAN_CLASS_IS_NOT_INSTANTIABLE"), e); + throw new WSException(BundleUtils.getMessage(bundle, "FAULT_BEAN_CLASS_IS_NOT_INSTANTIABLE"), e); } // copy the properties from the service exception to the fault bean @@ -247,11 +246,11 @@ } catch (IllegalAccessException e) { - throw new WebServiceException(e); + throw new WSException(e); } catch (InvocationTargetException e) { - throw new WebServiceException(e.getTargetException()); + throw new WSException(e.getTargetException()); } return faultBeanInstance; } @@ -288,15 +287,15 @@ } catch (InstantiationException e) { - throw new WebServiceException(BundleUtils.getMessage(bundle, "EXCEPTION_IS_NOT_INSTANTIABLE"), e); + throw new WSException(BundleUtils.getMessage(bundle, "EXCEPTION_IS_NOT_INSTANTIABLE"), e); } catch (IllegalAccessException e) { - throw new WebServiceException(e); + throw new WSException(e); } catch (InvocationTargetException e) { - throw new WebServiceException(e.getTargetException()); + throw new WSException(e.getTargetException()); } return serviceException; } Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureSet.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.metadata.umdm; - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.ws.WebServiceFeature; - -/** - * A component that maintains a set of web service features - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2005 - */ -public class FeatureSet -{ - // The features defined for this endpoint - private Set<WebServiceFeature> features = new HashSet<WebServiceFeature>(); - - public <T extends WebServiceFeature> boolean hasFeature(Class<T> key) - { - return getFeature(key) != null; - } - - public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) - { - T feature = getFeature(key); - return (feature != null ? feature.isEnabled() : false); - } - - public <T extends WebServiceFeature> T getFeature(Class<T> key) - { - for (WebServiceFeature feature : features) - { - if (key == feature.getClass()) - return (T)feature; - } - return null; - } - - public void addFeature(WebServiceFeature feature) - { - this.features.add(feature); - } - - public WebServiceFeature[] getFeatures() - { - final WebServiceFeature[] retVal = new WebServiceFeature[this.features.size()]; - - int i = 0; - for (final WebServiceFeature feature : this.features) - { - retVal[i++] = feature; - } - - return retVal; - } - -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -28,7 +28,6 @@ import java.util.ResourceBundle; import java.util.Set; -import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; @@ -63,7 +62,6 @@ private Method javaMethod; private boolean oneWay; private String soapAction; - private ParameterStyle parameterStyle; private List<ParameterMetaData> parameters = new ArrayList<ParameterMetaData>(); private List<FaultMetaData> faults = new ArrayList<FaultMetaData>(); private ParameterMetaData returnParam; @@ -125,16 +123,11 @@ return epMetaData.getEncodingStyle(); } - public ParameterStyle getParameterStyle() + public boolean isWrappedParameterStyle() { - return (parameterStyle != null) ? parameterStyle : epMetaData.getParameterStyle(); + return epMetaData.isWrappedParameterStyle(); } - public void setParameterStyle(ParameterStyle parameterStyle) - { - this.parameterStyle = parameterStyle; - } - public boolean isRPCLiteral() { return getStyle() == Style.RPC && getUse() == Use.LITERAL; @@ -145,14 +138,9 @@ return getStyle() == Style.RPC && getUse() == Use.ENCODED; } - public boolean isDocumentBare() - { - return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.BARE; - } - public boolean isDocumentWrapped() { - return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.WRAPPED; + return getStyle() == Style.DOCUMENT && isWrappedParameterStyle(); } public void setJavaName(String javaName) @@ -414,33 +402,6 @@ } } - public void assertDocumentBare() - { - if (isDocumentBare()) - { - int in = 0; - int out = 0; - - for (ParameterMetaData paramMetaData : parameters) - { - if (paramMetaData.isInHeader()) - continue; - - ParameterMode mode = paramMetaData.getMode(); - if (mode != ParameterMode.OUT) - in++; - if (mode != ParameterMode.IN) - out++; - } - - if (returnParam != null && !returnParam.isInHeader()) - out++; - - if (in > 1 || out > (oneWay ? 0 : 1)) - throw new WSException(BundleUtils.getMessage(bundle, "DOC_LIT_BARE_REQUIRE", new Object[]{javaName, in, out})); - } - } - public void validate() { for (ParameterMetaData parameter : parameters) @@ -502,10 +463,6 @@ buffer.append("\n qname=" + qname); buffer.append("\n javaName=" + javaName); buffer.append("\n style=" + getStyle() + "/" + getUse()); - if (getStyle() == Style.DOCUMENT) - { - buffer.append("/" + getParameterStyle()); - } buffer.append("\n oneWay=" + oneWay); buffer.append("\n soapAction=" + soapAction); for (ParameterMetaData param : parameters) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -202,7 +202,6 @@ buffer.append("\n linkName=").append(getLinkName()); buffer.append("\n implName=").append(getServiceEndpointImplName()); buffer.append("\n seiName=").append(getServiceEndpointInterfaceName()); - buffer.append("\n serviceMode=").append(getServiceMode()); buffer.append("\n portComponentName=").append(getPortComponentName()); buffer.append("\n contextRoot=").append(getContextRoot()); buffer.append("\n urlPattern=").append(getURLPattern()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -40,8 +40,6 @@ import java.util.StringTokenizer; import javax.ejb.SessionBean; -import javax.jws.WebMethod; -import javax.jws.WebService; import javax.xml.namespace.QName; import javax.xml.rpc.holders.BigDecimalHolder; import javax.xml.rpc.holders.BigIntegerHolder; @@ -96,7 +94,6 @@ private final Map primitiveMap = new HashMap(); private final static Map<String, Class> schemaBasicTypes = new HashMap<String, Class>(); - private final static Map<Class, Class> holderTypes = new HashMap<Class, Class>(); private final static Map<Class, Class> reverseHolderTypes = new HashMap<Class, Class>(); @@ -276,52 +273,6 @@ } /** - * The public, non-static or non-final methods that satisfy one of the following conditions: - * 1. They are annotated with the javax.jws.WebMethod annotation with the exclude element set to - * false or missing (since false is the default for this annotation element). - * 2. They are not annotated with the javax.jws.WebMethod annotation but their declaring class has a - * javax.jws.WebService annotation. - * @param method to process - * @return true if webmethod, false otherwise - */ - public static boolean isWebMethod(final Method method, final boolean definedInInterface) - { - if (!isWebMethodCandidate(method)) - return false; - - final WebMethod webMethodAnnotation = method.getAnnotation(WebMethod.class); - - if (webMethodAnnotation != null) - { - return !webMethodAnnotation.exclude(); - } - if (definedInInterface) - { - return true; - } - else - { - return method.getDeclaringClass().getAnnotation(WebService.class) != null; - } - } - - /** - * Only public, non-static and non-final methods are web method candidates. - * - * @param method to process - * @return true if satisfies modifier requirements, false otherwise - */ - private static boolean isWebMethodCandidate(final Method method) - { - final int modifiers = method.getModifiers(); - final boolean isPublic = Modifier.isPublic(modifiers); - final boolean isNotStatic = !Modifier.isStatic(modifiers); - final boolean isNotFinal = !Modifier.isFinal(modifiers); - - return isPublic && isNotStatic && isNotFinal; - } - - /** * Chop "PortType" at the end of the String * @param name * @return Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.wsf.stack.jbws; - -import java.security.Principal; - -import javax.xml.ws.EndpointReference; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.wsaddressing.W3CEndpointReference; - -import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; -import org.w3c.dom.Element; - -/** - * A WebServiceContext implementing the getEndpointReference jaxws methods. - * - * @author alessio.soldano(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class NativeWebServiceContext extends ExtensibleWebServiceContext -{ - public NativeWebServiceContext(final MessageContext messageContext) - { - super(messageContext); - } - - public EndpointReference getEndpointReference(final Element... referenceParameters) - { - return this.getEndpointReference(W3CEndpointReference.class, referenceParameters); - } - - public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) - { - throw new UnsupportedOperationException(); - } - - @Override - public Principal getUserPrincipal() - { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isUserInRole(String role) - { - throw new UnsupportedOperationException(); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -43,7 +43,6 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; -import javax.xml.ws.http.HTTPBinding; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -55,7 +54,6 @@ import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.CommonSOAPFaultException; -import org.jboss.ws.core.HTTPMessageImpl; import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.MessageTrace; import org.jboss.ws.core.binding.BindingException; @@ -356,20 +354,9 @@ MessageAbstraction reqMessage; - String bindingID = sepMetaData.getBindingId(); - if (HTTPBinding.HTTP_BINDING.equals(bindingID)) - { - reqMessage = new HTTPMessageImpl(headers, inputStream); - } - else - { - msgFactory.setServiceMode(sepMetaData.getServiceMode()); - msgFactory.setStyle(sepMetaData.getStyle()); - msgFactory.setFeatures(sepMetaData.getFeatures()); + msgFactory.setStyle(sepMetaData.getStyle()); + reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream); - reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream); - } - // Associate current message with message context msgContext.setMessageAbstraction(reqMessage); Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2012-04-10 09:54:01 UTC (rev 16140) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.wsf.stack.jbws; - -import javax.xml.ws.handler.MessageContext; - -import org.jboss.ws.common.invocation.WebServiceContextAdapter; -import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; - -/** - * Web service context factory implementation. - * - * @author alessio.soldano(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class WebServiceContextFactoryImpl extends WebServiceContextFactory -{ - @Override - public ExtensibleWebServiceContext newWebServiceContext(MessageContext messageContext) - { - return new WebServiceContextAdapter(new NativeWebServiceContext(messageContext)); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -34,7 +34,6 @@ <include>org.jboss.ws.native:jbossws-native-factories:jar</include> <include>org.jboss.ws.native:jbossws-native-services:jar</include> <include>org.jboss.ws.native:jbossws-native-core</include> - <include>javax.jws:jsr181-api:jar</include> <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> @@ -73,17 +72,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <scope>test</scope> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <includes> <include>org.codehaus.woodstox:wstx-lgpl:jar</include> @@ -94,16 +82,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> - <includes> - <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping> <includes> <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -31,12 +31,10 @@ <dependencies> <module name="javax.api" /> <module name="javax.servlet.api" /> - <module name="javax.jws.api" /> <module name="javax.mail.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.stream.api" /> <module name="javax.xml.rpc.api" /> - <module name="javax.xml.ws.api" /> <module name="org.apache.xerces" services="import"/> <module name="org.javassist" /> <module name="org.jboss.netty" /> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2012-04-10 09:54:01 UTC (rev 16140) @@ -1 +0,0 @@ -org.jboss.wsf.stack.jbws.WebServiceContextFactoryImpl \ No newline at end of file Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -1030,53 +1030,6 @@ </fileset> </jar> -  - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ws.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/WS-META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-ejb.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/EJB-META-INF"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/WS-META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws331.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws331/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws331-ejb.jar"/> - <include name="jaxrpc-jbws331-ws.jar"/> - <include name="jaxrpc-jbws331-client.jar"/> - </fileset> - </ear> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws349/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -1114,48 +1067,6 @@ </fileset> </jar> -  - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws358/HelloBean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws358-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws358-appclient.jar"/> - </fileset> - </jar> - <mkdir dir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> - <unjar dest="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/test-libs/jaxrpc-jbws358.jar"/> - <copy todir="${tests.output.dir}/test-libs/jaxrpc-jbws358.ear"> - <fileset dir="${tests.output.dir}/test-resources/jaxrpc/jbws358"> - <include name="META-INF/application.xml"/> - </fileset> - </copy> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws377.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws377/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -2198,49 +2109,6 @@ </metainf> </jar> -  - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-endpoint.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE"> - <include name="ejb-jar.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-remote.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-TWO"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws772.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE/application.xml"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws772-endpoint.jar"/> - <include name="jaxrpc-jbws772-remote.jar"/> - <include name="jaxrpc-jbws772-client.jar"/> - </fileset> - </ear> -  <war destfile="${tests.output.dir}/test-libs/jaxrpc-jbws775.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws775/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -2693,32 +2561,6 @@ </fileset> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1179-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1179/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1186.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1186/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -381,11 +381,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.picketbox</groupId> - <artifactId>jbosssx-client</artifactId> - <version>3.0.0.CR2</version> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </dependency> @@ -438,14 +433,6 @@ <excludes>  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> </excludes> </configuration> </plugin> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:39:58 UTC (rev 16139) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:54:01 UTC (rev 16140) @@ -66,10 +66,8 @@ <ejb.api.version>1.0.1.Final</ejb.api.version> <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.15.0-GA</javassist.version> - <jaxws.api.version>2.0.0.Final</jaxws.api.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <saaj.api.version>1.0.1.Final</saaj.api.version> - <jsr181.api.version>1.0-MR1</jsr181.api.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> <netty.version>3.2.6.Final</netty.version> @@ -161,16 +159,6 @@ <version>${commons.logging.version}</version> </dependency> <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>${jsr181.api.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <version>${jaxws.api.version}</version> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> <version>${ejb.api.version}</version> @@ -259,13 +247,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-shared-testsuite</artifactId> - <version>${jbossws.shared.testsuite.version}</version> - <type>zip</type> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> @@ -390,29 +371,6 @@  - <profile> - <id>smoketest</id> - <modules> - <module>modules/testsuite</module> - </modules> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>org/jboss/test/ws/jaxws/samples/**/*TestCase.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16139 - stack/native/branches/jbossws-native-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 05:39:58 -0400 (Tue, 10 Apr 2012) New Revision: 16139 Modified: stack/native/branches/jbossws-native-4.0.x/ Log: updating excludes Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-blocked - https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16138 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 05:31:07 -0400 (Tue, 10 Apr 2012) New Revision: 16138 Removed: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/codehaus/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jvnet/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-8667] Merged revisions 16083,16085 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16083 | ropalka | 2012-04-03 13:31:39 +0200 (Tue, 03 Apr 2012) | 1 line [JBWS-3474] removing apache ant & org.jvnet dependencies ....... r16085 | ropalka | 2012-04-04 07:19:59 +0200 (Wed, 04 Apr 2012) | 1 line upgrade config version ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16082 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -44,11 +44,6 @@ </dependency>  <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <scope>provided</scope> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -39,7 +39,6 @@ <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> <include>javax.xml.stream:stax-api:jar</include> - <include>org.jvnet.staxex:stax-ex:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.jboss.netty:netty:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -60,16 +60,6 @@ <include name="**/jbossxb.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/stax-ex.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/org/apache/commons/beanutils/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/commons-beanutils.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-common.jar"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -20,7 +20,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<server xmlns="urn:jboss:domain:1.2"> +<server xmlns="urn:jboss:domain:1.3"> <extensions> <extension module="org.jboss.as.connector"/> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:22:45 UTC (rev 16137) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:31:07 UTC (rev 16138) @@ -64,7 +64,6 @@ <jbossws.shared.testsuite.version>4.0.3.GA</jbossws.shared.testsuite.version> <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <ant.version>1.7.1</ant.version> <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.15.0-GA</javassist.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> @@ -113,12 +112,6 @@ </dependency>  <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>${ant.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1</version>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16137 - in stack/native/branches/jbossws-native-4.0.x: modules/core and 27 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-10 05:22:45 -0400 (Tue, 10 Apr 2012) New Revision: 16137 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/com/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/tools/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/helpers/JavaToXSDHelper.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-8668] Merged revisions 16081-16082 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16081 | ropalka | 2012-04-03 10:54:31 +0200 (Tue, 03 Apr 2012) | 1 line [JBWS-3474] removing jaxws native packages ....... r16082 | ropalka | 2012-04-03 11:52:44 +0200 (Tue, 03 Apr 2012) | 1 line [JBWS-3474] removing jaxb & sun tools dependencies ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16082 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-04-10 09:22:45 UTC (rev 16137) @@ -93,30 +93,10 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-tools</artifactId> - </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.spec.javax.xml.bind</groupId> - <artifactId>jboss-jaxb-api_2.2_spec</artifactId> - </dependency> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -24,18 +24,13 @@ import java.util.Observable; import javax.xml.ws.EndpointReference; -import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.ws.core.jaxrpc.SOAP11BindingJAXRPC; import org.jboss.ws.core.jaxrpc.SOAP12BindingJAXRPC; -import org.jboss.ws.core.jaxws.binding.HTTPBindingJAXWS; -import org.jboss.ws.core.jaxws.binding.SOAP11BindingJAXWS; -import org.jboss.ws.core.jaxws.binding.SOAP12BindingJAXWS; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; /** * Provides access to the protocol binding. @@ -54,15 +49,15 @@ public CommonBindingProvider(EndpointMetaData epMetaData) { this.epMetaData = epMetaData; - initBinding(epMetaData.getBindingId(), epMetaData.getType()); + initBinding(epMetaData.getBindingId()); this.epMetaData.registerConfigObserver(this); configure(); } - public CommonBindingProvider(String bindingId, Type type) + public CommonBindingProvider(String bindingId) { - initBinding(bindingId, type); + initBinding(bindingId); configure(); } @@ -74,20 +69,16 @@ } } - protected void initBinding(String bindingId, Type type) + protected void initBinding(String bindingId) { if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId)) { - binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS() : new SOAP11BindingJAXRPC()); + binding = new SOAP11BindingJAXRPC(); } else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) { - binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS() : new SOAP12BindingJAXRPC()); + binding = new SOAP12BindingJAXRPC(); } - else if (HTTPBinding.HTTP_BINDING.equals(bindingId)) - { - binding = new HTTPBindingJAXWS(); - } } public CommonBinding getCommonBinding() Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -36,7 +36,6 @@ import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPException; import javax.xml.ws.ProtocolException; -import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; @@ -56,7 +55,6 @@ import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -211,7 +209,7 @@ QName anonQName = new QName(Constants.NS_JBOSSWS_URI, "Anonymous"); QName anonPort = new QName(Constants.NS_JBOSSWS_URI, "AnonymousPort"); - epMetaData = new ClientEndpointMetaData(serviceMetaData, anonPort, anonQName, Type.JAXRPC); + epMetaData = new ClientEndpointMetaData(serviceMetaData, anonPort, anonQName); epMetaData.setStyle(Style.RPC); serviceMetaData.addEndpoint(epMetaData); @@ -282,20 +280,6 @@ // Create the invocation and sync the input parameters EndpointInvocation epInv = createEndpointInvocation(opMetaData); epInv.initInputParams(inputParams); - - if (opMetaData.getEndpointMetaData().getType() != Type.JAXRPC && opMetaData.isRPCLiteral() - && epInv.getRequestParamNames() != null) - { - for (QName qname : epInv.getRequestParamNames()) - { - ParameterMetaData paramMetaData = opMetaData.getParameter(qname); - if ((paramMetaData.getMode().equals(ParameterMode.IN) || paramMetaData.getMode().equals(ParameterMode.INOUT)) - && epInv.getRequestParamValue(qname) == null) - { - throw new WebServiceException(BundleUtils.getMessage(bundle, "RPC_LITERAL_OPERATION_PARAMS_IS_NULL")); - } - } - } // Set the required outbound properties setOutboundContextProperties(); @@ -549,8 +533,6 @@ retValue = epInv.getReturnValue(); if (opMetaData.isDocumentWrapped() && retMetaData.isMessageType() == false) retValue = ParameterWrapping.unwrapResponseParameters(retMetaData, retValue, inParams); - if (opMetaData.getEndpointMetaData().getType() != Type.JAXRPC && opMetaData.isRPCLiteral() && retValue == null) - throw new WebServiceException(BundleUtils.getMessage(bundle, "RPC_LITERAL_OPERATION_RETURN_IS_NULL", opMetaData.getQName())); } // Set the holder values for INOUT parameters @@ -563,15 +545,6 @@ { QName xmlName = paramMetaData.getXmlName(); Object value = epInv.getResponseParamValue(xmlName); - //JBWS-2969:Check if reponse parameter or return value is null - if (opMetaData.getEndpointMetaData().getType() != Type.JAXRPC && opMetaData.isRPCLiteral()) - { - if (value == null) - { - throw new WebServiceException(BundleUtils.getMessage(bundle, "RPC_LITERAL_OPERATION_RETURN_IS_NULL", - opMetaData.getQName())); - } - } // document/literal wrapped return value header if (index == -1) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -43,7 +43,6 @@ import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext; import org.apache.xerces.xs.XSElementDeclaration; import org.apache.xerces.xs.XSTypeDefinition; @@ -55,7 +54,6 @@ import org.jboss.ws.common.JavaUtils; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.jaxrpc.ParameterWrapping; -import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; @@ -176,14 +174,6 @@ CIDGenerator cidGenerator = reqMessage.getCidGenerator(); AttachmentPart part = createAttachmentPart(paramMetaData, value, cidGenerator); reqMessage.addAttachmentPart(part); - - // Add the attachment to the standard property - if (value instanceof DataHandler && msgContext instanceof MessageContextJAXWS) - { - DataHandler dataHandler = (DataHandler)value; - Map<String, DataHandler> attachments = (Map<String, DataHandler>)msgContext.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); - attachments.put(dataHandler.getContentType(), dataHandler); - } } else { @@ -339,9 +329,6 @@ } } - // Add all attachments to the standard property - this.propagateAttachmentsToJAXWSMessageContext(reqMessage, msgContext); - return epInv; } catch (Exception e) @@ -401,8 +388,6 @@ } } - this.propagateAttachmentsFromJAXWSMessageContext(resMessage, msgContext); - // Add the return to the message ParameterMetaData retMetaData = opMetaData.getReturnParameter(); if (retMetaData != null) @@ -419,14 +404,6 @@ AttachmentPart part = createAttachmentPart(retMetaData, value, cidGenerator); resMessage.addAttachmentPart(part); epInv.setReturnValue(part); - - // Add the attachment to the standard property - if (part.getDataHandler() != null && msgContext instanceof MessageContextJAXWS) - { - DataHandler dataHandler = part.getDataHandler(); - Map<String, DataHandler> attachments = (Map<String, DataHandler>)msgContext.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); - attachments.put(part.getContentId(), dataHandler); - } } else { @@ -446,14 +423,6 @@ CIDGenerator cidGenerator = resMessage.getCidGenerator(); AttachmentPart part = createAttachmentPart(paramMetaData, value, cidGenerator); resMessage.addAttachmentPart(part); - - // Add the attachment to the standard property - if (value instanceof DataHandler && msgContext instanceof MessageContextJAXWS) - { - DataHandler dataHandler = (DataHandler)value; - Map<String, DataHandler> attachments = (Map<String, DataHandler>)msgContext.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); - attachments.put(dataHandler.getContentType(), dataHandler); - } } else { @@ -477,31 +446,6 @@ } } - /** - * Propagates attachments from JAXWS message context to soap message. - * - * @param message soap message to bind attachments to - * @param msgContext message context to read attachments from - */ - private void propagateAttachmentsFromJAXWSMessageContext(final SOAPMessage message, final CommonMessageContext msgContext) - { - if (msgContext instanceof MessageContextJAXWS) - { - @SuppressWarnings("unchecked") - final Map<String, DataHandler> attachments = (Map<String, DataHandler>)msgContext.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); - final Iterator<?> attachmentsIterator = attachments.keySet().iterator(); - - AttachmentPart part = null; - while (attachmentsIterator.hasNext()) - { - final String contentId = (String)attachmentsIterator.next(); - final DataHandler handler = attachments.get(contentId); - part = this.createAttachmentPart(contentId, handler); - ((SOAPMessageImpl)message).addAttachmentPart(part); - } - } - } - /** On the client side, extract the OUT parameters from the payload and return them to the client. */ public void unbindResponseMessage(OperationMetaData opMetaData, MessageAbstraction payload, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException @@ -607,9 +551,6 @@ epInv.setResponseParamValue(xmlName, value); } } - - // Add all attachments to the standard property - this.propagateAttachmentsToJAXWSMessageContext(resMessage, msgContext); } catch (Exception e) { @@ -617,30 +558,6 @@ } } - /** - * Propagates all the attachments from SOAPMessage to JAXWS Message context standard property. - * - * @param message soap message to read attachments from - * @param msgContext to propagate attachments to - * @throws SOAPException if something went wrong - */ - private void propagateAttachmentsToJAXWSMessageContext(final SOAPMessage message, final CommonMessageContext msgContext) throws SOAPException - { - if (msgContext instanceof MessageContextJAXWS) - { - final SOAPMessageImpl implMessage = (SOAPMessageImpl)message; - final Iterator<?> attachmentsIterator = implMessage.getAttachments(); - final Map<String, DataHandler> attachments = (Map<String, DataHandler>)msgContext.get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS); - - AttachmentPart part = null; - while (attachmentsIterator.hasNext()) - { - part = (AttachmentPart)attachmentsIterator.next(); - attachments.put(part.getContentId(), part.getDataHandler()); // TODO: test on getDataHandler() == null? - } - } - } - public MessageAbstraction bindFaultMessage(Exception ex) { SOAPMessageImpl faultMessage = (SOAPMessageImpl)createFaultMessageFromException(ex); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -31,8 +31,8 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.Normalizer; import org.jboss.ws.core.soap.SOAPContentElement; -import org.jboss.ws.common.Normalizer; import org.jboss.xb.binding.NamespaceRegistry; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,8 +21,6 @@ */ package org.jboss.ws.core.client; -import java.net.URI; -import java.net.URISyntaxException; import java.util.Iterator; import java.util.Map; import java.util.Properties; Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPProtocolConnection.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.core.client; - -import org.jboss.ws.core.jaxws.binding.HTTPMessageMarshaller; -import org.jboss.ws.core.jaxws.binding.HTTPMessageUnMarshaller; - -/** - * @since 02-Apr-2007 - */ -public class HTTPProtocolConnection extends HTTPRemotingConnection -{ - public UnMarshaller getUnmarshaller() - { - return new HTTPMessageUnMarshaller(); - } - - public Marshaller getMarshaller() - { - return new HTTPMessageMarshaller(); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,25 +22,23 @@ package org.jboss.ws.core.client; import org.jboss.ws.core.jaxrpc.client.serviceref.NativeServiceRefBinderJAXRPC; -import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceRefBinderJAXWS; import org.jboss.wsf.spi.serviceref.ServiceRefBinder; import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; /** - * Binds a JAXWS Service object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public final class NativeServiceRefBinderFactoryImpl implements ServiceRefBinderFactory { private static final ServiceRefBinder JAXRPC_BINDER = new NativeServiceRefBinderJAXRPC(); - private static final ServiceRefBinder JAXWS_BINDER = new NativeServiceRefBinderJAXWS(); - public ServiceRefBinder newServiceRefBinder(final Type type) { - return type == Type.JAXRPC ? JAXRPC_BINDER : JAXWS_BINDER; + if (type == Type.JAXRPC) + { + return JAXRPC_BINDER; + } + throw new UnsupportedOperationException(); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPBindingJAXRPC.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -26,7 +26,6 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; -import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.metadata.umdm.OperationMetaData; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -131,7 +131,6 @@ if (desFactory == null) throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_DESERIALIZER_FACTORY", xmlType)); - // Try jaxb deserialization try { // http://jira.jboss.org/jira/browse/JBWS-955 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingRegistryImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,15 +22,15 @@ package org.jboss.ws.core.jaxrpc; import java.util.HashMap; +import java.util.Map; import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; -import java.util.Map; import javax.xml.rpc.JAXRPCException; import javax.xml.rpc.encoding.TypeMapping; import javax.xml.rpc.encoding.TypeMappingRegistry; import org.jboss.util.NotImplementedException; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.core.binding.TypeMappingImpl; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -25,11 +25,11 @@ import javax.xml.transform.Result; import org.jboss.logging.Logger; +import org.jboss.ws.common.JavaUtils; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.util.xml.BufferedStreamResult; -import org.jboss.ws.common.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.NamedNodeMap; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -23,12 +23,12 @@ import java.util.Calendar; import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import javax.xml.namespace.QName; import javax.xml.transform.Source; import org.jboss.logging.Logger; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.DeserializerSupport; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -23,12 +23,12 @@ import java.util.Calendar; import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import javax.xml.namespace.QName; import javax.xml.transform.Result; import org.jboss.logging.Logger; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,17 +21,18 @@ */ package org.jboss.ws.core.jaxrpc.binding; +import java.util.ResourceBundle; + import javax.xml.namespace.QName; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import javax.xml.transform.Result; import org.jboss.logging.Logger; +import org.jboss.ws.api.util.BundleUtils; +import org.jboss.ws.common.DOMWriter; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.util.xml.BufferedStreamResult; -import org.jboss.ws.common.DOMWriter; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -25,11 +25,11 @@ import javax.xml.transform.Result; import org.jboss.logging.Logger; +import org.jboss.ws.common.JavaUtils; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.util.xml.BufferedStreamResult; -import org.jboss.ws.common.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.NamedNodeMap; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializerFactory.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,8 +21,8 @@ */ package org.jboss.ws.core.jaxrpc.binding; +import org.jboss.ws.core.binding.AbstractDeserializerFactory; import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.AbstractDeserializerFactory; import org.jboss.ws.core.binding.DeserializerSupport; /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializerFactory.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,8 +21,8 @@ */ package org.jboss.ws.core.jaxrpc.binding; +import org.jboss.ws.core.binding.AbstractSerializerFactory; import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.AbstractSerializerFactory; import org.jboss.ws.core.binding.SerializerSupport; /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializerFactory.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,8 +21,8 @@ */ package org.jboss.ws.core.jaxrpc.binding; +import org.jboss.ws.core.binding.AbstractDeserializerFactory; import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.AbstractDeserializerFactory; import org.jboss.ws.core.binding.DeserializerSupport; /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializerFactory.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,8 +21,8 @@ */ package org.jboss.ws.core.jaxrpc.binding; +import org.jboss.ws.core.binding.AbstractSerializerFactory; import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.AbstractSerializerFactory; import org.jboss.ws.core.binding.SerializerSupport; /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,18 +21,19 @@ */ package org.jboss.ws.core.jaxrpc.binding; +import java.util.ResourceBundle; + import javax.xml.namespace.QName; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import javax.xml.soap.SOAPElement; import javax.xml.transform.Result; import org.jboss.logging.Logger; +import org.jboss.ws.api.util.BundleUtils; +import org.jboss.ws.common.DOMWriter; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.util.xml.BufferedStreamResult; -import org.jboss.ws.common.DOMWriter; import org.w3c.dom.NamedNodeMap; /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,8 +22,6 @@ package org.jboss.ws.core.jaxrpc.client; import java.rmi.RemoteException; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -33,6 +31,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.ResourceBundle; import java.util.Set; import javax.xml.namespace.QName; @@ -46,7 +45,9 @@ import javax.xml.soap.SOAPException; import org.jboss.logging.Logger; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; +import org.jboss.ws.common.JavaUtils; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; @@ -69,7 +70,6 @@ import org.jboss.ws.metadata.umdm.TypesMetaData; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.ws.common.JavaUtils; /** Provides support for the dynamic invocation of a service endpoint. * The javax.xml.rpc.Service interface acts as a factory for the creation of Call instances. Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,15 +21,15 @@ */ package org.jboss.ws.core.server; +import java.util.Iterator; +import java.util.ResourceBundle; + import org.jboss.logging.Logger; -import java.util.ResourceBundle; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.EndpointResolver; -import java.util.Iterator; - /** * @author Heiko.Braun(a)jboss.com * Created: Jul 23, 2007 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,27 +21,18 @@ */ package org.jboss.ws.core.server; -import static org.jboss.ws.common.integration.WSHelper.isJaxwsEndpoint; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; -import java.util.HashMap; -import java.util.Map; import java.util.ResourceBundle; -import javax.activation.DataHandler; import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; import javax.xml.rpc.server.ServiceLifecycle; import javax.xml.rpc.server.ServletEndpointContext; import javax.xml.soap.Name; import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPHeader; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.WebServiceException; -import javax.xml.ws.handler.MessageContext; import javax.xml.ws.http.HTTPBinding; import org.jboss.logging.Logger; @@ -61,16 +52,11 @@ import org.jboss.ws.core.jaxrpc.handler.HandlerDelegateJAXRPC; import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC; import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; -import org.jboss.ws.core.jaxws.handler.HandlerDelegateJAXWS; -import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; -import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -113,16 +99,8 @@ if (sepMetaData == null) throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_ENDPOINT_META_DATA")); - if (sepMetaData.getType() == EndpointMetaData.Type.JAXRPC) - { - bindingProvider = new CommonBindingProvider(sepMetaData); - delegate = new HandlerDelegateJAXRPC(sepMetaData); - } - else - { - bindingProvider = new BindingProviderImpl(sepMetaData); - delegate = new HandlerDelegateJAXWS(sepMetaData); - } + bindingProvider = new CommonBindingProvider(sepMetaData); + delegate = new HandlerDelegateJAXRPC(sepMetaData); } public boolean callRequestHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type) @@ -159,9 +137,6 @@ HandlerType[] handlerType = delegate.getHandlerTypeOrder(); HandlerType[] faultType = delegate.getHandlerTypeOrder(); - // Set the required inbound context properties - setInboundContextProperties(); - try { boolean oneway = false; @@ -211,21 +186,7 @@ reqMessage = msgContext.getMessageAbstraction(); sepInv = binding.unbindRequestMessage(opMetaData, reqMessage); } - //JBWS-2969:check if the RPC/Lit input paramter is null - if (opMetaData.getEndpointMetaData().getType() != EndpointMetaData.Type.JAXRPC - && opMetaData.isRPCLiteral() && sepInv.getRequestParamNames() != null) - { - for (QName qname : sepInv.getRequestParamNames()) - { - ParameterMetaData paramMetaData = opMetaData.getParameter(qname); - if ((paramMetaData.getMode().equals(ParameterMode.IN) || paramMetaData.getMode().equals(ParameterMode.INOUT)) && sepInv.getRequestParamValue(qname) == null) - { - throw new WebServiceException(BundleUtils.getMessage(bundle, "RPC/LITERAL_PAPAMETERS_IS_NULL", opMetaData.getQName())); - } - } - } - // Invoke an instance of the SEI implementation bean Invocation inv = setupInvocation(endpoint, sepInv, invContext); InvocationHandler invHandler = endpoint.getInvocationHandler(); @@ -247,9 +208,6 @@ // Reverse the message direction msgContext = processPivotInternal(msgContext, direction); - // Set the required outbound context properties - setOutboundContextProperties(); - // Bind the response message MessageAbstraction resMessage = binding.bindResponseMessage(opMetaData, sepInv); msgContext.setMessageAbstraction(resMessage); @@ -311,22 +269,6 @@ protected Invocation setupInvocation(Endpoint ep, EndpointInvocation epInv, InvocationContext invContext) throws Exception { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - if (msgContext instanceof SOAPMessageContextJAXWS) - { - if (isJaxwsEndpoint(ep)) - { - if (msgContext.get(MessageContext.SERVLET_REQUEST) != null) - { - WebServiceContext wsContext = contextFactory.newWebServiceContext((SOAPMessageContextJAXWS)msgContext); - invContext.addAttachment(WebServiceContext.class, wsContext); - } - else - { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_PROVIDE_WEBSERVICECONTEXT")); - } - } - invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext); - } if (msgContext instanceof SOAPMessageContextJAXRPC) { invContext.addAttachment(javax.xml.rpc.handler.MessageContext.class, msgContext); @@ -378,7 +320,7 @@ Method seiMethod = sepInv.getJavaMethod(); Method implMethod = null; - if (seiMethod != null) // RM hack + if (seiMethod != null) { String methodName = seiMethod.getName(); Class[] paramTypes = seiMethod.getParameterTypes(); @@ -412,50 +354,11 @@ return implMethod; } - protected void setInboundContextProperties() - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - if (msgContext instanceof MessageContextJAXWS) - { - // Map of attachments to a message for the outbound message, key is the MIME Content-ID, value is a DataHandler - msgContext.put(MessageContextJAXWS.INBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>()); - } - } - - protected void setOutboundContextProperties() - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - if (msgContext instanceof MessageContextJAXWS) - { - Map<String, DataHandler> outboundAttachments = (Map<String, DataHandler>)msgContext.get(MessageContextJAXWS.OUTBOUND_MESSAGE_ATTACHMENTS); - Map<String, DataHandler> newAttachments = new HashMap<String, DataHandler>(); // to protect against attacks from endpoint - - // Map of attachments to a message for the outbound message, key is the MIME Content-ID, value is a DataHandler - msgContext.put(MessageContextJAXWS.OUTBOUND_MESSAGE_ATTACHMENTS, newAttachments); - - if (outboundAttachments != null) - { - for (final String key : outboundAttachments.keySet()) - { - newAttachments.put(key, outboundAttachments.get(key)); - } - } - } - } - private CommonMessageContext processPivotInternal(CommonMessageContext msgContext, DirectionHolder direction) { if (direction.getDirection() == Direction.InBound) { - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - if (epMetaData.getType() == EndpointMetaData.Type.JAXRPC) - { - msgContext = MessageContextJAXRPC.processPivot(msgContext); - } - else - { - msgContext = MessageContextJAXWS.processPivot(msgContext); - } + msgContext = MessageContextJAXRPC.processPivot(msgContext); direction.setDirection(Direction.OutBound); } return msgContext; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServletRequestContext.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,13 +21,13 @@ */ package org.jboss.ws.core.server; -import org.jboss.wsf.spi.invocation.InvocationContext; - import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.jboss.wsf.spi.invocation.InvocationContext; + /** * Implementation of ServletEndpointContext * Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/DetailImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,10 +22,9 @@ package org.jboss.ws.core.soap; import java.util.ArrayList; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import java.util.Iterator; import java.util.List; +import java.util.ResourceBundle; import javax.xml.namespace.QName; import javax.xml.soap.Detail; @@ -36,6 +35,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.DOMUtils; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,7 +22,6 @@ package org.jboss.ws.core.soap; import java.lang.reflect.Method; -import java.util.List; import java.util.ResourceBundle; import javax.xml.namespace.QName; @@ -40,7 +39,6 @@ import org.jboss.ws.core.binding.SerializerSupport; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.NullValueSerializer; -import org.jboss.ws.core.jaxws.SerializationContextJAXWS; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; @@ -150,8 +148,6 @@ serContext.setJavaType(javaType); ParameterMetaData pmd = container.getParamMetaData(); OperationMetaData opMetaData = pmd.getOperationMetaData(); - List<Class> registeredTypes = opMetaData.getEndpointMetaData().getRegisteredTypes(); - serContext.setProperty(SerializationContextJAXWS.JAXB_CONTEXT_TYPES, registeredTypes.toArray(new Class[0])); TypeMappingImpl typeMapping = serContext.getTypeMapping(); XMLFragment xmlFragment = null; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,13 +22,12 @@ package org.jboss.ws.core.soap; import java.io.IOException; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import java.io.InputStream; import java.io.Reader; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.ResourceBundle; import javax.xml.soap.MimeHeaders; import javax.xml.soap.SOAPElement; @@ -41,6 +40,7 @@ import javax.xml.transform.stream.StreamSource; import org.jboss.logging.Logger; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.api.util.ServiceLoader; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -23,7 +23,6 @@ import java.lang.reflect.Array; import java.lang.reflect.Method; -import java.util.List; import java.util.ResourceBundle; import javax.xml.namespace.QName; @@ -42,7 +41,6 @@ import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; -import org.jboss.ws.core.jaxws.SerializationContextJAXWS; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.Comment; @@ -162,8 +160,6 @@ OperationMetaData opMetaData = pmd.getOperationMetaData(); serContext.setProperty(ParameterMetaData.class.getName(), pmd); serContext.setJavaType(javaType); - List<Class> registeredTypes = opMetaData.getEndpointMetaData().getRegisteredTypes(); - serContext.setProperty(SerializationContextJAXWS.JAXB_CONTEXT_TYPES, registeredTypes.toArray(new Class[0])); try { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/AttachmentPartImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,11 +21,14 @@ */ package org.jboss.ws.core.soap.attachment; -import org.jboss.util.Base64; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.util.Iterator; import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.IOUtils; -import org.jboss.ws.WSException; import javax.activation.DataHandler; import javax.activation.DataSource; @@ -33,9 +36,12 @@ import javax.xml.soap.AttachmentPart; import javax.xml.soap.MimeHeaders; import javax.xml.soap.SOAPException; -import java.io.*; -import java.util.Iterator; +import org.jboss.util.Base64; +import org.jboss.ws.WSException; +import org.jboss.ws.api.util.BundleUtils; +import org.jboss.ws.common.IOUtils; + /** * Implementation of the <code>AttachmentPart</code> interface. * @see javax.xml.soap.AttachmentPart Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessor.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.metadata.accessor; - -import org.jboss.ws.WSException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.api.RawAccessor; - -/** - * A JAXB object accessor. - * - * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> - */ -@SuppressWarnings("unchecked") -public class JAXBAccessor implements Accessor -{ - private RawAccessor accessor; - - JAXBAccessor(RawAccessor accessor) - { - this.accessor = accessor; - } - - public Object get(Object bean) - { - try - { - return accessor.get(bean); - } - catch (AccessorException a) - { - WSException ex = new WSException(a.getMessage()); - ex.setStackTrace(a.getStackTrace()); - throw ex; - } - } - - public void set(Object bean, Object value) - { - try - { - accessor.set(bean, value); - } - catch (AccessorException a) - { - WSException ex = new WSException(a.getMessage()); - ex.setStackTrace(a.getStackTrace()); - throw ex; - } - } -} Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactory.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.metadata.accessor; - -import java.util.ResourceBundle; - -import javax.xml.namespace.QName; - -import org.jboss.ws.WSException; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.umdm.WrappedParameter; - -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.RawAccessor; - -final class JAXBAccessorFactory implements AccessorFactory -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(JAXBAccessorFactory.class); - private final Class clazz; - private final JAXBRIContext ctx; - - JAXBAccessorFactory(Class clazz, JAXBRIContext ctx) - { - this.clazz = clazz; - this.ctx = ctx; - } - - public Accessor create(WrappedParameter parameter) - { - RawAccessor<Object, Object> accessor; - try - { - QName name = parameter.getName(); - accessor = ctx.getElementPropertyAccessor( - clazz, - name.getNamespaceURI().intern(), // JAXB internally optimizes String usage towards intern() - name.getLocalPart().intern() // see com.sun.xml.bind.v2.util.QNameMap; - ); - } - catch (Throwable t) - { - WSException ex = new WSException(t.getMessage()); - ex.setStackTrace(t.getStackTrace()); - throw ex; - } - - if (accessor == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_OBTAIN_ACCESSOR", parameter)); - - return new JAXBAccessor(accessor); - } -} Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/accessor/JAXBAccessorFactoryCreator.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.metadata.accessor; - -import java.util.ResourceBundle; - -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.umdm.FaultMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; - -import com.sun.xml.bind.api.JAXBRIContext; - -public class JAXBAccessorFactoryCreator implements AccessorFactoryCreator -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(JAXBAccessorFactoryCreator.class); - private JAXBRIContext ctx; - - public void setJAXBContext(JAXBRIContext ctx) - { - this.ctx = ctx; - } - - public AccessorFactory create(ParameterMetaData parameter) - { - if (ctx == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "JAXBCONTEXT_NOT_AVAILABLE")); - return new JAXBAccessorFactory(parameter.getJavaType(), ctx); - } - - public AccessorFactory create(FaultMetaData fault) - { - if (ctx == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "JAXBCONTEXT_NOT_AVAILABLE")); - return new JAXBAccessorFactory(fault.getFaultBean(), ctx); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -38,7 +38,6 @@ import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; @@ -171,7 +170,7 @@ { QName portName = wsdlEndpoint.getName(); QName interfaceQName = wsdlEndpoint.getInterface().getName(); - ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC); + ClientEndpointMetaData epMetaData = new ClientEndpointMetaData(serviceMetaData, portName, interfaceQName); epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); serviceMetaData.addEndpoint(epMetaData); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -32,7 +32,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -132,7 +131,7 @@ QName interfaceQName = wsdlEndpoint.getInterface().getName(); Endpoint ep = dep.getService().getEndpointByName(linkName); - ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, ep, portName, interfaceQName, Type.JAXRPC); + ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, ep, portName, interfaceQName); sepMetaData.setPortComponentName(pcMetaData.getPortComponentName()); sepMetaData.setLinkName(linkName); serviceMetaData.addEndpoint(sepMetaData); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,13 +21,11 @@ */ package org.jboss.ws.metadata.umdm; -import org.jboss.ws.core.jaxws.handler.PortInfoImpl; +import javax.xml.namespace.QName; + import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import javax.xml.namespace.QName; -import javax.xml.ws.handler.PortInfo; - /** * Client side endpoint meta data. * @@ -43,17 +41,12 @@ { } - public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName, Type type) + public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName) { - super(service, qname, portTypeName, type); + super(service, qname, portTypeName); String configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; + String configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; - String configFile; - if (type == Type.JAXRPC) - configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; - else - configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE; - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); ecmd.setConfigName(configName); ecmd.setConfigFile(configFile); @@ -69,15 +62,6 @@ this.endpointAddress = endpointAddress; } - public PortInfo getPortInfo() - { - QName serviceName = getServiceMetaData().getServiceName(); - QName portName = getPortName(); - String bindingID = getBindingId(); - PortInfo portInfo = new PortInfoImpl(serviceName, portName, bindingID); - return portInfo; - } - public EndpointConfigMetaData createEndpointConfigMetaData(String configName, String configFile) { return super.createEndpointConfigMetaData(configName, configFile); @@ -86,7 +70,6 @@ public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); - buffer.append("\n type=").append(getType()); buffer.append("\n qname=").append(getPortName()); buffer.append("\n address=").append(getEndpointAddress()); buffer.append("\n binding=").append(getBindingId()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -27,7 +27,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -39,7 +38,6 @@ import java.util.Set; import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.bind.JAXBContext; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.ws.Service.Mode; @@ -55,27 +53,18 @@ import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; -import org.jboss.ws.core.jaxws.JAXBContextCache; -import org.jboss.ws.core.jaxws.JAXBContextFactory; -import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; -import org.jboss.ws.core.jaxws.JAXBSerializerFactory; -import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.accessor.AccessorFactory; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; -import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.ws.metadata.config.EndpointFeature; import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.config.CommonConfig; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; -import com.sun.xml.bind.api.JAXBRIContext; - /** * A Service component describes a set of endpoints. * @@ -88,11 +77,6 @@ // provide logging private static Logger log = Logger.getLogger(EndpointMetaData.class); - public enum Type - { - JAXRPC, JAXWS - } - public static final Set<String> SUPPORTED_BINDINGS = new HashSet<String>(); static { @@ -128,14 +112,10 @@ private ParameterStyle parameterStyle; // The JAXWS ServiceMode private Mode serviceMode; - // Whether the endpoint was deployed from annotations - private Type type; // The list of service meta data private List<OperationMetaData> operations = new ArrayList<OperationMetaData>(); // Maps the java method to the operation meta data private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); - // All of the registered types - private List<Class> registeredTypes = new ArrayList<Class>(); // The features defined for this endpoint private FeatureSet features = new FeatureSet(); @@ -143,20 +123,15 @@ private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); - private JAXBContextCache jaxbCache = new JAXBContextCache(); - EndpointMetaData() { } - public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type) + public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName) { this.serviceMetaData = service; this.portName = portName; this.portTypeName = portTypeName; - this.type = type; - - // The default binding this.bindingId = Constants.SOAP11HTTP_BINDING; } @@ -323,11 +298,6 @@ this.serviceMode = serviceMode; } - public Type getType() - { - return type; - } - public String getAuthMethod() { return authMethod; @@ -526,7 +496,6 @@ eagerInitializeOperations(); eagerInitializeTypes(); eagerInitializeAccessors(); - eagerInitializeJAXBContextCache(); } private void eagerInitializeOperations() @@ -554,7 +523,6 @@ { TypeMappingImpl typeMapping = serviceMetaData.getTypeMapping(); List<TypeMappingMetaData> typeMappings = serviceMetaData.getTypesMetaData().getTypeMappings(); - registeredTypes = new ArrayList<Class>(typeMappings.size()); for (TypeMappingMetaData tmMetaData : typeMappings) { String javaTypeName = tmMetaData.getJavaTypeName(); @@ -563,52 +531,27 @@ { List<Class> types = typeMapping.getJavaTypes(xmlType); - // TODO: Clarification. In which cases is the type already registered? - boolean registered = false; - for (Class current : types) + try { - if (current.getName().equals(javaTypeName)) - { - registeredTypes.add(current); - registered = true; - break; - } - } + ClassLoader classLoader = getClassLoader(); + Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); - if (registered == false) - { - try - { - ClassLoader classLoader = getClassLoader(); - Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + if (JavaUtils.isPrimitive(javaTypeName)) + javaType = JavaUtils.getWrapperType(javaType); - if (JavaUtils.isPrimitive(javaTypeName)) - javaType = JavaUtils.getWrapperType(javaType); - - // Needed for runtime JAXB context - registeredTypes.add(javaType); - - if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) - { - typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); - } - else - { - if (getType() == Type.JAXWS) - { - typeMapping.register(javaType, xmlType, new JAXBSerializerFactory(), new JAXBDeserializerFactory()); - } - else - { - typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); - } - } + if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + { + typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); } - catch (ClassNotFoundException e) + else { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); + typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); } } + catch (ClassNotFoundException e) + { + log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); + } } } } @@ -616,78 +559,39 @@ private void eagerInitializeAccessors() { // Collect the list of all used types - boolean useJAXBAccessorFactory = false; List<Class> types = new ArrayList<Class>(); for (OperationMetaData opMetaData : operations) { for (ParameterMetaData paramMetaData : opMetaData.getParameters()) { - AccessorFactoryCreator factoryCreator = paramMetaData.getAccessorFactoryCreator(); - if (factoryCreator instanceof JAXBAccessorFactoryCreator) - useJAXBAccessorFactory = true; - types.add(paramMetaData.getJavaType()); } ParameterMetaData retParam = opMetaData.getReturnParameter(); if (retParam != null) { - AccessorFactoryCreator factoryCreator = retParam.getAccessorFactoryCreator(); - if (factoryCreator instanceof JAXBAccessorFactoryCreator) - useJAXBAccessorFactory = true; - types.add(retParam.getJavaType()); } } - // Create a JAXBContext for those types - JAXBRIContext jaxbCtx = null; - if (useJAXBAccessorFactory) - { - Class[] typeArr = new Class[types.size()]; - jaxbCtx = (JAXBRIContext)JAXBContextFactory.newInstance().createContext(types.toArray(typeArr)); - } - // Create the accessors using a shared JAXBContext for (OperationMetaData opMetaData : operations) { for (ParameterMetaData paramMetaData : opMetaData.getParameters()) { - createAccessor(paramMetaData, jaxbCtx); + createAccessor(paramMetaData); } ParameterMetaData retParam = opMetaData.getReturnParameter(); if (retParam != null) - createAccessor(retParam, jaxbCtx); + createAccessor(retParam); } } - private void eagerInitializeJAXBContextCache() + private void createAccessor(ParameterMetaData paramMetaData) { - //initialize jaxb context cache - if ("true".equalsIgnoreCase(System.getProperty(Constants.EAGER_INITIALIZE_JAXB_CONTEXT_CACHE))) - { - log.debug("Initializing JAXBContext cache..."); - try - { - Class[] classes = getRegisteredTypes().toArray(new Class[0]); - JAXBContext context = JAXBContextFactory.newInstance().createContext(classes); - jaxbCache.add(classes, context); - } - catch (Exception e) - { - //ignore - } - } - } - - private void createAccessor(ParameterMetaData paramMetaData, JAXBRIContext jaxbCtx) - { AccessorFactoryCreator factoryCreator = paramMetaData.getAccessorFactoryCreator(); - if (factoryCreator instanceof JAXBAccessorFactoryCreator) - ((JAXBAccessorFactoryCreator)factoryCreator).setJAXBContext(jaxbCtx); - if (paramMetaData.getWrappedParameters() != null) { AccessorFactory factory = factoryCreator.create(paramMetaData); @@ -705,12 +609,7 @@ public void configure(Configurable configurable) { CommonConfig config = getConfig(); - - if (configurable instanceof DispatchBinding) - { - DispatchBinding dpb = (DispatchBinding)configurable; - dpb.setValidateDispatch(config.hasFeature(EndpointFeature.VALIDATE_DISPATCH)); - } + // TODO: remove this method } public UnifiedVirtualFile getRootFile() @@ -723,11 +622,6 @@ configObservable.addObserver(observer); } - public JAXBContextCache getJaxbCache() - { - return jaxbCache; - } - public String getConfigFile() { return getEndpointConfigMetaData().getConfigFile(); @@ -836,11 +730,6 @@ toInitialise.configHandlerMetaData(); } - public List<Class> getRegisteredTypes() - { - return Collections.unmodifiableList(registeredTypes); - } - class ConfigObservable extends Observable { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,17 +21,12 @@ */ package org.jboss.ws.metadata.umdm; -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; import java.util.ResourceBundle; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import javax.xml.ws.WebServiceException; @@ -39,11 +34,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.JavaUtils; -import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; -import org.jboss.ws.metadata.accessor.AccessorFactory; -import org.jboss.ws.metadata.accessor.ReflectiveFieldAccessorFactoryCreator; -import org.jboss.ws.metadata.accessor.ReflectiveMethodAccessorFactoryCreator; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; /** * A Fault component describes a fault that a given operation supports. @@ -208,16 +198,6 @@ public void eagerInitialize() { - Type epType = getOperationMetaData().getEndpointMetaData().getType(); - if (epType == EndpointMetaData.Type.JAXWS && faultBeanName != null) - { - if (loadFaultBean() == null) - { - ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); - new DynamicWrapperGenerator(loader).generate(this); - } - } - // Initialize the cache javaType = getJavaType(); if (javaType == null) @@ -225,110 +205,8 @@ if (JavaUtils.isAssignableFrom(Exception.class, javaType) == false) throw new WSException(BundleUtils.getMessage(bundle, "FAULT_JAVA_TYPE_NOT_EXCEPTION", javaTypeName)); - - if (epType == EndpointMetaData.Type.JAXWS) - { - faultBean = getFaultBean(); - if (faultBean != null) - initializeFaultBean(); - } } - private void initializeFaultBean() - { - /* JAX-WS 3.7: For exceptions that match the pattern described in section - * 2.5 (i.e. exceptions that have a getFaultInfo method), the FaultBean - * is used as input to JAXB */ - try - { - /* JAX-WS 2.5: A wsdl:fault element refers to a wsdl:message that contains - * a single part. The global element declaration referred to by that part - * is mapped to a Java bean. A wrapper exception class contains the - * following methods: - * . WrapperException(String message, FaultBean faultInfo) - * . WrapperException(String message, FaultBean faultInfo, Throwable cause) - * . FaultBean getFaultInfo() */ - serviceExceptionConstructor = javaType.getConstructor(String.class, faultBean); - faultInfoMethod = javaType.getMethod("getFaultInfo"); - } - /* JAX-WS 3.7: For exceptions that do not match the pattern described in - * section 2.5, JAX-WS maps those exceptions to Java beans and then uses - * those Java beans as input to the JAXB mapping. */ - catch (NoSuchMethodException nsme) - { - /* For each getter in the exception and its superclasses, a property of - * the same type and name is added to the bean. */ - XmlType xmlType = (XmlType)faultBean.getAnnotation(XmlType.class); - if (xmlType == null) - throw new WebServiceException(BundleUtils.getMessage(bundle, "XMLTYPE_MISSING", faultBeanName)); - - AccessorFactory accessorFactory = getAccessorFactory(faultBean); - - String[] propertyNames = xmlType.propOrder(); - int propertyCount = propertyNames.length; - propertyTypes = new Class[propertyCount]; - faultBeanProperties = new WrappedParameter[propertyCount]; - serviceExceptionGetters = new Method[propertyCount]; - - for (int i = 0; i < propertyCount; i++) - { - String propertyName = propertyNames[i]; - // extract property metadata from the fault bean - try - { - PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyName, faultBean); - Class propertyType = propertyDescriptor.getPropertyType(); - - WrappedParameter faultBeanProperty = new WrappedParameter(null, propertyType.getName(), propertyName, i); - faultBeanProperty.setAccessor(accessorFactory.create(faultBeanProperty)); - faultBeanProperties[i] = faultBeanProperty; - - propertyTypes[i] = propertyType; - } - catch (IntrospectionException ie) - { - throw new WSException(BundleUtils.getMessage(bundle, "PROPERTY_NOT_FOUND_IN_BEAN", new Object[]{ propertyName, faultBeanName }), ie); - } - - // extract property metadata from the service exception - try - { - /* use PropertyDescriptor(String, Class, String, String) instead - * of PropertyDescriptor(String, Class) because the latter requires - * the setter method to be present */ - PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyName, javaType, "is" + JavaUtils.capitalize(propertyName), null); - serviceExceptionGetters[i] = propertyDescriptor.getReadMethod(); - } - catch (IntrospectionException ie) - { - throw new WSException(BundleUtils.getMessage(bundle, "PROPERTY_NOT_FOUND_IN_EXCEPTION", new Object[]{ propertyName , javaTypeName}), ie); - } - } - - try - { - // Attempt to locate a usable constructor - serviceExceptionConstructor = javaType.asSubclass(Exception.class).getConstructor(propertyTypes); - } - catch (NoSuchMethodException e) - { - // Only needed for client side. The spec does not clarify this, and the TCK makes use of non matching constructors, - // so we allow them for server side usage and only fail when used by the client. - } - } - } - - private AccessorFactory getAccessorFactory(Class faultBean) - { - // This should catch all cases due to the constraints that JAX-WS puts on the fault bean - // However, if issues arrise then switch this to a full jaxb reflection library - XmlAccessorType type = (XmlAccessorType)faultBean.getAnnotation(XmlAccessorType.class); - if (type != null && type.value() == XmlAccessType.FIELD) - return new ReflectiveFieldAccessorFactoryCreator().create(this); - - return new ReflectiveMethodAccessorFactoryCreator().create(this); - } - public Object toFaultBean(Exception serviceException) { Object faultBeanInstance; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -38,12 +38,10 @@ import org.jboss.ws.common.Constants; import org.jboss.ws.common.JavaUtils; import org.jboss.ws.core.jaxrpc.ParameterWrapping; -import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; import org.jboss.ws.metadata.accessor.ReflectiveMethodAccessorFactoryCreator; import org.jboss.ws.metadata.config.EndpointFeature; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; /** * A request/response parameter that a given operation supports. @@ -441,15 +439,11 @@ javaType = null; // TODO - Remove messageType hack - Type epType = getOperationMetaData().getEndpointMetaData().getType(); if (getOperationMetaData().isDocumentWrapped() && !isInHeader() && !isSwA() && !isMessageType()) { if (loadWrapperBean() == null) { - if (epType == EndpointMetaData.Type.JAXRPC) - throw new WSException(BundleUtils.getMessage(bundle, "WRAPPER_BEANS_AUTOGEN_NOT_SUPPORTED")); - - new DynamicWrapperGenerator(getClassLoader()).generate(this); + throw new WSException(BundleUtils.getMessage(bundle, "WRAPPER_BEANS_AUTOGEN_NOT_SUPPORTED")); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -68,17 +68,13 @@ // The optional secure wsdl access private boolean secureWSDLAccess; - public ServerEndpointMetaData(ServiceMetaData service, Endpoint endpoint, QName portName, QName portTypeName, Type type) + public ServerEndpointMetaData(ServiceMetaData service, Endpoint endpoint, QName portName, QName portTypeName) { - super(service, portName, portTypeName, type); + super(service, portName, portTypeName); this.endpoint = endpoint; String configName = ConfigurationProvider.DEFAULT_ENDPOINT_CONFIG_NAME; - String configFile; - if (type == Type.JAXRPC) - configFile = ConfigurationProvider.DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE; - else - configFile = ConfigurationProvider.DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE; + String configFile = ConfigurationProvider.DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE; EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); ecmd.setConfigName(configName); @@ -199,7 +195,6 @@ public String toString() { StringBuilder buffer = new StringBuilder("\nServerEndpointMetaData:"); - buffer.append("\n type=").append(getType()); buffer.append("\n qname=").append(getPortName()); buffer.append("\n id=").append(getServiceEndpointID().getCanonicalName()); buffer.append("\n address=").append(getEndpointAddress()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -23,8 +23,8 @@ import javax.xml.namespace.QName; +import org.jboss.ws.common.JavaUtils; import org.jboss.ws.metadata.accessor.Accessor; -import org.jboss.ws.common.JavaUtils; /** * WrappedParameter represents a document/literal wrapped parameter. Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,15 +22,15 @@ package org.jboss.ws.metadata.wsdl; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; -import java.util.LinkedHashMap; import javax.xml.namespace.QName; import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; -import org.jboss.ws.WSException; /** * A Message Reference component associates a defined type with a message Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/XSDWriter.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,17 +22,17 @@ package org.jboss.ws.metadata.wsdl.xsd; import java.io.File; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import java.io.FileWriter; import java.io.IOException; import java.io.OutputStream; import java.io.StringWriter; import java.io.Writer; import java.net.URL; +import java.util.ResourceBundle; import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/helpers/JavaToXSDHelper.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/helpers/JavaToXSDHelper.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/helpers/JavaToXSDHelper.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -23,11 +23,11 @@ import java.util.Map; import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import javax.xml.namespace.QName; import org.apache.xerces.xs.XSModel; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLFactoryImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLFactoryImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,16 +21,16 @@ */ package org.jboss.ws.tools.wsdl; -import com.ibm.wsdl.DefinitionImpl; -import com.ibm.wsdl.extensions.PopulatedExtensionRegistry; -import com.ibm.wsdl.xml.WSDLWriterImpl; - import javax.wsdl.Definition; import javax.wsdl.extensions.ExtensionRegistry; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; import javax.wsdl.xml.WSDLWriter; +import com.ibm.wsdl.DefinitionImpl; +import com.ibm.wsdl.extensions.PopulatedExtensionRegistry; +import com.ibm.wsdl.xml.WSDLWriterImpl; + /** * A fork of the original wsdl4j 1.6.2 package * that delegates to the {@link JBossWSDLReaderImpl}. Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,22 +21,38 @@ */ package org.jboss.ws.tools.wsdl; -import com.ibm.wsdl.Constants; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; -import com.ibm.wsdl.extensions.schema.SchemaConstants; -import com.ibm.wsdl.util.StringUtils; -import com.ibm.wsdl.util.xml.DOMUtils; -import com.ibm.wsdl.util.xml.QNameUtils; -import com.ibm.wsdl.util.xml.XPathUtils; -import org.jboss.ws.common.utils.JBossWSEntityResolver; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.xml.sax.InputSource; +import java.util.Vector; -import javax.wsdl.*; +import javax.wsdl.Binding; +import javax.wsdl.BindingFault; +import javax.wsdl.BindingInput; +import javax.wsdl.BindingOperation; +import javax.wsdl.BindingOutput; +import javax.wsdl.Definition; +import javax.wsdl.Fault; +import javax.wsdl.Import; +import javax.wsdl.Input; +import javax.wsdl.Message; +import javax.wsdl.Operation; +import javax.wsdl.OperationType; +import javax.wsdl.Output; +import javax.wsdl.Part; +import javax.wsdl.Port; +import javax.wsdl.PortType; +import javax.wsdl.Service; +import javax.wsdl.Types; +import javax.wsdl.WSDLException; import javax.wsdl.extensions.AttributeExtensible; import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.ExtensionDeserializer; @@ -50,10 +66,22 @@ import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import java.io.InputStream; -import java.net.URL; -import java.util.*; +import org.jboss.ws.api.util.BundleUtils; +import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.xml.sax.InputSource; + +import com.ibm.wsdl.Constants; +import com.ibm.wsdl.extensions.schema.SchemaConstants; +import com.ibm.wsdl.util.StringUtils; +import com.ibm.wsdl.util.xml.DOMUtils; +import com.ibm.wsdl.util.xml.QNameUtils; +import com.ibm.wsdl.util.xml.XPathUtils; + /** * A WSDLReader fork of the original wsdl4j 1.6.2 package * that delegates to the JBossWSEntityResolver in Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLWriter.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,16 +22,18 @@ package org.jboss.ws.tools.wsdl; import java.io.IOException; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import java.io.Writer; import java.util.Iterator; +import java.util.ResourceBundle; import javax.xml.namespace.QName; import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; -import org.jboss.ws.WSException; +import org.jboss.ws.common.DOMUtils; +import org.jboss.ws.common.DOMWriter; import org.jboss.ws.metadata.wsdl.DOMTypes; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLService; @@ -39,8 +41,6 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.XSModelTypes; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.common.DOMUtils; -import org.jboss.ws.common.DOMWriter; import org.w3c.dom.Element; /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,11 +21,12 @@ */ package org.jboss.wsf.stack.jbws; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; import java.util.ResourceBundle; + import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.ws.common.utils.DelegateClassLoader; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.Deployment; /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -25,20 +25,20 @@ import java.util.LinkedList; import java.util.List; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.ServletDelegate; -import org.jboss.wsf.spi.management.EndpointResolver; -import org.jboss.ws.common.injection.InjectionHelper; -import org.jboss.ws.common.injection.PreDestroyHolder; -import org.jboss.ws.common.servlet.AbstractEndpointServlet; - import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.jboss.logging.Logger; +import org.jboss.ws.common.injection.InjectionHelper; +import org.jboss.ws.common.injection.PreDestroyHolder; +import org.jboss.ws.common.servlet.AbstractEndpointServlet; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.ServletDelegate; +import org.jboss.wsf.spi.management.EndpointResolver; + /** * A Native endpoint servlet that is installed for every web service endpoint * @author thomas.diesler(a)jboss.com Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,8 +21,8 @@ */ package org.jboss.wsf.stack.jbws; +import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.invocation.RequestHandlerFactory; -import org.jboss.wsf.spi.invocation.RequestHandler; /** * @author Heiko.Braun(a)jboss.com Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -22,19 +22,14 @@ package org.jboss.wsf.stack.jbws; import java.io.IOException; -import java.util.ResourceBundle; -import org.jboss.ws.api.util.BundleUtils; import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.ResourceBundle; -import javax.activation.DataHandler; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; @@ -51,8 +46,11 @@ import javax.xml.ws.http.HTTPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.common.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.api.util.BundleUtils; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.DOMWriter; +import org.jboss.ws.common.IOUtils; import org.jboss.ws.core.CommonBinding; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonMessageContext; @@ -63,8 +61,6 @@ import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.jaxrpc.handler.MessageContextJAXRPC; import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; -import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.server.MimeHeaderSource; import org.jboss.ws.core.server.ServiceEndpointInvoker; import org.jboss.ws.core.server.ServletHeaderSource; @@ -74,11 +70,7 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; -import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.common.DOMWriter; -import org.jboss.ws.common.IOUtils; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; @@ -246,23 +238,9 @@ if (sepMetaData == null) throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_ENDPOINTMD")); - Type type = sepMetaData.getType(); - // Build the message context - CommonMessageContext msgContext; - if (type == EndpointMetaData.Type.JAXRPC) - { - msgContext = new SOAPMessageContextJAXRPC(); - invContext.addAttachment(javax.xml.rpc.handler.MessageContext.class, msgContext); - } - else - { - msgContext = new SOAPMessageContextJAXWS(); - msgContext.put(MessageContextJAXWS.MESSAGE_OUTBOUND_PROPERTY, Boolean.valueOf(false)); - msgContext.put(MessageContextJAXWS.INBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>()); - msgContext.put(MessageContextJAXWS.OUTBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>()); - invContext.addAttachment(javax.xml.ws.handler.MessageContext.class, msgContext); - } + CommonMessageContext msgContext = new SOAPMessageContextJAXRPC(); + invContext.addAttachment(javax.xml.rpc.handler.MessageContext.class, msgContext); // Set servlet specific properties HttpServletResponse httpResponse = null; @@ -275,23 +253,9 @@ HttpServletRequest httpRequest = reqContext.getHttpServletRequest(); httpResponse = reqContext.getHttpServletResponse(); headerSource = new ServletHeaderSource(httpRequest, httpResponse); - - if (type == EndpointMetaData.Type.JAXRPC) - { - msgContext.put(MessageContextJAXRPC.SERVLET_CONTEXT, servletContext); - msgContext.put(MessageContextJAXRPC.SERVLET_REQUEST, httpRequest); - msgContext.put(MessageContextJAXRPC.SERVLET_RESPONSE, httpResponse); - } - else - { - msgContext.put(MessageContextJAXWS.HTTP_REQUEST_HEADERS, headerSource.getHeaderMap()); - msgContext.put(MessageContextJAXWS.HTTP_REQUEST_METHOD, httpRequest.getMethod()); - msgContext.put(MessageContextJAXWS.QUERY_STRING, httpRequest.getQueryString()); - msgContext.put(MessageContextJAXWS.PATH_INFO, httpRequest.getPathInfo()); - msgContext.put(MessageContextJAXWS.SERVLET_CONTEXT, servletContext); - msgContext.put(MessageContextJAXWS.SERVLET_REQUEST, httpRequest); - msgContext.put(MessageContextJAXWS.SERVLET_RESPONSE, httpResponse); - } + msgContext.put(MessageContextJAXRPC.SERVLET_CONTEXT, servletContext); + msgContext.put(MessageContextJAXRPC.SERVLET_REQUEST, httpRequest); + msgContext.put(MessageContextJAXRPC.SERVLET_RESPONSE, httpResponse); } // Associate a message context with the current thread @@ -302,27 +266,7 @@ msgContext.setEndpointMetaData(sepMetaData); MessageAbstraction resMessage = processRequest(endpoint, headerSource, invContext, inStream); CommonMessageContext reqMsgContext = msgContext; - // Replace the message context with the response context - msgContext = MessageContextAssociation.peekMessageContext(); - Map<String, List<String>> headers = (Map<String, List<String>>)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_HEADERS); - if (headers != null) - { - if (headerSource != null) - { - headerSource.setHeaderMap(headers); - } - } - - Integer code = (Integer)msgContext.get(MessageContextJAXWS.HTTP_RESPONSE_CODE); - if (code != null) - { - if (httpResponse != null) - { - httpResponse.setStatus(code.intValue()); - } - } - boolean isFault = false; if (resMessage instanceof SOAPMessage) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -23,9 +23,9 @@ import static org.jboss.ws.common.integration.WSHelper.isJaxrpcEjbEndpoint; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.ws.core.server.ServiceEndpointInvoker; import org.jboss.ws.core.server.ServiceEndpointInvokerEJB21; -import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -23,17 +23,13 @@ import static org.jboss.ws.common.integration.WSHelper.isJaxrpcEjbDeployment; import static org.jboss.ws.common.integration.WSHelper.isJaxrpcJseDeployment; -import static org.jboss.ws.common.integration.WSHelper.isJaxwsEjbDeployment; import static org.jboss.ws.common.integration.WSHelper.isJaxwsDeployment; -import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseDeployment; import java.util.ResourceBundle; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; -import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -57,17 +53,6 @@ UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) { - if (isJaxwsJseDeployment(dep)) - { - JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); - umd = builder.buildMetaData((ArchiveDeployment)dep); - dep.addAttachment(UnifiedMetaData.class, umd); - } - if (isJaxwsEjbDeployment(dep)) - { - JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); - umd = builder.buildMetaData((ArchiveDeployment)dep); - } if (isJaxrpcJseDeployment(dep) && !isJaxwsDeployment(dep)) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebAppResolver.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -21,12 +21,13 @@ */ package org.jboss.wsf.stack.jbws; -import org.jboss.wsf.spi.management.EndpointResolver; -import org.jboss.wsf.spi.deployment.Endpoint; +import java.util.Iterator; import javax.management.ObjectName; -import java.util.Iterator; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointResolver; + /** * Resolves Endpoints by Servlet name and web context path. * Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-10 09:22:45 UTC (rev 16137) @@ -35,17 +35,11 @@ <include>org.jboss.ws.native:jbossws-native-services:jar</include> <include>org.jboss.ws.native:jbossws-native-core</include> <include>javax.jws:jsr181-api:jar</include> - <include>com.sun.xml.bind:jaxb-impl:jar</include> - <include>com.sun.xml.bind:jaxb-xjc:jar</include> - <include>com.sun.xml.ws:jaxws-tools:jar</include> - <include>com.sun.xml.ws:jaxws-rt:jar</include> <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> - <include>com.sun.xml.ws:policy:jar</include> <include>javax.xml.stream:stax-api:jar</include> <include>org.jvnet.staxex:stax-ex:jar</include> - <include>com.sun.xml.stream.buffer:streambuffer:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.jboss.netty:netty:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> @@ -98,21 +92,9 @@ <useProjectArtifact>false</useProjectArtifact> </dependencySet> - <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping> - <includes> - <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping> <includes> <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2012-04-10 09:22:45 UTC (rev 16137) @@ -32,12 +32,9 @@ <module name="javax.jws.api" export="true"/> <module name="javax.wsdl4j.api" export="true"/> <module name="javax.xml.ws.api" export="true"/> - <module name="com.sun.xml.bind" services="export" export="true"/> - <module name="com.sun.tools.javac" export="true"/> <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> <module name="org.jboss.ws.common" services="import" export="true"/> - <module name="org.jboss.ws.jaxws-client" services="export" export="true"/> <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/> <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> <imports> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-04-10 09:22:45 UTC (rev 16137) @@ -29,14 +29,11 @@ </resources> <dependencies> - <module name="com.sun.tools.ws" services="import" optional="true"/> - <module name="com.sun.xml.bind" services="import"/> <module name="javax.api" /> <module name="javax.servlet.api" /> <module name="javax.jws.api" /> <module name="javax.mail.api" /> <module name="javax.wsdl4j.api" /> - <module name="javax.xml.bind.api" /> <module name="javax.xml.stream.api" /> <module name="javax.xml.rpc.api" /> <module name="javax.xml.ws.api" /> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-10 09:22:45 UTC (rev 16137) @@ -60,26 +60,6 @@ <include name="**/jbossxb.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/com/sun/tools/ws/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jaxws-tools.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/com/sun/xml/stream/buffer/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/streambuffer.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/com/sun/xml/ws/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/jaxws-rt.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/com/sun/xml/ws/policy/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/policy.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/org/jvnet/staxex/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/stax-ex.jar"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/binding/SOAPBindingTestCase.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -48,7 +48,6 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; @@ -180,7 +179,7 @@ */ public void testBindRequestMessage() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); EndpointInvocation epInv = new EndpointInvocation(opMetaData); @@ -199,7 +198,7 @@ */ public void testBindRequestMessageWithBoundHeader() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); // Add bound header @@ -225,7 +224,7 @@ */ public void testBindRequestMessageWithUnboundHeader() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); // Add unbound header @@ -252,7 +251,7 @@ */ public void testUnbindRequestMessage() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); ByteArrayInputStream inputStream = new ByteArrayInputStream(reqEnvelope.getBytes()); @@ -290,7 +289,7 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(reqMessage); - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); assertNotNull(epInv); @@ -313,7 +312,7 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setSOAPMessage(reqMessage); - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); EndpointInvocation epInv = binding.unbindRequestMessage(opMetaData, reqMessage); assertNotNull(epInv); @@ -327,7 +326,7 @@ */ public void testBindResponseMessage() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); EndpointInvocation epInv = new EndpointInvocation(opMetaData); @@ -346,7 +345,7 @@ */ public void testUnbindResponseMessage() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelope.getBytes()); @@ -366,7 +365,7 @@ */ public void testUnbindResponseMessageWithBoundHeader() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithBoundHeader.getBytes()); @@ -397,7 +396,7 @@ */ public void testUnbindResponseMessageWithUnboundHeader() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithUnboundHeader.getBytes()); @@ -425,7 +424,7 @@ */ public void testUnbindFaultResponse() throws Exception { - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP12HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); ByteArrayInputStream inputStream = new ByteArrayInputStream(resEnvelopeWithFault.getBytes()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/GenericAttachmentTestCase.java 2012-04-10 09:22:45 UTC (rev 16137) @@ -51,12 +51,9 @@ import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.wsf.test.JBossWSTest; /** - * TODO - * * @author <a href="mailto:jason@stacksmash.com">Jason T. Greene</a> */ public class GenericAttachmentTestCase extends JBossWSTest @@ -149,7 +146,7 @@ MessageContextAssociation.pushMessageContext(messageContext); messageContext.setOperationMetaData(opMetaData); - CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP11HTTP_BINDING, Type.JAXRPC); + CommonBindingProvider bindingProvider = new CommonBindingProvider(CommonSOAPBinding.SOAP11HTTP_BINDING); CommonBinding binding = (CommonBinding)bindingProvider.getCommonBinding(); EndpointInvocation epInv = new EndpointInvocation(opMetaData); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-04-10 09:22:45 UTC (rev 16137) @@ -57,13 +57,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.5.0</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> @@ -128,42 +121,6 @@ </testResource> </testResources> <plugins> - <plugin>  - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.spec.javax.xml.bind</groupId> - <artifactId>jboss-jaxb-api_2.2_spec</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> <plugin>  <artifactId>maven-resources-plugin</artifactId> <executions> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:14:26 UTC (rev 16136) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-04-10 09:22:45 UTC (rev 16137) @@ -71,13 +71,9 @@ <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <saaj.api.version>1.0.1.Final</saaj.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> - <jaxb.api.version>1.0.3.Final</jaxb.api.version> - <jaxb.impl.version>2.2.4</jaxb.impl.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> <netty.version>3.2.6.Final</netty.version> - <sun.jaxws.version>2.2</sun.jaxws.version> - <sun.policy.version>2.0-b01</sun.policy.version> <stax.api.version>1.0-2</stax.api.version> <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> @@ -172,87 +168,6 @@ <version>${commons.logging.version}</version> </dependency> <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>policy</artifactId> - <version>${sun.policy.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.txw2</groupId> - <artifactId>txw2</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.istack</groupId> - <artifactId>istack-commons-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-tools</artifactId> - <version>${sun.jaxws.version}</version> - <exclusions> - <exclusion> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - <version>${sun.jaxws.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.messaging.saaj</groupId> - <artifactId>saaj-impl</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.jvnet</groupId> - <artifactId>mimepull</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.gmbal</groupId> - <artifactId>gmbal-api-only</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> <version>${jsr181.api.version}</version> @@ -278,21 +193,6 @@ <version>${saaj.api.version}</version> </dependency> <dependency> - <groupId>org.jboss.spec.javax.xml.bind</groupId> - <artifactId>jboss-jaxb-api_2.2_spec</artifactId> - <version>${jaxb.api.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb.impl.version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>${jaxb.impl.version}</version> - </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> <version>${stax.api.version}</version>

12 years, 1 month

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 April 2012