December 2009 - jbossws-commits - Jboss List Archives

JBossWS SVN: r11227 - in stack/cxf/branches/jbossws-cxf-3.1.2: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: fnasser(a)redhat.com Date: 2009-12-09 09:31:06 -0500 (Wed, 09 Dec 2009) New Revision: 11227 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/src/main/scripts/assembly-deploy-artifacts.xml Log: Preserve juddi-service 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:29:10 UTC (rev 11226) +++ 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) @@ -296,7 +296,9 @@ <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> +  </target> <target name="check-parameters"> @@ -348,8 +350,9 @@  <delete dir="@{targetdir}" verbose="true"/> +   - <delete dir="@{targetdir}/../juddi-service.sar" verbose="true"/> +  </sequential> </macrodef> 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:29:10 UTC (rev 11226) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 14:31:06 UTC (rev 11227) @@ -84,6 +84,7 @@ <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> +    <!--

14 years, 5 months

1
0
0 / 0

JBossWS SVN: r11226 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: fnasser(a)redhat.com Date: 2009-12-09 09:29:10 -0500 (Wed, 09 Dec 2009) New Revision: 11226 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml Log: Revert framework removal, needs investigation as it causes regressions 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 13:54:45 UTC (rev 11225) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 14:29:10 UTC (rev 11226) @@ -61,10 +61,11 @@ <patternset id="jbossws.server.lib.patternset"> <include name="**/nothing-to-deploy"/>  -  -  -  + from the ones shipped with the JBoss ative EAP AS + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + --> </patternset> <patternset id="jbossws.service.lib.patternset"> @@ -260,8 +261,8 @@ </copy> <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true"> <fileset dir="@{thirdpartydir}"> -  -  + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/>   <!--

14 years, 5 months

1
0
0 / 0

JBossWS SVN: r11225 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: fnasser(a)redhat.com Date: 2009-12-09 08:54:45 -0500 (Wed, 09 Dec 2009) New Revision: 11225 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml Log: Try and remove jbossws-framework overwrite 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 11:37:39 UTC (rev 11224) +++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 13:54:45 UTC (rev 11225) @@ -61,11 +61,10 @@ <patternset id="jbossws.server.lib.patternset"> <include name="**/nothing-to-deploy"/>  + from the ones shipped with the JBoss ative EAP AS --> +  +  +  </patternset> <patternset id="jbossws.service.lib.patternset"> @@ -261,8 +260,8 @@ </copy> <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> +  +    <!--

