Author: richard.opalka(a)jboss.com
Date: 2011-01-11 09:19:31 -0500 (Tue, 11 Jan 2011)
New Revision: 13552
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/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:
use created ASIL for jboss 600 Final
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2011-01-11 14:11:18 UTC (rev 13551)
+++ stack/cxf/trunk/modules/management/pom.xml 2011-01-11 14:19:31 UTC (rev 13552)
@@ -29,12 +29,9 @@
<scope>provided</scope>
<type>zip</type>
</dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M5</artifactId>
+ <artifactId>jbossws-jboss600</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -47,6 +44,9 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2011-01-11 14:11:18 UTC (rev 13551)
+++ stack/cxf/trunk/modules/server/pom.xml 2011-01-11 14:19:31 UTC (rev 13552)
@@ -268,6 +268,31 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- JBWS-2505 -->
<!-- START -->
<!--
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-01-11 14:11:18 UTC (rev 13551)
+++ stack/cxf/trunk/pom.xml 2011-01-11 14:19:31 UTC (rev 13552)
@@ -49,6 +49,7 @@
<jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version>
+ <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
@@ -117,6 +118,18 @@
<classifier>testsuite</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
<!-- JBWS-2505 -->
<!-- START -->
<!--
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2011-01-11 14:11:18 UTC (rev 13551)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2011-01-11 14:19:31 UTC (rev 13552)
@@ -22,7 +22,7 @@
<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"/><!-- [JBWS-2505] -->
+ <param name="modifyjbossintegration"
value="true"/><!-- [JBWS-2505] -->
</antcall>
</target>
@@ -49,7 +49,7 @@
<macro-undeploy-jbossws targetdir="${jboss600.server}"
defaultconf="${jbossws.default.deploy.conf}"
defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="false"
+ modifyjbossintegration="true"
removenativecore="false" /><!--
[JBWS-2505][JBWS-2895] -->
</target>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-11 14:11:18 UTC
(rev 13551)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-11 14:19:31 UTC
(rev 13552)
@@ -130,6 +130,16 @@
<include>juddi:juddi:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws:jbossws-jboss600:jar</include>
+ </includes>
+ </dependencySet>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
Show replies by date