Author: richard.opalka(a)jboss.com Date: 2011-11-07 09:04:15 -0500 (Mon, 07 Nov 2011) New Revision: 15202 Modified: 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/secureejb/META-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-webservices.xml Log: [JBWS-3376] refactoring jboss-webservices.xml file format Modified: 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 2011-11-07 14:00:31 UTC (rev 15201) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml 2011-11-07 14:04:15 UTC (rev 15202) @@ -7,15 +7,10 @@ <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> + <port-component> + <ejb-name>TestService</ejb-name> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + </port-component> </webservices> Modified: 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 2011-11-07 14:00:31 UTC (rev 15201) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml 2011-11-07 14:04:15 UTC (rev 15202) @@ -7,16 +7,15 @@ <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> + <port-component> + <ejb-name>TestService</ejb-name> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + </port-component> + <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> Modified: 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 2011-11-07 14:00:31 UTC (rev 15201) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml 2011-11-07 14:04:15 UTC (rev 15202) @@ -7,34 +7,28 @@ <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> + <port-component> + <ejb-name>RoleSecuredSLSB</ejb-name> + <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> + <port-component> + <ejb-name>BasicSecuredSLSB</ejb-name> + <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> + + <port-component> + <ejb-name>ConfidentialSLSB</ejb-name> + <port-component-name>ConfidentialSecured</port-component-name> + <port-component-uri>/ConfidentialSecured</port-component-uri> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </port-component> + </webservices> + Modified: 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 2011-11-07 14:00:31 UTC (rev 15201) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws2241/META-INF/jboss-webservices.xml 2011-11-07 14:04:15 UTC (rev 15202) @@ -7,18 +7,14 @@ <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> + <port-component> + <ejb-name>EJB3Bean</ejb-name> + <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> </webservices> +