June 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7640 - in stack/cxf/branches/jbossws-cxf-3.0.2: modules/resources/src/main and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 09:56:50 -0400 (Wed, 18 Jun 2008) New Revision: 7640 Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/scripts/ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build-deploy.xml Log: [JBWS-2231] sync QA branch with trunk Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml 2008-06-18 13:56:39 UTC (rev 7639) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/pom.xml 2008-06-18 13:56:50 UTC (rev 7640) @@ -14,4 +14,28 @@ <relativePath>../../pom.xml</relativePath> </parent> +  + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="src/main/scripts/zip-other-configs.xml"> + <property name="project.build.finalName" value="${project.build.finalName}"/> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:56:39 UTC (rev 7639) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:56:50 UTC (rev 7640) @@ -217,13 +217,14 @@  <macrodef name="macro-deploy-jbossws-cxf42-sar"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{artifactsdir}"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> @@ -232,7 +233,7 @@ </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> @@ -251,18 +252,19 @@ </macrodef> <macrodef name="macro-deploy-jbossws-cxf50-sar"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> @@ -279,13 +281,14 @@  <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-(a){jbossid}.jar"/> @@ -308,13 +311,19 @@ <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws.sar" src="@{thirdpartydir}/jbossws-(a){jbossid}-container.jar"> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-(a){jbossid}-container.jar"/> + </fileset> + </copy> + <unzip dest="@{targetdir}" src="@{targetdir}/jbossws-(a){jbossid}-container.jar"> <patternset> <include name="META-INF/jbossws-container-beans.xml"/> </patternset> </unzip> - <move file="@{targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml" todir="@{targetdir}"/> + <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/> + <delete file="@{targetdir}/jbossws-(a){jbossid}-container.jar"/> + <delete dir="@{targetdir}/META-INF"/> </sequential> </macrodef> @@ -325,28 +334,34 @@  <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> + <target name="deploy-jbossws-cxf42" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> - <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> + <target name="deploy-jbossws-cxf50" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> + <target name="check-parameters"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="artifactsdir must be specified" unless="artifactsdir"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + </target> +    Added: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml 2008-06-18 13:56:50 UTC (rev 7640) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main"> + + <property name="target.dir" value="${basedir}/target"/> + <property name="source.jar" value="${target.dir}/${project.build.finalName}-sources.jar"/> + <property name="binary.jar" value="${target.dir}/${project.build.finalName}.jar"/> + + <target name="main"> + <copy todir="${target.dir}/classes/resources"> + <fileset dir="${basedir}/../server/target/resources"/> + </copy> + <jar destfile="${source.jar}" basedir="${target.dir}/classes" update="true"/> + <jar destfile="${binary.jar}" basedir="${target.dir}/classes" update="true"/> + </target> + +</project> Property changes on: stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:56:39 UTC (rev 7639) +++ stack/cxf/branches/jbossws-cxf-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:56:50 UTC (rev 7640) @@ -23,6 +23,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -81,6 +82,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7639 - in stack/metro/branches/jbossws-metro-3.0.2: modules/resources/src/main and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 09:56:39 -0400 (Wed, 18 Jun 2008) New Revision: 7639 Added: stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/scripts/ stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/resources/pom.xml stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/branches/jbossws-metro-3.0.2/src/main/distro/build-deploy.xml Log: [JBWS-2229] sync QA branch with trunk Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/resources/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.0.2/modules/resources/pom.xml 2008-06-18 13:56:29 UTC (rev 7638) +++ stack/metro/branches/jbossws-metro-3.0.2/modules/resources/pom.xml 2008-06-18 13:56:39 UTC (rev 7639) @@ -14,4 +14,28 @@ <relativePath>../../pom.xml</relativePath> </parent> +  + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="src/main/scripts/zip-other-configs.xml"> + <property name="project.build.finalName" value="${project.build.finalName}"/> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:56:29 UTC (rev 7638) +++ stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:56:39 UTC (rev 7639) @@ -227,13 +227,14 @@  <macrodef name="macro-deploy-jbossws-sar42"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{artifactsdir}"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> @@ -242,7 +243,7 @@ </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> @@ -258,18 +259,19 @@ </macrodef> <macrodef name="macro-deploy-jbossws-sar50"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> @@ -286,13 +288,14 @@  <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-(a){jbossid}.jar"/> @@ -315,13 +318,19 @@ <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws.sar" src="@{thirdpartydir}/jbossws-(a){jbossid}-container.jar"> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-(a){jbossid}-container.jar"/> + </fileset> + </copy> + <unzip dest="@{targetdir}" src="@{targetdir}/jbossws-(a){jbossid}-container.jar"> <patternset> <include name="META-INF/jbossws-container-beans.xml"/> </patternset> </unzip> - <move file="@{targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml" todir="@{targetdir}"/> + <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/> + <delete file="@{targetdir}/jbossws-(a){jbossid}-container.jar"/> + <delete dir="@{targetdir}/META-INF"/> </sequential> </macrodef> @@ -332,28 +341,34 @@  <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed"> + <target name="deploy-jbossws-metro42" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> - <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed"> + <target name="deploy-jbossws-metro50" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> + <target name="check-parameters"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="artifactsdir must be specified" unless="artifactsdir"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + </target> +    @@ -391,4 +406,4 @@ </sequential> </macrodef> -</project> \ No newline at end of file +</project> Added: stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml (rev 0) +++ stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml 2008-06-18 13:56:39 UTC (rev 7639) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main"> + + <property name="target.dir" value="${basedir}/target"/> + <property name="source.jar" value="${target.dir}/${project.build.finalName}-sources.jar"/> + <property name="binary.jar" value="${target.dir}/${project.build.finalName}.jar"/> + + <target name="main"> + <copy todir="${target.dir}/classes/resources"> + <fileset dir="${basedir}/../server/target/resources"/> + </copy> + <jar destfile="${source.jar}" basedir="${target.dir}/classes" update="true"/> + <jar destfile="${binary.jar}" basedir="${target.dir}/classes" update="true"/> + </target> + +</project> Property changes on: stack/metro/branches/jbossws-metro-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/branches/jbossws-metro-3.0.2/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:56:29 UTC (rev 7638) +++ stack/metro/branches/jbossws-metro-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:56:39 UTC (rev 7639) @@ -23,6 +23,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -85,6 +86,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -113,7 +115,7 @@ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>  <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/> -  +  <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/> </target>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7638 - in stack/native/branches/jbossws-native-3.0.2: modules/resources/src/main and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 09:56:29 -0400 (Wed, 18 Jun 2008) New Revision: 7638 Added: stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/ stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml Modified: stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml Log: [JBWS-2228] sync QA branch with trunk Modified: stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml 2008-06-18 13:19:15 UTC (rev 7637) +++ stack/native/branches/jbossws-native-3.0.2/modules/resources/pom.xml 2008-06-18 13:56:29 UTC (rev 7638) @@ -14,4 +14,28 @@ <relativePath>../../pom.xml</relativePath> </parent> +  + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="src/main/scripts/zip-other-configs.xml"> + <property name="project.build.finalName" value="${project.build.finalName}"/> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:19:15 UTC (rev 7637) +++ stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-18 13:56:29 UTC (rev 7638) @@ -138,49 +138,6 @@ </macrodef>  -  -  - - <macrodef name="macro-deploy-jbossws-deployers50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-(a){jbossid}.jar"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-deployer-beans.xml"/> - </fileset> - </copy> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-jbossws-deploy50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-(a){jbossid}-container.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - -    @@ -260,7 +217,7 @@ <mkdir dir="@{targetdir}"/> <unzip dest="@{targetdir}"> <fileset dir="@{thirdpartydir}"> - <include name="juddi-service.sar"/> + <include name="**/juddi-service.sar"/> </fileset> </unzip> </sequential> @@ -271,13 +228,14 @@  <macrodef name="macro-deploy-jbossws-sar42"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{artifactsdir}"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> @@ -286,7 +244,7 @@ </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-native-management.war"/> </fileset> </unzip> @@ -305,18 +263,19 @@ </macrodef> <macrodef name="macro-deploy-jbossws-sar50"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}"> + <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-native-management.war"/> </fileset> </unzip> @@ -338,13 +297,14 @@  <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> + <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-(a){jbossid}.jar"/> @@ -367,13 +327,19 @@ <attribute name="targetdir"/> <attribute name="jbossid"/> <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws.sar" src="@{thirdpartydir}/jbossws-(a){jbossid}-container.jar"> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-(a){jbossid}-container.jar"/> + </fileset> + </copy> + <unzip dest="@{targetdir}" src="@{targetdir}/jbossws-(a){jbossid}-container.jar"> <patternset> <include name="META-INF/jbossws-container-beans.xml"/> </patternset> </unzip> - <move file="@{targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml" todir="@{targetdir}"/> + <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/> + <delete file="@{targetdir}/jbossws-(a){jbossid}-container.jar"/> + <delete dir="@{targetdir}/META-INF"/> </sequential> </macrodef> @@ -384,30 +350,36 @@  <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - <target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed"> + <target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed"> + <target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> </target> + <target name="check-parameters"> + <fail message="artifactsdir must be specified" unless="artifactsdir"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + <fail message="installserver must be specified" unless="installserver"/> + </target> +    @@ -448,4 +420,4 @@ </sequential> </macrodef> -</project> \ No newline at end of file +</project> Added: stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml =================================================================== --- stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml (rev 0) +++ stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml 2008-06-18 13:56:29 UTC (rev 7638) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main"> + + <property name="target.dir" value="${basedir}/target"/> + <property name="source.jar" value="${target.dir}/${project.build.finalName}-sources.jar"/> + <property name="binary.jar" value="${target.dir}/${project.build.finalName}.jar"/> + + <target name="main"> + <copy todir="${target.dir}/classes/resources"> + <fileset dir="${basedir}/../core/target/resources"/> + <fileset dir="${basedir}/../client/src/main/resources/META-INF"/> + </copy> + <jar destfile="${source.jar}" basedir="${target.dir}/classes" update="true"/> + <jar destfile="${binary.jar}" basedir="${target.dir}/classes" update="true"/> + </target> + +</project> Property changes on: stack/native/branches/jbossws-native-3.0.2/modules/resources/src/main/scripts/zip-other-configs.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml =================================================================== --- stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:19:15 UTC (rev 7637) +++ stack/native/branches/jbossws-native-3.0.2/src/main/distro/build-deploy.xml 2008-06-18 13:56:29 UTC (rev 7638) @@ -23,6 +23,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -116,6 +117,7 @@ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -142,7 +144,7 @@ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>  <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/> -  +  <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/> </target>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7637 - in stack/native/trunk: src/main/distro and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 09:19:15 -0400 (Wed, 18 Jun 2008) New Revision: 7637 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/trunk/src/main/distro/build-deploy.xml Log: synchronize Native trunk with Native QA branch Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 12:46:00 UTC (rev 7636) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 13:19:15 UTC (rev 7637) @@ -16,4 +16,4 @@ org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* # [JBWS-2170] Fix embedded for maven build -org/jboss/test/ws/embedded/** \ No newline at end of file +org/jboss/test/ws/embedded/** Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-06-18 12:46:00 UTC (rev 7636) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-06-18 13:19:15 UTC (rev 7637) @@ -144,6 +144,8 @@ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>  <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/> +  + <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/> </target>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7636 - in stack/metro/trunk: modules/testsuite and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 08:46:00 -0400 (Wed, 18 Jun 2008) New Revision: 7636 Modified: stack/metro/trunk/modules/client/pom.xml stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/src/main/distro/build-deploy.xml Log: synchronize Metro trunk with Metro QA branch Modified: stack/metro/trunk/modules/client/pom.xml =================================================================== --- stack/metro/trunk/modules/client/pom.xml 2008-06-18 12:29:44 UTC (rev 7635) +++ stack/metro/trunk/modules/client/pom.xml 2008-06-18 12:46:00 UTC (rev 7636) @@ -83,4 +83,19 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Class-Path>jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar jaxws-tools.jar jaxws-rt.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-metro-wsit-rt.jar jbossws-metro-wsit-tools.jar jbossws-spi.jar streambuffer.jar stax-api.jar stax-ex.jar jsr181-api.jar saaj-api.jar saaj-impl.jar stax-api.jar wsdl4j.jar wstx.jar</Class-Path> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </build> + </project> Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-18 12:29:44 UTC (rev 7635) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-18 12:46:00 UTC (rev 7636) @@ -11,7 +11,7 @@ # [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with Metro +# [JBWS-1684] Fix @WebServiceRef with Metro org/jboss/test/ws/jaxws/samples/webserviceref/** # [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 12:29:44 UTC (rev 7635) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 12:46:00 UTC (rev 7636) @@ -11,7 +11,7 @@ # [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with Metro +# [JBWS-1684] Fix @WebServiceRef with Metro org/jboss/test/ws/jaxws/samples/webserviceref/** # [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" Modified: stack/metro/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-18 12:29:44 UTC (rev 7635) +++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-06-18 12:46:00 UTC (rev 7636) @@ -115,6 +115,8 @@ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>  <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/> +  + <delete file="${jboss500.home}/lib/endorsed/jaxb-api.jar"/> </target>

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7635 - in stack/cxf/trunk: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 08:29:44 -0400 (Wed, 18 Jun 2008) New Revision: 7635 Modified: stack/cxf/trunk/.classpath stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt Log: synchronize CXF trunk with CXF QA branch Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2008-06-18 11:35:27 UTC (rev 7634) +++ stack/cxf/trunk/.classpath 2008-06-18 12:29:44 UTC (rev 7635) @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="src" path="modules/server/src/main/java"/> + <classpathentry kind="src" path="modules/testsuite/cxf-tests/src/test/java"/> + <classpathentry kind="src" path="modules/client/src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path=""/> + <classpathentry kind="output" path="target/eclipse-classes"/> </classpath> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-06-18 11:35:27 UTC (rev 7634) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-06-18 12:29:44 UTC (rev 7635) @@ -18,7 +18,6 @@ <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</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>-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> @@ -209,7 +208,7 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.security.args} ${surefire.jdwp.args}</surefire.jvm.args> </properties> </profile> <profile> @@ -220,7 +219,7 @@ </property> </activation> <properties> - <surefire.jvm.args>${surefire.security.args} ${surefire.gc.args}</surefire.jvm.args> + <surefire.jvm.args>${surefire.security.args}</surefire.jvm.args> </properties> </profile> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-18 11:35:27 UTC (rev 7634) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-06-18 12:29:44 UTC (rev 7635) @@ -69,9 +69,6 @@ # [CXF-1624] XmlSchemaException: Schema name conflict in collection org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.* -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - # [JBWS-1683] Fix JAXR samples for CXF org/jboss/test/ws/jaxws/samples/jaxr/** @@ -99,9 +96,12 @@ # [JBWS-2119] WebServiceRef injection from DD doesn't work org/jboss/test/ws/jaxws/jbws1841/** -# [JBWS-2163] wsconsume for maven build +# [JBWS-2165] Fix xop tests with maven build +org/jboss/test/ws/jaxws/samples/xop/** + +# [JBWS-2223] wsconsume for cxf build org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** +# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF +org/jboss/test/ws/jaxws/jbws1178/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 11:35:27 UTC (rev 7634) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-06-18 12:29:44 UTC (rev 7635) @@ -69,9 +69,6 @@ # [CXF-1624] XmlSchemaException: Schema name conflict in collection org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.* -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - # [JBWS-1683] Fix JAXR samples for CXF org/jboss/test/ws/jaxws/samples/jaxr/** @@ -99,9 +96,12 @@ # [JBWS-2119] WebServiceRef injection from DD doesn't work org/jboss/test/ws/jaxws/jbws1841/** -# [JBWS-2163] wsconsume for maven build +# [JBWS-2165] Fix xop tests with maven build +org/jboss/test/ws/jaxws/samples/xop/** + +# [JBWS-2223] wsconsume for cxf build org/jboss/test/ws/jaxws/complex/** org/jboss/test/ws/jaxws/holder/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** +# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF +org/jboss/test/ws/jaxws/jbws1178/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-18 11:35:27 UTC (rev 7634) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-06-18 12:29:44 UTC (rev 7635) @@ -103,10 +103,6 @@ # [JBWS-2120] @WebWservice does not work with class isolation org/jboss/test/ws/jaxws/jbws1556/** -# [JBWS-2163] wsconsume for maven build -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** @@ -124,3 +120,10 @@ org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* org/jboss/test/ws/projectGenerator/** + +# [JBWS-2223] wsconsume for cxf build +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF +org/jboss/test/ws/jaxws/jbws1178/** Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-18 11:35:27 UTC (rev 7634) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-06-18 12:29:44 UTC (rev 7635) @@ -103,12 +103,15 @@ # [JBWS-2119] WebServiceRef injection from DD doesn't work org/jboss/test/ws/jaxws/jbws1841/** -# [JBWS-2163] wsconsume for maven build -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - # [JBWS-2165] Fix xop tests with maven build org/jboss/test/ws/jaxws/samples/xop/** # [JBWS-2194] request requires HTTP authentication: Unauthorized org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* + +# [JBWS-2223] wsconsume for cxf build +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF +org/jboss/test/ws/jaxws/jbws1178/**

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7634 - stack/native/trunk/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 07:35:27 -0400 (Wed, 18 Jun 2008) New Revision: 7634 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf Log: update default resources Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-18 11:34:20 UTC (rev 7633) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-18 11:35:27 UTC (rev 7634) @@ -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/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar \ No newline at end of file +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/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar \ No newline at end of file

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7633 - stack/metro/trunk/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 07:34:20 -0400 (Wed, 18 Jun 2008) New Revision: 7633 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf Log: update default resources Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-18 11:33:14 UTC (rev 7632) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-18 11:34:20 UTC (rev 7633) @@ -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/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file +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/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar \ No newline at end of file

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7632 - stack/cxf/trunk/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-06-18 07:33:14 -0400 (Wed, 18 Jun 2008) New Revision: 7632 Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf Log: update default resources Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-18 10:24:22 UTC (rev 7631) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-18 11:33:14 UTC (rev 7632) @@ -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/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file +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/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw! s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar \ No newline at end of file

15 years, 11 months

1
0
0 / 0

JBossWS SVN: r7631 - stack/native/branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-06-18 06:24:22 -0400 (Wed, 18 Jun 2008) New Revision: 7631 Removed: stack/native/branches/dlofthouse/JBPAPP-890/ Log: Branch no longer required.

15 years, 11 months

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 June 2008