November 2011 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-07 09:12:18 -0500 (Mon, 07 Nov 2011) New Revision: 15204 Modified: spi/trunk/pom.xml Log: prepare for tagging Modified: spi/trunk/pom.xml =================================================================== --- spi/trunk/pom.xml 2011-11-07 14:08:07 UTC (rev 15203) +++ spi/trunk/pom.xml 2011-11-07 14:12:18 UTC (rev 15204) @@ -7,25 +7,25 @@ <packaging>jar</packaging> <description>JBossWS SPI</description> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0.Beta14</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>1.0.10.Alpha2</version> </parent>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.0.0...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.0.0.Be...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/spi/tags/jbossws-spi-2.0.0.Beta14</url> </scm>  <properties> - <jbossws.api.version>1.0.0-SNAPSHOT</jbossws.api.version> + <jbossws.api.version>1.0.0.Beta3</jbossws.api.version> <jms.api.version>1.0.0.Final</jms.api.version> <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version> <servlet.api.version>1.0.0.Final</servlet.api.version>

12 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

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 @@  <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 @@  - <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> -  - <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> +  + </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>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15202 - in shared-testsuite/trunk/testsuite/src/test/resources: jaxrpc/samples/jsr109ejb/rpclit/META-INF and 2 other directories.

by jbossws-commits＠lists.jboss.org

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> +

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15201 - container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-07 09:00:31 -0500 (Mon, 07 Nov 2011) New Revision: 15201 Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java Log: [JBWS-3376] refactoring jboss-webservices.xml file format Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -27,8 +27,8 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebserviceDescriptionMetaData; /** * Common class for EJB meta data builders. @@ -101,18 +101,16 @@ ejbArchiveMD.setConfigFile(configFile); // set wsdl location resolver - final WebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); + final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); ejbArchiveMD.setPublishLocationAdapter(resolver); } - protected PortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { + protected JBossPortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { if (jbossWebservicesMD == null) return null; - - PortComponentMetaData portComponentMD = null; - for (final WebserviceDescriptionMetaData webserviceDescriptionMD : jbossWebservicesMD.getWebserviceDescriptions()) { - portComponentMD = webserviceDescriptionMD.getPortComponentByEjbLinkName(ejbName); - if (portComponentMD != null) return portComponentMD; + + for (final JBossPortComponentMetaData jbossPortComponentMD : jbossWebservicesMD.getPortComponents()) { + if (ejbName.equals(jbossPortComponentMD.getEjbName())) return jbossPortComponentMD; } return null; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -34,7 +34,7 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; /** * Builds container independent meta data from EJB21 container meta data. @@ -108,18 +108,18 @@ wsEjbMD.setJndiName(sessionEjbMD.determineJndiName()); wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName()); - final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); - if (portComponentMD != null) + final JBossPortComponentMetaData jbossPortComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); + if (jbossPortComponentMD != null) { // set port component meta data - wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); - wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); + wsEjbMD.setPortComponentName(jbossPortComponentMD.getPortComponentName()); + wsEjbMD.setPortComponentURI(jbossPortComponentMD.getPortComponentURI()); // set security meta data final EJBSecurityMetaData smd = new EJBSecurityMetaData(); - smd.setAuthMethod(portComponentMD.getAuthMethod()); - smd.setTransportGuarantee(portComponentMD.getTransportGuarantee()); - smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess()); + smd.setAuthMethod(jbossPortComponentMD.getAuthMethod()); + smd.setTransportGuarantee(jbossPortComponentMD.getTransportGuarantee()); + smd.setSecureWSDLAccess(jbossPortComponentMD.getSecureWSDLAccess()); wsEjbMD.setSecurityMetaData(smd); } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; /** * Builds container independent meta data from EJB3 container meta data. @@ -92,7 +92,7 @@ if (jbossEjbMD.isSession()) { - final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); + final JBossPortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); if (portComponentMD != null) { // set port component meta data Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -22,7 +22,7 @@ package org.jboss.webservices.integration.metadata; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebserviceDescriptionMetaData; /** * Publish location adapter implementation. @@ -33,14 +33,14 @@ final class PublishLocationAdapterImpl implements PublishLocationAdapter { /** Webservice descriptions meta data. */ - private final WebserviceDescriptionMetaData[] wsDescriptionsMD; + private final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD; /** * Constructor. * * @param wsDescriptionsMD webservice descriptions meta data */ - PublishLocationAdapterImpl(final WebserviceDescriptionMetaData[] wsDescriptionsMD) + PublishLocationAdapterImpl(final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD) { this.wsDescriptionsMD = wsDescriptionsMD; } @@ -55,7 +55,7 @@ { if (wsDescriptionsMD != null) { - for (final WebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) + for (final JBossWebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) { if (endpointName.equals(wsDescriptionMD.getWebserviceDescriptionName())) return wsDescriptionMD.getWsdlPublishLocation(); @@ -64,4 +64,5 @@ return null; } + }

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15200 - container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-07 09:00:15 -0500 (Mon, 07 Nov 2011) New Revision: 15200 Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java Log: [JBWS-3376] refactoring jboss-webservices.xml file format Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-11-07 13:56:33 UTC (rev 15199) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-11-07 14:00:15 UTC (rev 15200) @@ -27,8 +27,8 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebserviceDescriptionMetaData; /** * Common class for EJB meta data builders. @@ -101,18 +101,16 @@ ejbArchiveMD.setConfigFile(configFile); // set wsdl location resolver - final WebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); + final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); ejbArchiveMD.setPublishLocationAdapter(resolver); } - protected PortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { + protected JBossPortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { if (jbossWebservicesMD == null) return null; - - PortComponentMetaData portComponentMD = null; - for (final WebserviceDescriptionMetaData webserviceDescriptionMD : jbossWebservicesMD.getWebserviceDescriptions()) { - portComponentMD = webserviceDescriptionMD.getPortComponentByEjbLinkName(ejbName); - if (portComponentMD != null) return portComponentMD; + + for (final JBossPortComponentMetaData jbossPortComponentMD : jbossWebservicesMD.getPortComponents()) { + if (ejbName.equals(jbossPortComponentMD.getEjbName())) return jbossPortComponentMD; } return null; Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-11-07 13:56:33 UTC (rev 15199) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-11-07 14:00:15 UTC (rev 15200) @@ -34,7 +34,7 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; /** * Builds container independent meta data from EJB21 container meta data. @@ -108,18 +108,18 @@ wsEjbMD.setJndiName(sessionEjbMD.determineJndiName()); wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName()); - final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); - if (portComponentMD != null) + final JBossPortComponentMetaData jbossPortComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); + if (jbossPortComponentMD != null) { // set port component meta data - wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); - wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); + wsEjbMD.setPortComponentName(jbossPortComponentMD.getPortComponentName()); + wsEjbMD.setPortComponentURI(jbossPortComponentMD.getPortComponentURI()); // set security meta data final EJBSecurityMetaData smd = new EJBSecurityMetaData(); - smd.setAuthMethod(portComponentMD.getAuthMethod()); - smd.setTransportGuarantee(portComponentMD.getTransportGuarantee()); - smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess()); + smd.setAuthMethod(jbossPortComponentMD.getAuthMethod()); + smd.setTransportGuarantee(jbossPortComponentMD.getTransportGuarantee()); + smd.setSecureWSDLAccess(jbossPortComponentMD.getSecureWSDLAccess()); wsEjbMD.setSecurityMetaData(smd); } } Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-11-07 13:56:33 UTC (rev 15199) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-11-07 14:00:15 UTC (rev 15200) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; /** * Builds container independent meta data from EJB3 container meta data. @@ -92,7 +92,7 @@ if (jbossEjbMD.isSession()) { - final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); + final JBossPortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); if (portComponentMD != null) { // set port component meta data Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-11-07 13:56:33 UTC (rev 15199) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-11-07 14:00:15 UTC (rev 15200) @@ -22,7 +22,7 @@ package org.jboss.webservices.integration.metadata; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebserviceDescriptionMetaData; /** * Publish location adapter implementation. @@ -33,14 +33,14 @@ final class PublishLocationAdapterImpl implements PublishLocationAdapter { /** Webservice descriptions meta data. */ - private final WebserviceDescriptionMetaData[] wsDescriptionsMD; + private final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD; /** * Constructor. * * @param wsDescriptionsMD webservice descriptions meta data */ - PublishLocationAdapterImpl(final WebserviceDescriptionMetaData[] wsDescriptionsMD) + PublishLocationAdapterImpl(final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD) { this.wsDescriptionsMD = wsDescriptionsMD; } @@ -55,7 +55,7 @@ { if (wsDescriptionsMD != null) { - for (final WebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) + for (final JBossWebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) { if (endpointName.equals(wsDescriptionMD.getWebserviceDescriptionName())) return wsDescriptionMD.getWsdlPublishLocation(); @@ -64,4 +64,5 @@ return null; } + }

12 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-07 08:56:33 -0500 (Mon, 07 Nov 2011) New Revision: 15199 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebserviceDescriptionMetaData.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java Log: [JBWS-3376] refactoring jboss-webservices.xml file format Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-11-07 13:39:04 UTC (rev 15198) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -45,6 +45,8 @@ public static final String CHAIN_SERVICE_PATTERN = "service-name-pattern"; + public static final String EJB_NAME = "ejb-name"; + public static final String HANDLER_CHAIN = "handler-chain"; public static final String HANDLER_CHAINS = "handler-chains"; Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossPortComponentMetaData.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.wsf.spi.metadata.webservices; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBossPortComponentMetaData { + + private String ejbName; + private String portComponentName; + private String portComponentURI; + private String authMethod; + private String transportGuarantee; + private Boolean secureWSDLAccess; + + public void setEjbName(String ejbName) { + this.ejbName = ejbName; + } + + public String getEjbName() { + return ejbName; + } + + public void setPortComponentName(String portComponentName) { + this.portComponentName = portComponentName; + } + + public String getPortComponentName() { + return portComponentName; + } + + public void setPortComponentURI(String portComponentURI) { + this.portComponentURI = portComponentURI; + } + + public String getPortComponentURI() { + return portComponentURI; + } + + public void setAuthMethod(String authMethod) { + this.authMethod = authMethod; + } + + public String getAuthMethod() { + return authMethod; + } + + public void setTransportGuarantee(String transportGuarantee) { + this.transportGuarantee = transportGuarantee; + } + + public String getTransportGuarantee() { + return transportGuarantee; + } + + public void setSecureWSDLAccess(Boolean secureWSDLAccess) { + this.secureWSDLAccess = secureWSDLAccess; + } + + public Boolean getSecureWSDLAccess() { + return secureWSDLAccess; + } + +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebserviceDescriptionMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebserviceDescriptionMetaData.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebserviceDescriptionMetaData.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.wsf.spi.metadata.webservices; + +/** + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBossWebserviceDescriptionMetaData { + + private String webserviceDescriptionName; + private String wsdlPublishLocation; + + public void setWsdlPublishLocation(final String wsdlPublishLocation) { + this.wsdlPublishLocation = wsdlPublishLocation; + } + + public String getWsdlPublishLocation() { + return wsdlPublishLocation; + } + + public void setWebserviceDescriptionName(final String webserviceDescriptionName) { + this.webserviceDescriptionName = webserviceDescriptionName; + } + + public String getWebserviceDescriptionName() { + return webserviceDescriptionName; + } + +} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java 2011-11-07 13:39:04 UTC (rev 15198) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -19,15 +19,13 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ + package org.jboss.wsf.spi.metadata.webservices; import org.jboss.wsf.spi.metadata.DescriptorParser; /** - * Parser for WS UMDM. - * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public interface JBossWebservicesDescriptorParser extends DescriptorParser<JBossWebservicesMetaData> -{ +public interface JBossWebservicesDescriptorParser extends DescriptorParser<JBossWebservicesMetaData> { } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2011-11-07 13:39:04 UTC (rev 15198) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -19,16 +19,27 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ + package org.jboss.wsf.spi.metadata.webservices; import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; +import static org.jboss.wsf.spi.metadata.ParserConstants.AUTH_METHOD; import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_FILE; import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_NAME; import static org.jboss.wsf.spi.metadata.ParserConstants.CONTEXT_ROOT; +import static org.jboss.wsf.spi.metadata.ParserConstants.EJB_NAME; import static org.jboss.wsf.spi.metadata.ParserConstants.JBOSSEE_NS; +import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT; +import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_NAME; +import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_URI; +import static org.jboss.wsf.spi.metadata.ParserConstants.SECURE_WSDL_ACCESS; +import static org.jboss.wsf.spi.metadata.ParserConstants.TRANSPORT_GUARANTEE; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION; +import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION_NAME; +import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PUBLISH_LOCATION; +import static org.jboss.wsf.spi.util.StAXUtils.elementAsBoolean; import static org.jboss.wsf.spi.util.StAXUtils.elementAsString; import static org.jboss.wsf.spi.util.StAXUtils.match; @@ -47,182 +58,215 @@ import org.jboss.wsf.spi.util.StAXUtils; /** - * A JBossXB factory for {@link JBossWebservicesMetaData} - * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public class JBossWebservicesFactory extends WebservicesFactory -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(JBossWebservicesFactory.class); - - public JBossWebservicesFactory(URL descriptorURL) - { - super(descriptorURL); - } +public class JBossWebservicesFactory { - /** - * Load jboss-webservices.xml from <code>META-INF/jboss-webservices.xml</code> - * or <code>WEB-INF/jboss-webservices.xml</code>. - * - * @param root virtual file root - * @return JBossWebservicesMetaData or <code>null</code> if it cannot be found - */ - public static JBossWebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile root) - { - JBossWebservicesMetaData webservices = null; + private static final ResourceBundle bundle = BundleUtils.getBundle(JBossWebservicesFactory.class); - UnifiedVirtualFile wsdd = null; - try - { - wsdd = root.findChild("META-INF/jboss-webservices.xml"); - } - catch (IOException e) - { - // - } + // The URL to the jboss-webservices.xml descriptor + private URL descriptorURL; - // Maybe a web application deployment? - if (null == wsdd) - { - try - { - wsdd = root.findChild("WEB-INF/jboss-webservices.xml"); - } - catch (IOException e) - { + public JBossWebservicesFactory(final URL descriptorURL) { + this.descriptorURL = descriptorURL; + } + + public URL getDescriptorURL() { + return descriptorURL; + } + + /** + * Load jboss-webservices.xml from <code>META-INF/jboss-webservices.xml</code> or <code>WEB-INF/jboss-webservices.xml</code> + * . + * + * @param root virtual file root + * @return JBossWebservicesMetaData or <code>null</code> if it cannot be found + */ + public static JBossWebservicesMetaData loadFromVFSRoot(final UnifiedVirtualFile root) { + JBossWebservicesMetaData webservices = null; + + UnifiedVirtualFile wsdd = null; + try { + wsdd = root.findChild("META-INF/jboss-webservices.xml"); + } catch (IOException e) { // - } - } + } - // the descriptor is optional - if (wsdd != null) - { - return load(wsdd.toURL()); - } + // Maybe a web application deployment? + if (null == wsdd) { + try { + wsdd = root.findChild("WEB-INF/jboss-webservices.xml"); + } catch (IOException e) { + // + } + } - return webservices; - } - - public static JBossWebservicesMetaData load(URL wsddUrl) - { - InputStream is = null; - try - { - is = wsddUrl.openStream(); - XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); - return parse(xmlr, wsddUrl); - } - catch (Exception e) - { - throw new WebServiceException(BundleUtils.getMessage(bundle, "FAILED_TO_UNMARSHALL", wsddUrl), e); - } - finally - { - try - { - if (is != null) is.close(); - } - catch (IOException e) {} //ignore - } - } - - public static JBossWebservicesMetaData parse(InputStream is) - { - return parse(is, null); - } - - public static JBossWebservicesMetaData parse(InputStream is, URL descriptorURL) - { - try - { - XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); - return parse(xmlr, descriptorURL); - } - catch (Exception e) - { - throw new WebServiceException(e); - } - } - - public static JBossWebservicesMetaData parse(XMLStreamReader reader) throws XMLStreamException - { - return parse(reader, null); - } - - private static JBossWebservicesMetaData parse(XMLStreamReader reader, URL descriptorURL) throws XMLStreamException - { - int iterate; - try - { - iterate = reader.nextTag(); - } - catch (XMLStreamException e) - { - // skip non-tag elements - iterate = reader.nextTag(); - } - JBossWebservicesMetaData metadata = null; - switch (iterate) - { - case END_ELEMENT : { - // we're done - break; - } - case START_ELEMENT : { + // the descriptor is optional + if (wsdd != null) { + return load(wsdd.toURL()); + } - if (match(reader, JBOSSEE_NS, WEBSERVICES)) - { - String nsUri = reader.getNamespaceURI(); - JBossWebservicesFactory factory = new JBossWebservicesFactory(descriptorURL); - metadata = factory.parseWebservices(reader, nsUri, descriptorURL); + return webservices; + } + + public static JBossWebservicesMetaData load(final URL wsddUrl) { + InputStream is = null; + try { + is = wsddUrl.openStream(); + XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return parse(xmlr, wsddUrl); + } catch (Exception e) { + throw new WebServiceException(BundleUtils.getMessage(bundle, "FAILED_TO_UNMARSHALL", wsddUrl), e); + } finally { + try { + if (is != null) + is.close(); + } catch (IOException e) { + } // ignore + } + } + + public static JBossWebservicesMetaData parse(final InputStream is) { + return parse(is, null); + } + + public static JBossWebservicesMetaData parse(final InputStream is, final URL descriptorURL) { + try { + final XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return parse(xmlr, descriptorURL); + } catch (Exception e) { + throw new WebServiceException(e); + } + } + + public static JBossWebservicesMetaData parse(final XMLStreamReader reader) throws XMLStreamException { + return parse(reader, null); + } + + private static JBossWebservicesMetaData parse(final XMLStreamReader reader, final URL descriptorURL) + throws XMLStreamException { + int iterate; + try { + iterate = reader.nextTag(); + } catch (XMLStreamException e) { + // skip non-tag elements + iterate = reader.nextTag(); + } + JBossWebservicesMetaData metadata = null; + switch (iterate) { + case END_ELEMENT: { + // we're done + break; } - else - { - throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName())); + case START_ELEMENT: { + + if (match(reader, JBOSSEE_NS, WEBSERVICES)) { + String nsUri = reader.getNamespaceURI(); + JBossWebservicesFactory factory = new JBossWebservicesFactory(descriptorURL); + metadata = factory.parseWebservices(reader, nsUri, descriptorURL); + } else { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName())); + } } - } - } - return metadata; - } - - private JBossWebservicesMetaData parseWebservices(XMLStreamReader reader, String nsUri, URL descriptorURL) throws XMLStreamException - { - JBossWebservicesMetaData metadata = new JBossWebservicesMetaData(descriptorURL); - while (reader.hasNext()) - { - switch (reader.nextTag()) - { - case XMLStreamConstants.END_ELEMENT : { - if (match(reader, nsUri, WEBSERVICES)) - { - return metadata; - } - else - { - throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", reader.getLocalName())); - } + } + return metadata; + } + + private JBossWebservicesMetaData parseWebservices(final XMLStreamReader reader, final String nsUri, final URL descriptorURL) + throws XMLStreamException { + JBossWebservicesMetaData metadata = new JBossWebservicesMetaData(descriptorURL); + while (reader.hasNext()) { + switch (reader.nextTag()) { + case XMLStreamConstants.END_ELEMENT: { + if (match(reader, nsUri, WEBSERVICES)) { + return metadata; + } else { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", + reader.getLocalName())); + } + } + case XMLStreamConstants.START_ELEMENT: { + if (match(reader, nsUri, CONTEXT_ROOT)) { + metadata.setContextRoot(elementAsString(reader)); + } else if (match(reader, nsUri, CONFIG_NAME)) { + metadata.setConfigName(elementAsString(reader)); + } else if (match(reader, nsUri, CONFIG_FILE)) { + metadata.setConfigFile(elementAsString(reader)); + } else if (match(reader, nsUri, PORT_COMPONENT)) { + metadata.addPortComponent(parsePortComponent(reader, nsUri)); + } else if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) { + metadata.addWebserviceDescription(parseWebserviceDescription(reader, nsUri)); + } else { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", + reader.getLocalName())); + } + } } - case XMLStreamConstants.START_ELEMENT : { - if (match(reader, nsUri, CONTEXT_ROOT)) { - metadata.setContextRoot(elementAsString(reader)); - } - else if (match(reader, nsUri, CONFIG_NAME)) { - metadata.setConfigName(elementAsString(reader)); - } - else if (match(reader, nsUri, CONFIG_FILE)) { - metadata.setConfigFile(elementAsString(reader)); - } - else if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) { - metadata.addWebserviceDescription(super.parseWebserviceDescription(reader, nsUri, metadata)); - } - else - { - throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName())); - } + } + throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); + } + + private JBossPortComponentMetaData parsePortComponent(XMLStreamReader reader, String nsUri) throws XMLStreamException { + JBossPortComponentMetaData pc = new JBossPortComponentMetaData(); + while (reader.hasNext()) { + switch (reader.nextTag()) { + case XMLStreamConstants.END_ELEMENT: { + if (match(reader, nsUri, PORT_COMPONENT)) { + return pc; + } else { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", + reader.getLocalName())); + } + } + case XMLStreamConstants.START_ELEMENT: { + if (match(reader, nsUri, EJB_NAME)) { + pc.setEjbName(elementAsString(reader)); + } else if (match(reader, nsUri, PORT_COMPONENT_NAME)) { + pc.setPortComponentName(elementAsString(reader)); + } else if (match(reader, nsUri, PORT_COMPONENT_URI)) { + pc.setPortComponentURI(elementAsString(reader)); + } else if (match(reader, nsUri, AUTH_METHOD)) { + pc.setAuthMethod(elementAsString(reader)); + } else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) { + pc.setTransportGuarantee(elementAsString(reader)); + } else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) { + pc.setSecureWSDLAccess(elementAsBoolean(reader)); + } else { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", + reader.getLocalName())); + } + } } - } - } - throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); - } - + } + throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); + } + + private JBossWebserviceDescriptionMetaData parseWebserviceDescription(XMLStreamReader reader, String nsUri) + throws XMLStreamException { + JBossWebserviceDescriptionMetaData description = new JBossWebserviceDescriptionMetaData(); + while (reader.hasNext()) { + switch (reader.nextTag()) { + case XMLStreamConstants.END_ELEMENT: { + if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) { + return description; + } else { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", + reader.getLocalName())); + } + } + case XMLStreamConstants.START_ELEMENT: { + if (match(reader, nsUri, WEBSERVICE_DESCRIPTION_NAME)) { + description.setWebserviceDescriptionName(elementAsString(reader)); + } else if (match(reader, nsUri, WSDL_PUBLISH_LOCATION)) { + description.setWsdlPublishLocation(elementAsString(reader)); + } else { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", + reader.getLocalName())); + } + } + } + } + throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); + } + } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2011-11-07 13:39:04 UTC (rev 15198) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -23,59 +23,76 @@ package org.jboss.wsf.spi.metadata.webservices; import java.net.URL; +import java.util.LinkedList; +import java.util.List; /** - * XML Binding root element for <code>jboss-webservices.xml</code> - * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public class JBossWebservicesMetaData extends WebservicesMetaData -{ +public final class JBossWebservicesMetaData { - private String contextRoot; + private String contextRoot; - private String configName; + private String configName; - private String configFile; + private String configFile; - public JBossWebservicesMetaData() - { - super(); - } + private List<JBossPortComponentMetaData> portComponents = new LinkedList<JBossPortComponentMetaData>(); - public JBossWebservicesMetaData(final URL descriptorURL) - { - super(descriptorURL); - } + private List<JBossWebserviceDescriptionMetaData> webserviceDescriptions = new LinkedList<JBossWebserviceDescriptionMetaData>(); - public String getContextRoot() - { - return contextRoot; - } + private URL descriptorURL; - public void setContextRoot(String contextRoot) - { - this.contextRoot = contextRoot; - } + public JBossWebservicesMetaData(final URL descriptorURL) { + this.descriptorURL = descriptorURL; + } - public String getConfigName() - { - return configName; - } + public URL getDescriptorURL() { + return descriptorURL; + } - public void setConfigName(String configName) - { - this.configName = configName; - } + public void setContextRoot(final String contextRoot) { + this.contextRoot = contextRoot; + } - public String getConfigFile() - { - return configFile; - } + public String getContextRoot() { + return contextRoot; + } - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } + public void setConfigName(final String configName) { + this.configName = configName; + } + public String getConfigName() { + return configName; + } + + public void setConfigFile(final String configFile) { + this.configFile = configFile; + } + + public String getConfigFile() { + return configFile; + } + + public void addPortComponent(final JBossPortComponentMetaData portComponent) { + portComponents.add(portComponent); + } + + public JBossPortComponentMetaData[] getPortComponents() { + final JBossPortComponentMetaData[] array = new JBossPortComponentMetaData[portComponents.size()]; + portComponents.toArray(array); + return array; + } + + public void addWebserviceDescription(final JBossWebserviceDescriptionMetaData webserviceDescriptionMD) { + webserviceDescriptions.add(webserviceDescriptionMD); + } + + public JBossWebserviceDescriptionMetaData[] getWebserviceDescriptions() { + final JBossWebserviceDescriptionMetaData[] array = new JBossWebserviceDescriptionMetaData[webserviceDescriptions.size()]; + webserviceDescriptions.toArray(array); + return array; + } + } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-11-07 13:39:04 UTC (rev 15198) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -62,12 +62,6 @@ * This name must be unique amongst all port component names in a module. */ private String portComponentName; - // The optional <port-component-uri> - private String portComponentURI; - // The optional <auth-method> - private String authMethod; - // The optional <transport-guarantee> - private String transportGuarantee; // The required <wsdl-port> element private QName wsdlPort; // The required <service-endpoint-interface> element @@ -80,8 +74,6 @@ // The HTTP context root private String contextRoot; - // The optional secure wsdl access - private Boolean secureWSDLAccess; // ----------------------------------------- // JAX-WS additions @@ -123,36 +115,6 @@ this.portComponentName = portComponentName; } - public String getPortComponentURI() - { - return portComponentURI; - } - - public void setPortComponentURI(String portComponentURI) - { - this.portComponentURI = portComponentURI; - } - - public String getAuthMethod() - { - return authMethod; - } - - public void setAuthMethod(String authMethod) - { - this.authMethod = authMethod; - } - - public String getTransportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - public QName getWsdlPort() { return wsdlPort; @@ -218,16 +180,6 @@ this.contextRoot = contextRoot; } - public Boolean getSecureWSDLAccess() - { - return secureWSDLAccess; - } - - public void setSecureWSDLAccess(Boolean secureWSDLAccess) - { - this.secureWSDLAccess = secureWSDLAccess; - } - public void setAddressingEnabled(final boolean addressingEnabled) { this.addressingEnabled = addressingEnabled; } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2011-11-07 13:39:04 UTC (rev 15198) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -55,19 +55,7 @@ private String jaxrpcMappingFile; // The required <port-component> elements private ArrayList<PortComponentMetaData> portComponents = new ArrayList<PortComponentMetaData>(); - // The optional <wsdl-publish-location> element - private String wsdlPublishLocation; - public String getWsdlPublishLocation() - { - return wsdlPublishLocation; - } - - public void setWsdlPublishLocation(String wsdlPublishLocation) - { - this.wsdlPublishLocation = wsdlPublishLocation; - } - public WebserviceDescriptionMetaData(WebservicesMetaData webservices) { this.webservices = webservices; Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2011-11-07 13:39:04 UTC (rev 15198) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2011-11-07 13:56:33 UTC (rev 15199) @@ -25,7 +25,6 @@ import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING; import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING_RESPONSES; -import static org.jboss.wsf.spi.metadata.ParserConstants.AUTH_METHOD; import static org.jboss.wsf.spi.metadata.ParserConstants.EJB_LINK; import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLED; import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLE_MTOM; @@ -37,20 +36,16 @@ import static org.jboss.wsf.spi.metadata.ParserConstants.MTOM_THRESHOLD; import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT; import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_NAME; -import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_URI; import static org.jboss.wsf.spi.metadata.ParserConstants.PROTOCOL_BINDING; import static org.jboss.wsf.spi.metadata.ParserConstants.REQUIRED; import static org.jboss.wsf.spi.metadata.ParserConstants.RESPECT_BINDING; -import static org.jboss.wsf.spi.metadata.ParserConstants.SECURE_WSDL_ACCESS; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_ENDPOINT_INTERFACE; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_IMPL_BEAN; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVLET_LINK; -import static org.jboss.wsf.spi.metadata.ParserConstants.TRANSPORT_GUARANTEE; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION_NAME; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_FILE; -import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PUBLISH_LOCATION; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PORT; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_SERVICE; import static org.jboss.wsf.spi.util.StAXUtils.elementAsBoolean; @@ -271,12 +266,9 @@ else if (match(reader, nsUri, WSDL_FILE)) { description.setWsdlFile(elementAsString(reader)); } - else if (match(reader, nsUri, WSDL_PUBLISH_LOCATION)) { - description.setWsdlPublishLocation(elementAsString(reader)); - } else if (match(reader, nsUri, JAXRPC_MAPPING_FILE)) { description.setJaxrpcMappingFile(elementAsString(reader)); - } + } else if (match(reader, nsUri, PORT_COMPONENT)) { description.addPortComponent(parsePortComponent(reader, nsUri, description)); } @@ -311,24 +303,12 @@ if (match(reader, nsUri, PORT_COMPONENT_NAME)) { pc.setPortComponentName(elementAsString(reader)); } - else if (match(reader, nsUri, PORT_COMPONENT_URI)) { - pc.setPortComponentURI(elementAsString(reader)); - } - else if (match(reader, nsUri, AUTH_METHOD)) { - pc.setAuthMethod(elementAsString(reader)); - } - else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) { - pc.setTransportGuarantee(elementAsString(reader)); - } else if (match(reader, nsUri, WSDL_SERVICE)) { pc.setWsdlService(elementAsQName(reader)); } else if (match(reader, nsUri, WSDL_PORT)) { pc.setWsdlPort(elementAsQName(reader)); } - else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) { - pc.setSecureWSDLAccess(elementAsBoolean(reader)); - } else if (match(reader, nsUri, ENABLE_MTOM)) { pc.setMtomEnabled(elementAsBoolean(reader)); }

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15198 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-11-07 08:39:04 -0500 (Mon, 07 Nov 2011) New Revision: 15198 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-11-04 18:43:30 UTC (rev 15197) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-11-07 13:39:04 UTC (rev 15198) @@ -63,7 +63,7 @@ private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address"; private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; - private static final Deployer DEPLOYER; + private static Deployer DEPLOYER; private static MBeanServerConnection server; private static String integrationTarget; @@ -73,10 +73,15 @@ private static String testArchiveDir; private static String testResourcesDir; - static + private static synchronized Deployer getDeployer() { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - DEPLOYER = spiProvider.getSPI(Deployer.class); + //lazy loading of deployer + if (DEPLOYER == null) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + DEPLOYER = spiProvider.getSPI(Deployer.class); + } + return DEPLOYER; } /** Deploy the given archive @@ -84,7 +89,7 @@ public static void deploy(String archive) throws Exception { URL archiveURL = getArchiveFile(archive).toURI().toURL(); - DEPLOYER.deploy(archiveURL); + getDeployer().deploy(archiveURL); } /** Undeploy the given archive @@ -92,7 +97,7 @@ public static void undeploy(String archive) throws Exception { URL archiveURL = getArchiveFile(archive).toURI().toURL(); - DEPLOYER.undeploy(archiveURL); + getDeployer().undeploy(archiveURL); } public static boolean isTargetJBoss6() @@ -319,11 +324,11 @@ public static void addSecurityDomain(String name, Map<String,String> authenticationOptions) throws Exception { - DEPLOYER.addSecurityDomain(name, authenticationOptions); + getDeployer().addSecurityDomain(name, authenticationOptions); } public static void removeSecurityDomain(String name) throws Exception { - DEPLOYER.removeSecurityDomain(name); + getDeployer().removeSecurityDomain(name); } }

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15197 - common/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-04 14:43:30 -0400 (Fri, 04 Nov 2011) New Revision: 15197 Modified: common/trunk/pom.xml Log: prepare for next dev. cycle Modified: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml 2011-11-04 18:43:00 UTC (rev 15196) +++ common/trunk/pom.xml 2011-11-04 18:43:30 UTC (rev 15197) @@ -9,25 +9,25 @@ <packaging>jar</packaging> <description>JBossWS Common</description> - <version>2.0.0.Beta13</version> + <version>2.0.0-SNAPSHOT</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10.Alpha2</version> + <version>1.0.10-SNAPSHOT</version> </parent>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags/jbossws-common...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-2....</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-common-2.0.0...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/trunk</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url> </scm>  <properties> - <jbossws.spi.version>2.0.0.Beta13</jbossws.spi.version> + <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version> <jboss.common.core.version>2.2.14.GA</jboss.common.core.version> <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15196 - common/tags.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-04 14:43:00 -0400 (Fri, 04 Nov 2011) New Revision: 15196 Added: common/tags/jbossws-common-2.0.0.Beta13/ Log: tagging JBossWS Common 2.0.0.Beta13

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15195 - common/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-11-04 14:39:51 -0400 (Fri, 04 Nov 2011) New Revision: 15195 Modified: common/trunk/pom.xml Log: prepare for tagging Modified: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml 2011-11-04 18:36:11 UTC (rev 15194) +++ common/trunk/pom.xml 2011-11-04 18:39:51 UTC (rev 15195) @@ -9,25 +9,25 @@ <packaging>jar</packaging> <description>JBossWS Common</description> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0.Beta13</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>1.0.10.Alpha2</version> </parent>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags/jbossws-common...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-2....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-common-2.0.0...</url> </scm>  <properties> - <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> + <jbossws.spi.version>2.0.0.Beta13</jbossws.spi.version> <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version> <jboss.common.core.version>2.2.14.GA</jboss.common.core.version> <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2011