April 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16105 - in stack/native/trunk: modules/core and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-05 10:16:06 -0400 (Thu, 05 Apr 2012) New Revision: 16105 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: [JBWS-3462] reviewed Native maven dependencies Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/modules/core/pom.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -15,17 +15,19 @@  <dependencies> - -  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> + <artifactId>jbossws-api</artifactId> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.xml.rpc</groupId> <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> </dependency> @@ -38,48 +40,35 @@ <artifactId>jbossws-native-factories</artifactId> <version>${project.version}</version> </dependency> -  <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <scope>provided</scope> </dependency> -  <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <scope>provided</scope> </dependency> <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <scope>provided</scope> </dependency> -  <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </dependency> - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> @@ -88,17 +77,9 @@ <artifactId>netty</artifactId> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> </dependencies>  Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -38,10 +38,8 @@ <include>org.jboss.ws:jbossws-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> - <include>javax.xml.stream:stax-api:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.jboss.netty:netty:jar</include> - <include>commons-beanutils:commons-beanutils:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useProjectArtifact>false</useProjectArtifact> @@ -84,16 +82,6 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <includes> - <include>org.codehaus.woodstox:wstx-lgpl:jar</include> - </includes> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping> <includes> <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -15,16 +15,13 @@  <properties> - <surefire.security.args></surefire.security.args> <surefire.jdwp.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdwp.args> - <surefire.gc.args>-Xmx512m -XX:MaxPermSize=256m</surefire.gc.args> - <surefire.management.args>-Dcom.sun.management.jmxremote</surefire.management.args> + <surefire.gc.args>-Xmx256m -XX:MaxPermSize=128m</surefire.gc.args> <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory> <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> - <hornetq.version>2.1.0.BETA3</hornetq.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> <appclient.output.dir>${project.build.directory}/appclient-logs</appclient.output.dir> </properties> @@ -37,10 +34,6 @@  <dependencies> <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </dependency> - <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-core</artifactId> <version>${project.version}</version> @@ -50,16 +43,6 @@ <artifactId>jbossws-shared-testsuite</artifactId> </dependency> <dependency> - <groupId>gnu-getopt</groupId> - <artifactId>getopt</artifactId> - <version>1.0.13</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> @@ -76,11 +59,6 @@ <version>${jboss.javaee.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>test</scope> - </dependency> </dependencies>  @@ -264,7 +242,7 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.jdwp.args} ${surefire.gc.args}</surefire.jvm.args> </properties> </profile> <profile> @@ -275,38 +253,11 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.gc.args}</surefire.jvm.args> </properties> </profile>  - <profile> - <id>management</id> - <activation> - <property> - <name>management</name> - </property> - </activation> - <properties> - <surefire.jvm.management.args>${surefire.management.args}</surefire.jvm.management.args> - </properties> - </profile> - <profile> - <id>no-management</id> - <activation> - <property> - <name>!management</name> - </property> - </activation> - <properties> - <surefire.jvm.management.args> </surefire.jvm.management.args> - </properties> - </profile> - -  @@ -353,6 +304,10 @@ <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-security</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -361,10 +316,6 @@ <version>1.0.2.Final</version> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> <version>1.0.4.Final</version> @@ -379,32 +330,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency>  <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> <version>2.0.0-beta-1</version> </dependency> -  <dependency> - <groupId>apache-xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> - <groupId>apache-xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> <version>1.0.2.Final</version> @@ -428,7 +360,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes>  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> @@ -468,6 +400,10 @@ <groupId>org.jboss</groupId> <artifactId>jboss-remote-naming</artifactId> </exclusion> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-security</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -476,10 +412,6 @@ <version>1.0.2.Final</version> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-ejb-client</artifactId> <version>1.0.4.Final</version> @@ -494,32 +426,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - </dependency>  <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> <version>2.0.0-beta-1</version> </dependency> -  <dependency> - <groupId>apache-xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> - <groupId>apache-xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1.patch01-brew</version> - </dependency> - <dependency> <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> <version>1.0.2.Final</version> @@ -543,7 +456,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> + <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes>  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-04-05 12:45:05 UTC (rev 16104) +++ stack/native/trunk/pom.xml 2012-04-05 14:16:06 UTC (rev 16105) @@ -65,16 +65,13 @@ <jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version> <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> + <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version> - <commons.logging.version>1.1.1</commons.logging.version> - <javassist.version>3.15.0-GA</javassist.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <saaj.api.version>1.0.1.Final</saaj.api.version> <jboss.common.core.version>2.2.16.GA</jboss.common.core.version> <jboss.logging.version>3.1.0.GA</jboss.logging.version> <netty.version>3.2.6.Final</netty.version> - <stax.api.version>1.0-2</stax.api.version> - <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> @@ -94,6 +91,16 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> <version>${jbossws.common.version}</version> + <exclusions> + <exclusion> + <groupId>jboss.jaxbintros</groupId> + <artifactId>jboss-jaxb-intros</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -104,6 +111,12 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> <version>${jbossws.spi.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -123,6 +136,11 @@ </dependency>  <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1</version> @@ -152,7 +170,6 @@ <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>${jboss.common.core.version}</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>org.jboss.logging</groupId> @@ -160,18 +177,8 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> - </dependency>  <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.ejb</groupId> <artifactId>jboss-ejb-api_3.1_spec</artifactId> <version>${ejb.api.version}</version> @@ -180,6 +187,12 @@ <groupId>org.jboss.spec.javax.xml.rpc</groupId> <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> <version>${jaxrpc.api.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.soap</groupId> @@ -187,27 +200,11 @@ <version>${saaj.api.version}</version> </dependency> <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>${stax.api.version}</version> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>${jboss.logging.version}</version> </dependency> <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-lgpl</artifactId> - <version>${woodstox.version}</version> - <exclusions> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> <version>${wsdl4j.version}</version> @@ -228,10 +225,14 @@ <version>${jbossxb.version}</version> <exclusions> <exclusion> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </exclusion> <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + </exclusion> + <exclusion> <groupId>apache-xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> @@ -248,9 +249,21 @@ <artifactId>jboss-logging-log4j</artifactId> </exclusion> <exclusion> - <groupId>apache-xerces</groupId> + <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.wutka</groupId> + <artifactId>dtdparser</artifactId> + </exclusion> </exclusions> </dependency> <dependency>

12 years

1
0
0 / 0

JBossWS SVN: r16104 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core/client and 15 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-05 08:45:05 -0400 (Thu, 05 Apr 2012) New Revision: 16104 Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml stack/native/trunk/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd stack/native/trunk/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1653/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml Log: [JBWS-3462] removing configurability ability Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -21,12 +21,8 @@ */ package org.jboss.ws.core; -import java.util.Observable; - -import org.jboss.logging.Logger; import org.jboss.ws.core.jaxrpc.SOAP11BindingJAXRPC; import org.jboss.ws.core.jaxrpc.SOAP12BindingJAXRPC; -import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.EndpointMetaData; /** @@ -36,9 +32,8 @@ * @author Heiko.Braun(a)jboss.com * @since 04-Jul-2006 */ -public class CommonBindingProvider implements Configurable +public class CommonBindingProvider { - private static Logger log = Logger.getLogger(CommonBindingProvider.class); /** * A constant representing the identity of the SOAP 1.1 over HTTP binding. */ @@ -56,25 +51,13 @@ { this.epMetaData = epMetaData; initBinding(epMetaData.getBindingId()); - - this.epMetaData.registerConfigObserver(this); - configure(); } public CommonBindingProvider(String bindingId) { initBinding(bindingId); - configure(); } - private void configure() - { - if (epMetaData != null) - { - epMetaData.configure(this); - } - } - protected void initBinding(String bindingId) { if (SOAP11HTTP_BINDING.equals(bindingId)) @@ -91,10 +74,4 @@ { return binding; } - - public void update(Observable observable, Object object) - { - if(log.isDebugEnabled()) log.debug("Update config: " + object); - configure(); - } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -613,23 +613,4 @@ throw new JAXRPCException(BundleUtils.getMessage(bundle, "CANNOT_CREATE_ATTACHMENT_PART")); } } - - public String getConfigName() - { - EndpointMetaData epMetaData = getEndpointMetaData(); - return epMetaData.getConfigName(); - } - - public void setConfigName(String configName) - { - setConfigName(configName, null); - } - - public abstract void setConfigName(String configName, String configFile); - - public String getConfigFile() - { - EndpointMetaData epMetaData = getEndpointMetaData(); - return epMetaData.getConfigFile(); - } } Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.ws.core; - -/** - * Provides configuration for JAXRPC/JAXWS ports - * - * @author Thomas.Diesler(a)jboss.com - * @since 17-Jan-2006 - */ -public interface ConfigProvider -{ - /** - * Get the port configuration file - */ - String getConfigFile(); - - /** - * Get the port configuration name - */ - String getConfigName(); - - /** - * Set the port configuration name - */ - void setConfigName(String configName); - - /** - * Set the port configuration name and file - */ - void setConfigName(String configName, String configFile); -} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -33,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 17-Jan-2007 */ -public interface StubExt extends ConfigProvider, EndpointMetadataProvider +public interface StubExt extends EndpointMetadataProvider { /** ClientTimeout property: org.jboss.ws.timeout */ static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout"; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -55,18 +55,6 @@ properties.put(key, val); } } - - // Add the endpoint properties - Properties epProps = epMetaData.getProperties(); - Iterator it = epProps.entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Map.Entry)it.next(); - String key = (String)entry.getKey(); - Object val = entry.getValue(); - properties.put(key, val); - } - } public Map<String, Object> getProperties() Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -54,17 +54,12 @@ import org.jboss.netty.handler.ssl.SslHandler; import org.jboss.util.Base64; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.StubExt; import org.jboss.ws.core.WSTimeoutException; import org.jboss.ws.core.client.Marshaller; import org.jboss.ws.core.client.UnMarshaller; import org.jboss.ws.core.client.ssl.SSLContextFactory; import org.jboss.ws.core.client.transport.WSResponseHandler.Result; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.metadata.config.EndpointProperty; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.wsf.spi.metadata.config.CommonConfig; /** * A http client using Netty @@ -344,17 +339,6 @@ { if (HttpMethod.POST.equals(message.getMethod())) { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - //Overwrite, through endpoint config - if (msgContext != null) - { - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - CommonConfig config = epMetaData.getConfig(); - - String sizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE); - if (sizeValue != null) - chunkSize = Integer.valueOf(sizeValue); - } //override using call props try { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -661,16 +661,6 @@ } } - @Override - public void setConfigName(String configName, String configFile) - { - EndpointMetaData epMetaData = getEndpointMetaData(); - epMetaData.setConfigName(configName, configFile); - - // Reinitialize the client handler chain - jaxrpcService.setupHandlerChain(epMetaData); - } - public Set<QName> getHeaders() { HandlerChainBaseImpl handlerChain = (HandlerChainBaseImpl)jaxrpcService.getHandlerChain(epMetaData.getPortName()); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Observable; import java.util.Set; import javax.xml.namespace.QName; @@ -67,7 +66,6 @@ public HandlerDelegateJAXRPC(ServerEndpointMetaData sepMetaData) { super(sepMetaData); - sepMetaData.registerConfigObserver(this); } /** @@ -214,8 +212,4 @@ { return headers; } - - public void update(Observable observable, Object object) - { - } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServerHandlerDelegate.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -22,7 +22,6 @@ package org.jboss.ws.core.server; import org.jboss.ws.core.HeaderSource; -import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -30,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 19-Jan-2005 */ -public abstract class ServerHandlerDelegate implements Configurable, HeaderSource +public abstract class ServerHandlerDelegate implements HeaderSource { private ServerEndpointMetaData sepMetaData; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -174,15 +174,6 @@ epMetaData.setEndpointAddress(wsdlEndpoint.getAddress()); serviceMetaData.addEndpoint(epMetaData); - // config-name, config-file - if (serviceRefMetaData != null) - { - String configName= serviceRefMetaData.getConfigName(); - String configFile = serviceRefMetaData.getConfigFile(); - if (configName != null || configFile != null) - epMetaData.setConfigName(configName, configFile); - } - // Init the endpoint binding initEndpointBinding(wsdlBinding, epMetaData); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -157,11 +157,6 @@ if (bmd == null) throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_UNIFIEDBEANMETADATA", linkName)); - String configName = apMetaData.getConfigName(); - String configFile = apMetaData.getConfigFile(); - if (configName != null || configFile != null) - sepMetaData.setConfigName(configName, configFile); - EJBSecurityMetaData smd = bmd.getSecurityMetaData(); if (smd != null) { @@ -184,12 +179,6 @@ String wsdName = serviceMetaData.getWebserviceDescriptionName(); String wsdlPublishLocation = webMetaData.getWsdlPublishLocationByName(wsdName); serviceMetaData.setWsdlPublishLocation(wsdlPublishLocation); - - String configName = webMetaData.getConfigName(); - String configFile = webMetaData.getConfigFile(); - if (configName != null || configFile != null) - sepMetaData.setConfigName(configName, configFile); - initTransportGuaranteeJSE(dep, sepMetaData, linkName); } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -23,7 +23,6 @@ import javax.xml.namespace.QName; -import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -37,19 +36,9 @@ // The endpoint address private String endpointAddress; - ClientEndpointMetaData() - { - } - public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName) { super(service, qname, portTypeName); - String configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; - String configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; - - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - ecmd.setConfigName(configName); - ecmd.setConfigFile(configFile); } public String getEndpointAddress() @@ -62,11 +51,6 @@ this.endpointAddress = endpointAddress; } - public EndpointConfigMetaData createEndpointConfigMetaData(String configName, String configFile) - { - return super.createEndpointConfigMetaData(configName, configFile); - } - public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); @@ -74,10 +58,7 @@ buffer.append("\n address=").append(getEndpointAddress()); buffer.append("\n binding=").append(getBindingId()); buffer.append("\n seiName=").append(getServiceEndpointInterfaceName()); - buffer.append("\n configFile=").append(getConfigFile()); - buffer.append("\n configName=").append(getConfigName()); buffer.append("\n authMethod=").append(getAuthMethod()); - buffer.append("\n properties=").append(getProperties()); for (OperationMetaData opMetaData : getOperations()) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -25,10 +25,6 @@ import java.util.List; import org.jboss.logging.Logger; -import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; -import org.jboss.wsf.spi.metadata.config.CommonConfig; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -48,14 +44,6 @@ private static Logger log = Logger.getLogger(EndpointConfigMetaData.class); private final EndpointMetaData epMetaData; - // The REQUIRED config-name - protected String configName; - // The REQUIRED config-file - protected String configFile; - - // The REQUIRED endpoint config - private CommonConfig config; - // The optional handlers private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); // True if the handlers are initialized @@ -113,40 +101,8 @@ List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); clearHandlers(); - List<HandlerMetaData> preHandlers = getHandlers(epMetaData, HandlerType.PRE); - List<HandlerMetaData> postHandlers = getHandlers(epMetaData, HandlerType.POST); - - addHandlers(preHandlers); addHandlers(sepHandlers); - addHandlers(postHandlers); - - if (log.isDebugEnabled()) - { - log.debug("Added " + preHandlers.size() + " PRE handlers"); - log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers"); - log.debug("Added " + postHandlers.size() + " POST handlers"); - } } - - private List<HandlerMetaData> getHandlers(EndpointMetaData epMetaData, HandlerType type) - { - List<UnifiedHandlerChainMetaData> handlerChains = config.getHandlers(type); - boolean isJAXRPCConfig = (config instanceof CommonConfigJAXRPC); - List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - if (handlerChains != null) - { - for (UnifiedHandlerChainMetaData handlerChain : handlerChains) - { - for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) - { - HandlerMetaData hmd = isJAXRPCConfig ? HandlerMetaDataJAXRPC.newInstance(uhmd, type) : HandlerMetaDataJAXWS.newInstance(uhmd, type); - hmd.setEndpointMetaData(epMetaData); - handlers.add(hmd); - } - } - } - return handlers; - } public EndpointMetaData getEndpointMetaData() { @@ -159,34 +115,4 @@ for (HandlerMetaData handler : handlers) handler.eagerInitialize(); } - - public CommonConfig getConfig() - { - return config; - } - - void setConfig(CommonConfig config) - { - this.config = config; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -21,9 +21,6 @@ */ package org.jboss.ws.metadata.umdm; -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; -import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -31,9 +28,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Observable; -import java.util.Observer; -import java.util.Properties; import java.util.ResourceBundle; import java.util.Set; @@ -54,11 +48,6 @@ import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.accessor.AccessorFactory; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; -import org.jboss.ws.metadata.config.Configurable; -import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.metadata.config.CommonConfig; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; @@ -68,7 +57,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2005 */ -public abstract class EndpointMetaData extends ExtensibleMetaData implements ConfigurationProvider, InitalizableMetaData +public abstract class EndpointMetaData extends ExtensibleMetaData implements InitalizableMetaData { private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointMetaData.class); // provide logging @@ -99,8 +88,6 @@ private Class seiClass; // The optional authentication method private String authMethod; - // Arbitrary properties given by <call-property> - private Properties properties; // The SOAPBinding style private Style style; // The SOAPBinding use @@ -112,14 +99,8 @@ // Maps the java method to the operation meta data private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); - private ConfigObservable configObservable = new ConfigObservable(); - private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); - EndpointMetaData() - { - } - public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName) { this.serviceMetaData = service; @@ -287,18 +268,6 @@ this.authMethod = authMethod; } - public Properties getProperties() - { - if (null == this.properties) - this.properties = new Properties(); - return this.properties; - } - - public void setProperties(Properties properties) - { - this.properties = properties; - } - public List<OperationMetaData> getOperations() { return new ArrayList<OperationMetaData>(operations); @@ -577,38 +546,6 @@ } } - // --------------------------------------------------------------- - // Configuration provider impl - - /** - * Callback for components that require configuration through jbossws-dd - */ - public void configure(Configurable configurable) - { - CommonConfig config = getConfig(); - // TODO: remove this method - } - - public UnifiedVirtualFile getRootFile() - { - return getServiceMetaData().getUnifiedMetaData().getRootFile(); - } - - public void registerConfigObserver(Configurable observer) - { - configObservable.addObserver(observer); - } - - public String getConfigFile() - { - return getEndpointConfigMetaData().getConfigFile(); - } - - public String getConfigName() - { - return getEndpointConfigMetaData().getConfigName(); - } - public EndpointConfigMetaData getEndpointConfigMetaData() { if (configMetaData == null) @@ -617,161 +554,6 @@ return this.configMetaData; } - public CommonConfig getConfig() - { - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - CommonConfig config = ecmd.getConfig(); - - // Make sure we have a configuration - if (config == null) - { - // No base configuration. - initEndpointConfigMetaData(ecmd); - config = ecmd.getConfig(); - } - - return config; - } - - public void setConfigName(String configName) - { - setConfigNameInternal(configName, null); - } - - public void setConfigName(String configName, String configFile) - { - setConfigNameInternal(configName, configFile); - } - - private void setConfigNameInternal(String configName, String configFile) - { - if (configName == null) - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CONFIG_NAME_CANNOT_BE_NULL")); - - if (configFile == null) - { - configFile = getEndpointConfigMetaData().getConfigFile(); - } - - if (configName.equals(getEndpointConfigMetaData().getConfigName()) == false || configFile.equals(getEndpointConfigMetaData().getConfigFile()) == false) - { - if (log.isDebugEnabled()) - log.debug("Reconfiguration forced, new config is '" + configName + "' file is '" + configFile + "'"); - - this.configMetaData = createEndpointConfigMetaData(configName, configFile); - configObservable.doNotify(configName); - } - } - - /** - * The factory method to create and initialise a new EndpointConfigMetaData, the current - * EndpointConfigMetaData will be used as the base to backup the RMMD. - * - * This method does not set the EndpointConfigMetaData as it can be used by clients to create - * a local configuration not stored in the EndpointMetaData. - */ - protected EndpointConfigMetaData createEndpointConfigMetaData(String configName, String configFile) - { - EndpointConfigMetaData ecmd = new EndpointConfigMetaData(this); - ecmd.setConfigName(configName); - ecmd.setConfigFile(configFile); - - initEndpointConfigMetaData(ecmd); - - return ecmd; - } - - public void initEndpointConfig() - { - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - initEndpointConfigMetaData(ecmd); - } - - /** - * Initialise the EndpointConfigMeta. - * - * @param toInitialise - The EndpointConfigMetaData to initialise. - */ - private void initEndpointConfigMetaData(EndpointConfigMetaData toInitialise) - { - String configName = toInitialise.getConfigName(); - String configFile = toInitialise.getConfigFile(); - - if (log.isDebugEnabled()) - log.debug("Create new config [name=" + configName + ",file=" + configFile + "]"); - - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(getClassLoader()); - CommonConfig config = factory.getConfig(getRootFile(), configName, configFile); - toInitialise.setConfig(config); - - toInitialise.configHandlerMetaData(); - } - - class ConfigObservable extends Observable - { - - private ReferenceQueue<WeakReference<Observer>> queue = new ReferenceQueue<WeakReference<Observer>>(); - private List<WeakReference<Observer>> observer = new ArrayList<WeakReference<Observer>>(); - - public void doNotify(Object object) - { - setChanged(); - notifyObservers(object); - } - - public synchronized void addObserver(Observer o) - { - clearCollected(); - observer.add(new WeakReference(o, queue)); - } - - public synchronized void deleteObserver(Observer o) - { - clearCollected(); - for (WeakReference<Observer> w : observer) - { - Observer tmp = w.get(); - if (tmp != null && tmp.equals(o)) - { - observer.remove(o); - break; - } - - } - } - - public void notifyObservers() - { - notifyObservers(null); - } - - public void notifyObservers(Object arg) - { - clearCollected(); - if (hasChanged()) - { - for (WeakReference<Observer> w : observer) - { - Observer tmp = w.get(); - if (tmp != null) - { - tmp.update(this, arg); - } - } - } - } - - private void clearCollected() - { - Reference ref; - while ((ref = queue.poll()) != null) - { - observer.remove(ref); - } - - } - } - public List<UnifiedPortComponentRefMetaData> getServiceRefContrib() { return serviceRefContrib; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -41,7 +41,6 @@ import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; import org.jboss.ws.metadata.accessor.ReflectiveMethodAccessorFactoryCreator; -import org.jboss.ws.metadata.config.EndpointFeature; /** * A request/response parameter that a given operation supports. @@ -410,14 +409,7 @@ public String getPartName() { - // [JBWS-771] Use part names that are friendly to .NET - String auxPartName = partName; - if (opMetaData.getEndpointMetaData().getConfig().hasFeature(EndpointFeature.BINDING_WSDL_DOTNET)) - { - if (opMetaData.isDocumentWrapped() && inHeader == false) - auxPartName = "parameters"; - } - return auxPartName; + return partName; } public void setPartName(String partName) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -28,7 +28,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -72,13 +71,6 @@ { super(service, portName, portTypeName); this.endpoint = endpoint; - - String configName = ConfigurationProvider.DEFAULT_ENDPOINT_CONFIG_NAME; - String configFile = ConfigurationProvider.DEFAULT_JAXRPC_ENDPOINT_CONFIG_FILE; - - EndpointConfigMetaData ecmd = getEndpointConfigMetaData(); - ecmd.setConfigName(configName); - ecmd.setConfigFile(configFile); } public Endpoint getEndpoint() @@ -205,12 +197,9 @@ buffer.append("\n portComponentName=").append(getPortComponentName()); buffer.append("\n contextRoot=").append(getContextRoot()); buffer.append("\n urlPattern=").append(getURLPattern()); - buffer.append("\n configFile=").append(getConfigFile()); - buffer.append("\n configName=").append(getConfigName()); buffer.append("\n authMethod=").append(getAuthMethod()); buffer.append("\n transportGuarantee=").append(getTransportGuarantee()); buffer.append("\n secureWSDLAccess=").append(isSecureWSDLAccess()); - buffer.append("\n properties=").append(getProperties()); for (OperationMetaData opMetaData : getOperations()) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -25,7 +25,6 @@ import java.util.LinkedList; import java.util.List; -import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -66,17 +65,7 @@ return new WebAppResolver(contextPath, servletName); } - /** - * Post init phase hook using template method - * @param servletConfig servlet config - */ @Override - protected final void postInit(ServletConfig servletConfig) - { - ServletConfigHelper.initEndpointConfig(servletConfig, endpoint); - } - - @Override protected final void postService() { registerForPreDestroy(endpoint); Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServletConfigHelper.java 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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.stack.jbws; - -import java.util.ResourceBundle; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; - -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.metadata.config.CommonConfig; - -/** - * Native servlet configuration helper - * @author richard.opalka(a)jboss.com - */ -public final class ServletConfigHelper -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(ServletConfigHelper.class); - - /** - * Constructor - */ - private ServletConfigHelper() {} - - /** - * Reads the config name/file from web.xml - * @param servletConfig servlet config - * @param endpoint endpoint instance - */ - public static void initEndpointConfig(ServletConfig servletConfig, Endpoint endpoint) - { - final ServletContext servletContext = servletConfig.getServletContext(); - final String configName = servletContext.getInitParameter(CommonConfig.JBOSSWS_CONFIG_NAME); - final String configFile = servletContext.getInitParameter(CommonConfig.JBOSSWS_CONFIG_FILE); - - if (configName != null || configFile != null) - { - ServerEndpointMetaData epMetaData = endpoint.getAttachment(ServerEndpointMetaData.class); - if (epMetaData == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_ENDPOINTMD")); - - epMetaData.setConfigName(configName, configFile); - } - } - -} Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,6 +1,3 @@ -urn\:jboss\:jaxrpc-config\:2.0=schema/jaxrpc-config_2_0.xsd -urn\:jboss\:jaxws-config\:2.0=schema/jaxws-config_2_0.xsd -http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 schema/jaxrpc-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - </client-config> - -</jaxrpc-config> Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 schema/jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - -</jaxrpc-config> Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature> - <property> - <property-name>http://org.jboss.ws/http#chunksize</property-name> - <property-value>2048</property-value> - </property> - </client-config> - - <client-config> - <config-name>HTTP 1.0 Client</config-name> - <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature> - </client-config> - -</jaxws-config> Deleted: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - </endpoint-config> - -  - <endpoint-config> - <config-name>.NET friendly Endpoint</config-name> - <feature><feature-name>http://org.jboss.ws/binding/wsdl/dotnet</feature-name></feature> - </endpoint-config> - -</jaxws-config> Deleted: stack/native/trunk/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:jboss:jaxrpc-config:2.0" xmlns:tns="urn:jboss:jaxrpc-config:2.0" - xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - attributeFormDefault="unqualified" version="1.1"> - - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - This is the schema definition for JBossWS configurations JAXRPC. - It relies on the handler definitions that are part of the standard J2EE-1.4 deployment descriptors. - ]]> - </xsd:documentation> - </xsd:annotation> - - <xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_web_services_1_1.xsd"/> - - <xsd:complexType name="jaxrpcConfigType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:choice> - <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:choice> - </xsd:complexType> - - <xsd:element name="jaxrpc-config" type="tns:jaxrpcConfigType"/> - - <xsd:complexType name="endpointConfigType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSEndpointConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="clientConfigType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSClientConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="commonConfigType"> - <xsd:sequence> - <xsd:element name="config-name" type="xsd:string"/> - <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/> - <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/> - <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="handlerChainType"> - <xsd:annotation> - <xsd:appinfo> - <jbxb:class impl="org.jboss.ws.metadata.config.WSHandlerChainConfig"/> - </xsd:appinfo> - </xsd:annotation> - <xsd:sequence> - <xsd:element name="handler-chain-name" type="xsd:string"/> - <xsd:element name="handler" type="j2ee:port-component_handlerType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="propertyType"> - <xsd:sequence> - <xsd:element name="property-name" type="xsd:string"/> - <xsd:element name="property-value" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> \ No newline at end of file Deleted: stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/schema/jaxws-config_2_0.xsd 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="urn:jboss:jaxws-config:2.0" - xmlns:tns="urn:jboss:jaxws-config:2.0" - xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - attributeFormDefault="unqualified" - version="1.1"> - - <xsd:annotation> - <xsd:documentation> - <![CDATA[ - This is the schema definition for JBossWS configurations JAXWS. - It relies on the handler definitions that are part of the standard J2EE-1.5 deployment descriptors. - ]]> - </xsd:documentation> - </xsd:annotation> - - <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="javaee_web_services_1_2.xsd"/> - - <xsd:element name="jaxws-config" type="tns:jaxwsConfigType"/> - <xsd:complexType name="jaxwsConfigType"> - <xsd:choice> - <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:choice> - </xsd:complexType> - - <xsd:complexType name="endpointConfigType"> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="clientConfigType"> - <xsd:complexContent> - <xsd:extension base="tns:commonConfigType"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="commonConfigType"> - <xsd:sequence> - <xsd:element name="config-name" type="xsd:string"/> - <xsd:element name="pre-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> - <xsd:element name="post-handler-chains" type="javaee:handler-chainsType" minOccurs="0"/> - <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="propertyType"> - <xsd:sequence> - <xsd:element name="property-name" type="xsd:anyURI"/> - <xsd:element name="property-value" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> Deleted: stack/native/trunk/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/core/src/main/resources/schema/jbossws-tool_1_0.xsd 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,286 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.jboss.org/jbossws-tools" targetNamespace="http://www.jboss.org/jbossws-tools" elementFormDefault="qualified" attributeFormDefault="unqualified"> - <xs:element name="configuration" type="ns1:configurationType"> - <xs:annotation> - <xs:documentation>Configuration Element</xs:documentation> - </xs:annotation> - </xs:element> -  - <xs:complexType name="configurationType"> - <xs:sequence> - <xs:element name="global" type="ns1:globalType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Represents global options</xs:documentation> - </xs:annotation> - </xs:element> - <xs:choice> - <xs:element name="java-wsdl" type="ns1:javaToWsdlType"> - <xs:annotation> - <xs:documentation>Generates a WSDL file from a JSR-109 service endpoint interface. Additionally, a webservices.xml and a JSR-109 mapping file can also be generated</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="wsdl-java" type="ns1:wsdlToJavaType"> - <xs:annotation> - <xs:documentation>Generates a JSR-109 service endpoint interface, and optionally a JSR-109 mapping file</xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - </xs:sequence> - </xs:complexType> - <xs:complexType name="globalType"> - <xs:sequence> - <xs:element name="package-namespace" type="ns1:pkgNSType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>Allows customization of the java package name to xml namespace mapping. This is specified in package/namespace element pairs.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="pkgNSType"> - <xs:annotation> - <xs:documentation>A package namespace pair.</xs:documentation> - </xs:annotation> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute name="package"> - <xs:annotation> - <xs:documentation>Package Name</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="namespace"> - <xs:annotation> - <xs:documentation>XML Namespace</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - <xs:complexType name="serviceType"> - <xs:sequence> - <xs:element name="operation" type="ns1:operationType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>Used to customize a WSDL operation. This chlid elements of this tag are mapped to a Java method on the endpoint interface. The name and parameter types must be specified in order to locate the method.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="name" use="required"> - <xs:annotation> - <xs:documentation>Name of the service. This will appear in the service element of the generated WSDL file.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="endpoint" use="required"> - <xs:annotation> - <xs:documentation>The fully qualified Java interface name of the service endpoint interface.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="style" use="optional" default="rpc"> - <xs:annotation> - <xs:documentation>The style of the web service. The "rpc" style indicates multiple parts where each part is a separate schema document instance. The "document" style indicates that the body of the message is represented by a single part.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="rpc"/> - <xs:enumeration value="document"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="parameter-style" use="optional" default="wrapped"> - <xs:annotation> - <xs:documentation>The parameter style convention to use when using document/literal. The "bare" convention requires that the Java method have a single parameter that represents the full request message body, and a single return value that represents the full response message body. The "wrapped" convention allows any Java method signature because it wraps all parameter in a single schema type.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="bare"/> - <xs:enumeration value="wrapped"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - <xs:complexType name="namespacesType"> - <xs:attribute name="target-namespace" use="required"> - <xs:annotation> - <xs:documentation>The target namespace of the WSDL. By default, it will be derived from the package name of the java endpoint.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:anyURI"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="type-namespace" use="required"> - <xs:annotation> - <xs:documentation>The namespace to be used for the schema types.By default, will be the same as the target namespace of the WSDL file.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:anyURI"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - <xs:complexType name="mappingType"> - <xs:attribute name="file" use="optional" default="jaxrpc-mapping.xml"> - <xs:annotation> - <xs:documentation>The JSR-109 mapping file to generate. This defaults to jaxrpc-mapping.xml</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - <xs:complexType name="operationType"> - <xs:sequence> - <xs:element name="parameter" type="ns1:parameterType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>Represents a method parameter. It must be in the exact order of the Java method signature.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="name" use="required"> - <xs:annotation> - <xs:documentation>The Java method name.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="one-way" use="optional"> - <xs:annotation> - <xs:documentation>If true, the generated WSDL operation should have no response message.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="return-xml-name" type="xs:QName" use="optional"> - <xs:annotation> - <xs:documentation>The name of the return value in the response message.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="wsxmlType"> - <xs:attribute name="servlet-link" use="optional"> - <xs:annotation> - <xs:documentation>Specifies the web.xml servlet-link that is used by Java Service Endpoints (WAR style deployments)</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="ejb-link" use="optional"> - <xs:annotation> - <xs:documentation>Specifies the ejb-jar.xml ejb-link for Stateless Session Bean endpoints</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="append" type="xs:boolean" use="optional" /> - </xs:complexType> - <xs:complexType name="javaToWsdlType"> - <xs:sequence> - <xs:element name="service" type="ns1:serviceType"/> - <xs:element name="namespaces" type="ns1:namespacesType"> - <xs:annotation> - <xs:documentation>Namespaces to use when generating the WSDL file.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="mapping" type="ns1:mappingType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies the JSR-109 mapping file to generate.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="webservices" type="ns1:wsxmlType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Used to generate the JSR-109 webservices.xml file</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="wsdlToJavaType"> - <xs:sequence> - <xs:element name="mapping" type="ns1:mappingType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies the JSR-109 mapping file to generate.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="webservices" type="ns1:wsxmlType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Used to generate the JSR-109 webservices.xml file</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="location" type="xs:anyURI" use="required"> - <xs:annotation> - <xs:documentation>Specifies the location of the WSDL file as a URL. The URL may be either absolute or relative to the current directory. Remote protocols such as http are supported.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="parameter-style" use="optional" default="wrapped"> - <xs:annotation> - <xs:documentation>The parameter style convention to use when using document/literal. The "bare" convention requires that the Java method have a single parameter that represents the full request message body, and a single return value that represents the full response message body. The "wrapped" convention allows any Java method signature because it wraps all parameter in a single schema type.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="bare"/> - <xs:enumeration value="wrapped"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="serializable-types" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Should generated types implement java.io.Serializable, default to false.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="parameterType"> - <xs:attribute name="type" use="required"> - <xs:annotation> - <xs:documentation>The fully qualified Java class name of the method parameter type.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="xml-name" type="xs:QName" use="optional"> - <xs:annotation> - <xs:documentation>Used to customize the name of the parameter that is used in the generated WSDL file.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="mode" use="optional" default="IN"> - <xs:annotation> - <xs:documentation>Indicates the in/out mode of the parameter. The "IN" mode is a normal java parameter. The "OUT" mode is a holder parameter that is used to pass multiple return values. The "INOUT" mode is a holder parameter that is used to receive as well as return values. The default is "IN".</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:whiteSpace value="collapse"/> - <xs:enumeration value="IN"/> - <xs:enumeration value="OUT"/> - <xs:enumeration value="INOUT"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="header" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Indicates whether this parameter should be mapped to a SOAP header instead of a SOAP body part.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> -</xs:schema> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -2856,41 +2856,6 @@ </manifest> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1653/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1653-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws1653-appclient.jar"/> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1792.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -2901,7 +2866,6 @@ <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1792/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> - <include name="custom-endpoint-config.xml"/> <include name="wsdl/**"/> </webinf> </war> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - -</jaxrpc-config> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - </endpoint-config> - -</jaxws-config> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml 2012-04-05 08:34:35 UTC (rev 16103) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1792/WEB-INF/custom-endpoint-config.xml 2012-04-05 12:45:05 UTC (rev 16104) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> - - <endpoint-config> - <config-name>Custom Endpoint Config</config-name> - <pre-handler-chain> - <handler-chain-name>Custom Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>Custom Handler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.test.ws.jaxrpc.jbws1792.TestHandler</j2ee:handler-class> - <j2ee:init-param> - <j2ee:param-name>TestParameter</j2ee:param-name> - <j2ee:param-value>TestValue</j2ee:param-value> - </j2ee:init-param> - </handler> - </pre-handler-chain> - </endpoint-config> - -</jaxrpc-config>

