[jbossws-commits] JBossWS SVN: r16492 - in stack/native/trunk: modules/dist and 3 other directories.

Author: richard.opalka(a)jboss.com Date: 2012-07-19 04:55:26 -0400 (Thu, 19 Jul 2012) New Revision: 16492 Modified: stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: [JBWS-3484] fixing AS 712 only - still waiting for pull request to be merged Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/dist/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -63,7 +63,7 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <scope>provided</scope> </dependency> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -94,7 +94,7 @@ <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> 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 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -48,7 +48,6 @@ <unpack>false</unpack> <includes> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss:jbossxb:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> @@ -60,9 +59,9 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss*:jar</include> + <include>org.jboss.ws:jbossws-jboss712-server-integration:jar</include> </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss712.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -261,60 +261,9 @@ </properties> <dependencies> <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-security</artifactId> - </exclusion> - </exclusions> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - <version>1.0.3.Final</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.10.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remotingjmx</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.3.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.7.GA</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-07-19 08:04:38 UTC (rev 16491) +++ stack/native/trunk/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) @@ -114,14 +114,13 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <version>${jbossws.jboss712.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> <version>${jbossws.jboss712.version}</version> - <classifier>tests-integration</classifier> </dependency> <!-- provided apis --> <dependency>