14 years, 5 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-12-09 06:37:39 -0500 (Wed, 09 Dec 2009) New Revision: 11224 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/src/main/distro/build-deploy.xml Log: [JBWS-2821] fixing Native Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 11:01:33 UTC (rev 11223) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 11:37:39 UTC (rev 11224) @@ -13,8 +13,6 @@  <patternset id="jbossws.bin.patternset"> <include name="**/wsconsume.bat"/> @@ -56,7 +54,8 @@ </patternset> <patternset id="jbossws.lib.patternset"> - <include name="**/nothing-to-deploy"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.endorsed.patternset"> @@ -82,7 +81,7 @@ <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-native-core.jar"/> <include name="**/jettison.jar"/> - <include name="**/netty.jar"/> + <include name="**/netty.jar"/> <include name="**/policy.jar"/> <include name="**/wsdl4j.jar"/> <include name="**/xmlsec.jar"/> @@ -109,7 +108,7 @@   - <macrodef name="macro-deploy-jbossws-lib50"> + <macrodef name="macro-deploy-jbossws-lib"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <sequential> @@ -117,58 +116,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> </fileset> </copy> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-lib51"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-lib52"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-lib60"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> -    @@ -190,84 +142,26 @@   - <macrodef name="macro-deploy-jbossws-client50"> + <macrodef name="macro-deploy-jbossws-client"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-client51"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - <include name="**/jbossws-(a){jbossid}.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-client52"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> -  -  -  -  - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-client60"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> -  -  -  -  - </fileset> - </copy> - </sequential> - </macrodef> -    - <macrodef name="macro-deploy-jbossws-server-lib50"> + <macrodef name="macro-deploy-jbossws-server-lib"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> @@ -278,48 +172,6 @@ </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-server-lib51"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-server-lib52"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-server-lib60"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> -    @@ -344,17 +196,15 @@ </macrodef>  -  +   - <macrodef name="macro-deploy-jbossws-sar50"> + <macrodef name="macro-deploy-jbossws-deployment"> <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> + <unzip dest="@{targetdir}"> <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-native-management.war"/> </fileset> @@ -362,56 +212,12 @@ </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-sar51"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-native-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> - <macrodef name="macro-deploy-jbossws-sar52"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-native-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-sar60"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-native-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> -    - <macrodef name="macro-deploy-jbossws-deployers50"> + <macrodef name="macro-deploy-jbossws-deployers"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> @@ -437,364 +243,105 @@ <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="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/stack-agnostic-jboss-beans.xml"/> - </fileset> - </copy> + <antcall target="modify-jboss-integration"> + <param name="targetdir" value="@{targetdir}"/> + </antcall> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-deployers51"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> + <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> + <copy todir="${targetdir}" flatten="true" overwrite="true"> + <fileset dir="${thirdpartydir}"> + <include name="**/jbossws-${jbossid}.jar"/> </fileset> </copy> - <copy todir="@{targetdir}"> - <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{artifactsdir}/resources"> - <include name="standard-*-config.xml"/> - </fileset> - </copy> - <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="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}"> <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> </sequential> - </macrodef> + </target> - <macrodef name="macro-deploy-jbossws-deployers52"> - <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="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <copy todir="@{targetdir}"> - <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{artifactsdir}/resources"> - <include name="standard-*-config.xml"/> - </fileset> - </copy> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> -  -  -  -  - </fileset> - </copy> -  -  -  -  - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-deployers60"> - <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="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <copy todir="@{targetdir}"> - <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{artifactsdir}/resources"> - <include name="standard-*-config.xml"/> - </fileset> - </copy> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> -  -  -  -  - </fileset> - </copy> -  -  -  -  - </sequential> - </macrodef> -    - <available classname="java.io.Console" property="HAVE_JDK16_OR_ABOVE"/> - - <target name="deploy-jbossws-native50" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/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-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + <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"/> + <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/> </target> - <target name="deploy-jbossws-native51" depends="check-parameters"> + <target name="deploy-jbossws-native" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  - <macro-deploy-jbossws-sar51 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - <target name="deploy-jbossws-native52" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client52 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib52 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib52 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  - <macro-deploy-jbossws-sar52 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers52 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - <target name="deploy-jbossws-native60" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib60 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib60 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  - <macro-deploy-jbossws-sar60 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers60 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - - <target name="deploy-jbossws-endorsed" if="HAVE_JDK16_OR_ABOVE"> - <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> -    - <macrodef name="macro-undeploy-jbossws50"> + <macrodef name="macro-undeploy-jbossws"> <attribute name="defaultconf"/> <attribute name="targetdir"/> + <attribute name="modifyjbossintegration"/> <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.server.home" value="@{targetdir}"/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> -  - <delete> + <delete includeemptydirs="true"> <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> + <include name="**/jbossws.sar/**"/> + <include name="**/juddi-service.sar/**"/> + <include name="**/jbossws-console.war/**"/> </fileset> - <fileset dir="${jboss.home}/client"> - <include name="jbossws-jboss*.jar"/> - </fileset> </delete> + <antcall target="remove-jboss-integration"> + <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> + </antcall>  <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - </sequential> </macrodef> - <macrodef name="macro-undeploy-jbossws51"> - <attribute name="defaultconf"/> - <attribute name="targetdir"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration"> + <delete> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + </delete> + </target> - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + <target name="process-jboss-integration"> + <condition property="fixintegration"> + <and> + <istrue value="${modifyjbossintegration}"/> + </and> + </condition> + </target> -  - <delete> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - -  - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbossws52"> - <attribute name="defaultconf"/> - <attribute name="targetdir"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - -  -  -  -  -  - -  - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbossws60"> - <attribute name="defaultconf"/> - <attribute name="targetdir"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - -  -  -  -  -  - -  - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - - </sequential> - </macrodef> - </project> Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2009-12-09 11:01:33 UTC (rev 11223) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-12-09 11:37:39 UTC (rev 11224) @@ -17,11 +17,12 @@ <target name="deploy-structure-jboss50" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native50" inheritall="false"> + <antcall target="deploy-jbossws-native" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="true"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -45,7 +46,7 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss500.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> </target>  @@ -67,7 +68,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss501.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> </target>  @@ -76,11 +77,12 @@ <target name="deploy-structure-jboss51" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native51" inheritall="false"> + <antcall target="deploy-jbossws-native" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="true"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -104,7 +106,7 @@ <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss510.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> </target>  @@ -113,11 +115,12 @@ <target name="deploy-structure-jboss52" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native52" inheritall="false"> + <antcall target="deploy-jbossws-native" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="false"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -141,7 +144,7 @@ <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520"> <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/> - <macro-undeploy-jbossws52 targetdir="${jboss520.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss520.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/> </target>  @@ -150,11 +153,12 @@ <target name="deploy-structure-jboss60" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native60" inheritall="false"> + <antcall target="deploy-jbossws-native" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="false"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -178,7 +182,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/> </target>  @@ -188,11 +192,11 @@ <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**,**/juddi-service.sar/**"/> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/juddi-service.sar/**"/> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> - <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> + <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/> </sequential> </macrodef>

14 years, 5 months

1
0
0 / 0

JBossWS SVN: r11223 - stack/cxf/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-12-09 06:01:33 -0500 (Wed, 09 Dec 2009) New Revision: 11223 Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml Log: [JBWS-2821] fix AS 50x Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-12-09 10:41:03 UTC (rev 11222) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-12-09 11:01:33 UTC (rev 11223) @@ -46,7 +46,7 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-undeploy-jbossws targetdir="${jboss500.server}" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss500.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> </target>

14 years, 5 months

1
0
0 / 0

JBossWS SVN: r11222 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2009-12-09 05:41:03 -0500 (Wed, 09 Dec 2009) New Revision: 11222 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: Cleaned up the security manager configuration in surefire plugin Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2009-12-09 10:32:25 UTC (rev 11221) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-12-09 10:41:03 UTC (rev 11222) @@ -445,7 +445,6 @@ <properties> <jboss.version>5.1.0.GA</jboss.version> <jbossws.integration.target>jboss510</jbossws.integration.target> -  </properties> <dependencies> <dependency> @@ -477,7 +476,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed ${security.manager.args}</argLine> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine>  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>

14 years, 5 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-12-09 05:32:25 -0500 (Wed, 09 Dec 2009) New Revision: 11221 Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/distro/build-deploy.xml Log: [JBWS-2821] fixing CXF 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 2009-12-09 10:12:25 UTC (rev 11220) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 10:32:25 UTC (rev 11221) @@ -13,8 +13,6 @@  <patternset id="jbossws.bin.patternset"> <include name="**/wsconsume.bat"/> @@ -61,7 +59,8 @@ </patternset> <patternset id="jbossws.lib.patternset"> - <include name="**/nothing-to-deploy"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.endorsed.patternset"> @@ -125,7 +124,7 @@   - <macrodef name="macro-deploy-jbossws-lib50"> + <macrodef name="macro-deploy-jbossws-lib"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <sequential> @@ -133,58 +132,11 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> </fileset> </copy> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-lib51"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-lib52"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-lib60"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> -    @@ -206,84 +158,26 @@   - <macrodef name="macro-deploy-jbossws-client50"> + <macrodef name="macro-deploy-jbossws-client"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-client51"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - <include name="**/jbossws-(a){jbossid}.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-client52"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> -  -  -  -  - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-client60"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> -  -  -  -  - </fileset> - </copy> - </sequential> - </macrodef> -    - <macrodef name="macro-deploy-jbossws-server-lib50"> + <macrodef name="macro-deploy-jbossws-server-lib"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> @@ -294,48 +188,6 @@ </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-server-lib51"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-server-lib52"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-server-lib60"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> -    @@ -360,17 +212,15 @@ </macrodef>  -  +   - <macrodef name="macro-deploy-jbossws-cxf50-sar"> + <macrodef name="macro-deploy-jbossws-deployment"> <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> + <unzip dest="@{targetdir}"> <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-cxf-management.war"/> </fileset> @@ -378,56 +228,11 @@ </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-cxf51-sar"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-cxf52-sar"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-cxf60-sar"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> -    - <macrodef name="macro-deploy-jbossws-deployers50"> + <macrodef name="macro-deploy-jbossws-deployers"> <attribute name="thirdpartydir"/> <attribute name="artifactsdir"/> <attribute name="targetdir"/> @@ -448,342 +253,104 @@ <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="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/stack-agnostic-jboss-beans.xml"/> - </fileset> - </copy> + <antcall target="modify-jboss-integration"> + <param name="targetdir" value="@{targetdir}"/> + </antcall> </sequential> </macrodef> - <macrodef name="macro-deploy-jbossws-deployers51"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> + <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> + <copy todir="${targetdir}" flatten="true" overwrite="true"> + <fileset dir="${thirdpartydir}"> + <include name="**/jbossws-${jbossid}.jar"/> </fileset> </copy> - <copy todir="@{targetdir}"> - <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <include name="META-INF/**"/> - </fileset> - </copy> - <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="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}"> <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> </sequential> - </macrodef> + </target> - <macrodef name="macro-deploy-jbossws-deployers52"> - <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="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <copy todir="@{targetdir}"> - <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> -  -  -  -  - </fileset> - </copy> -  -  -  -  - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-deployers60"> - <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="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <copy todir="@{targetdir}"> - <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> -  -  -  -  - </fileset> - </copy> -  -  -  -  - </sequential> - </macrodef> -    - <target name="deploy-jbossws-cxf50" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/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-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> + <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"/> + <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/> </target> - <target name="deploy-jbossws-cxf51" depends="check-parameters"> + <target name="deploy-jbossws-cxf" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  - <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> - <target name="deploy-jbossws-cxf52" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client52 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib52 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib52 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  - <macro-deploy-jbossws-cxf52-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers52 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - - <target name="deploy-jbossws-cxf60" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib60 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib60 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  - <macro-deploy-jbossws-cxf60-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers60 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" 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> -    - <macrodef name="macro-undeploy-jbossws50"> + <macrodef name="macro-undeploy-jbossws"> <attribute name="defaultconf"/> <attribute name="targetdir"/> + <attribute name="modifyjbossintegration"/> <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.server.home" value="@{targetdir}"/> <property name="jboss.home" value="${jboss.server.home}/../.."/> <available property="jboss.undeploy.client" file="${jboss.home}/client"/> <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - <delete> + <delete includeemptydirs="true"> <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> + <include name="**/jbossws.sar/**"/> + <include name="**/juddi-service.sar/**"/> + <include name="**/jbossws-console.war/**"/> </fileset> - <fileset dir="${jboss.home}/client"> - <include name="jbossws-jboss*.jar"/> - </fileset> </delete> + <antcall target="remove-jboss-integration"> + <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> + </antcall>  <delete> <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - </sequential> </macrodef> - <macrodef name="macro-undeploy-jbossws51"> - <attribute name="defaultconf"/> - <attribute name="targetdir"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration"> + <delete> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + </delete> + </target> - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + <target name="process-jboss-integration"> + <condition property="fixintegration"> + <and> + <istrue value="${modifyjbossintegration}"/> + </and> + </condition> + </target> -  - <delete> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - -  - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbossws52"> - <attribute name="defaultconf"/> - <attribute name="targetdir"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - -  -  -  -  -  - -  - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-jbossws60"> - <attribute name="defaultconf"/> - <attribute name="targetdir"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - - <property name="jboss.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - -  -  -  -  -  - -  - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - -  - <delete dir="@{targetdir}"/> - -  - <delete dir="@{targetdir}/../juddi-service.sar"/> - - </sequential> - </macrodef> - </project> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-12-09 10:12:25 UTC (rev 11220) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-12-09 10:32:25 UTC (rev 11221) @@ -17,11 +17,12 @@ <target name="deploy-structure-jboss50" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf50" inheritall="false"> + <antcall target="deploy-jbossws-cxf" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="true"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -45,7 +46,7 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss500.server}" defaultconf="${jbossws.default.deploy.conf}"/> </target>  @@ -67,7 +68,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss501.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> </target>  @@ -76,11 +77,12 @@ <target name="deploy-structure-jboss51" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf51" inheritall="false"> + <antcall target="deploy-jbossws-cxf" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="true"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -104,7 +106,7 @@ <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss510.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/> </target>  @@ -113,11 +115,12 @@ <target name="deploy-structure-jboss52" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf52" inheritall="false"> + <antcall target="deploy-jbossws-cxf" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="false"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -141,7 +144,7 @@ <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520"> <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/> - <macro-undeploy-jbossws52 targetdir="${jboss520.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss520.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/> </target>  @@ -150,11 +153,12 @@ <target name="deploy-structure-jboss60" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf60" inheritall="false"> + <antcall target="deploy-jbossws-cxf" inheritall="false"> <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}"/> + <param name="modifyjbossintegration" value="false"/> </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure}"/> </target> @@ -178,7 +182,7 @@ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/> </target>  @@ -188,11 +192,11 @@ <macrodef name="macro-create-deploy-conf"> <attribute name="deploystructure"/> <sequential> - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**,**/juddi-service.sar/**"/> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/juddi-service.sar/**"/> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> - <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> + <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/> </sequential> </macrodef>

14 years, 5 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2009-12-09 05:12:25 -0500 (Wed, 09 Dec 2009) New Revision: 11220 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-2821] remove useless macro attributes Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 09:45:17 UTC (rev 11219) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 10:12:25 UTC (rev 11220) @@ -158,7 +158,6 @@ <macrodef name="macro-deploy-jbossws-client"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> @@ -176,7 +175,6 @@ <macrodef name="macro-deploy-jbossws-server-lib"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> - <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> @@ -227,9 +225,9 @@ </sequential> </macrodef> -  -  -  +  +  +  <macrodef name="macro-deploy-jbossws-deployers"> <attribute name="thirdpartydir"/> @@ -288,12 +286,12 @@ <target name="deploy-jbossws-metro" depends="check-parameters"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target>

14 years, 5 months

1
0
0 / 0

JBossWS SVN: r11219 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2009-12-09 04:45:17 -0500 (Wed, 09 Dec 2009) New Revision: 11219 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: There is something wrong may caused by maven version, revert my change to fix the build Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-12-09 09:26:34 UTC (rev 11218) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-12-09 09:45:17 UTC (rev 11219) @@ -15,7 +15,8 @@  <properties> - <surefire.security.args>-Djava.home=${java.home} -Djava.security.debug=failure -Djava.security.manager -Djava.security.policy==${basedir}/../src/test/resources/securityMgr/client.policy </surefire.security.args> + <surefire.security.args></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>-Xmx512m -XX:MaxPermSize=256m</surefire.gc.args> <surefire.management.args>-Dcom.sun.management.jmxremote</surefire.management.args>

14 years, 5 months

1
0
0 / 0

JBossWS SVN: r11218 - in stack/native/trunk/modules/testsuite: src/test/resources/securityMgr and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2009-12-09 04:26:34 -0500 (Wed, 09 Dec 2009) New Revision: 11218 Modified: stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/client.policy Log: JBWS-2692:modify the client.policy and enable the security manager Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2009-12-09 07:12:01 UTC (rev 11217) +++ stack/native/trunk/modules/testsuite/pom.xml 2009-12-09 09:26:34 UTC (rev 11218) @@ -15,8 +15,7 @@  <properties> -  - <surefire.security.args></surefire.security.args> + <surefire.security.args>-Djava.home=${java.home} -Djava.security.debug=failure -Djava.security.manager -Djava.security.policy==${basedir}/../src/test/resources/securityMgr/client.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>-Xmx512m -XX:MaxPermSize=256m</surefire.gc.args> <surefire.management.args>-Dcom.sun.management.jmxremote</surefire.management.args> Modified: stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/client.policy =================================================================== --- stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/client.policy 2009-12-09 07:12:01 UTC (rev 11217) +++ stack/native/trunk/modules/testsuite/src/test/resources/securityMgr/client.policy 2009-12-09 09:26:34 UTC (rev 11218) @@ -1,4 +1,4 @@ -// Permissions for jbossws cxf test suite +// Permissions for jbossws native test suite // Trusted core Java code grant codeBase "file:${java.home}/lib/ext/-" { @@ -14,11 +14,6 @@ permission java.security.AllPermission; }; -//trust all jars in m2_repo -grant codeBase "file:${M2_REPO}/-" { - permission java.security.AllPermission; -}; - grant { //allow surefire to read compiled class in target dir and delte file @@ -30,6 +25,12 @@ permission java.net.SocketPermission "*", "accept,listen,connect,resolve"; permission java.net.NetPermission "setDefaultAuthenticator"; +permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.setSubjectInfo"; +permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getSubjectInfo"; +permission java.lang.RuntimePermission "org.jboss.security.SecurityAssociation.getPrincipalInfo"; +permission java.lang.RuntimePermission "org.jboss.security.getSecurityContext"; +permission java.lang.RuntimePermission "org.jboss.security.setSecurityContext"; +permission java.lang.RuntimePermission "setIO"; permission java.lang.RuntimePermission "setFactory"; permission java.lang.RuntimePermission "accessDeclaredMembers"; permission java.lang.RuntimePermission "createClassLoader"; @@ -40,6 +41,7 @@ permission java.lang.RuntimePermission "getProtectionDomain"; permission java.lang.RuntimePermission "getenv.*"; permission java.lang.RuntimePermission "getClassLoader"; +permission java.lang.RuntimePermission "createSecurityManager"; permission javax.management.MBeanServerPermission "findMBeanServer"; @@ -48,6 +50,12 @@ permission javax.xml.ws.WebServicePermission "publishEndpoint"; permission java.security.SecurityPermission "getPolicy"; +permission java.security.SecurityPermission "getAccessControlContext"; + + +permission org.jboss.metadata.spi.stack.MetaDataStackPermission "*"; + + };

14 years, 5 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 December 2009