Author: alessio.soldano(a)jboss.com Date: 2010-02-26 10:53:01 -0500 (Fri, 26 Feb 2010) New Revision: 11696 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsprovide-plugin-config.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml Log: [JBWS-2650] Adding more tests + conforming to maven convention on plugin naming Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - JAX-WS Tools Maven Plugin</name> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1.0.0-SNAPSHOT</version> Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-02-26 15:53:01 UTC (rev 11696) @@ -37,7 +37,7 @@ * @since 24-Feb-2010 * */ -abstract class AbstractWsConsumeMojo extends AbstractToolsMojo +public abstract class AbstractWsConsumeMojo extends AbstractToolsMojo { /** * The list of wsdl urls / files to consume Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2010-02-26 15:53:01 UTC (rev 11696) @@ -34,7 +34,7 @@ * @since 25-Feb-2010 * */ -abstract class AbstractWsProvideMojo extends AbstractToolsMojo +public abstract class AbstractWsProvideMojo extends AbstractToolsMojo { /** * Enables/Disables WSDL generation. Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java 2010-02-26 15:53:01 UTC (rev 11696) @@ -25,6 +25,10 @@ import static org.junit.matchers.JUnitMatchers.hasItems; import org.jboss.test.ws.plugins.tools.utils.AbstractToolsMojoTestCase; +import org.jboss.ws.plugins.tools.AbstractWsConsumeMojo; +import org.jboss.ws.plugins.tools.AbstractWsProvideMojo; +import org.jboss.ws.plugins.tools.TestWsConsumeMojo; +import org.jboss.ws.plugins.tools.TestWsProvideMojo; import org.jboss.ws.plugins.tools.WsConsumeMojo; import org.jboss.ws.plugins.tools.WsProvideMojo; import org.junit.Test; @@ -44,7 +48,12 @@ { final String pluginConfig = "target/test-classes/test-argument/wsconsume-plugin-config.xml"; - WsConsumeMojo mojo = getMojo(WsConsumeMojo.class, "wsconsume", pluginConfig); + internalWsConsumeTest(getMojo(WsConsumeMojo.class, "wsconsume", pluginConfig)); + internalWsConsumeTest(getMojo(TestWsConsumeMojo.class, "wsconsume", pluginConfig)); + } + + private static void internalWsConsumeTest(AbstractWsConsumeMojo mojo) + { assertEquals("t", mojo.getTarget()); assertEquals("output", mojo.getOutputDirectory().getName()); assertEquals("tp", mojo.getTargetPackage()); @@ -63,7 +72,12 @@ { final String pluginConfig = "target/test-classes/test-argument/wsprovide-plugin-config.xml"; - WsProvideMojo mojo = getMojo(WsProvideMojo.class, "wsprovide", pluginConfig); + internalWsProvideTest(getMojo(WsProvideMojo.class, "wsprovide", pluginConfig)); + internalWsProvideTest(getMojo(TestWsProvideMojo.class, "wsprovide", pluginConfig)); + } + + private static void internalWsProvideTest(AbstractWsProvideMojo mojo) + { assertEquals("output", mojo.getOutputDirectory().getName()); assertEquals("endpoint", mojo.getEndpointClass()); assertEquals("resource", mojo.getResourceDirectory().getName()); Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -2,8 +2,8 @@ <build> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <configuration> <outputDirectory>output</outputDirectory> <classpathElements> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsprovide-plugin-config.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsprovide-plugin-config.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsprovide-plugin-config.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -2,8 +2,8 @@ <build> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <configuration> <outputDirectory>output</outputDirectory> <classpathElements> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -27,8 +27,8 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <version&gt;@pom.version(a)&lt;/version&gt; <configuration> <verbose>true</verbose> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -27,8 +27,8 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <version&gt;@pom.version(a)&lt;/version&gt; <configuration> <verbose>true</verbose> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -27,8 +27,8 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <version&gt;@pom.version(a)&lt;/version&gt; <configuration> <verbose>true</verbose> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -27,8 +27,8 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <version&gt;@pom.version(a)&lt;/version&gt; <configuration> <verbose>true</verbose> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -27,8 +27,8 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <version&gt;@pom.version(a)&lt;/version&gt; <configuration> <verbose>true</verbose> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2010-02-26 15:23:31 UTC (rev 11695) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2010-02-26 15:53:01 UTC (rev 11696) @@ -27,8 +27,8 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.jboss.ws.plugins.maven</groupId> - <artifactId>jaxws-tools-plugin</artifactId> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> <version&gt;@pom.version(a)&lt;/version&gt; <configuration> <verbose>true</verbose>