Author: fnasser(a)redhat.com Date: 2009-12-09 10:16:02 -0500 (Wed, 09 Dec 2009) New Revision: 11228 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml Log: Replace geronimo-ws-metadata with a jsr181-api.jar from Sun (CDDL) Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2009-12-09 15:16:02 UTC (rev 11228) @@ -68,7 +68,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-frontend-jaxws.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-dv.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-ts.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2009-12-09 15:16:02 UTC (rev 11228) @@ -107,7 +107,7 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-frontend-jaxws.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-dv.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-ts.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jsr181-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar" Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-12-09 15:16:02 UTC (rev 11228) @@ -68,7 +68,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar -set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-12-09 15:16:02 UTC (rev 11228) @@ -109,7 +109,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-lang.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-logging.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar" Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-12-09 15:16:02 UTC (rev 11228) @@ -93,7 +93,7 @@ set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar -set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar +set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-12-09 15:16:02 UTC (rev 11228) @@ -111,7 +111,7 @@ WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-lang.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar" -WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/geronimo-ws-metadata_2.0_spec.jar" +WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar" WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/neethi.jar" Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 15:16:02 UTC (rev 11228) @@ -31,7 +31,8 @@ <include name="**/commons-lang.jar"/> <include name="**/cxf-*.jar"/> <include name="**/geronimo-javamail*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> + <!-- ws-metadata --> + <include name="**/jsr181-api.jar"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/jaxb-xjc.jar"/> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 15:16:02 UTC (rev 11228) @@ -70,7 +70,8 @@ <patternset id="jbossws.service.lib.patternset"> <include name="**/cxf-*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> + <!-- ws-metadata --> + <include name="**/jsr181-api.jar"/> <include name="**/jaxrpc-api.jar"/> <include name="**/jaxws-api.jar"/> <include name="**/jbossws-cxf-client*.jar"/> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 15:16:02 UTC (rev 11228) @@ -137,11 +137,11 @@ <version>5.0.1.GA</version> <scope>provided</scope> </dependency> + <!-- ws-metadata --> <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> <version>1.0-MR1</version> - <scope>provided</scope> </dependency> <!-- CXF dependencies --> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml 2009-12-09 15:16:02 UTC (rev 11228) @@ -122,7 +122,8 @@ <pathelement location="${jboss.client}/jbossws-common.jar"/> <pathelement location="${jboss.client}/jbossws-spi.jar"/> <pathelement location="${jboss.client}/jbossws-cxf-client.jar"/> - <pathelement location="${jboss.client}/geronimo-ws-metadata_2.0_spec.jar"/> + <!-- ws-metadata --> + <pathelement location="${jboss.client}/jsr181-api.jar"/> <path refid="integration.target.javac.classpath" /> </path> <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 14:31:06 UTC (rev 11227) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 15:16:02 UTC (rev 11228) @@ -24,7 +24,8 @@ <includes> <include>org.apache.cxf:cxf-*</include> <!-- <include>javax.mail:mail*</include> --> - <include>org.apache.geronimo.specs:geronimo-ws-metadata*</include> + <!-- ws-metadata --> + <include>javax.jws:jsr181-api:jar</include> <include>javax.xml.bind:jaxb-api:jar</include> <include>com.sun.xml.bind:jaxb-impl:jar</include> <include>com.sun.xml.bind:jaxb-xjc:jar</include>