Author: asoldano
Date: 2014-02-12 09:52:25 -0500 (Wed, 12 Feb 2014)
New Revision: 18342
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Replacing javax.xml:jaxrpc-api with org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec
(there's already a redirect in the pom for the former, but that does not work properly
with the maven assemply plugin)
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2014-02-12 14:11:48
UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2014-02-12 14:52:25
UTC (rev 18342)
@@ -21,8 +21,8 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
@@ -37,7 +37,7 @@
<configuration>
<archive>
<manifestEntries>
- <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar
jbossws-native-core.jar jbossws-native-factories.jar jaxrpc-api.jar jaxws-api.jar
jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar
javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar
jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar
jbosssx-client.jar jboss-javaee.jar jboss-remoting.jar jboss-xml-binding.jar jbossxb.jar
netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
+ <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar
jbossws-native-core.jar jbossws-native-factories.jar jboss-jaxrpc-api_1.1_spec.jar
jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar
concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar
jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar
jbosssx-client.jar jboss-javaee.jar jboss-remoting.jar jboss-xml-binding.jar jbossxb.jar
netty.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2014-02-12 14:11:48
UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2014-02-12 14:52:25
UTC (rev 18342)
@@ -31,8 +31,8 @@
<artifactId>jbossws-spi</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2014-02-12
14:52:25 UTC (rev 18342)
@@ -50,7 +50,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
set
WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set
WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set
WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
rem Force use of IPv4 stack
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2014-02-12
14:52:25 UTC (rev 18342)
@@ -76,7 +76,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
###
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2014-02-12
14:52:25 UTC (rev 18342)
@@ -49,7 +49,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
set
WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set
WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set
WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2014-02-12
14:52:25 UTC (rev 18342)
@@ -75,7 +75,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2014-02-12
14:52:25 UTC (rev 18342)
@@ -54,7 +54,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
set
WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set
WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set
WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2014-02-12
14:52:25 UTC (rev 18342)
@@ -73,7 +73,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.bat 2014-02-12
14:52:25 UTC (rev 18342)
@@ -39,7 +39,7 @@
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-client.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jbossws-native-core.jar
-set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jaxrpc-api.jar
+set
WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc-api_1.1_spec.jar
set WSTOOLS_CLASSPATH=%WSTOOLS_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
rem Force use of IPv4 stack
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/bin/wstools.sh 2014-02-12
14:52:25 UTC (rev 18342)
@@ -61,7 +61,7 @@
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-client.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jbossws-native-core.jar"
-WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jaxrpc-api.jar"
+WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc-api_1.1_spec.jar"
WSTOOLS_CLASSPATH="$WSTOOLS_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-02-12
14:52:25 UTC (rev 18342)
@@ -42,7 +42,7 @@
<include name="**/jbossws-native-core.jar"/>
<include name="**/jbossws-native-factories.jar"/>
<include name="**/jbossws-spi.jar"/>
- <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jboss-jaxrpc-api_1.1_spec.jar"/>
<include name="**/saaj-api.jar"/>
<include name="**/jettison.jar"/>
<include name="**/stax-api.jar"/>
@@ -65,7 +65,7 @@
<patternset id="jbossws.server.lib.patternset">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jboss-jaxrpc-api_1.1_spec.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jbossws-native-factories.jar"/>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2014-02-12 14:11:48 UTC (rev
18341)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2014-02-12 14:52:25 UTC (rev
18342)
@@ -58,7 +58,7 @@
<javassist.version>3.9.0.GA</javassist.version>
<jaxws.api.version>2.1-1</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
- <jaxrpc.api.version>1.1</jaxrpc.api.version>
+ <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
<saaj.api.version>1.3</saaj.api.version>
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.12.patch01</jaxb.impl.version>
@@ -243,8 +243,8 @@
<version>${jsr181.api.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
<version>${jaxrpc.api.version}</version>
<exclusions>
<exclusion>
Modified:
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/src/main/distro/build-project-gen.xml 2014-02-12
14:52:25 UTC (rev 18342)
@@ -109,7 +109,7 @@
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jbossws-common.jar"/>
<pathelement location="${jboss.client}/jbossws-spi.jar"/>
- <pathelement location="${jboss.client}/jaxrpc-api.jar"/>
+ <pathelement
location="${jboss.client}/jboss-jaxrpc-api_1.1_spec.jar"/>
<pathelement location="${jboss.client}/saaj-api.jar"/>
<pathelement
location="${jboss.client}/jbossws-native-factories.jar"/>
<pathelement
location="${jboss.client}/jbossws-native-core.jar"/>
Modified: stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml 2014-02-12
14:11:48 UTC (rev 18341)
+++ stack/native/branches/jbossws-native-3.1.2/src/main/distro/build.xml 2014-02-12
14:52:25 UTC (rev 18342)
@@ -59,7 +59,7 @@
<path id="ws.stack.classpath">
<!-- Move the native API to the front of the classpath -->
- <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
+ <pathelement
location="${thirdparty.dir}/jboss-jaxrpc-api_1.1_spec.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
<fileset dir="${thirdparty.dir}"/>
</path>
Modified:
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-12
14:11:48 UTC (rev 18341)
+++
stack/native/branches/jbossws-native-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2014-02-12
14:52:25 UTC (rev 18342)
@@ -41,7 +41,7 @@
<include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
<include>org.jboss.ws:jbossws-common:jar</include>
<include>org.jboss.ws:jbossws-spi:jar</include>
- <include>javax.xml:jaxrpc-api:jar</include>
+
<include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec</include>
<include>javax.xml.ws:jaxws-api:jar</include>
<include>javax.jws:jsr181-api</include>
<include>org.jboss.ws.native:jbossws-native-factories:jar</include>
Show replies by date