Author: richard.opalka(a)jboss.com Date: 2011-11-07 09:08:07 -0500 (Mon, 07 Nov 2011) New Revision: 15203 Modified: stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd 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/jbws165/META-INF-both/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/jbws723/META-INF/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/secureejb/META-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/jaxws/jbws1309/META-INF/jboss-webservices.xml Log: [JBWS-3376] refactoring jboss-webservices.xml file format Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/core/src/main/resources/schema/jboss_web_services_1.0.xsd 2011-11-07 14:08:07 UTC (rev 15203) @@ -14,34 +14,28 @@ <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:element name="port-component" type="jboss:portComponentType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="webservice-description" type="jboss:webservice-descriptionType" minOccurs="0" 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="ejb-name" type="xsd:token"/> <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 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:schema> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/doclit/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -5,15 +5,10 @@ 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> + <port-component> + <ejb-name>BenchmarkDocLit</ejb-name> + <port-component-name>BenchmarkDocLitEJBWS</port-component-name> + <port-component-uri>/jaxrpc-benchmark-doc-ejb/*</port-component-uri> + </port-component> </webservices> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/benchmark/jaxrpc/rpclit/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -5,15 +5,10 @@ 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> + <port-component> + <ejb-name>BenchmarkRpcLit</ejb-name> + <port-component-name>BenchmarkRpcLitEJBWS</port-component-name> + <port-component-uri>/jaxrpc-benchmark-rpc-ejb/*</port-component-uri> + </port-component> </webservices> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-both/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -8,15 +8,10 @@ <!-- 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> + <port-component> + <ejb-name>HelloBoth</ejb-name> + <port-component-name>HelloBoth</port-component-name> + <port-component-uri>/Explicit/Path</port-component-uri> + </port-component> </webservices> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -7,25 +7,16 @@ <!-- 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> + <port-component> + <ejb-name>HelloPCOne</ejb-name> + <port-component-name>HelloPCOne</port-component-name> + <port-component-uri>/Explicit/Path/HelloPCOne</port-component-uri> + </port-component> + <port-component> + <ejb-name>HelloPCTwo</ejb-name> + <port-component-name>HelloPCTwo</port-component-name> + <port-component-uri>/Explicit/Path/HelloPCTwo</port-component-uri> + </port-component> + </webservices> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -6,37 +6,30 @@ 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> + <port-component> + <ejb-name>JBWS723RoleSecuredSLSB</ejb-name> + <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> + <port-component> + <ejb-name>JBWS723BasicSecuredSLSB</ejb-name> + <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> + + <port-component> + <ejb-name>JBWS723ConfidentialSLSB</ejb-name> + <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> + </webservices> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -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: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -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>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> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -7,34 +7,27 @@ <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: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -7,15 +7,11 @@ <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> + <port-component> + <ejb-name>TestService</ejb-name> + <port-component-name>TestServicePort</port-component-name> + <port-component-uri>/*</port-component-uri> + </port-component> + </webservices> Modified: 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 2011-11-07 14:04:15 UTC (rev 15202) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/META-INF/jboss-webservices.xml 2011-11-07 14:08:07 UTC (rev 15203) @@ -8,15 +8,10 @@ <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> + <port-component> + <ejb-name>HelloBean</ejb-name> + <port-component-name>TestPortComponent</port-component-name> + <port-component-uri>/*</port-component-uri> + </port-component> </webservices>