Author: richard.opalka(a)jboss.com Date: 2011-01-11 11:11:01 -0500 (Tue, 11 Jan 2011) New Revision: 13556 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/management/pom.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/jbossws-deploy-macros.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: refactoring framework sources to common Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2011-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/client/pom.xml 2011-01-11 16:11:01 UTC (rev 13556) @@ -277,9 +277,9 @@ <classpathLayoutType>custom</classpathLayoutType> <!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be reviewed(remove one $) when maven jar plugin is updated--> <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> - </manifest> + </manifest> <manifestEntries> - <Class-Path>jbossws-framework.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path> + <Class-Path>jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path> </manifestEntries> </archive> </configuration> Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2011-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/management/pom.xml 2011-01-11 16:11:01 UTC (rev 13556) @@ -20,11 +20,6 @@ <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> <classifier>testsuite</classifier> <scope>provided</scope> <type>zip</type> Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.bat 2011-01-11 16:11:01 UTC (rev 13556) @@ -33,7 +33,6 @@ 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-framework.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-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh 2011-01-11 16:11:01 UTC (rev 13556) @@ -84,7 +84,6 @@ 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-framework.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-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2011-01-11 16:11:01 UTC (rev 13556) @@ -26,7 +26,6 @@ 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-framework.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-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2011-01-11 16:11:01 UTC (rev 13556) @@ -80,7 +80,6 @@ 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-framework.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-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2011-01-11 16:11:01 UTC (rev 13556) @@ -51,7 +51,6 @@ 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-framework.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-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2011-01-11 16:11:01 UTC (rev 13556) @@ -83,7 +83,6 @@ 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-framework.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/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-01-11 16:11:01 UTC (rev 13556) @@ -39,7 +39,6 @@ <include name="**/jbossws-api.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-spi.jar"/> <include name="**/jbossws-cxf-transports-httpserver.jar"/> <include name="**/jdom.jar"/> @@ -78,7 +77,6 @@ <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-api.jar"/> <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-spi.jar"/> <include name="**/jdom.jar"/> <include name="**/neethi.jar"/> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-11 16:11:01 UTC (rev 13556) @@ -42,10 +42,6 @@ <artifactId>jbossws-common</artifactId> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - </dependency> - <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> </dependency> @@ -353,7 +349,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> @@ -361,7 +357,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - </dependency> + </dependency> </dependencies> </profile> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/pom.xml 2011-01-11 16:11:01 UTC (rev 13556) @@ -110,11 +110,6 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <version>${jbossws.framework.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <version>${jbossws.framework.version}</version> <classifier>testsuite</classifier> <type>zip</type> </dependency> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-11 16:08:33 UTC (rev 13555) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-11 16:11:01 UTC (rev 13556) @@ -124,7 +124,6 @@ <scope>provided</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-framework:jar</include> <include>org.jboss.jaxr:juddi-service:sar</include> <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include>