[jbossws-commits] JBossWS SVN: r9302 - in stack/metro/trunk: modules/management and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Feb 13 16:24:18 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-02-13 16:24:17 -0500 (Fri, 13 Feb 2009)
New Revision: 9302
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2505] rollback
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/management/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -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>
@@ -77,7 +75,7 @@
<type>sar</type>
</dependency>
</dependencies>
-
+
<!-- Build -->
<build>
<plugins>
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-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -252,9 +252,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-@{jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -272,9 +270,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-@{jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -292,9 +288,7 @@
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<include name="**/jbossws-@{jbossid}.jar"/>
- -->
<!-- END -->
</fileset>
</copy>
@@ -525,21 +519,17 @@
<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>
@@ -567,21 +557,17 @@
<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>
@@ -609,21 +595,17 @@
<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>
@@ -783,7 +765,6 @@
<!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -792,7 +773,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -824,7 +804,6 @@
<!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -833,7 +812,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
@@ -865,7 +843,6 @@
<!-- JBWS-2505 -->
<!-- START -->
<!-- delete stale container integration jars -->
- <!--
<delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
@@ -874,7 +851,6 @@
<include name="jbossws-jboss*.jar"/>
</fileset>
</delete>
- -->
<!-- END -->
<!-- delete content of last deployment -->
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/server/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -192,7 +192,6 @@
</artifactItem>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -217,7 +216,6 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
- -->
<!-- END -->
</artifactItems>
</configuration>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -495,11 +495,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>
@@ -509,7 +509,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -570,11 +570,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>
@@ -584,7 +584,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
@@ -645,11 +645,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>
@@ -659,7 +659,7 @@
<artifactId>jbosssx</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/pom.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -54,11 +54,9 @@
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.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 -->
<jboss.common.version>1.2.1.GA</jboss.common.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -155,7 +153,6 @@
</dependency>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss501x</artifactId>
@@ -192,7 +189,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
<!-- END -->
<!-- provided apis -->
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:18:35 UTC (rev 9301)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-13 21:24:17 UTC (rev 9302)
@@ -99,7 +99,6 @@
</dependencySet>
<!-- JBWS-2505 -->
<!-- START -->
- <!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
@@ -130,7 +129,6 @@
<include>org.jboss.ws:jbossws-jboss600x:jar</include>
</includes>
</dependencySet>
- -->
<!-- END -->
</dependencySets>
</binaries>
More information about the jbossws-commits
mailing list