[jbossws-commits] JBossWS SVN: r11690 - in projects/plugins/maven/jaxws-tools/trunk: src/main/java/org/jboss/ws/plugins/tools and 4 other directories.

Author: alessio.soldano(a)jboss.com Date: 2010-02-26 07:18:02 -0500 (Fri, 26 Feb 2010) New Revision: 11690 Added: 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/utils/ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/utils/AbstractToolsMojoTestCase.java projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/ 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 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 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/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java Log: [JBWS-2650] Adding argument tests Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-02-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-02-26 12:18:02 UTC (rev 11690) @@ -49,8 +49,23 @@ <version>${maven.plugin.api.version}</version> </dependency> - <!-- Non transient test dependencies: declared here just to prepare the local maven repo and use that in the embedded tests, making them faster and with simpler pom.xml files --> + <!-- Non transient test dependencies --> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <type>jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + + <!-- The following are declared here just to prepare the local maven repo and use that in the embedded tests, making them faster and with simpler pom.xml files --> + <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-client</artifactId> <version>3.3.0.Beta4</version> Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2010-02-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -31,8 +31,8 @@ import org.apache.maven.project.MavenProject; /** + * Abstract mojo all the other need to extend * - * * @author alessio.soldano(a)jboss.com * @since 24-Feb-2010 * @@ -63,16 +63,21 @@ /** * Either ${build.outputDirectory} or ${build.testOutputDirectory}. */ - protected abstract File getDestDir(); + public abstract File getOutputDirectory(); /** * Either ${project.compileClasspathElements} or ${project.testClasspathElements} */ - protected abstract List<String> getClasspath(); + public abstract List<String> getClasspathElements(); + /** + * Update the current Maven project source roots with the generated classes / resources + */ + protected abstract void updateProjectSourceRoots(); + protected ClassLoader getMavenClasspathAwareClassLoader(ClassLoader parent) { - List<String> classpath = getClasspath(); + List<String> classpath = getClasspathElements(); final int size = classpath.size(); URL[] urls = new URL[size]; for (int i=0; i < size; i++) @@ -88,5 +93,15 @@ } return new URLClassLoader(urls, parent); } + + public Boolean getExtension() + { + return extension; + } + + public Boolean isVerbose() + { + return verbose; + } } 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-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -31,8 +31,8 @@ import org.jboss.wsf.spi.tools.WSContractConsumer; /** + * Generic mojo for wsconsume tool * - * * @author alessio.soldano(a)jboss.com * @since 24-Feb-2010 * @@ -51,7 +51,7 @@ * * @parameter */ - protected List<File> bindingFiles; + protected List<String> bindingFiles; /** * Sets the OASIS XML Catalog file to use for entity resolution. @@ -104,7 +104,7 @@ if (verbose) { log.info("Classpath:"); - for (String s : getClasspath()) + for (String s : getClasspathElements()) { log.info(" " + s); } @@ -131,7 +131,7 @@ throw new MojoExecutionException("Error while running wsconsume", e); } } - project.addCompileSourceRoot(sourceDirectory.getAbsolutePath()); + updateProjectSourceRoots(); } finally { @@ -141,11 +141,16 @@ private void setupConsumer(WSContractConsumer consumer) { - consumer.setAdditionalCompilerClassPath(new LinkedList<String>(getClasspath())); + consumer.setAdditionalCompilerClassPath(new LinkedList<String>(getClasspathElements())); consumer.setMessageStream(System.out); if (bindingFiles != null && !bindingFiles.isEmpty()) { - consumer.setBindingFiles(bindingFiles); + List<File> files = new LinkedList<File>(); + for (String bf : bindingFiles) + { + files.add(new File(bf)); + } + consumer.setBindingFiles(files); } if (catalog != null) { @@ -154,7 +159,7 @@ consumer.setExtension(extension); consumer.setGenerateSource(generateSource); consumer.setNoCompile(noCompile); - File outputDir = getDestDir(); + File outputDir = getOutputDirectory(); if (outputDir != null) { consumer.setOutputDirectory(outputDir); @@ -176,4 +181,39 @@ consumer.setWsdlLocation(wsdlLocation); } } + + public List<String> getWsdls() + { + return wsdls; + } + + public List<String> getBindingFiles() + { + return bindingFiles; + } + + public File getCatalog() + { + return catalog; + } + + public File getSourceDirectory() + { + return sourceDirectory; + } + + public String getTargetPackage() + { + return targetPackage; + } + + public String getWsdlLocation() + { + return wsdlLocation; + } + + public String getTarget() + { + return target; + } } 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-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -28,8 +28,8 @@ import org.jboss.wsf.spi.tools.WSContractProvider; /** + * Generic mojo for wsprovide tool * - * * @author alessio.soldano(a)jboss.com * @since 25-Feb-2010 * @@ -49,7 +49,7 @@ * * @parameter default-value="${project.build.directory}/wsprovide/resources" */ - private File resourceDirectory; + protected File resourceDirectory; /** * Sets the source directory. This directory will contain any generated Java source. @@ -79,7 +79,7 @@ if (verbose) { log.info("Classpath:"); - for (String s : getClasspath()) + for (String s : getClasspathElements()) { log.info(" " + s); } @@ -93,7 +93,7 @@ WSContractProvider provider = WSContractProvider.newInstance(); setupProvider(provider, loader); provider.provide(endpointClass); - project.addCompileSourceRoot(sourceDirectory.getAbsolutePath()); + updateProjectSourceRoots(); } catch (Exception e) { @@ -112,7 +112,7 @@ provider.setGenerateSource(generateSource); provider.setGenerateWsdl(generateWsdl); provider.setMessageStream(System.out); - File outputDir = getDestDir(); + File outputDir = getOutputDirectory(); if (outputDir != null) { provider.setOutputDirectory(outputDir); @@ -126,4 +126,24 @@ provider.setSourceDirectory(sourceDirectory); } } + + public boolean isGenerateWsdl() + { + return generateWsdl; + } + + public File getResourceDirectory() + { + return resourceDirectory; + } + + public File getSourceDirectory() + { + return sourceDirectory; + } + + public String getEndpointClass() + { + return endpointClass; + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2010-02-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -49,14 +49,20 @@ protected List<String> testClasspathElements; @Override - protected File getDestDir() + public File getOutputDirectory() { return outputDirectory; } @Override - protected List<String> getClasspath() + public List<String> getClasspathElements() { return testClasspathElements; } + + @Override + protected void updateProjectSourceRoots() + { + project.addTestCompileSourceRoot(sourceDirectory.getAbsolutePath()); + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2010-02-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -54,14 +54,20 @@ protected List<String> testClasspathElements; @Override - protected File getDestDir() + public File getOutputDirectory() { return outputDirectory; } @Override - protected List<String> getClasspath() + public List<String> getClasspathElements() { return testClasspathElements; } + + @Override + protected void updateProjectSourceRoots() + { + project.addTestCompileSourceRoot(sourceDirectory.getAbsolutePath()); + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2010-02-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -54,13 +54,19 @@ protected List<String> classpathElements; @Override - protected File getDestDir() + protected void updateProjectSourceRoots() { + project.addCompileSourceRoot(sourceDirectory.getAbsolutePath()); + } + + @Override + public File getOutputDirectory() + { return outputDirectory; } - + @Override - protected List<String> getClasspath() + public List<String> getClasspathElements() { return classpathElements; } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2010-02-25 21:44:36 UTC (rev 11689) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -54,13 +54,19 @@ protected List<String> classpathElements; @Override - protected File getDestDir() + protected void updateProjectSourceRoots() { + project.addCompileSourceRoot(sourceDirectory.getAbsolutePath()); + } + + @Override + public File getOutputDirectory() + { return outputDirectory; } @Override - protected List<String> getClasspath() + public List<String> getClasspathElements() { return classpathElements; } Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.plugins.tools; + +import static org.junit.Assert.assertThat; +import static org.junit.matchers.JUnitMatchers.hasItems; + +import org.jboss.test.ws.plugins.tools.utils.AbstractToolsMojoTestCase; +import org.jboss.ws.plugins.tools.WsConsumeMojo; +import org.jboss.ws.plugins.tools.WsProvideMojo; +import org.junit.Test; + +/** + * A test for checking tools mojo arguments are correctly understood + * + * @author alessio.soldano(a)jboss.com + * @since 26-Feb-2010 + * + */ +public class ArgumentTest extends AbstractToolsMojoTestCase +{ + + @Test + public void testWsConsumePluginArguments() throws Exception + { + final String pluginConfig = "target/test-classes/test-argument/wsconsume-plugin-config.xml"; + + WsConsumeMojo mojo = getMojo(WsConsumeMojo.class, "wsconsume", pluginConfig); + assertEquals("t", mojo.getTarget()); + assertEquals("output", mojo.getOutputDirectory().getName()); + assertEquals("tp", mojo.getTargetPackage()); + assertEquals("catalog", mojo.getCatalog().getName()); + assertTrue(mojo.getExtension()); + assertEquals("wl", mojo.getWsdlLocation()); + assertEquals("source", mojo.getSourceDirectory().getName()); + assertTrue(mojo.isVerbose()); + assertThat(mojo.getBindingFiles(), hasItems(new String[] { "b1" })); + assertThat(mojo.getClasspathElements(), hasItems(new String[] { "cp1", "cp2" })); + assertThat(mojo.getWsdls(), hasItems(new String[] { "w1", "w2" })); + } + + @Test + public void testWsProvidePluginArguments() throws Exception + { + final String pluginConfig = "target/test-classes/test-argument/wsprovide-plugin-config.xml"; + + WsProvideMojo mojo = getMojo(WsProvideMojo.class, "wsprovide", pluginConfig); + assertEquals("output", mojo.getOutputDirectory().getName()); + assertEquals("endpoint", mojo.getEndpointClass()); + assertEquals("resource", mojo.getResourceDirectory().getName()); + assertEquals(true, mojo.isGenerateWsdl()); + assertTrue(mojo.getExtension()); + assertEquals("source", mojo.getSourceDirectory().getName()); + assertTrue(mojo.isVerbose()); + assertThat(mojo.getClasspathElements(), hasItems(new String[] { "cp1", "cp2" })); + } + +} Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/utils/AbstractToolsMojoTestCase.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/utils/AbstractToolsMojoTestCase.java (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/utils/AbstractToolsMojoTestCase.java 2010-02-26 12:18:02 UTC (rev 11690) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.plugins.tools.utils; + +import java.io.File; + +import org.apache.maven.plugin.Mojo; +import org.apache.maven.plugin.logging.SystemStreamLog; +import org.apache.maven.plugin.testing.AbstractMojoTestCase; +import org.codehaus.plexus.configuration.PlexusConfiguration; + +/** + * Utility class for providing additional means of looking up mojo classes. + * + * @author alessio.soldano(a)jboss.com + * @since 26-Feb-2010 + * + */ +public abstract class AbstractToolsMojoTestCase extends AbstractMojoTestCase +{ + + @SuppressWarnings("unchecked") + protected <T extends Mojo> T getMojo(Class<T> mojoClass, String goal, String pomXml) throws Exception + { + File testPom = new File(getBasedir(), pomXml); + + T mojo = (T)lookupMojo(goal, testPom); + + assertNotNull(mojo); + + return mojo; + } + + @SuppressWarnings("unchecked") + protected <T extends Mojo> T getMojo(Class<T> mojoClass, String groupId, String artifactId, String version, String goal, String pomXml) throws Exception + { + File testPom = new File(getBasedir(), pomXml); + + T mojo = (T)lookupMojo(groupId, artifactId, version, goal, testPom); + + assertNotNull(mojo); + + return mojo; + } + + protected Mojo lookupMojo(String groupId, String artifactId, String version, String goal, File pom) throws Exception + { + PlexusConfiguration pluginConfiguration = extractPluginConfiguration(artifactId, pom); + return lookupMojo(groupId, artifactId, version, goal, pluginConfiguration); + } + + protected class DebugEnabledLog extends SystemStreamLog + { + public DebugEnabledLog() + { + super(); + } + + @Override + public boolean isDebugEnabled() + { + return true; + } + } + +} Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/utils/AbstractToolsMojoTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml 2010-02-26 12:18:02 UTC (rev 11690) @@ -0,0 +1,31 @@ +<project> + <build> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins.maven</groupId> + <artifactId>jaxws-tools-plugin</artifactId> + <configuration> + <outputDirectory>output</outputDirectory> + <classpathElements> + <classpathElement>cp1</classpathElement> + <classpathElement>cp2</classpathElement> + </classpathElements> + <wsdls> + <wsdl>w1</wsdl> + <wsdl>w2</wsdl> + </wsdls> + <bindingFiles> + <bindingFile>b1</bindingFile> + </bindingFiles> + <catalog>catalog</catalog> + <sourceDirectory>source</sourceDirectory> + <targetPackage>tp</targetPackage> + <wsdlLocation>wl</wsdlLocation> + <target>t</target> + <extension>true</extension> + <verbose>true</verbose> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsprovide-plugin-config.xml 2010-02-26 12:18:02 UTC (rev 11690) @@ -0,0 +1,23 @@ +<project> + <build> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins.maven</groupId> + <artifactId>jaxws-tools-plugin</artifactId> + <configuration> + <outputDirectory>output</outputDirectory> + <classpathElements> + <classpathElement>cp1</classpathElement> + <classpathElement>cp2</classpathElement> + </classpathElements> + <generateWsdl>true</generateWsdl> + <resourceDirectory>resource</resourceDirectory> + <sourceDirectory>source</sourceDirectory> + <endpointClass>endpoint</endpointClass> + <extension>true</extension> + <verbose>true</verbose> + </configuration> + </plugin> + </plugins> + </build> +</project> Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsprovide-plugin-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF