Author: richard.opalka(a)jboss.com
Date: 2011-04-18 07:19:20 -0400 (Mon, 18 Apr 2011)
New Revision: 14139
Modified:
stack/cxf/trunk/modules/dist/management/pom.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3273] removing ANT & CMD tools from jbossws-common.jar to
jbossws-common-tools.jar
Modified: stack/cxf/trunk/modules/dist/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/management/pom.xml 2011-04-18 11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/dist/management/pom.xml 2011-04-18 11:19:20 UTC (rev 14139)
@@ -24,7 +24,7 @@
<scope>provided</scope>
<type>zip</type>
</dependency>
-</dependencies>
+ </dependencies>
<build>
<plugins>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2011-04-18 11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/dist/pom.xml 2011-04-18 11:19:20 UTC (rev 14139)
@@ -46,6 +46,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common-tools</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!--test-suite-->
<dependency>
<groupId>org.jboss.ws</groupId>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-04-18 11:14:04 UTC
(rev 14138)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-04-18 11:19:20 UTC
(rev 14139)
@@ -104,7 +104,7 @@
<path id="jbossws-common.path">
<fileset dir="${deploy.artifacts.dir}">
- <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-common-tools.jar"/>
</fileset>
</path>
<taskdef name="installModules"
classname="org.jboss.ws.tools.ant.InstallModulesTask"
classpathref="jbossws-common.path"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-04-18 11:14:04
UTC (rev 14138)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-04-18 11:19:20
UTC (rev 14139)
@@ -22,7 +22,7 @@
</filterset>
<path id="jbws-ant.path">
- <pathelement location="${thirdparty.dir}/jbossws-common.jar" />
+ <pathelement location="${thirdparty.dir}/jbossws-common-tools.jar"
/>
</path>
<taskdef name="pathFixer"
classname="org.jboss.ws.tools.ant.FixPathTask"
classpathref="jbws-ant.path"/>
<taskdef name="eclipseClasspathGenerator"
classname="org.jboss.ws.tools.ant.EclipseClasspathTask"
classpathref="jbws-ant.path"/>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-04-18
11:19:20 UTC (rev 14139)
@@ -93,6 +93,7 @@
<include>org.jboss.jaxr:juddi-service:sar</include>
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
+ <include>org.jboss.ws:jbossws-common-tools:jar</include>
<include>org.jboss.ws:jbossws-jboss600:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
</includes>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-04-18
11:19:20 UTC (rev 14139)
@@ -33,6 +33,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
+set
WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common-tools.jar
rem CXF XJC patched plugins
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-boolean.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2011-04-18
11:19:20 UTC (rev 14139)
@@ -84,6 +84,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-spi.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-common.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jbossws-common-tools.jar"
# CXF XJC patched plugins
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-boolean.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2011-04-18
11:19:20 UTC (rev 14139)
@@ -26,6 +26,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
+set
WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common-tool.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/activation.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/getopt.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2011-04-18
11:19:20 UTC (rev 14139)
@@ -80,6 +80,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-spi.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-common.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossws-common-tools.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/activation.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/getopt.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jbossall-client.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2011-04-18
11:19:20 UTC (rev 14139)
@@ -51,6 +51,7 @@
set
WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-xml-binding.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossxb.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common.jar
+set
WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-common-tools.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jbossws-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/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2011-04-18
11:19:20 UTC (rev 14139)
@@ -83,6 +83,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossxb.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-common.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-common-tools.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-04-18
11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-04-18
11:19:20 UTC (rev 14139)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar
client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar
client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar
client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar
client/commons-collections.jar client/commons-lang.jar client/jettison.jar
client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar
client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar
client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar
client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar
client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar
client/jbossws-common.jar client!
/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar
client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar
lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar
common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar
common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar
common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar
common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar
common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar
common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar
common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar
common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar
common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar
common/lib/commons-beanutils.jar lib/endorsed/!
*jbossws* lib/endorsed/*jaxb*.jar lib/endorsed/*jaxws*.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar
client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar
client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar
client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar
client/commons-collections.jar client/commons-lang.jar client/jettison.jar
client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar
client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar
client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar
client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar
client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar
client/jbossws-common.jar client!
/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar
client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar
client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar
common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar
common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar
common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar
common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar
common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar
common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar
common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar
common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar
common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar
common/lib/jbossws-spi.jar common/lib/com!
mons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*.!
jar lib/
endorsed/*jaxws*.jar
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-18
11:14:04 UTC (rev 14138)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-04-18
11:19:20 UTC (rev 14139)
@@ -38,6 +38,7 @@
<include name="**/jsr181-api.jar"/>
<include name="**/jbossws-api.jar"/>
<include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-common-tools.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
<include name="**/jbossws-spi.jar"/>
<include name="**/jbossws-cxf-transports-httpserver.jar"/>
@@ -366,6 +367,11 @@
<include name="**/jbossws-common.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/jboss/ws/tools/common/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jbossws-common-tools.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/ws/spi/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-spi.jar"/>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-18 11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-04-18 11:19:20 UTC (rev 14139)
@@ -42,6 +42,10 @@
<artifactId>jbossws-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common-tools</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
</dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-04-18 11:14:04 UTC (rev 14138)
+++ stack/cxf/trunk/pom.xml 2011-04-18 11:19:20 UTC (rev 14139)
@@ -47,6 +47,7 @@
<properties>
<jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
+
<jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
<!-- JBWS-2505 -->
@@ -103,6 +104,11 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common-tools</artifactId>
+ <version>${jbossws.common.tools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
<version>${jbossws.spi.version}</version>
</dependency>
Show replies by date