Author: alessio.soldano(a)jboss.com Date: 2011-12-06 13:05:38 -0500 (Tue, 06 Dec 2011) New Revision: 15360 Removed: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf Modified: stack/cxf/branches/JBWS-3393/build.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml Log: Remove AS6 related targets, macros, etc. Modified: stack/cxf/branches/JBWS-3393/build.xml =================================================================== --- stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -42,8 +42,6 @@ <import file="${dist.distro.dir}/build-deploy.xml"/> <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> - <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/deploy.conf"/> - <property name="jbossws.default.server.deploy.conf" value="${stack.resources.dir}/resources/server-deploy.conf"/> <property name="jbossws.default.modules.conf" value="${stack.resources.dir}/resources/modules-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 18:05:38 UTC (rev 15360) @@ -12,7 +12,6 @@ jbossws.integration.target=jboss700 # The JBoss settings -jboss.server.instance=default jboss.bind.address=localhost # JBoss Management console authentication (AS 7.1.x) Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -211,25 +211,4 @@ </antcall> </target> - <!-- ================================================================== --> - <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf --> - <!-- ================================================================== --> - - <macrodef name="macro-create-deploy-conf"> - <attribute name="deploystructure"/> - <sequential> - <property name="jbossws.deployers.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer&quot;/&gt; - <!-- Create jbossws-deploy.conf --> - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/server/**"/> - <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> - <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/> - <!-- Create jbossws-server-deploy.conf --> - <fileset id="jbossws.server.deploy.fileset" dir=&quot;(a){deploystructure}/server/${jboss.server.instance}&quot; excludes="**/juddi-service.sar/**"/> - <property name="jbossws.server.deploy.fileset" refid="jbossws.server.deploy.fileset"/> - <echo file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" message="${jbossws.server.deploy.fileset}"/> - <replace file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" token=";" value=" "/> - </sequential> - </macrodef> - </project> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -32,7 +32,6 @@ <!-- Load jbossws.integration.target properties --> <property file="${target.properties.file}"/> - <property name="jboss.server.instance" value="default"/> <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -35,8 +35,6 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/deploy.conf"/> - <property name="jbossws.default.server.deploy.conf" value="${build.dir}/server-deploy.conf"/> <property name="jbossws.default.modules.conf" value="${build.dir}/modules-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> Deleted: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf 2011-12-06 18:05:38 UTC (rev 15360) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-*httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar clien! t/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/co! mmons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*! .jar lib /endorsed/*jaxws*.jar Modified: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -24,183 +24,7 @@ <project> - <!-- - These patterns should be common for all supported containers. - --> - <patternset id="jbossws.client.patternset"> - <include name="**/asm.jar"/> - <include name="**/commons-beanutils.jar"/> - <include name="**/commons-collections.jar"/> - <include name="**/commons-lang.jar"/> - <include name="**/cxf-*.jar"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jaxws-jboss-httpserver-httpspi.jar"/> - <include name="**/httpserver.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/jbossws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-common-tools.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jbossws-cxf-transports-httpserver.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/velocity.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - <include name="**/wstx.jar"/> - <include name="**/xmlschema-core.jar"/> - <include name="**/FastInfoset.jar"/> - <include name="**/wstx.jar"/> - </patternset> - - <patternset id="jbossws.lib.patternset"> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </patternset> - - <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/jbossws-cxf-factories.jar"/> - </patternset> - - <patternset id="jbossws.server.lib.patternset"> - <include name="**/asm.jar"/> - <include name="**/commons-beanutils.jar"/> - <include name="**/cxf-*.jar"/> - <include name="**/FastInfoset.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jaxws-jboss-httpserver-httpspi.jar"/> - <include name="**/httpserver.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/jboss-jaxb-intros.jar"/> - <include name="**/jbossws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/xmlschema-core.jar"/> - <include name="**/xmlsec.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - </patternset> - - <patternset id="jbossws.service.lib.patternset"> - <include name="**/jbossws-cxf-transports-httpserver.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-cxf-factories.jar"/> - <include name="**/jbossws-cxf-server*.jar"/> - </patternset> - - <patternset id="spring.patternset"> - <include name="**/spring-aop.jar"/> - <include name="**/spring-asm.jar"/> - <include name="**/spring-beans.jar"/> - <include name="**/spring-context.jar"/> - <include name="**/spring-core.jar"/> - <include name="**/spring-expression.jar"/> - <include name="**/spring-jms.jar"/> - <include name="**/spring-tx.jar"/> - </patternset> - <!-- ================================================================== --> - <!-- Deploy Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-lib"> - <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"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Lib Endorsed --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-endorsed"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.endorsed.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Client --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-client"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - </fileset> - </copy> - <condition property="patch.jboss.metadata" value="true"> - <or> - <equals arg1="${jbossid}" arg2="jboss501"/> - <equals arg1="${jbossid}" arg2="jboss510"/> - </or> - </condition> - <antcall target="modify-jboss-metadata"> - <param name="targetdir" value="@{targetdir}"/> - <param name="thirdpartydir" value="@{thirdpartydir}"/> - </antcall> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Server Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-server-lib"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - <include name="**/jbossws-${jbossid}.jar"/> - </fileset> - </copy> - <condition property="patch.jboss.metadata" value="true"> - <or> - <equals arg1="${jbossid}" arg2="jboss501"/> - <equals arg1="${jbossid}" arg2="jboss510"/> - </or> - </condition> - <antcall target="modify-jboss-metadata"> - <param name="targetdir" value="@{targetdir}"/> - <param name="thirdpartydir" value="@{thirdpartydir}"/> - </antcall> - </sequential> - </macrodef> - - <!-- ================================================================== --> <!-- Deploy JUDDI Service --> <!-- ================================================================== --> @@ -224,56 +48,6 @@ </macrodef> <!-- ================================================================== --> - <!-- Deploy Deployers --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployers"> - <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=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - <antcall target="modify-jboss-integration"> - <param name="targetdir" value="@{targetdir}"/> - </antcall> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-jaxrpc-deployers"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <copy todir="@{targetdir}"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-jaxrpc-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> - <sequential> - <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer"> - <include name="**/stack-agnostic-jboss-beans.xml"/> - </fileset> - </copy> - </sequential> - </target> - - <!-- ================================================================== --> <!-- Modules --> <!-- ================================================================== --> @@ -382,25 +156,6 @@ <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/> </target> - <target name="deploy-jbossws-cxf" depends="check-parameters"> - <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}"/> - <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-cxf-with-jaxrpc" depends="check-parameters"> - <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}"/> - <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-jaxrpc-deployers targetdir="${installserver}/deployers/jbossws-jaxrpc.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - <target name="deploy-jbossws-cxf-modules"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> @@ -431,24 +186,6 @@ </sequential> </macrodef> - <macrodef name="macro-install-spring"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="spring.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <target name="deploy-spring"> - <macro-install-spring targetdir="${installserver}/client" thirdpartydir="${thirdpartydir}"/> - <macro-install-spring targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/> - </target> - <target name="deploy-spring-module"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> @@ -486,68 +223,6 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-jbossws"> - <attribute name="defaultconf"/> - <attribute name="defaultserverconf"/> - <attribute name="targetdir"/> - <attribute name="modifyjbossintegration"/> - <attribute name="removenativecore"/> - - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf&quot; failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <loadfile property="jbossws.server.deploy.conf" srcfile=&quot;(a){targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf&quot; failonerror="false"/> - <loadfile property="jbossws.server.deploy.conf" srcfile="@{defaultserverconf}" 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 includeemptydirs="true" verbose="true"> - <fileset dir="${jboss.server.home}"> - <include name="**/juddi-service.sar/**"/> - <include name="**/jbossws-console.war/**"/> - <include name="**/jbossws.sar/**"/> - </fileset> - </delete> - <antcall target="remove-jboss-integration"> - <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> - </antcall> - - <!-- delete content of last deployment --> - <delete verbose="true"> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - <delete verbose="true"> - <fileset dir="${jboss.server.home}" includes="${jbossws.server.deploy.conf}"/> - </delete> - - <!-- [JBWS-2895] jbossws-native-core.jar is not removed by default from JBWS 3.3.0, as it's required for jaxrpc support --> - <condition property="removenativecoreprop"> - <and> - <istrue value="@{removenativecore}"/> - </and> - </condition> - <antcall target="remove-native-core-from-client-and-common"/> - - </sequential> - </macrodef> - - <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration"> - <delete verbose="true"> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/common"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - </delete> - </target> - <target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration"> <delete verbose="true"> <fileset dir="${jboss.modules}"> @@ -556,17 +231,6 @@ </delete> </target> - <target name="remove-native-core-from-client-and-common" if="removenativecoreprop"> - <delete verbose="true"> - <fileset dir="${jboss.home}/client"> - <include name="**/jbossws-native-core.jar"/> - </fileset> - <fileset dir="${jboss.home}/common"> - <include name="**/jbossws-native-core.jar"/> - </fileset> - </delete> - </target> - <target name="process-jboss-integration"> <condition property="fixintegration"> <and> @@ -575,17 +239,4 @@ </condition> </target> - <target name="modify-jboss-metadata" if="patch.jboss.metadata"> - <sequential> - <copy - tofile="${targetdir}/jboss-metadata.jar" - failonerror="false" - overwrite="true"> - <fileset dir="${thirdpartydir}"> - <include name="**/jbossws-${jbossid}-metadata.jar"/> - </fileset> - </copy> - </sequential> - </target> - </project> Deleted: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-06 18:05:38 UTC (rev 15360) @@ -1 +0,0 @@ -deployers/jbossws.deployer/jbossws-cxf-*.jar deployers/jbossws.deployer/FastInfoset.jar deployers/jbossws.deployer/jboss-jaxb-intros.jar deployers/jbossws.deployer/jbossws-common.jar deployers/jbossws.deployer/jbossws-framework.jar deployers/jbossws.deployer/jbossws-native-core.jar deployers/jbossws.deployer/jbossws-native-factories.jar deployers/jbossws.deployer/jbossws-native-services.jar deployers/jbossws.deployer/jettison.jar deployers/jbossws.deployer/netty.jar deployers/jbossws.deployer/wscommons-policy.jar deployers/jbossws.deployer/policy.jar deployers/jbossws.deployer/wsdl4j.jar deployers/jbossws.deployer/xmlsec.jar deployers/jbossws.deployer/META-INF/jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml deployers/jbossws.deployer/META-INF/standard-*-config.xml deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -269,10 +269,6 @@ </includes> <systemProperties> <property> - <name>jboss.server.instance</name> - <value>${jboss.server.instance}</value> - </property> - <property> <name>jboss.bind.address</name> <value>${jboss.bind.address}</value> </property> @@ -367,10 +363,6 @@ </includes> <systemProperties> <property> - <name>jboss.server.instance</name> - <value>${jboss.server.instance}</value> - </property> - <property> <name>jboss.bind.address</name> <value>${jboss.bind.address}</value> </property> @@ -1381,26 +1373,7 @@ </properties> </profile> - <!-- - Name: no-jboss-server-instance - Descr: Set the default jboss.server.instance - - command line cannot overwrite pom properties - http://jira.codehaus.org/browse/MNG-3546 - --> <profile> - <id>no-jboss-server-instance</id> - <activation> - <property> - <name>!jboss.server.instance</name> - </property> - </activation> - <properties> - <jboss.server.instance>default</jboss.server.instance> - </properties> - </profile> - - <profile> <id>default-mgmt-security</id> <activation> <property>