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"> + + <!-- contains both <context-root> and <port-component-uri> --> + <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"> -<!-- contains a <context-root> but no <port-component-uri> --> - <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"> + + <!-- contains a <context-root> but no <port-component-uri> --> + + <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"> -<!-- contains a <context-root> but no <port-component-uri> --> - <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"> + + <!-- contains no <context-root> but a <port-component-uri> --> + + <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"> -<!-- contains no <context-root> but a <port-component-uri> --> - <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> + <!-- default secure-wsdl-access (false for jaxrpc) --> + <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> - <!-- default secure-wsdl-access (false for jaxrpc) --> - </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>