Author: richard.opalka(a)jboss.com Date: 2011-09-12 08:15:46 -0400 (Mon, 12 Sep 2011) New Revision: 14982 Modified: stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/pom.xml Log: resuscitate JBossWS Native against AS700 Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2011-09-12 12:13:39 UTC (rev 14981) +++ stack/native/trunk/modules/dist/pom.xml 2011-09-12 12:15:46 UTC (rev 14982) @@ -124,6 +124,22 @@ </exclusions> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss700</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <!--junit--> <dependency> <groupId>junit</groupId> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-09-12 12:13:39 UTC (rev 14981) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-09-12 12:15:46 UTC (rev 14982) @@ -92,6 +92,7 @@ <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss600:jar</include> <include>org.jboss.ws:jbossws-jboss610:jar</include> + <include>org.jboss.ws:jbossws-jboss700:jar</include> <include>org.jboss:jbossxb:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> @@ -102,7 +103,7 @@ <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <unpack>false</unpack> + <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> </includes> Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-12 12:13:39 UTC (rev 14981) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-12 12:15:46 UTC (rev 14982) @@ -393,6 +393,7 @@ <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-native-resources.jar"/> + <include name="**/jbossws-jboss700.jar"/> </fileset> </copy> <!-- module.xml files --> @@ -457,6 +458,7 @@ <delete includeemptydirs="true" verbose="true"> <fileset dir="${jboss.modules}"> <include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/> + <include name="**/org/jboss/as/webservices/main/*7.0.0.Final*"/> </fileset> </delete> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-09-12 12:13:39 UTC (rev 14981) +++ stack/native/trunk/pom.xml 2011-09-12 12:15:46 UTC (rev 14982) @@ -51,6 +51,7 @@ <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> + <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> <jboss700.version>7.0.0.Final</jboss700.version> <ant.version>1.7.1</ant.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> @@ -125,6 +126,11 @@ <type>zip</type> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss700</artifactId> + <version>${jbossws.jboss700.version}</version> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss700.version}</version>