12 years

1
0
0 / 0

JBossWS SVN: r16103 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-04-05 04:34:35 -0400 (Thu, 05 Apr 2012) New Revision: 16103 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: [JBWS-3474] fixing regression Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-05 08:08:46 UTC (rev 16102) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-04-05 08:34:35 UTC (rev 16103) @@ -482,6 +482,7 @@ { TypeMappingImpl typeMapping = serviceMetaData.getTypeMapping(); List<TypeMappingMetaData> typeMappings = serviceMetaData.getTypesMetaData().getTypeMappings(); + List<Class> registeredTypes = new ArrayList<Class>(typeMappings.size()); for (TypeMappingMetaData tmMetaData : typeMappings) { String javaTypeName = tmMetaData.getJavaTypeName(); @@ -490,27 +491,44 @@ { List<Class> types = typeMapping.getJavaTypes(xmlType); - try + // TODO: Clarification. In which cases is the type already registered? + boolean registered = false; + for (Class current : types) { - ClassLoader classLoader = getClassLoader(); - Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); + if (current.getName().equals(javaTypeName)) + { + registeredTypes.add(current); + registered = true; + break; + } + } - if (JavaUtils.isPrimitive(javaTypeName)) - javaType = JavaUtils.getWrapperType(javaType); + if (registered == false) + { + try + { + ClassLoader classLoader = getClassLoader(); + Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); - if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) - { - typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); + if (JavaUtils.isPrimitive(javaTypeName)) + javaType = JavaUtils.getWrapperType(javaType); + + registeredTypes.add(javaType); + + if (getEncodingStyle() == Use.ENCODED && javaType.isArray()) + { + typeMapping.register(javaType, xmlType, new SOAPArraySerializerFactory(), new SOAPArrayDeserializerFactory()); + } + else + { + typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); + } } - else + catch (ClassNotFoundException e) { - typeMapping.register(javaType, xmlType, new JBossXBSerializerFactory(), new JBossXBDeserializerFactory()); + log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); } } - catch (ClassNotFoundException e) - { - log.warn(BundleUtils.getMessage(bundle, "CANNOT_LOAD_CLASS", new Object[]{ xmlType, javaTypeName})); - } } } }

12 years

1
0
0 / 0

JBossWS SVN: r16102 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-04-05 04:08:46 -0400 (Thu, 05 Apr 2012) New Revision: 16102 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java Log: Solve AS 7.0.2 regression caused by -r 16094 by making MultipleClientsServiceImpl an EJB3 ws endpoint, given JBWS-3276 is fixed starting from AS 7.1.0 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java 2012-04-04 15:54:30 UTC (rev 16101) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/MultipleClientsServiceImpl.java 2012-04-05 08:08:46 UTC (rev 16102) @@ -21,10 +21,12 @@ */ package org.jboss.test.ws.jaxws.samples.wsse.policy.basic; +import javax.ejb.Stateless; import javax.jws.WebService; import org.apache.cxf.annotations.EndpointProperties; import org.apache.cxf.annotations.EndpointProperty; +import org.jboss.ws.api.annotation.WebContext; @WebService ( @@ -43,6 +45,8 @@ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback") } ) +@Stateless +@WebContext(urlPattern = "SecurityService") public class MultipleClientsServiceImpl implements ServiceIface { public String sayHello()

12 years

1
0
0 / 0

JBossWS SVN: r16101 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-04-04 11:54:30 -0400 (Wed, 04 Apr 2012) New Revision: 16101 Modified: stack/cxf/trunk/pom.xml Log: [JBWS-3480] Moving to latest jbossws-parent Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-04-04 15:53:50 UTC (rev 16100) +++ stack/cxf/trunk/pom.xml 2012-04-04 15:54:30 UTC (rev 16101) @@ -38,7 +38,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10.GA</version> + <version>1.0.11-SNAPSHOT</version> </parent>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16100 - maven/parent/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-04-04 11:53:50 -0400 (Wed, 04 Apr 2012) New Revision: 16100 Modified: maven/parent/trunk/pom.xml Log: [JBWS-3480] Updating maven plugin versions Modified: maven/parent/trunk/pom.xml =================================================================== --- maven/parent/trunk/pom.xml 2012-04-04 15:45:25 UTC (rev 16099) +++ maven/parent/trunk/pom.xml 2012-04-04 15:53:50 UTC (rev 16100) @@ -114,6 +114,10 @@ <pluginManagement> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-5</version> </plugin> @@ -145,17 +149,17 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-1</version> + <version>1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.7.2</version> + <version>2.11</version> </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> @@ -170,7 +174,7 @@ <plugins> <plugin> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.7.2</version> + <version>2.11</version> </plugin> </plugins> </reporting> @@ -228,7 +232,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-beta-1</version> + <version>1.0.1</version> <executions> <execution> <id>enforce-java-maven-versions</id>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16099 - shared-testsuite/trunk/testsuite/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-04-04 11:45:25 -0400 (Wed, 04 Apr 2012) New Revision: 16099 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: Adding default native version specification in binary distro testsuite build for 712 target too Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-04-04 15:11:11 UTC (rev 16098) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-04-04 15:45:25 UTC (rev 16099) @@ -122,6 +122,9 @@ <condition property="jbossws-native-core.default-filename" value="4.0.2.GA"> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> </condition> + <condition property="jbossws-native-core.default-filename" value="4.0.2.GA"> + <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> + </condition> <echo/> <echo message="-----------------------------------------------"/>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16098 - stack/native/trunk/modules/testsuite/native-tests.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-04-04 11:11:11 -0400 (Wed, 04 Apr 2012) New Revision: 16098 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml Log: Avoid using ${project.parent.build.directory} which is not working anymore with recent antrun maven plugin versions Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-04-04 15:07:45 UTC (rev 16097) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-04-04 15:11:11 UTC (rev 16098) @@ -67,7 +67,7 @@ <configuration> <tasks> <copy - file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" + file="${project.build.directory}/../../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" failonerror="false" verbose="true"

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16097 - stack/cxf/trunk/modules/testsuite/shared-tests.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-04-04 11:07:45 -0400 (Wed, 04 Apr 2012) New Revision: 16097 Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml Log: Avoid using ${project.parent.build.directory} which is not working anymore with recent antrun maven plugin versions Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-04-04 13:08:29 UTC (rev 16096) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-04-04 15:07:45 UTC (rev 16097) @@ -140,7 +140,7 @@ <configuration> <tasks> <copy - file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" + file="${project.build.directory}/../../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" failonerror="false" verbose="true"

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16096 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-04-04 09:08:29 -0400 (Wed, 04 Apr 2012) New Revision: 16096 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java Log: Fixing test potentially messing up with client thread default bus Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2012-04-04 13:05:15 UTC (rev 16095) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2012-04-04 13:08:29 UTC (rev 16096) @@ -74,11 +74,17 @@ Service serviceOne = Service.create(wsdlOneURL, serviceOneName); Bus bus = BusFactory.getThreadDefaultBus(false); CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener(); - bus.getExtension(ClientLifeCycleManager.class).registerListener(listener); - assertEquals(0, listener.getCount()); - EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class); - assertEquals(1, listener.getCount()); - assertEquals("Foo", portOne.echo("Foo")); + ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class); + try { + mgr.registerListener(listener); + assertEquals(0, listener.getCount()); + EndpointOne portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class); + assertEquals(1, listener.getCount()); + assertEquals("Foo", portOne.echo("Foo")); + } finally { + mgr.unRegisterListener(listener); + } + } private class CustomClientLifeCycleListener implements ClientLifeCycleListener

12 years, 1 month

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 April 2012