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>