Author: richard.opalka(a)jboss.com Date: 2009-02-13 16:17:48 -0500 (Fri, 13 Feb 2009) New Revision: 9300 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 Log: [JBWS-2505] rollback Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2009-02-13 21:11:39 UTC (rev 9299) +++ stack/cxf/trunk/modules/management/pom.xml 2009-02-13 21:17:48 UTC (rev 9300) @@ -52,7 +52,6 @@ </dependency> <!-- [JBWS-2505] --> <!-- START --> - <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501x</artifactId> @@ -68,7 +67,6 @@ <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-13 21:11:39 UTC (rev 9299) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 21:17:48 UTC (rev 9300) @@ -248,9 +248,7 @@ <patternset refid="jbossws.client.patternset"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> @@ -268,9 +266,7 @@ <patternset refid="jbossws.client.patternset"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> @@ -288,9 +284,7 @@ <patternset refid="jbossws.client.patternset"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- END --> </fileset> </copy> @@ -524,21 +518,17 @@ <include name="**/jbossws-framework.jar"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- 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> @@ -566,21 +556,17 @@ <include name="**/jbossws-framework.jar"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- 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> @@ -608,21 +594,17 @@ <include name="**/jbossws-framework.jar"/> <!-- [JBWS-2505] --> <!-- START --> - <!-- <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - --> <!-- 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> @@ -781,7 +763,6 @@ <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> - <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -790,7 +771,6 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> - --> <!-- END --> <!-- delete content of last deployment --> @@ -822,7 +802,6 @@ <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> - <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -831,7 +810,6 @@ <include name="jbossws-jboss*.jar"/> </fileset> </delete> - --> <!-- END --> <!-- delete content of last deployment --> @@ -863,7 +841,6 @@ <!-- [JBWS-2505] --> <!-- START --> <!-- delete stale container integration jars --> - <!-- <delete> <fileset dir="${jboss.server.home}"> <include name="**/jbossws-jboss*.jar"/> @@ -872,7 +849,6 @@ <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-13 21:11:39 UTC (rev 9299) +++ stack/cxf/trunk/modules/server/pom.xml 2009-02-13 21:17:48 UTC (rev 9300) @@ -243,7 +243,6 @@ </artifactItem> <!-- JBWS-2505 --> <!-- START --> - <!-- <artifactItem> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501x</artifactId> @@ -268,7 +267,6 @@ <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-13 21:11:39 UTC (rev 9299) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-13 21:17:48 UTC (rev 9300) @@ -464,11 +464,11 @@ <dependencies> <!-- [JBWS-2505] --> <!-- START --> - <!--dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501x</artifactId> - </dependency--> - <dependency> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> @@ -478,7 +478,7 @@ <artifactId>jbosssx</artifactId> </exclusion> </exclusions> - </dependency> + </dependency--> <!-- END --> <dependency> <groupId>org.jboss.jbossas</groupId> @@ -534,11 +534,11 @@ <dependencies> <!-- [JBWS-2505] --> <!-- START --> - <!--dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss510x</artifactId> - </dependency--> - <dependency> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> @@ -548,7 +548,7 @@ <artifactId>jbosssx</artifactId> </exclusion> </exclusions> - </dependency> + </dependency--> <!-- END --> <dependency> <groupId>org.jboss.jbossas</groupId> @@ -604,11 +604,11 @@ <dependencies> <!-- [JBWS-2505] --> <!-- START --> - <!--dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss600x</artifactId> - </dependency--> - <dependency> + </dependency> + <!--dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-webservices</artifactId> <version>${jboss.version}</version> @@ -618,7 +618,7 @@ <artifactId>jbosssx</artifactId> </exclusion> </exclusions> - </dependency> + </dependency--> <!-- END --> <dependency> <groupId>org.jboss.jbossas</groupId>