October 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15182 - thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2011-10-31 12:08:44 -0400 (Mon, 31 Oct 2011) New Revision: 15182 Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Log: [JBPAPP-7452] Removing extraneous System.err.println Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java 2011-10-31 15:32:58 UTC (rev 15181) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java 2011-10-31 16:08:44 UTC (rev 15182) @@ -323,7 +323,6 @@ for (Entry<String, Object> entry : properties.entrySet()) { endpointInfo.setProperty(entry.getKey(), entry.getValue()); } - System.err.println("\n\n"); } this.address = endpointInfo.getAddress();

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15181 - in stack/native/trunk/modules/testsuite/native-tests: src/test/resources/benchmark/jaxrpc/doclit/META-INF and 22 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:32:58 -0400 (Mon, 31 Oct 2011) New Revision: 15181 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-webservices.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss-webservices.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-web.xml Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss.xml Log: [JBWS-3376] migrate data from jboss.xml to jboss-webservices.xml Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -98,7 +98,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/rpclit/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> @@ -142,7 +142,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/benchmark/jaxrpc/doclit/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> @@ -278,7 +278,7 @@ </metainf> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/enventry/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> </metainf> </jar> @@ -306,7 +306,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -318,7 +318,7 @@ <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/> </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbas897/META-INF"> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -697,6 +697,7 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> @@ -710,6 +711,7 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> @@ -723,6 +725,7 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> @@ -736,6 +739,7 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> @@ -923,7 +927,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws331/WS-META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -998,7 +1002,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws358/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -1414,7 +1418,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws626/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/TestService.wsdl"/> @@ -1748,6 +1752,7 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </metainf> </jar> @@ -1830,7 +1835,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws772/META-INF-ONE"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -2031,7 +2036,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1011/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jbosscmp-jdbc.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> @@ -2822,7 +2827,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsdlpublish/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> @@ -2839,7 +2844,7 @@ <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/WEB-INF"> - <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="jboss-wsse-server.xml"/> @@ -2878,6 +2883,7 @@ </classes> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="jboss-wsse-server.xml"/> @@ -2933,6 +2939,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> @@ -2974,6 +2981,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> @@ -3015,6 +3023,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> @@ -3058,6 +3067,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> @@ -3105,6 +3115,7 @@ </webinf> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/webclient/WEB-INF"> <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="jboss-wsse-client.xml"/> </webinf> <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> @@ -3127,6 +3138,7 @@ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="jboss-wsse-server.xml"/> <include name="webservices.xml"/> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -185,6 +185,7 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1309/META-INF"> <include name="jboss-wsse-server.xml" /> <include name="jboss.xml" /> + <include name="jboss-webservices.xml" /> </metainf> <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1309/"> <include name="wsse.truststore" /> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -200,7 +200,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> @@ -229,7 +229,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> @@ -260,7 +260,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> - <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> @@ -427,6 +427,7 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </metainf> </jar> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,19 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <webservice-description> + <webservice-description-name>BenchmarkDocLitEJBWS</webservice-description-name> + <port-component> + <port-component-name>BenchmarkDocLitEJBWS</port-component-name> + <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-uri> + <service-impl-bean> + <ejb-link>BenchmarkDocLit</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - <enterprise-beans> - <session> - <ejb-name>BenchmarkDocLit</ejb-name> - <port-component> - <port-component-name>BenchmarkDocLitEJBWS</port-component-name> - <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-uri> - </port-component> - </session> - </enterprise-beans> -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,19 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <webservice-description> + <webservice-description-name>BenchmarkDocLitEJBWS</webservice-description-name> + <port-component> + <port-component-name>BenchmarkRpcLitEJBWS</port-component-name> + <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-uri> + <service-impl-bean> + <ejb-link>BenchmarkRpcLit</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - <enterprise-beans> - <session> - <ejb-name>BenchmarkRpcLit</ejb-name> - <port-component> - <port-component-name>BenchmarkRpcLitEJBWS</port-component-name> - <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-uri> - </port-component> - </session> - </enterprise-beans> -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-enventry</context-root> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/enventry/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-enventry</context-root> - </webservices> - -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-jbas897</context-root> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbas897/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-jbas897</context-root> - </webservices> - -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-jbws1011</context-root> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1011/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-jbws1011</context-root> - </webservices> - -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,22 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + +  + <context-root>/Explicit/Both</context-root> + + <webservice-description> + <webservice-description-name>HelloServiceBoth</webservice-description-name> + <port-component> + <port-component-name>HelloBoth</port-component-name> + <port-component-uri>/Explicit/Path</port-component-uri> + <service-impl-bean> + <ejb-link>HelloBoth</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -2,22 +2,13 @@ <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - - <jboss> - - <webservices> - <context-root>/Explicit/Both</context-root> - </webservices> - + <enterprise-beans> <session> <ejb-name>HelloBoth</ejb-name> <jndi-name>ejb/HelloBoth</jndi-name> - <port-component> - <port-component-name>HelloBoth</port-component-name> - <port-component-uri>/Explicit/Path</port-component-uri> - </port-component> </session> </enterprise-beans> + </jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,12 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + +  + + <context-root>/Explicit/Context</context-root> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-ctxroot/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -2,18 +2,13 @@ <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - - <jboss> - - <webservices> - <context-root>/Explicit/Context</context-root> - </webservices> - + <enterprise-beans> <session> <ejb-name>HelloContextRoot</ejb-name> <jndi-name>ejb/HelloContextRoot</jndi-name> </session> </enterprise-beans> + </jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,31 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + +  + + <webservice-description> + <webservice-description-name>HelloServicePcURI1</webservice-description-name> + <port-component> + <port-component-name>HelloPCOne</port-component-name> + <port-component-uri>/Explicit/Path/HelloPCOne</port-component-uri> + <service-impl-bean> + <ejb-link>HelloPCOne</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + <webservice-description> + <webservice-description-name>HelloServicePcURI2</webservice-description-name> + <port-component> + <port-component-name>HelloPCTwo</port-component-name> + <port-component-uri>/Explicit/Path/HelloPCTwo</port-component-uri> + <service-impl-bean> + <ejb-link>HelloPCTwo</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -2,25 +2,17 @@ <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - - <jboss> + <enterprise-beans> <session> <ejb-name>HelloPCOne</ejb-name> <jndi-name>ejb/HelloPCOne</jndi-name> - <port-component> - <port-component-name>HelloPCOne</port-component-name> - <port-component-uri>/Explicit/Path/HelloPCOne</port-component-uri> - </port-component> </session> <session> <ejb-name>HelloPCTwo</ejb-name> <jndi-name>ejb/HelloPCTwo</jndi-name> - <port-component> - <port-component-name>HelloPCTwo</port-component-name> - <port-component-uri>/Explicit/Path/HelloPCTwo</port-component-uri> - </port-component> </session> </enterprise-beans> + </jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-jbws331</context-root> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-jbws331</context-root> - </webservices> - -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-jbws358</context-root> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws358/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-jbws358</context-root> - </webservices> - -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-jbws626</context-root> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws626/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-jbws626</context-root> - </webservices> - -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <webservice-description> + <webservice-description-name>OrganizationServiceEJB</webservice-description-name> + <port-component> + <port-component-name>RoleSecured</port-component-name> + <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> +  + <service-impl-bean> + <ejb-link>JBWS723RoleSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>BasicSecured</port-component-name> + <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <secure-wsdl-access>true</secure-wsdl-access> + <service-impl-bean> + <ejb-link>JBWS723BasicSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>ConfidentialSecured</port-component-name> + <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + <secure-wsdl-access>false</secure-wsdl-access> + <service-impl-bean> + <ejb-link>JBWS723ConfidentialSLSB</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -10,34 +10,15 @@ <session> <ejb-name>JBWS723RoleSecuredSLSB</ejb-name> <jndi-name>ejb/JBWS723RoleSecuredSLSB</jndi-name> - <port-component> - <port-component-name>RoleSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> -  - </port-component> </session> <session> <ejb-name>JBWS723BasicSecuredSLSB</ejb-name> <jndi-name>ejb/JBWS723BasicSecuredSLSB</jndi-name> - <port-component> - <port-component-name>BasicSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - <secure-wsdl-access>true</secure-wsdl-access> - </port-component> </session> <session> <ejb-name>JBWS723ConfidentialSLSB</ejb-name> <jndi-name>ejb/JBWS723ConfidentialSLSB</jndi-name> - <port-component> - <port-component-name>ConfidentialSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - <secure-wsdl-access>false</secure-wsdl-access> - </port-component> </session> </enterprise-beans> + </jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-jbws772</context-root> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-jbws772</context-root> - </webservices> - -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,21 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + <service-impl-bean> + <ejb-link>TestService</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root> - </webservices> - - <enterprise-beans> - <session> - <ejb-name>TestService</ejb-name> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <port-component-uri>/*</port-component-uri> - </port-component> - </session> - </enterprise-beans> -</jboss> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,22 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-publish-location>file:@wsdl.publish.location@/jsr109ejb</wsdl-publish-location> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + <service-impl-bean> + <ejb-link>TestService</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>file:@wsdl.publish.location@/jsr109ejb</wsdl-publish-location> - </webservice-description> - </webservices> - - <enterprise-beans> - <session> - <ejb-name>TestService</ejb-name> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <port-component-uri>/*</port-component-uri> - </port-component> - </session> - </enterprise-beans> -</jboss> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,12 +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> - - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>file:@wsdl.publish.location@/jsr109pojo</wsdl-publish-location> - </webservice-description> - -</jboss-web> \ No newline at end of file Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,13 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-publish-location>file:@wsdl.publish.location@/jsr109pojo</wsdl-publish-location> + </webservice-description> + +</webservices> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,40 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-samples-ejb</context-root> + + <webservice-description> + <webservice-description-name>OrganizationServiceEJB</webservice-description-name> + <port-component> + <port-component-name>RoleSecured</port-component-name> + <port-component-uri>/RoleSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <service-impl-bean> + <ejb-link>RoleSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>BasicSecured</port-component-name> + <port-component-uri>/BasicSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <service-impl-bean> + <ejb-link>BasicSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>ConfidentialSecured</port-component-name> + <port-component-uri>/ConfidentialSecured</port-component-uri> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + <service-impl-bean> + <ejb-link>ConfidentialSLSB</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -6,39 +6,19 @@ <security-domain>JBossWS</security-domain> - <webservices> - <context-root>/jaxrpc-samples-ejb</context-root> - </webservices> - <enterprise-beans> <session> <ejb-name>RoleSecuredSLSB</ejb-name> <jndi-name>ejb/RoleSecuredSLSB</jndi-name> - <port-component> - <port-component-name>RoleSecured</port-component-name> - <port-component-uri>/RoleSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - </port-component> </session> <session> <ejb-name>BasicSecuredSLSB</ejb-name> <jndi-name>ejb/BasicSecuredSLSB</jndi-name> - <port-component> - <port-component-name>BasicSecured</port-component-name> - <port-component-uri>/BasicSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - </port-component> </session> <session> <ejb-name>ConfidentialSLSB</ejb-name> <jndi-name>ejb/ConfidentialSLSB</jndi-name> - <port-component> - <port-component-name>ConfidentialSecured</port-component-name> - <port-component-uri>/ConfidentialSecured</port-component-uri> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </port-component> </session> </enterprise-beans> + </jboss> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-web.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,9 +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> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>file:@wsdl.publish.location@/some-wsdl-location</wsdl-publish-location> - </webservice-description> -</jboss-web> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsdlpublish/WEB-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,13 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-publish-location>file:@wsdl.publish.location@/some-wsdl-location</wsdl-publish-location> + </webservice-description> + +</webservices> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-web.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-web.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -1,12 +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> - - <webservice-description> - <webservice-description-name>HelloService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - -</jboss-web> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/WEB-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <config-name>Standard WSSecurity Endpoint</config-name> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-web.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -3,12 +3,7 @@ <!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>jaxrpc-wsse-rpc</context-root> - - <webservice-description> - <webservice-description-name>HelloService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - + + <context-root>jaxrpc-wsse-rpc</context-root> + </jboss-web> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/WEB-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <config-name>Standard WSSecurity Endpoint</config-name> + +</webservices> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,21 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-wsse-username</context-root> + <config-name>Standard WSSecurity Endpoint</config-name> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + <service-impl-bean> + <ejb-link>TestService</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -3,23 +3,7 @@ <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> <jboss> + <security-domain>JBossWS</security-domain> - - <webservices> - <context-root>/jaxrpc-wsse-username</context-root> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - </webservices> - - <enterprise-beans> - <session> - <ejb-name>TestService</ejb-name> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <port-component-uri>/*</port-component-uri> - </port-component> - </session> - </enterprise-beans> + </jboss> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-web.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -3,17 +3,13 @@ <!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>jaxrpc-wsse-rpc</context-root> - - <webservice-description> - <webservice-description-name>HelloService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - + <service-ref> <service-ref-name>service/HelloService</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-rpc/Hello?wsdl</wsdl-override> </service-ref> - + </jboss-web> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/webclient/WEB-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <config-name>Standard WSSecurity Endpoint</config-name> + +</webservices> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss-webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss-webservices.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss-webservices.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -0,0 +1,22 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxws-jbws1309</context-root> + <config-name>Standard WSSecurity Endpoint</config-name> + + <webservice-description> + <webservice-description-name>jbws1309-ws-description</webservice-description-name> + <port-component> + <port-component-name>TestPortComponent</port-component-name> + <port-component-uri>/*</port-component-uri> + <service-impl-bean> + <ejb-link>HelloBean</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss.xml 2011-10-31 15:31:59 UTC (rev 15180) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss.xml 2011-10-31 15:32:58 UTC (rev 15181) @@ -3,21 +3,12 @@ <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> <jboss> - <webservices> - <context-root>/jaxws-jbws1309</context-root> - <webservice-description> - <webservice-description-name>jbws1309-ws-description</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - </webservices> + <enterprise-beans> <session> <ejb-name>HelloBean</ejb-name> <jndi-name>ejb/HelloBean</jndi-name> - <port-component> - <port-component-name>TestPortComponent</port-component-name> - <port-component-uri>/*</port-component-uri> - </port-component> </session> </enterprise-beans> -</jboss> \ No newline at end of file + +</jboss>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15180 - in stack/native/trunk/modules/core/src/main/resources: schema and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:31:59 -0400 (Mon, 31 Oct 2011) New Revision: 15180 Added: stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml Log: [JBWS-3376] register jboss-webservices.xml parser Modified: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-10-31 15:30:34 UTC (rev 15179) +++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-10-31 15:31:59 UTC (rev 15180) @@ -8,9 +8,12 @@ </bean>  - <bean name="WSDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl"> + <bean name="WSWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl"> <property name="descriptorName">webservices.xml</property> </bean> + <bean name="WSJBossWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.JBossWebservicesDescriptorParserImpl"> + <property name="descriptorName">jboss-webservices.xml</property> + </bean>  <bean name="WSMemoryBufferRecorder" class="org.jboss.ws.common.monitoring.MemoryBufferRecorder"> Added: stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd (rev 0) +++ stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd 2011-10-31 15:31:59 UTC (rev 15180) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema + targetNamespace="http://www.jboss.com/xml/ns/javaee" + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.1"> + + <xsd:element name="webservices" type="jboss:webservicesType"/> + + <xsd:complexType name="webservicesType"> + <xsd:sequence> + <xsd:element name="context-root" type="xsd:token" minOccurs="0"/> + <xsd:element name="config-name" type="xsd:token" minOccurs="0"/> + <xsd:element name="config-file" type="xsd:token" minOccurs="0"/> + <xsd:element name="webservice-description" type="jboss:webservice-descriptionType" minOccurs="1" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="webservice-descriptionType"> + <xsd:sequence> + <xsd:element name="webservice-description-name" type="xsd:token"/> + <xsd:element name="wsdl-publish-location" type="xsd:token" minOccurs="0"/> + <xsd:element name="port-component" type="jboss:port-componentType" minOccurs="1" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="port-componentType"> + <xsd:sequence> + <xsd:element name="port-component-name" type="xsd:token"/> + <xsd:element name="port-component-uri" type="xsd:token" minOccurs="0"/> + <xsd:element name="auth-method" type="xsd:token" minOccurs="0"/> + <xsd:element name="transport-guarantee" type="xsd:token" minOccurs="0"/> + <xsd:element name="secure-wsdl-access" type="xsd:boolean" minOccurs="0"/> + <xsd:element name="service-impl-bean" type="jboss:service-impl-beanType"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="service-impl-beanType"> + <xsd:choice> + <xsd:element name="ejb-link" type="xsd:token"/> + <xsd:element name="servlet-link" type="xsd:token"/> + </xsd:choice> + </xsd:complexType> + +</xsd:schema>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15179 - stack/cxf/trunk/modules/server/src/main/resources.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:30:34 -0400 (Mon, 31 Oct 2011) New Revision: 15179 Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml Log: [JBWS-3376] register jboss-webservices.xml parser Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-10-31 15:29:21 UTC (rev 15178) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-10-31 15:30:34 UTC (rev 15179) @@ -11,9 +11,12 @@ </bean>  - <bean name="WSDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl"> + <bean name="WSWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl"> <property name="descriptorName">webservices.xml</property> </bean> + <bean name="WSJBossWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.JBossWebservicesDescriptorParserImpl"> + <property name="descriptorName">jboss-webservices.xml</property> + </bean>  <bean name="WSMemoryBufferRecorder" class="org.jboss.ws.common.monitoring.MemoryBufferRecorder">

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15178 - in shared-testsuite/trunk/testsuite/src/test: resources/jaxrpc/samples/jsr109ejb/doclit/META-INF and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:29:21 -0400 (Mon, 31 Oct 2011) New Revision: 15178 Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-webservices.xml Removed: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss.xml Log: [JBWS-3376] migrate data from jboss.xml to jboss-webservices.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -418,7 +418,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class" /> </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1813/META-INF"> - <include name="jboss.xml" /> + <include name="jboss-webservices.xml" /> </metainf> </jar> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1813.ear"> @@ -483,6 +483,7 @@ <include name="wsdl/*" /> <include name="ejb-jar.xml" /> <include name="jboss.xml" /> + <include name="jboss-webservices.xml" /> </metainf> </jar> @@ -697,6 +698,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2241/META-INF"> <include name="jboss.xml" /> + <include name="jboss-webservices.xml" /> </metainf> </jar> Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -171,7 +171,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> @@ -200,7 +200,7 @@ </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> @@ -231,7 +231,7 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> - <include name="jboss-web.xml"/> + <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> @@ -401,6 +401,7 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </metainf> </jar> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -0,0 +1,21 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + <service-impl-bean> + <ejb-link>TestService</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root> - </webservices> - - <enterprise-beans> - <session> - <ejb-name>TestService</ejb-name> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <port-component-uri>/*</port-component-uri> - </port-component> - </session> - </enterprise-beans> -</jboss> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -0,0 +1,22 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-publish-location> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + <service-impl-bean> + <ejb-link>TestService</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> - -<jboss> - - <webservices> - <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-publish-location> - </webservice-description> - </webservices> - - <enterprise-beans> - <session> - <ejb-name>TestService</ejb-name> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <port-component-uri>/*</port-component-uri> - </port-component> - </session> - </enterprise-beans> -</jboss> Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -1,12 +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> - - <webservice-description> - <webservice-description-name>TestService</webservice-description-name> - <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-publish-location> - </webservice-description> - -</jboss-web> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-webservices.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -0,0 +1,13 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-publish-location>http://@jboss.bind.address@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-publish-location> + </webservice-description> + +</webservices> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -0,0 +1,40 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxrpc-samples-ejb</context-root> + + <webservice-description> + <webservice-description-name>OrganizationServiceEJB</webservice-description-name> + <port-component> + <port-component-name>RoleSecured</port-component-name> + <port-component-uri>/RoleSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <service-impl-bean> + <ejb-link>RoleSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>BasicSecured</port-component-name> + <port-component-uri>/BasicSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <service-impl-bean> + <ejb-link>BasicSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>ConfidentialSecured</port-component-name> + <port-component-uri>/ConfidentialSecured</port-component-uri> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + <service-impl-bean> + <ejb-link>ConfidentialSLSB</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -6,39 +6,19 @@ <security-domain>JBossWS</security-domain> - <webservices> - <context-root>/jaxrpc-samples-ejb</context-root> - </webservices> - <enterprise-beans> <session> <ejb-name>RoleSecuredSLSB</ejb-name> <jndi-name>ejb/RoleSecuredSLSB</jndi-name> - <port-component> - <port-component-name>RoleSecured</port-component-name> - <port-component-uri>/RoleSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - </port-component> </session> <session> <ejb-name>BasicSecuredSLSB</ejb-name> <jndi-name>ejb/BasicSecuredSLSB</jndi-name> - <port-component> - <port-component-name>BasicSecured</port-component-name> - <port-component-uri>/BasicSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - </port-component> </session> <session> <ejb-name>ConfidentialSLSB</ejb-name> <jndi-name>ejb/ConfidentialSLSB</jndi-name> - <port-component> - <port-component-name>ConfidentialSecured</port-component-name> - <port-component-uri>/ConfidentialSecured</port-component-uri> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </port-component> </session> </enterprise-beans> + </jboss> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss-webservices.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/test-context</context-root> + +</webservices> Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1813/META-INF/jboss.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> - -<jboss> - - <webservices> - <context-root>/test-context</context-root> - </webservices> -</jboss> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-webservices.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -0,0 +1,10 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/jaxws-jbws1841</context-root> + +</webservices> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd"> <jboss> - <webservices> - <context-root>/jaxws-jbws1841</context-root> - </webservices> + <enterprise-beans> <session> <ejb-name>StatelessBean</ejb-name> @@ -20,4 +19,5 @@ </service-ref> </session> </enterprise-beans> -</jboss> \ No newline at end of file + +</jboss> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-webservices.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -0,0 +1,24 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.0" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_webservices_1_0.xsd"> + + <context-root>/contextRoot</context-root> + + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <port-component> + <port-component-name>TestPortComponent</port-component-name> + <port-component-uri>/urlPattern/test</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <secure-wsdl-access>false</secure-wsdl-access> + <service-impl-bean> + <ejb-link>EJB3Bean</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + +</webservices> Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss.xml 2011-10-31 15:28:04 UTC (rev 15177) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss.xml 2011-10-31 15:29:21 UTC (rev 15178) @@ -3,21 +3,14 @@ <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> <jboss> + <security-domain>JBossWS</security-domain> - <webservices> - <context-root>/contextRoot</context-root> - </webservices> + <enterprise-beans> <session> <ejb-name>EJB3Bean</ejb-name> <jndi-name>ejb/EJB3Bean</jndi-name> - <port-component> - <port-component-name>TestPortComponent</port-component-name> - <port-component-uri>/urlPattern/test</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - <secure-wsdl-access>false</secure-wsdl-access> - </port-component> </session> </enterprise-beans> + </jboss>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15177 - in container/jboss60/branches/jbossws-jboss600/src/main: java/org/jboss/webservices/integration/deployers/deployment and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:28:04 -0400 (Mon, 31 Oct 2011) New Revision: 15177 Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java Removed: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml Log: [JBWS-3376] implemented jboss-webservices.xml parser and updated ASIL processing accordingly Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -0,0 +1,53 @@ +/* + * 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.webservices.integration.deployers; + +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesDescriptorParser; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; + +/** + * jboss-webservices.xml deployer. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBossWebservicesDescriptorDeployer extends AbstractDescriptorDeployer<JBossWebservicesDescriptorParser, JBossWebservicesMetaData> +{ + + /** + * Constructor. + */ + public JBossWebservicesDescriptorDeployer() + { + super(JBossWebservicesMetaData.class); + } + + /** + * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. + * @param parser the parser + */ + @Override + public void setParser(final JBossWebservicesDescriptorParser parser) + { + super.setParser(parser); + } + +} Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -28,6 +28,7 @@ import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.webservices.integration.deployers.deployment.WSDeploymentBuilder; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -47,6 +48,7 @@ // inputs this.addInput(JBossWebMetaData.class); this.addInput(WebservicesMetaData.class); + this.addInput(JBossWebservicesMetaData.class); this.addInput(WebServiceDeployment.class); // outputs Deleted: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -1,53 +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.webservices.integration.deployers; - -import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * webservices.xml deployer. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData> -{ - - /** - * Constructor. - */ - public WSDescriptorDeployer() - { - super(WebservicesMetaData.class); - } - - /** - * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. - * @param parser the parser - */ - @Override - public void setParser(final WebservicesDescriptorParser parser) - { - super.setParser(parser); - } - -} Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -0,0 +1,53 @@ +/* + * 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.webservices.integration.deployers; + +import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * webservices.xml deployer. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class WebservicesDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData> +{ + + /** + * Constructor. + */ + public WebservicesDescriptorDeployer() + { + super(WebservicesMetaData.class); + } + + /** + * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. + * @param parser the parser + */ + @Override + public void setParser(final WebservicesDescriptorParser parser) + { + super.setParser(parser); + } + +} Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -29,6 +29,7 @@ import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.webservices.integration.WebServiceDeployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -60,6 +61,10 @@ final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -29,6 +29,7 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -59,6 +60,10 @@ { final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXRPC JSE endpoints meta data model"); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -29,6 +29,7 @@ import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.webservices.integration.WebServiceDeclaration; import org.jboss.webservices.integration.WebServiceDeployment; @@ -58,6 +59,10 @@ { this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -31,6 +31,7 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; /** * Creates new JAXWS JSE deployment. @@ -57,6 +58,10 @@ protected void build(final Deployment dep, final DeploymentUnit unit) { this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXWS JSE endpoints meta data model"); final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -21,19 +21,14 @@ */ package org.jboss.webservices.integration.metadata; -import java.util.Iterator; - import org.jboss.logging.Logger; -import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; -import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.ejb.jboss.WebservicesMetaData; -import org.jboss.webservices.integration.util.ASHelper; import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; /** * Common class for EJB meta data builders. @@ -86,67 +81,41 @@ */ private void buildWebservicesMetaData(final Deployment dep, final EJBArchiveMetaData ejbArchiveMD) { - final JBossMetaData jbossMD = WSHelper.getRequiredAttachment(dep, JBossMetaData.class); - final WebservicesMetaData webservicesMD = jbossMD.getWebservices(); + final JBossWebservicesMetaData webservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); - if (webservicesMD == null) - { - return; - } + if (webservicesMD == null) return; // set context root - String contextRoot = webservicesMD.getContextRoot(); - final WebserviceDescriptionsMetaData wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); - - if (wsDescriptionsMD != null) - { - // set wsdl location resolver - final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); - ejbArchiveMD.setPublishLocationAdapter(resolver); - - final WebserviceDescriptionMetaData wsDescriptionMD = ASHelper - .getWebserviceDescriptionMetaData(wsDescriptionsMD); - if (wsDescriptionMD != null) - { - if (contextRoot == null && !hasContextRoot(ejbArchiveMD)) - { - contextRoot = wsDescriptionMD.getWebserviceDescriptionName(); // TCK6 fallback - } - - final String configName = wsDescriptionMD.getConfigName(); - final String configFile = wsDescriptionMD.getConfigFile(); - - // set config name - this.log.debug("Setting config name: " + configName); - ejbArchiveMD.setConfigName(wsDescriptionMD.getConfigName()); - - // set config file - this.log.debug("Setting config file: " + configFile); - ejbArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile()); - } - } - + final String contextRoot = webservicesMD.getContextRoot(); ejbArchiveMD.setWebServiceContextRoot(contextRoot); this.log.debug("Setting context root: " + contextRoot); + + // set config name + final String configName = webservicesMD.getConfigName(); + this.log.debug("Setting config name: " + configName); + ejbArchiveMD.setConfigName(configName); + + // set config file + final String configFile = webservicesMD.getConfigFile(); + this.log.debug("Setting config file: " + configFile); + ejbArchiveMD.setConfigFile(configFile); + + // set wsdl location resolver + final WebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); + final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); + ejbArchiveMD.setPublishLocationAdapter(resolver); } - /** - * Returns true if has context root, false otherwise. - * - * @param ejbArchiveMD ejb archive MD - * @return true if has context root, false otherwise - */ - private boolean hasContextRoot(final EJBArchiveMetaData ejbArchiveMD) - { - for (final Iterator<EJBMetaData> ejbMDs = ejbArchiveMD.getEnterpriseBeans(); ejbMDs.hasNext(); ) - { - final EJBMetaData ejbMD = ejbMDs.next(); - if (ejbMD.getPortComponentURI() != null) - { - return true; - } - } + protected PortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { + if (jbossWebservicesMD == null) return null; - return false; + PortComponentMetaData portComponentMD = null; + for (final WebserviceDescriptionMetaData webserviceDescriptionMD : jbossWebservicesMD.getWebserviceDescriptions()) { + portComponentMD = webserviceDescriptionMD.getPortComponentByEjbLinkName(ejbName); + if (portComponentMD != null) return portComponentMD; + } + + return null; } + } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -27,13 +27,14 @@ import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; -import org.jboss.metadata.javaee.spec.PortComponent; import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; /** * Builds container independent meta data from EJB21 container meta data. @@ -63,10 +64,11 @@ { final JBossMetaData jbossMetaData = WSHelper.getRequiredAttachment(dep, JBossMetaData.class); final List<EJBMetaData> wsEjbsMD = new LinkedList<EJBMetaData>(); + final JBossWebservicesMetaData jbossWebservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); for (final JBossEnterpriseBeanMetaData jbossEjbMD : jbossMetaData.getEnterpriseBeans()) { - this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD); + this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebservicesMD); } ejbArchiveMD.setEnterpriseBeans(wsEjbsMD); @@ -83,7 +85,7 @@ * @param jbossEjbMD jboss specific EJB meta data */ private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, - final JBossEnterpriseBeanMetaData jbossEjbMD) + final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservicesMetaData jbossWebservicesMD) { final EJBMetaData wsEjbMD = newEjbMetaData(jbossEjbMD); @@ -106,19 +108,19 @@ wsEjbMD.setJndiName(sessionEjbMD.determineJndiName()); wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName()); - final PortComponent portComponentMD = sessionEjbMD.getPortComponent(); + final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); if (portComponentMD != null) { - // set port component meta data - wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); - wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); + // set port component meta data + wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); + wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); - // set security meta data - final EJBSecurityMetaData smd = new EJBSecurityMetaData(); - smd.setAuthMethod(portComponentMD.getAuthMethod()); - smd.setTransportGuarantee(portComponentMD.getTransportGuarantee()); - smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess()); - wsEjbMD.setSecurityMetaData(smd); + // set security meta data + final EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(portComponentMD.getAuthMethod()); + smd.setTransportGuarantee(portComponentMD.getTransportGuarantee()); + smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess()); + wsEjbMD.setSecurityMetaData(smd); } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -26,16 +26,16 @@ import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; -import org.jboss.metadata.javaee.spec.PortComponent; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.webservices.integration.WebServiceDeclaration; -import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; /** * Builds container independent meta data from EJB3 container meta data. @@ -65,12 +65,13 @@ final JBossMetaData jbossMetaData = WSHelper.getRequiredAttachment(dep, JBossMetaData.class); final WebServiceDeployment ejb3Deployment = WSHelper.getRequiredAttachment(dep, WebServiceDeployment.class); final List<EJBMetaData> wsEjbsMD = new LinkedList<EJBMetaData>(); + final JBossWebservicesMetaData jbossWebservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); for (final WebServiceDeclaration ejbEndpoint : ejb3Deployment.getServiceEndpoints()) { final String ejbName = ejbEndpoint.getComponentName(); final JBossEnterpriseBeanMetaData jbossEjbMD = jbossMetaData.getEnterpriseBean(ejbName); - this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD); + this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebservicesMD); } ejbArchiveMD.setEnterpriseBeans(wsEjbsMD); @@ -82,7 +83,7 @@ * @param wsEjbsMD jboss agnostic EJBs meta data * @param jbossEjbMD jboss specific EJB meta data */ - private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, final JBossEnterpriseBeanMetaData jbossEjbMD) + private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservicesMetaData jbossWebservicesMD) { log.debug("Creating JBoss agnostic EJB3 meta data for session bean: " + jbossEjbMD.getEjbClass()); final EJBMetaData wsEjbMD = new SLSBMetaData(); @@ -91,8 +92,7 @@ if (jbossEjbMD.isSession()) { - final JBossSessionBeanMetaData sessionEjbMD = (JBossSessionBeanMetaData) jbossEjbMD; - final PortComponent portComponentMD = sessionEjbMD.getPortComponent(); + final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); if (portComponentMD != null) { // set port component meta data Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -49,6 +49,7 @@ import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; /** * Builds container independent meta data from WEB container meta data. @@ -97,16 +98,20 @@ jseArchiveMD.setSecurityDomain(securityDomain); // set wsdl location resolver - final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(jbossWebMD.getWebserviceDescriptions()); - jseArchiveMD.setPublishLocationAdapter(resolver); + final JBossWebservicesMetaData jbossWebservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); + if (jbossWebservicesMD != null) + { + final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(jbossWebservicesMD.getWebserviceDescriptions()); + jseArchiveMD.setPublishLocationAdapter(resolver); + } + // set config name and file + this.setConfigNameAndFile(jseArchiveMD, jbossWebMD, jbossWebservicesMD); + // set security meta data final List<JSESecurityMetaData> jseSecurityMDs = this.getSecurityMetaData(jbossWebMD.getSecurityConstraints()); jseArchiveMD.setSecurityMetaData(jseSecurityMDs); - // set config name and file - this.setConfigNameAndFile(jseArchiveMD, jbossWebMD); - return jseArchiveMD; } @@ -116,16 +121,14 @@ * @param jseArchiveMD universal JSE meta data model * @param jbossWebMD jboss web meta data */ - private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD, final JBossWebMetaData jbossWebMD) + private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD, final JBossWebMetaData jbossWebMD, final JBossWebservicesMetaData jbossWebservicesMD) { - final WebserviceDescriptionsMetaData wsDescriptionsMD = jbossWebMD.getWebserviceDescriptions(); - final WebserviceDescriptionMetaData wsDescriptionMD = ASHelper.getWebserviceDescriptionMetaData(wsDescriptionsMD); - if (wsDescriptionMD != null) + if (jbossWebservicesMD != null) { - if (wsDescriptionMD.getConfigName() != null) + if (jbossWebservicesMD.getConfigName() != null) { - jseArchiveMD.setConfigName(wsDescriptionMD.getConfigName()); - jseArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile()); + jseArchiveMD.setConfigName(jbossWebservicesMD.getConfigName()); + jseArchiveMD.setConfigFile(jbossWebservicesMD.getConfigFile()); // ensure higher priority against web.xml context parameters return; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-10-31 15:28:04 UTC (rev 15177) @@ -21,9 +21,8 @@ */ package org.jboss.webservices.integration.metadata; -import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; -import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; /** * Publish location adapter implementation. @@ -34,17 +33,15 @@ final class PublishLocationAdapterImpl implements PublishLocationAdapter { /** Webservice descriptions meta data. */ - private final WebserviceDescriptionsMetaData wsDescriptionsMD; + private final WebserviceDescriptionMetaData[] wsDescriptionsMD; /** * Constructor. * * @param wsDescriptionsMD webservice descriptions meta data */ - PublishLocationAdapterImpl(final WebserviceDescriptionsMetaData wsDescriptionsMD) + PublishLocationAdapterImpl(final WebserviceDescriptionMetaData[] wsDescriptionsMD) { - super(); - this.wsDescriptionsMD = wsDescriptionsMD; } @@ -56,13 +53,12 @@ */ public String getWsdlPublishLocationByName(final String endpointName) { - if (this.wsDescriptionsMD != null) + if (wsDescriptionsMD != null) { - final WebserviceDescriptionMetaData endpointMD = this.wsDescriptionsMD.get(endpointName); - - if (endpointMD != null) + for (final WebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) { - return endpointMD.getWsdlPublishLocation(); + if (endpointName.equals(wsDescriptionMD.getWebserviceDescriptionName())) + return wsDescriptionMD.getWsdlPublishLocation(); } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-10-31 15:27:32 UTC (rev 15176) +++ container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-10-31 15:28:04 UTC (rev 15177) @@ -54,9 +54,12 @@ </bean>  - <bean name="WSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDescriptorDeployer"> + <bean name="WSWebservicesDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WebservicesDescriptorDeployer"> <incallback method="setParser"/> </bean> + <bean name="WSJBossWebservicesDescriptorDeployer" class="org.jboss.webservices.integration.deployers.JBossWebservicesDescriptorDeployer"> + <incallback method="setParser"/> + </bean> <bean name="WSEJBAdapterDeployer" class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15176 - in container/jboss60/branches/jbossws-jboss610/src/main: java/org/jboss/webservices/integration/deployers/deployment and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:27:32 -0400 (Mon, 31 Oct 2011) New Revision: 15176 Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java Removed: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml Log: [JBWS-3376] implemented jboss-webservices.xml parser and updated ASIL processing accordingly Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java (rev 0) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JBossWebservicesDescriptorDeployer.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -0,0 +1,53 @@ +/* + * 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.webservices.integration.deployers; + +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesDescriptorParser; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; + +/** + * jboss-webservices.xml deployer. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBossWebservicesDescriptorDeployer extends AbstractDescriptorDeployer<JBossWebservicesDescriptorParser, JBossWebservicesMetaData> +{ + + /** + * Constructor. + */ + public JBossWebservicesDescriptorDeployer() + { + super(JBossWebservicesMetaData.class); + } + + /** + * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. + * @param parser the parser + */ + @Override + public void setParser(final JBossWebservicesDescriptorParser parser) + { + super.setParser(parser); + } + +} Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -28,6 +28,7 @@ import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.webservices.integration.deployers.deployment.WSDeploymentBuilder; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -47,6 +48,7 @@ // inputs this.addInput(JBossWebMetaData.class); this.addInput(WebservicesMetaData.class); + this.addInput(JBossWebservicesMetaData.class); this.addInput(WebServiceDeployment.class); // outputs Deleted: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -1,53 +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.webservices.integration.deployers; - -import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * webservices.xml deployer. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData> -{ - - /** - * Constructor. - */ - public WSDescriptorDeployer() - { - super(WebservicesMetaData.class); - } - - /** - * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. - * @param parser the parser - */ - @Override - public void setParser(final WebservicesDescriptorParser parser) - { - super.setParser(parser); - } - -} Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java (rev 0) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WebservicesDescriptorDeployer.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -0,0 +1,53 @@ +/* + * 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.webservices.integration.deployers; + +import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * webservices.xml deployer. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class WebservicesDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData> +{ + + /** + * Constructor. + */ + public WebservicesDescriptorDeployer() + { + super(WebservicesMetaData.class); + } + + /** + * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. + * @param parser the parser + */ + @Override + public void setParser(final WebservicesDescriptorParser parser) + { + super.setParser(parser); + } + +} Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -29,6 +29,7 @@ import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.webservices.integration.WebServiceDeployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -60,6 +61,10 @@ final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -29,6 +29,7 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -59,6 +60,10 @@ { final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXRPC JSE endpoints meta data model"); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -29,6 +29,7 @@ import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.webservices.integration.WebServiceDeclaration; import org.jboss.webservices.integration.WebServiceDeployment; @@ -58,6 +59,10 @@ { this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -31,6 +31,7 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; /** * Creates new JAXWS JSE deployment. @@ -57,6 +58,10 @@ protected void build(final Deployment dep, final DeploymentUnit unit) { this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + if (unit.isAttachmentPresent(JBossWebservicesMetaData.class)) + { + this.getAndPropagateAttachment(JBossWebservicesMetaData.class, unit, dep); + } this.log.debug("Creating JAXWS JSE endpoints meta data model"); final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -21,19 +21,14 @@ */ package org.jboss.webservices.integration.metadata; -import java.util.Iterator; - import org.jboss.logging.Logger; -import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; -import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.ejb.jboss.WebservicesMetaData; -import org.jboss.webservices.integration.util.ASHelper; import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; -import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; /** * Common class for EJB meta data builders. @@ -86,67 +81,41 @@ */ private void buildWebservicesMetaData(final Deployment dep, final EJBArchiveMetaData ejbArchiveMD) { - final JBossMetaData jbossMD = WSHelper.getRequiredAttachment(dep, JBossMetaData.class); - final WebservicesMetaData webservicesMD = jbossMD.getWebservices(); + final JBossWebservicesMetaData webservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); - if (webservicesMD == null) - { - return; - } + if (webservicesMD == null) return; // set context root - String contextRoot = webservicesMD.getContextRoot(); - final WebserviceDescriptionsMetaData wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); - - if (wsDescriptionsMD != null) - { - // set wsdl location resolver - final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); - ejbArchiveMD.setPublishLocationAdapter(resolver); - - final WebserviceDescriptionMetaData wsDescriptionMD = ASHelper - .getWebserviceDescriptionMetaData(wsDescriptionsMD); - if (wsDescriptionMD != null) - { - if (contextRoot == null && !hasContextRoot(ejbArchiveMD)) - { - contextRoot = wsDescriptionMD.getWebserviceDescriptionName(); // TCK6 fallback - } - - final String configName = wsDescriptionMD.getConfigName(); - final String configFile = wsDescriptionMD.getConfigFile(); - - // set config name - this.log.debug("Setting config name: " + configName); - ejbArchiveMD.setConfigName(wsDescriptionMD.getConfigName()); - - // set config file - this.log.debug("Setting config file: " + configFile); - ejbArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile()); - } - } - + final String contextRoot = webservicesMD.getContextRoot(); ejbArchiveMD.setWebServiceContextRoot(contextRoot); this.log.debug("Setting context root: " + contextRoot); + + // set config name + final String configName = webservicesMD.getConfigName(); + this.log.debug("Setting config name: " + configName); + ejbArchiveMD.setConfigName(configName); + + // set config file + final String configFile = webservicesMD.getConfigFile(); + this.log.debug("Setting config file: " + configFile); + ejbArchiveMD.setConfigFile(configFile); + + // set wsdl location resolver + final WebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); + final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); + ejbArchiveMD.setPublishLocationAdapter(resolver); } - /** - * Returns true if has context root, false otherwise. - * - * @param ejbArchiveMD ejb archive MD - * @return true if has context root, false otherwise - */ - private boolean hasContextRoot(final EJBArchiveMetaData ejbArchiveMD) - { - for (final Iterator<EJBMetaData> ejbMDs = ejbArchiveMD.getEnterpriseBeans(); ejbMDs.hasNext(); ) - { - final EJBMetaData ejbMD = ejbMDs.next(); - if (ejbMD.getPortComponentURI() != null) - { - return true; - } - } + protected PortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { + if (jbossWebservicesMD == null) return null; - return false; + PortComponentMetaData portComponentMD = null; + for (final WebserviceDescriptionMetaData webserviceDescriptionMD : jbossWebservicesMD.getWebserviceDescriptions()) { + portComponentMD = webserviceDescriptionMD.getPortComponentByEjbLinkName(ejbName); + if (portComponentMD != null) return portComponentMD; + } + + return null; } + } Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -27,13 +27,14 @@ import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; -import org.jboss.metadata.javaee.spec.PortComponent; import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; /** * Builds container independent meta data from EJB21 container meta data. @@ -63,10 +64,11 @@ { final JBossMetaData jbossMetaData = WSHelper.getRequiredAttachment(dep, JBossMetaData.class); final List<EJBMetaData> wsEjbsMD = new LinkedList<EJBMetaData>(); + final JBossWebservicesMetaData jbossWebservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); for (final JBossEnterpriseBeanMetaData jbossEjbMD : jbossMetaData.getEnterpriseBeans()) { - this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD); + this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebservicesMD); } ejbArchiveMD.setEnterpriseBeans(wsEjbsMD); @@ -83,7 +85,7 @@ * @param jbossEjbMD jboss specific EJB meta data */ private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, - final JBossEnterpriseBeanMetaData jbossEjbMD) + final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservicesMetaData jbossWebservicesMD) { final EJBMetaData wsEjbMD = newEjbMetaData(jbossEjbMD); @@ -106,19 +108,19 @@ wsEjbMD.setJndiName(sessionEjbMD.determineJndiName()); wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName()); - final PortComponent portComponentMD = sessionEjbMD.getPortComponent(); + final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); if (portComponentMD != null) { - // set port component meta data - wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); - wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); + // set port component meta data + wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); + wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); - // set security meta data - final EJBSecurityMetaData smd = new EJBSecurityMetaData(); - smd.setAuthMethod(portComponentMD.getAuthMethod()); - smd.setTransportGuarantee(portComponentMD.getTransportGuarantee()); - smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess()); - wsEjbMD.setSecurityMetaData(smd); + // set security meta data + final EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(portComponentMD.getAuthMethod()); + smd.setTransportGuarantee(portComponentMD.getTransportGuarantee()); + smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess()); + wsEjbMD.setSecurityMetaData(smd); } } Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -26,16 +26,16 @@ import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; -import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; -import org.jboss.metadata.javaee.spec.PortComponent; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.webservices.integration.WebServiceDeclaration; -import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; /** * Builds container independent meta data from EJB3 container meta data. @@ -65,12 +65,13 @@ final JBossMetaData jbossMetaData = WSHelper.getRequiredAttachment(dep, JBossMetaData.class); final WebServiceDeployment ejb3Deployment = WSHelper.getRequiredAttachment(dep, WebServiceDeployment.class); final List<EJBMetaData> wsEjbsMD = new LinkedList<EJBMetaData>(); + final JBossWebservicesMetaData jbossWebservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); for (final WebServiceDeclaration ejbEndpoint : ejb3Deployment.getServiceEndpoints()) { final String ejbName = ejbEndpoint.getComponentName(); final JBossEnterpriseBeanMetaData jbossEjbMD = jbossMetaData.getEnterpriseBean(ejbName); - this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD); + this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebservicesMD); } ejbArchiveMD.setEnterpriseBeans(wsEjbsMD); @@ -82,7 +83,7 @@ * @param wsEjbsMD jboss agnostic EJBs meta data * @param jbossEjbMD jboss specific EJB meta data */ - private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, final JBossEnterpriseBeanMetaData jbossEjbMD) + private void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, final JBossEnterpriseBeanMetaData jbossEjbMD, final JBossWebservicesMetaData jbossWebservicesMD) { log.debug("Creating JBoss agnostic EJB3 meta data for session bean: " + jbossEjbMD.getEjbClass()); final EJBMetaData wsEjbMD = new SLSBMetaData(); @@ -91,8 +92,7 @@ if (jbossEjbMD.isSession()) { - final JBossSessionBeanMetaData sessionEjbMD = (JBossSessionBeanMetaData) jbossEjbMD; - final PortComponent portComponentMD = sessionEjbMD.getPortComponent(); + final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); if (portComponentMD != null) { // set port component meta data Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -49,6 +49,7 @@ import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; /** * Builds container independent meta data from WEB container meta data. @@ -97,16 +98,20 @@ jseArchiveMD.setSecurityDomain(securityDomain); // set wsdl location resolver - final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(jbossWebMD.getWebserviceDescriptions()); - jseArchiveMD.setPublishLocationAdapter(resolver); + final JBossWebservicesMetaData jbossWebservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); + if (jbossWebservicesMD != null) + { + final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(jbossWebservicesMD.getWebserviceDescriptions()); + jseArchiveMD.setPublishLocationAdapter(resolver); + } + // set config name and file + this.setConfigNameAndFile(jseArchiveMD, jbossWebMD, jbossWebservicesMD); + // set security meta data final List<JSESecurityMetaData> jseSecurityMDs = this.getSecurityMetaData(jbossWebMD.getSecurityConstraints()); jseArchiveMD.setSecurityMetaData(jseSecurityMDs); - // set config name and file - this.setConfigNameAndFile(jseArchiveMD, jbossWebMD); - return jseArchiveMD; } @@ -116,16 +121,14 @@ * @param jseArchiveMD universal JSE meta data model * @param jbossWebMD jboss web meta data */ - private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD, final JBossWebMetaData jbossWebMD) + private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD, final JBossWebMetaData jbossWebMD, final JBossWebservicesMetaData jbossWebservicesMD) { - final WebserviceDescriptionsMetaData wsDescriptionsMD = jbossWebMD.getWebserviceDescriptions(); - final WebserviceDescriptionMetaData wsDescriptionMD = ASHelper.getWebserviceDescriptionMetaData(wsDescriptionsMD); - if (wsDescriptionMD != null) + if (jbossWebservicesMD != null) { - if (wsDescriptionMD.getConfigName() != null) + if (jbossWebservicesMD.getConfigName() != null) { - jseArchiveMD.setConfigName(wsDescriptionMD.getConfigName()); - jseArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile()); + jseArchiveMD.setConfigName(jbossWebservicesMD.getConfigName()); + jseArchiveMD.setConfigFile(jbossWebservicesMD.getConfigFile()); // ensure higher priority against web.xml context parameters return; Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-10-31 15:27:32 UTC (rev 15176) @@ -21,9 +21,8 @@ */ package org.jboss.webservices.integration.metadata; -import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData; -import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; /** * Publish location adapter implementation. @@ -34,17 +33,15 @@ final class PublishLocationAdapterImpl implements PublishLocationAdapter { /** Webservice descriptions meta data. */ - private final WebserviceDescriptionsMetaData wsDescriptionsMD; + private final WebserviceDescriptionMetaData[] wsDescriptionsMD; /** * Constructor. * * @param wsDescriptionsMD webservice descriptions meta data */ - PublishLocationAdapterImpl(final WebserviceDescriptionsMetaData wsDescriptionsMD) + PublishLocationAdapterImpl(final WebserviceDescriptionMetaData[] wsDescriptionsMD) { - super(); - this.wsDescriptionsMD = wsDescriptionsMD; } @@ -56,13 +53,12 @@ */ public String getWsdlPublishLocationByName(final String endpointName) { - if (this.wsDescriptionsMD != null) + if (wsDescriptionsMD != null) { - final WebserviceDescriptionMetaData endpointMD = this.wsDescriptionsMD.get(endpointName); - - if (endpointMD != null) + for (final WebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) { - return endpointMD.getWsdlPublishLocation(); + if (endpointName.equals(wsDescriptionMD.getWebserviceDescriptionName())) + return wsDescriptionMD.getWsdlPublishLocation(); } } Modified: container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-10-31 15:26:50 UTC (rev 15175) +++ container/jboss60/branches/jbossws-jboss610/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-10-31 15:27:32 UTC (rev 15176) @@ -54,9 +54,12 @@ </bean>  - <bean name="WSDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDescriptorDeployer"> + <bean name="WSWebservicesDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WebservicesDescriptorDeployer"> <incallback method="setParser"/> </bean> + <bean name="WSJBossWebservicesDescriptorDeployer" class="org.jboss.webservices.integration.deployers.JBossWebservicesDescriptorDeployer"> + <incallback method="setParser"/> + </bean> <bean name="WSEJBAdapterDeployer" class="org.jboss.webservices.integration.deployers.WSEJBAdapterDeployer"/>

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15175 - common/trunk/src/main/java/org/jboss/ws/common/deployment.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:26:50 -0400 (Mon, 31 Oct 2011) New Revision: 15175 Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java Log: [JBWS-3376] implemented jboss-webservices.xml parser Added: common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java (rev 0) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/JBossWebservicesDescriptorParserImpl.java 2011-10-31 15:26:50 UTC (rev 15175) @@ -0,0 +1,60 @@ +/* + * 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.ws.common.deployment; + +import java.net.URL; + +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesDescriptorParser; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesFactory; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; + +/** + * JBoss Webservices descriptor parser implementation. + * + * @author <a href="ropalka(a)redhat.com">Richard Opalka</a> + */ +public final class JBossWebservicesDescriptorParserImpl implements JBossWebservicesDescriptorParser +{ + private String descriptorName; + + @Override + public String getDescriptorName() + { + return this.descriptorName; + } + + /** + * Invoked via MC. + * @param descriptorName + */ + public void setDescriptorName(final String descriptorName) + { + this.descriptorName = descriptorName; + } + + @Override + public JBossWebservicesMetaData parse(URL url) + { + return JBossWebservicesFactory.load(url); + } + +}

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15174 - in spi/trunk/src/main/java/org/jboss/wsf/spi/metadata: webservices and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:26:08 -0400 (Mon, 31 Oct 2011) New Revision: 15174 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java Log: [JBWS-3376] implemented jboss-webservices.xml parser Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -30,10 +30,15 @@ */ public abstract class ParserConstants { + public static final String JAVAEE_NS = "http://java.sun.com/xml/ns/javaee"; + public static final String JBOSSEE_NS = "http://www.jboss.com/xml/ns/javaee"; + public static final String J2EE_NS = "http://java.sun.com/xml/ns/j2ee"; + public static final String AUTH_METHOD = "auth-method"; + public static final String CHAIN_PORT_PATTERN = "port-name-pattern"; public static final String CHAIN_PROTOCOL_BINDING = "protocol-bindings"; @@ -70,10 +75,14 @@ public static final String WSDL_FILE = "wsdl-file"; + public static final String WSDL_PUBLISH_LOCATION = "wsdl-publish-location"; + public static final String PORT_COMPONENT = "port-component"; public static final String PORT_COMPONENT_NAME = "port-component-name"; + public static final String PORT_COMPONENT_URI = "port-component-uri"; + public static final String WSDL_SERVICE = "wsdl-service"; public static final String WSDL_PORT = "wsdl-port"; @@ -112,19 +121,28 @@ public static final String CONFIG_NAME = "config-name"; + public static final String CONFIG_FILE = "config-file"; + + public static final String CONTEXT_ROOT = "context-root"; + public static final String PRE_HANDLER_CHAINS = "pre-handler-chains"; public static final String POST_HANDLER_CHAINS = "post-handler-chains"; public static final String FEATURE = "feature"; + public static final String FEATURE_DATA = "feature-data"; + + public static final String FEATURE_NAME = "feature-name"; + public static final String PROPERTY = "property"; public static final String PROPERTY_NAME = "property-name"; public static final String PROPERTY_VALUE = "property-value"; + + public static final String SECURE_WSDL_ACCESS = "secure-wsdl-access"; - public static final String FEATURE_NAME = "feature-name"; + public static final String TRANSPORT_GUARANTEE = "transport-guarantee"; - public static final String FEATURE_DATA = "feature-data"; } Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -0,0 +1,33 @@ +/* + * 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.wsf.spi.metadata.webservices; + +import org.jboss.wsf.spi.metadata.DescriptorParser; + +/** + * Parser for WS UMDM. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public interface JBossWebservicesDescriptorParser extends DescriptorParser<JBossWebservicesMetaData> +{ +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -0,0 +1,228 @@ +/* + * 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.spi.metadata.webservices; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; +import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; +import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_FILE; +import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_NAME; +import static org.jboss.wsf.spi.metadata.ParserConstants.CONTEXT_ROOT; +import static org.jboss.wsf.spi.metadata.ParserConstants.JBOSSEE_NS; +import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES; +import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION; +import static org.jboss.wsf.spi.util.StAXUtils.elementAsString; +import static org.jboss.wsf.spi.util.StAXUtils.match; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ResourceBundle; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.ws.WebServiceException; + +import org.jboss.ws.api.util.BundleUtils; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.util.StAXUtils; + +/** + * A JBossXB factory for {@link JBossWebservicesMetaData} + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBossWebservicesFactory extends WebservicesFactory +{ + private static final ResourceBundle bundle = BundleUtils.getBundle(JBossWebservicesFactory.class); + + public JBossWebservicesFactory(URL descriptorURL) + { + super(descriptorURL); + } + + /** + * Load jboss-webservices.xml from <code>META-INF/jboss-webservices.xml</code> + * or <code>WEB-INF/jboss-webservices.xml</code>. + * + * @param root virtual file root + * @return JBossWebservicesMetaData or <code>null</code> if it cannot be found + */ + public static WebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile root) + { + WebservicesMetaData webservices = null; + + UnifiedVirtualFile wsdd = null; + try + { + wsdd = root.findChild("META-INF/jboss-webservices.xml"); + } + catch (IOException e) + { + // + } + + // Maybe a web application deployment? + if (null == wsdd) + { + try + { + wsdd = root.findChild("WEB-INF/jboss-webservices.xml"); + } + catch (IOException e) + { + // + } + } + + // the descriptor is optional + if (wsdd != null) + { + return load(wsdd.toURL()); + } + + return webservices; + } + + public static JBossWebservicesMetaData load(URL wsddUrl) + { + InputStream is = null; + try + { + is = wsddUrl.openStream(); + XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return parse(xmlr, wsddUrl); + } + catch (Exception e) + { + throw new WebServiceException(BundleUtils.getMessage(bundle, "FAILED_TO_UNMARSHALL", wsddUrl), e); + } + finally + { + try + { + if (is != null) is.close(); + } + catch (IOException e) {} //ignore + } + } + + public static JBossWebservicesMetaData parse(InputStream is) + { + return parse(is, null); + } + + public static JBossWebservicesMetaData parse(InputStream is, URL descriptorURL) + { + try + { + XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return parse(xmlr, descriptorURL); + } + catch (Exception e) + { + throw new WebServiceException(e); + } + } + + public static JBossWebservicesMetaData parse(XMLStreamReader reader) throws XMLStreamException + { + return parse(reader, null); + } + + private static JBossWebservicesMetaData parse(XMLStreamReader reader, URL descriptorURL) throws XMLStreamException + { + int iterate; + try + { + iterate = reader.nextTag(); + } + catch (XMLStreamException e) + { + // skip non-tag elements + iterate = reader.nextTag(); + } + JBossWebservicesMetaData metadata = null; + switch (iterate) + { + case END_ELEMENT : { + // we're done + break; + } + case START_ELEMENT : { + + if (match(reader, JBOSSEE_NS, WEBSERVICES)) + { + String nsUri = reader.getNamespaceURI(); + JBossWebservicesFactory factory = new JBossWebservicesFactory(descriptorURL); + metadata = factory.parseWebservices(reader, nsUri, descriptorURL); + } + else + { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName())); + } + } + } + return metadata; + } + + private JBossWebservicesMetaData parseWebservices(XMLStreamReader reader, String nsUri, URL descriptorURL) throws XMLStreamException + { + JBossWebservicesMetaData metadata = new JBossWebservicesMetaData(descriptorURL); + while (reader.hasNext()) + { + switch (reader.nextTag()) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, nsUri, WEBSERVICES)) + { + return metadata; + } + else + { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", reader.getLocalName())); + } + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, nsUri, CONTEXT_ROOT)) { + metadata.setContextRoot(elementAsString(reader)); + } + else if (match(reader, nsUri, CONFIG_NAME)) { + metadata.setConfigName(elementAsString(reader)); + } + else if (match(reader, nsUri, CONFIG_FILE)) { + metadata.setConfigFile(elementAsString(reader)); + } + else if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) { + metadata.addWebserviceDescription(super.parseWebserviceDescription(reader, nsUri, metadata)); + } + else + { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName())); + } + } + } + } + throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); + } + +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., 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.spi.metadata.webservices; + +import java.net.URL; + +/** + * XML Binding root element for <code>jboss-webservices.xml</code> + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBossWebservicesMetaData extends WebservicesMetaData +{ + + private String contextRoot; + + private String configName; + + private String configFile; + + public JBossWebservicesMetaData() + { + super(); + } + + public JBossWebservicesMetaData(final URL descriptorURL) + { + super(descriptorURL); + } + + public String getContextRoot() + { + return contextRoot; + } + + public void setContextRoot(String contextRoot) + { + this.contextRoot = contextRoot; + } + + 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: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -62,6 +62,12 @@ * This name must be unique amongst all port component names in a module. */ private String portComponentName; + // The optional <port-component-uri> + private String portComponentURI; + // The optional <auth-method> + private String authMethod; + // The optional <transport-guarantee> + private String transportGuarantee; // The required <wsdl-port> element private QName wsdlPort; // The required <service-endpoint-interface> element @@ -117,6 +123,36 @@ this.portComponentName = portComponentName; } + public String getPortComponentURI() + { + return portComponentURI; + } + + public void setPortComponentURI(String portComponentURI) + { + this.portComponentURI = portComponentURI; + } + + public String getAuthMethod() + { + return authMethod; + } + + public void setAuthMethod(String authMethod) + { + this.authMethod = authMethod; + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + public QName getWsdlPort() { return wsdlPort; Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -55,7 +55,19 @@ private String jaxrpcMappingFile; // The required <port-component> elements private ArrayList<PortComponentMetaData> portComponents = new ArrayList<PortComponentMetaData>(); + // The optional <wsdl-publish-location> element + private String wsdlPublishLocation; + public String getWsdlPublishLocation() + { + return wsdlPublishLocation; + } + + public void setWsdlPublishLocation(String wsdlPublishLocation) + { + this.wsdlPublishLocation = wsdlPublishLocation; + } + public WebserviceDescriptionMetaData(WebservicesMetaData webservices) { this.webservices = webservices; @@ -120,6 +132,16 @@ return null; } + public PortComponentMetaData getPortComponentByEjbLinkName(String ejbName) + { + for (PortComponentMetaData pc : portComponents) + { + if (ejbName.equals(pc.getEjbLink())) return pc; + } + + return null; + } + public String getWebserviceDescriptionName() { return webserviceDescriptionName; Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -25,6 +25,7 @@ import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING; import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING_RESPONSES; +import static org.jboss.wsf.spi.metadata.ParserConstants.AUTH_METHOD; import static org.jboss.wsf.spi.metadata.ParserConstants.EJB_LINK; import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLED; import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLE_MTOM; @@ -36,16 +37,20 @@ import static org.jboss.wsf.spi.metadata.ParserConstants.MTOM_THRESHOLD; import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT; import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_NAME; +import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_URI; import static org.jboss.wsf.spi.metadata.ParserConstants.PROTOCOL_BINDING; import static org.jboss.wsf.spi.metadata.ParserConstants.REQUIRED; import static org.jboss.wsf.spi.metadata.ParserConstants.RESPECT_BINDING; +import static org.jboss.wsf.spi.metadata.ParserConstants.SECURE_WSDL_ACCESS; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_ENDPOINT_INTERFACE; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_IMPL_BEAN; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVLET_LINK; +import static org.jboss.wsf.spi.metadata.ParserConstants.TRANSPORT_GUARANTEE; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION_NAME; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_FILE; +import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PUBLISH_LOCATION; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PORT; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_SERVICE; import static org.jboss.wsf.spi.util.StAXUtils.elementAsBoolean; @@ -242,7 +247,7 @@ throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); } - private WebserviceDescriptionMetaData parseWebserviceDescription(XMLStreamReader reader, String nsUri, WebservicesMetaData wsMetaData) throws XMLStreamException + WebserviceDescriptionMetaData parseWebserviceDescription(XMLStreamReader reader, String nsUri, WebservicesMetaData wsMetaData) throws XMLStreamException { WebserviceDescriptionMetaData description = new WebserviceDescriptionMetaData(wsMetaData); while (reader.hasNext()) @@ -266,9 +271,12 @@ else if (match(reader, nsUri, WSDL_FILE)) { description.setWsdlFile(elementAsString(reader)); } + else if (match(reader, nsUri, WSDL_PUBLISH_LOCATION)) { + description.setWsdlPublishLocation(elementAsString(reader)); + } else if (match(reader, nsUri, JAXRPC_MAPPING_FILE)) { - description.setJaxrpcMappingFile(elementAsString(reader)); - } + description.setJaxrpcMappingFile(elementAsString(reader)); + } else if (match(reader, nsUri, PORT_COMPONENT)) { description.addPortComponent(parsePortComponent(reader, nsUri, description)); } @@ -303,12 +311,24 @@ if (match(reader, nsUri, PORT_COMPONENT_NAME)) { pc.setPortComponentName(elementAsString(reader)); } + else if (match(reader, nsUri, PORT_COMPONENT_URI)) { + pc.setPortComponentURI(elementAsString(reader)); + } + else if (match(reader, nsUri, AUTH_METHOD)) { + pc.setAuthMethod(elementAsString(reader)); + } + else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) { + pc.setTransportGuarantee(elementAsString(reader)); + } else if (match(reader, nsUri, WSDL_SERVICE)) { pc.setWsdlService(elementAsQName(reader)); } else if (match(reader, nsUri, WSDL_PORT)) { pc.setWsdlPort(elementAsQName(reader)); } + else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) { + pc.setSecureWSDLAccess(elementAsBoolean(reader)); + } else if (match(reader, nsUri, ENABLE_MTOM)) { pc.setMtomEnabled(elementAsBoolean(reader)); }

13 years, 1 month

1
0
0 / 0

JBossWS SVN: r15173 - in thirdparty/cxf/branches/cxf-2.2.12: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2011-10-28 15:49:55 -0400 (Fri, 28 Oct 2011) New Revision: 15173 Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest.java thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Log: [JBPAPP-7452] soap:address rewrite from Spring configuration Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java 2011-10-28 11:10:44 UTC (rev 15172) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java 2011-10-28 19:49:55 UTC (rev 15173) @@ -57,6 +57,7 @@ import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.XMLUtils; +import org.apache.cxf.message.MessageUtils; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.transports.http.StemMatchingQueryHandler; @@ -294,10 +295,10 @@ LOG, base), e); } - - Boolean rewriteSoapAddress = ei.getProperty("autoRewriteSoapAddress", Boolean.class); - - if (rewriteSoapAddress != null && rewriteSoapAddress.booleanValue()) { + + Object rewriteSoapAddress = ei.getProperty("autoRewriteSoapAddress"); + + if (rewriteSoapAddress != null && MessageUtils.isTrue(rewriteSoapAddress)) { List<Element> serviceList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(), "http://schemas.xmlsoap.org/wsdl/", "service"); Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java 2011-10-28 11:10:44 UTC (rev 15172) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java 2011-10-28 19:49:55 UTC (rev 15173) @@ -27,6 +27,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; +import java.util.Map.Entry; import java.util.concurrent.Executor; import java.util.logging.Logger; @@ -317,6 +318,14 @@ // TODO is there a good place to put this key-string as a constant? endpointInfo.setProperty("publishedEndpointUrl", publishedEndpointUrl); } + + if (null != properties) { + for (Entry<String, Object> entry : properties.entrySet()) { + endpointInfo.setProperty(entry.getKey(), entry.getValue()); + } + System.err.println("\n\n"); + } + this.address = endpointInfo.getAddress(); } serv.start(); Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/AbstractSpringConfiguredAutoRewriteSoapAddressTest.java 2011-10-28 19:49:55 UTC (rev 15173) @@ -0,0 +1,64 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.systest.handlers; + +import java.net.URL; +import java.net.URLConnection; +import java.util.LinkedList; +import java.util.List; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.test.AbstractCXFSpringTest; + +/** + * + */ +public abstract class AbstractSpringConfiguredAutoRewriteSoapAddressTest extends AbstractCXFSpringTest { + + private Document retrieveWsdlDocument(String hostname, String port) throws Exception { + URL wsdlUrlLocalhost = new URL("http://" + hostname + ":" + port + "/SpringEndpoint?wsdl"); + URLConnection urlConnection = wsdlUrlLocalhost.openConnection(); + return DOMUtils.readXml(urlConnection.getInputStream()); + } + + protected List<String> findAllServiceUrlsFromWsdl(String hostname, String port) throws Exception { + Document wsdlDocument = retrieveWsdlDocument(hostname, port); + List<String> serviceUrls = new LinkedList<String>(); + List<Element> serviceList = DOMUtils.findAllElementsByTagNameNS(wsdlDocument.getDocumentElement(), + "http://schemas.xmlsoap.org/wsdl/", + "service"); + for (Element serviceEl : serviceList) { + List<Element> portList = DOMUtils.findAllElementsByTagNameNS(serviceEl, + "http://schemas.xmlsoap.org/wsdl/", + "port"); + for (Element portEl : portList) { + List<Element> addressList = DOMUtils.findAllElementsByTagNameNS(portEl, + "http://schemas.xmlsoap.org/wsdl/soap/", + "address"); + for (Element addressEl : addressList) { + serviceUrls.add(addressEl.getAttribute("location")); + } + } + } + return serviceUrls; + } + +} Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredAutoRewriteSoapAddressTest.java 2011-10-28 19:49:55 UTC (rev 15173) @@ -0,0 +1,62 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.systest.handlers; + +import java.util.List; + +import org.apache.cxf.testutil.common.TestUtil; +import org.apache.handlers.AddNumbers; +import org.junit.Test; + +/** + * + */ +public class SpringConfiguredAutoRewriteSoapAddressTest + extends AbstractSpringConfiguredAutoRewriteSoapAddressTest { + static String port = TestUtil.getPortNumber("springportAutoRewriteSoapAddressTest"); + + @Override + protected String[] getConfigLocations() { + return new String[] {"classpath:/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml" }; + } + + @Test + public void testWsdlAddress() throws Exception { + System.err.println("portNumber: " + port); + System.err.println(getApplicationContext().getBean("cxfHandlerTestEndpoint"). + getClass().toString()); + + AddNumbers addNumbers = (AddNumbers)getApplicationContext().getBean("cxfHandlerTestClientEndpoint", + AddNumbers.class); + + int r = addNumbers.addNumbers(10, 15); + assertEquals(1015, r); + + + List<String> serviceUrls = findAllServiceUrlsFromWsdl("localhost", port); + assertEquals(1, serviceUrls.size()); + assertEquals("http://localhost:" + port + "/SpringEndpoint", serviceUrls.get(0)); + + serviceUrls = findAllServiceUrlsFromWsdl("127.0.0.1", port); + assertEquals(1, serviceUrls.size()); + assertEquals("http://127.0.0.1:" + port + "/SpringEndpoint", serviceUrls.get(0)); + + } +} Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/SpringConfiguredNoAutoRewriteSoapAddressTest.java 2011-10-28 19:49:55 UTC (rev 15173) @@ -0,0 +1,64 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.systest.handlers; + +import java.util.List; + +import org.apache.cxf.testutil.common.TestUtil; +import org.apache.handlers.AddNumbers; +import org.junit.Test; + +/** + * + */ +public class SpringConfiguredNoAutoRewriteSoapAddressTest + extends AbstractSpringConfiguredAutoRewriteSoapAddressTest { + static String port = TestUtil.getPortNumber("springportNoAutoRewriteSoapAddressTest"); + + @Override + protected String[] getConfigLocations() { + return new String[] + {"classpath:/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml" }; + } + + @Test + public void testWsdlAddress() throws Exception { + System.err.println("portNumber: " + port); + System.err.println(getApplicationContext().getBean("cxfHandlerTestEndpoint"). + getClass().toString()); + + AddNumbers addNumbers = (AddNumbers)getApplicationContext().getBean("cxfHandlerTestClientEndpoint", + AddNumbers.class); + + int r = addNumbers.addNumbers(10, 15); + assertEquals(1015, r); + + + List<String> serviceUrls = findAllServiceUrlsFromWsdl("localhost", port); + assertEquals(1, serviceUrls.size()); + assertEquals("http://localhost:" + port + "/SpringEndpoint", serviceUrls.get(0)); + + serviceUrls = findAllServiceUrlsFromWsdl("127.0.0.1", port); + assertEquals(1, serviceUrls.size()); + assertEquals("http://localhost:" + port + "/SpringEndpoint", serviceUrls.get(0)); + + } + +} Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_autoRewriteSoapAddress.xml 2011-10-28 19:49:55 UTC (rev 15173) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xmlns:jaxws="http://cxf.apache.org/jaxws" +xmlns:cxf="http://cxf.apache.org/core" +xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd +http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd +http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> +<import resource="classpath:META-INF/cxf/cxf.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" /> + + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + + <jaxws:endpoint id="cxfHandlerTestEndpoint" + implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" + address="http://localhost:${testutil.ports.springportAutoRewriteSoapAddressTest}/S..."> + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + <jaxws:properties> + <entry key="autoRewriteSoapAddress" value="true"/> + </jaxws:properties> + </jaxws:endpoint> + <jaxws:server id="cxfHandlerTestServer" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportAutoRewriteSoapAddressTest}/S..."> + <jaxws:serviceBean> + <bean class="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" /> + </jaxws:serviceBean> + + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + </jaxws:server> + + <jaxws:client id="cxfHandlerTestClientEndpoint" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportAutoRewriteSoapAddressTest}/S..."> + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + </jaxws:client> + <jaxws:client id="cxfHandlerTestClientEndpointNoHandler" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportAutoRewriteSoapAddressTest}/S..."> + </jaxws:client> + <jaxws:client id="cxfHandlerTestClientServer" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportAutoRewriteSoapAddressTest}/S..."> + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + </jaxws:client> + +</beans> Added: thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.2.12/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/beans_no_autoRewriteSoapAddress.xml 2011-10-28 19:49:55 UTC (rev 15173) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xmlns:jaxws="http://cxf.apache.org/jaxws" +xmlns:cxf="http://cxf.apache.org/core" +xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd +http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd +http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> +<import resource="classpath:META-INF/cxf/cxf.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> +<import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" /> + + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + + <jaxws:endpoint id="cxfHandlerTestEndpoint" + implementor="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" + address="http://localhost:${testutil.ports.springportNoAutoRewriteSoapAddressTest}..."> + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + </jaxws:endpoint> + <jaxws:server id="cxfHandlerTestServer" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportNoAutoRewriteSoapAddressTest}..."> + <jaxws:serviceBean> + <bean class="org.apache.cxf.systest.handlers.AddNumbersNoHandlers" /> + </jaxws:serviceBean> + + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + </jaxws:server> + + <jaxws:client id="cxfHandlerTestClientEndpoint" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportNoAutoRewriteSoapAddressTest}..."> + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + </jaxws:client> + <jaxws:client id="cxfHandlerTestClientEndpointNoHandler" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportNoAutoRewriteSoapAddressTest}..."> + </jaxws:client> + <jaxws:client id="cxfHandlerTestClientServer" + serviceClass="org.apache.handlers.AddNumbers" + address="http://localhost:${testutil.ports.springportNoAutoRewriteSoapAddressTest}..."> + <jaxws:handlers> + <bean class="org.apache.cxf.systest.handlers.ModifyNumberHandler"/> + </jaxws:handlers> + </jaxws:client> + +</beans>

13 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 October 2011