Author: jim.ma Date: 2009-09-30 04:08:32 -0400 (Wed, 30 Sep 2009) New Revision: 10798 Modified: stack/metro/trunk/modules/client/pom.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/modules/testsuite/framework-tests/pom.xml stack/metro/trunk/pom.xml Log: [JBWS-2740]:Fixed classpath entries in metro client jar and enabled framework test jbws1666 Modified: stack/metro/trunk/modules/client/pom.xml =================================================================== --- stack/metro/trunk/modules/client/pom.xml 2009-09-30 08:06:07 UTC (rev 10797) +++ stack/metro/trunk/modules/client/pom.xml 2009-09-30 08:08:32 UTC (rev 10798) @@ -90,23 +90,40 @@ <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> - </dependency> - - + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> </dependencies> <build> <plugins> <plugin> <artifactId>maven-jar-plugin</artifactId> + <dependencies> + <dependency> + <artifactId>maven-archiver</artifactId> + <groupId>org.apache.maven</groupId> + <version>2.4</version> + </dependency> + </dependencies> <configuration> <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathLayoutType>custom</classpathLayoutType> + <!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be reviewed(remove one $) when maven jar plugin is updated--> + <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> + </manifest> <manifestEntries> - <Class-Path>jaxb-api.jar jaxb-impl.jar jaxb-xjc.jar jaxws-tools.jar jaxws-rt.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-metro-wsit-rt.jar jbossws-metro-wsit-tools.jar jbossws-spi.jar streambuffer.jar stax-api.jar stax-ex.jar jsr181-api.jar saaj-api.jar saaj-impl.jar stax-api.jar wsdl4j.jar wstx.jar</Class-Path> + <Class-Path>jbossws-framework.jar jaxws-common.jar jaxws-api.jar stax-api.jar wstx.jar</Class-Path> </manifestEntries> </archive> </configuration> </plugin> + </plugins> </build> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2009-09-30 08:06:07 UTC (rev 10797) +++ stack/metro/trunk/modules/server/pom.xml 2009-09-30 08:08:32 UTC (rev 10798) @@ -108,6 +108,15 @@ <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + </dependencies> <!-- Plugins --> Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:06:07 UTC (rev 10797) +++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2009-09-30 08:08:32 UTC (rev 10798) @@ -14,6 +14,10 @@ <relativePath>../pom.xml</relativePath> </parent> + <properties> + <stack.name>metro</stack.name> + </properties> + <!-- Dependencies --> <dependencies> <dependency> @@ -83,7 +87,49 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>filter-test</id> + <!--This is for filter the stack name in the test--> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target/tmp</outputDirectory> + <resources> + <resource> + <directory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + + <execution> + <id>copy-back-test</id> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <overwrite>true</overwrite> + <outputDirectory>src/test/java/org/jboss/test/ws/jaxws/jbws1666</outputDirectory> + <resources> + <resource> + <directory>target/tmp</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2009-09-30 08:06:07 UTC (rev 10797) +++ stack/metro/trunk/pom.xml 2009-09-30 08:08:32 UTC (rev 10798) @@ -74,6 +74,7 @@ <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.1</wsdl4j.version> <jsr181.version>1.0-MR1</jsr181.version> + <jsr250.version>1.0</jsr250.version> </properties> <!-- DependencyManagement --> @@ -321,12 +322,35 @@ <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> <version>${jsr181.version}</version> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>${jsr250.version}</version> </dependency> </dependencies> </dependencyManagement> <!-- Plugins --> <build> + + <!-- PluginMangament--> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <dependencies> + <dependency> + <artifactId>maven-archiver</artifactId> + <groupId>org.apache.maven</groupId> + <version>2.4</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -392,6 +416,8 @@ <enabled>false</enabled> </snapshots> </repository> + + <repository> <id>snapshots.jboss.org</id> <url>http://snapshots.jboss.org/maven2</url>