[jbossws-commits] JBossWS SVN: r9314 - in stack/cxf/trunk: modules/management and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Feb 16 09:25:47 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-02-16 09:25:47 -0500 (Mon, 16 Feb 2009)
New Revision: 9314
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2505] removing AS IL for AS 501 & AS 600
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-02-16 14:00:40 UTC (rev 9313)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-02-16 14:25:47 UTC (rev 9314)
@@ -50,13 +50,14 @@
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
@@ -67,6 +68,7 @@
<artifactId>jbossws-jboss600x</artifactId>
<scope>runtime</scope>
</dependency>
+ -->
<!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
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-02-16 14:00:40 UTC (rev 9313)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-16 14:25:47 UTC (rev 9314)
@@ -222,21 +222,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-client500">
- <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-@{jbossid}.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-client50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -246,10 +231,7 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
- <!-- [JBWS-2505] -->
- <!-- START -->
<include name="**/jbossws-@{jbossid}.jar"/>
- <!-- END -->
</fileset>
</copy>
</sequential>
@@ -266,7 +248,9 @@
<patternset refid="jbossws.client.patternset"/>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -284,7 +268,9 @@
<patternset refid="jbossws.client.patternset"/>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
@@ -463,38 +449,6 @@
<!-- Deploy Deployers -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-deployers500">
- <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-@{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-@{jbossid}.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<macrodef name="macro-deploy-jbossws-deployers50">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
@@ -516,20 +470,14 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <!-- [JBWS-2505] -->
- <!-- START -->
<include name="**/jbossws-@{jbossid}.jar"/>
- <!-- END -->
</fileset>
</copy>
- <!-- [JBWS-2505] -->
- <!-- START -->
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
- <!-- END -->
</sequential>
</macrodef>
@@ -556,17 +504,21 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -594,17 +546,21 @@
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<include name="**/jbossws-@{jbossid}.jar"/>
+ -->
<!-- END -->
</fileset>
</copy>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
+ -->
<!-- END -->
</sequential>
</macrodef>
@@ -623,17 +579,6 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
- <target name="deploy-jbossws-cxf500" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client500 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}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers500 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-cxf50" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -713,41 +658,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-undeploy-jbossws500">
- <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.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
<macrodef name="macro-undeploy-jbossws50">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
@@ -760,9 +670,6 @@
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!-- delete stale container integration jars -->
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -771,7 +678,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- <!-- END -->
<!-- delete content of last deployment -->
<delete>
@@ -802,6 +708,7 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -810,6 +717,7 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
+ -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -841,6 +749,7 @@
<!-- [JBWS-2505] -->
<!-- START -->
<!-- delete stale container integration jars -->
+ <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -849,6 +758,7 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
+ -->
<!-- END -->
<!-- delete content of last deployment -->
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-02-16 14:00:40 UTC (rev 9313)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-02-16 14:25:47 UTC (rev 9314)
@@ -241,8 +241,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
</artifactItem>
- <!-- JBWS-2505 -->
- <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -251,6 +249,9 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
+ <!-- JBWS-2505 -->
+ <!-- START -->
+ <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
@@ -267,6 +268,7 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
+ -->
<!-- END -->
</artifactItems>
</configuration>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-16 14:00:40 UTC (rev 9313)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-16 14:25:47 UTC (rev 9314)
@@ -462,24 +462,10 @@
<jbossws.integration.target>jboss501</jbossws.integration.target>
</properties>
<dependencies>
- <!-- [JBWS-2505] -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- <version>${jboss.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
- <!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
@@ -534,11 +520,13 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
</dependency>
- <!--dependency>
+ -->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -548,7 +536,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -604,11 +592,13 @@
<dependencies>
<!-- [JBWS-2505] -->
<!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
</dependency>
- <!--dependency>
+ -->
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
@@ -618,7 +608,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency-->
+ </dependency>
<!-- END -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-02-16 14:00:40 UTC (rev 9313)
+++ stack/cxf/trunk/pom.xml 2009-02-16 14:25:47 UTC (rev 9314)
@@ -51,11 +51,13 @@
<jbossws.jboss423.version>3.1.0-SNAPSHOT</jbossws.jboss423.version>
<jbossws.jboss424.version>3.1.0-SNAPSHOT</jbossws.jboss424.version>
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
+ <jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version>
<!-- JBWS-2505 -->
<!-- START -->
- <jbossws.jboss501.version>3.1.0-SNAPSHOT</jbossws.jboss501.version>
+ <!--
<jbossws.jboss510.version>3.1.0-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.1.0-SNAPSHOT</jbossws.jboss600.version>
+ -->
<!-- END -->
<cxf.version>2.1.4</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
@@ -152,8 +154,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2505 -->
- <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -166,6 +166,9 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ <!-- JBWS-2505 -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510x</artifactId>
@@ -190,6 +193,7 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
+ -->
<!-- END -->
<!-- provided apis -->
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-16 14:00:40 UTC (rev 9313)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-16 14:25:47 UTC (rev 9314)
@@ -96,17 +96,6 @@
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss500" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf500" 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}"/>
- </antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- </target>
-
<target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-cxf50" inheritall="false">
@@ -127,7 +116,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss500" description="Deploy jbossws to jboss500">
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
@@ -137,7 +126,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-jbossws500 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.as5.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-16 14:00:40 UTC (rev 9313)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-16 14:25:47 UTC (rev 9314)
@@ -109,8 +109,6 @@
<include>org.jboss.ws:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
- <!-- [JBWS-2505] -->
- <!-- START -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
@@ -121,6 +119,9 @@
<include>org.jboss.ws:jbossws-jboss501x:jar</include>
</includes>
</dependencySet>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
@@ -141,6 +142,7 @@
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
+ -->
<!-- END -->
</dependencySets>
</binaries>
More information about the jbossws-commits
mailing list