February 2010 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

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> -  +  <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> + +  + <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

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11689 - in projects/plugins/maven/jaxws-tools/trunk: src/main/java/org/jboss/ws/plugins/tools and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-02-25 16:44:36 -0500 (Thu, 25 Feb 2010) New Revision: 11689 Added: 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/TestWsProvideMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsProvideHelper.java 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/test2.wsdl projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties 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 projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/setup.bsh projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/tools/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/tools/wsprovide/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/tools/wsprovide/TestEndpoint.java projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/verify.bsh 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/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml Log: [JBWS-2650] Adding mojos for wsprovide, extending embedded tests to all supported stacks, improving test checks Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-02-25 13:38:26 UTC (rev 11688) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-02-25 21:44:36 UTC (rev 11689) @@ -48,6 +48,41 @@ <artifactId>maven-plugin-api</artifactId> <version>${maven.plugin.api.version}</version> </dependency> + +  + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-client</artifactId> + <version>3.3.0.Beta4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>3.3.0.Beta1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws.metro</groupId> + <artifactId>jbossws-metro-client</artifactId> + <version>3.3.0.Beta1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>2.0.1.GA</version> + <optional>true</optional> +   + </dependency> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.5.0</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath>  + </dependency> + </dependencies> <reporting> @@ -65,10 +100,6 @@ <version>${maven.invoker.plugin.version}</version> <configuration> <projectsDirectory>src/test/resources/test-embedded</projectsDirectory> - <cloneProjectsTo>${project.build.directory}/test-embedded</cloneProjectsTo> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> <settingsFile>src/test/resources/test-embedded/settings.xml</settingsFile> <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath> <preBuildHookScript>setup.bsh</preBuildHookScript> @@ -77,14 +108,55 @@ </configuration> <executions> <execution> - <id>integration-test</id> + <id>integration-test-native</id> <goals> <goal>install</goal> <goal>run</goal> </goals> + <configuration> + <cloneProjectsTo>${project.build.directory}/test-embedded-native</cloneProjectsTo> + <pomIncludes> + <pomInclude>*/pom.xml</pomInclude> + </pomIncludes> + </configuration> </execution> + <execution> + <id>integration-test-cxf</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <configuration> + <cloneProjectsTo>${project.build.directory}/test-embedded-cxf</cloneProjectsTo> + <pomIncludes> + <pomInclude>*/pom-cxf.xml</pomInclude> + </pomIncludes> + </configuration> + </execution> + <execution> + <id>integration-test-metro</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <configuration> + <cloneProjectsTo>${project.build.directory}/test-embedded-metro</cloneProjectsTo> + <pomIncludes> + <pomInclude>*/pom-metro.xml</pomInclude> + </pomIncludes> + </configuration> + </execution> </executions> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*TestCase.java</include> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin> </plugins> </build> 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 13:38:26 UTC (rev 11688) +++ 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) @@ -26,7 +26,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.List; -import java.util.Map; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.project.MavenProject; @@ -46,23 +45,17 @@ */ protected MavenProject project; + protected Boolean generateSource = true; //always generate sources, as we're having them compiled by Maven + /** - * Map of of plugin artifacts. - * - * @parameter expression="${plugin.artifactMap}" - * @readonly + * Enables/Disables SOAP 1.2 binding extension + * + * @parameter default-value="false" */ - private Map pluginArtifactMap; + protected Boolean extension; /** - * Enables/Disables Java source generation. * - * @parameter default-value="true" - */ - protected Boolean generateSource; - - /** - * * @parameter default-value="false" */ protected Boolean 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 13:38:26 UTC (rev 11688) +++ 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) @@ -62,20 +62,12 @@ /** * Sets the source directory. This directory will contain any generated Java source. - * If the directory does not exist, it will be created. If not specified, - * the output directory will be used instead. + * If the directory does not exist, it will be created. * * @parameter default-value="${project.build.directory}/wsconsume/java" */ protected File sourceDirectory; - /** - * Enables/Disables SOAP 1.2 binding extension - * - * @parameter default-value="false" - */ - protected Boolean extension; - protected Boolean noCompile = true; //let Maven compile the sources /** Added: 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 (rev 0) +++ 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) @@ -0,0 +1,129 @@ +/* + * 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.ws.plugins.tools; + +import java.io.File; + +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.logging.Log; +import org.jboss.wsf.spi.tools.WSContractProvider; + +/** + * + * + * @author alessio.soldano(a)jboss.com + * @since 25-Feb-2010 + * + */ +abstract class AbstractWsProvideMojo extends AbstractToolsMojo +{ + /** + * Enables/Disables WSDL generation. + * + * @parameter default-value="false" + */ + private boolean generateWsdl; + + /** + * Sets the resource directory. This directory will contain any generated + * WSDL and XSD files. If the directory does not exist, it will be created. + * + * @parameter default-value="${project.build.directory}/wsprovide/resources" + */ + private File resourceDirectory; + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. + * + * @parameter default-value="${project.build.directory}/wsprovide/java" + */ + protected File sourceDirectory; + + /** + * The endpoint implementation class name. + * + * @parameter + * @required + */ + private String endpointClass; + + public void execute() throws MojoExecutionException + { + Log log = getLog(); + if (endpointClass == null) + { + getLog().info("No service endpoint implementation class specified, nothing to do."); + return; + } + + if (verbose) + { + log.info("Classpath:"); + for (String s : getClasspath()) + { + log.info(" " + s); + } + } + + ClassLoader origLoader = Thread.currentThread().getContextClassLoader(); + ClassLoader loader = getMavenClasspathAwareClassLoader(origLoader); + Thread.currentThread().setContextClassLoader(loader); + try + { + WSContractProvider provider = WSContractProvider.newInstance(); + setupProvider(provider, loader); + provider.provide(endpointClass); + project.addCompileSourceRoot(sourceDirectory.getAbsolutePath()); + } + catch (Exception e) + { + throw new MojoExecutionException("Error while running wsconsume", e); + } + finally + { + Thread.currentThread().setContextClassLoader(origLoader); + } + } + + private void setupProvider(WSContractProvider provider, ClassLoader loader) + { + provider.setClassLoader(loader); + provider.setExtension(extension); + provider.setGenerateSource(generateSource); + provider.setGenerateWsdl(generateWsdl); + provider.setMessageStream(System.out); + File outputDir = getDestDir(); + if (outputDir != null) + { + provider.setOutputDirectory(outputDir); + } + if (resourceDirectory != null) + { + provider.setResourceDirectory(resourceDirectory); + } + if (sourceDirectory != null) + { + provider.setSourceDirectory(sourceDirectory); + } + } +} Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ 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) @@ -0,0 +1,67 @@ +/* + * 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.ws.plugins.tools; + +import java.io.File; +import java.util.List; + +/** + * Runs wsprovide tool (for tests) + * + * @goal wsprovide-test + * @phase process-test-classes + * @requiresDependencyResolution + * @description JBossWS WSProvide (Test) Maven Plugin. + * + * @author alessio.soldano(a)jboss.com + * @since 25-Feb-2010 + */ +public class TestWsProvideMojo extends AbstractWsProvideMojo +{ + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + * @parameter default-value="${project.build.testOutputDirectory}" + */ + protected File outputDirectory; + + /** + * Project test classpath. + * + * @parameter expression="${project.testClasspathElements}" + * @required + * @readonly + */ + protected List<String> testClasspathElements; + + @Override + protected File getDestDir() + { + return outputDirectory; + } + + @Override + protected List<String> getClasspath() + { + return testClasspathElements; + } +} Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ 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) @@ -0,0 +1,67 @@ +/* + * 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.ws.plugins.tools; + +import java.io.File; +import java.util.List; + +/** + * Runs wsprovide tool + * + * @goal wsprovide + * @phase process-classes + * @requiresDependencyResolution + * @description JBossWS WSProvide Maven Plugin. + * + * @author alessio.soldano(a)jboss.com + * @since 25-Feb-2010 + */ +public class WsProvideMojo extends AbstractWsProvideMojo +{ + /** + * Sets the main output directory. If the directory does not exist, it will be created. + * + * @parameter default-value="${project.build.outputDirectory}" + */ + protected File outputDirectory; + + /** + * Project classpath. + * + * @parameter expression="${project.compileClasspathElements}" + * @required + * @readonly + */ + protected List<String> classpathElements; + + @Override + protected File getDestDir() + { + return outputDirectory; + } + + @Override + protected List<String> getClasspath() + { + return classpathElements; + } +} Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java 2010-02-25 13:38:26 UTC (rev 11688) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsConsumeHelper.java 2010-02-25 21:44:36 UTC (rev 11689) @@ -25,6 +25,7 @@ import java.util.Map; /** + * A helper class for testing the plugin through bsh scripts * * @author alessio.soldano(a)jboss.com * @since 24-Feb-2010 @@ -33,10 +34,12 @@ public class TestWsConsumeHelper implements VerifyScriptHelper, SetupScriptHelper { private Long lastModificationTime = null; + private Long lastModificationTime2 = null; @Override public boolean verify(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { + //fist execution checks File endpointFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + File.separator + "foo" + File.separator + "bar" + File.separator + "Endpoint.java"); if (!endpointFile.exists()) @@ -49,6 +52,29 @@ System.out.println(endpointFile + " was not modified by the plugin!"); return false; } + + //second execution checks + File endpointFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated" + File.separator + "java-sources" + + File.separator + "foo" + File.separator + "bar2" + File.separator + "Endpoint.java"); + if (!endpointFile2.exists()) + { + System.out.println(endpointFile2 + " not found!"); + return false; + } + if (lastModificationTime2 != null && endpointFile2.lastModified() == lastModificationTime2) + { + System.out.println(endpointFile2 + " was not modified by the plugin!"); + return false; + } + + //classes checks + File classesOrg = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "classes" + File.separator + "org"); + File classesFoo = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "classes" + File.separator + "foo"); + if (!classesFoo.exists() || !classesOrg.exists()) + { + return false; + } + return true; } @@ -61,6 +87,13 @@ { this.lastModificationTime = endpointFile.lastModified(); } + + File endpointFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "generated" + File.separator + "java-sources" + + File.separator + "foo" + File.separator + "bar2" + File.separator + "Endpoint.java"); + if (endpointFile2.exists()) + { + this.lastModificationTime2 = endpointFile2.lastModified(); + } } } Added: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsProvideHelper.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsProvideHelper.java (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsProvideHelper.java 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,91 @@ +/* + * 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.helpers; + +import java.io.File; +import java.util.Map; + +/** + * A helper class for testing the plugin through bsh scripts + * + * @author alessio.soldano(a)jboss.com + * @since 25-Feb-2010 + * + */ +public class TestWsProvideHelper implements VerifyScriptHelper, SetupScriptHelper +{ + private Long wsdlLastModificationTime = null; + private Long wrapperClassLastModificationTime = null; + + @Override + public boolean verify(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception + { + File wrapper = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsprovide" + File.separator + "java" + + File.separator + "org" + File.separator + "jboss" + File.separator + "test" + File.separator + "ws" + File.separator + "plugins" + + File.separator + "tools" + File.separator + "wsprovide" + File.separator + "jaxws" + File.separator + "Test.java"); + if (!wrapper.exists()) + { + System.out.println(wrapper + " not found!"); + return false; + } + if (wrapperClassLastModificationTime != null && wrapper.lastModified() == wrapperClassLastModificationTime) + { + System.out.println(wrapper + " was not modified by the plugin!"); + return false; + } + + File wsdl = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsprovide" + File.separator + "resources" + + File.separator + "TestEndpointService.wsdl"); + if (!wsdl.exists()) + { + System.out.println(wsdl + " not found!"); + return false; + } + if (wsdlLastModificationTime != null && wsdl.lastModified() == wsdlLastModificationTime) + { + System.out.println(wsdl + " was not modified by the plugin!"); + return false; + } + + return true; + } + + @Override + public void setup(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception + { + File wrapper = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsprovide" + File.separator + "java" + + File.separator + "org" + File.separator + "jboss" + File.separator + "test" + File.separator + "ws" + File.separator + "plugins" + + File.separator + "tools" + File.separator + "wsprovide" + File.separator + "jaxws" + File.separator + "Test.java"); + if (wrapper.exists()) + { + this.wrapperClassLastModificationTime = wrapper.lastModified(); + } + + File wsdl = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsprovide" + File.separator + "resources" + + File.separator + "TestEndpointService.wsdl"); + if (wsdl.exists()) + { + this.wsdlLastModificationTime = wsdl.lastModified(); + } + } + +} Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestWsProvideHelper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>testWsConsume</name> + <groupId>org.jboss.ws.plugins.maven.tests</groupId> + <artifactId>testWsConsume</artifactId> + <packaging>jar</packaging> + <version>@pom.version@</version> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <maxmem>256M</maxmem> + <fork>${compiler.fork}</fork> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins.maven</groupId> + <artifactId>jaxws-tools-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>First execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar</targetPackage> + </configuration> + </execution> + <execution> + <id>Second execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test2.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar2</targetPackage> + <sourceDirectory>${project.build.directory}/generated/java-sources</sourceDirectory> + <extension>true</extension> + </configuration> + </execution> + <execution> + <id>Third execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + <wsdl>${basedir}/test2.wsdl</wsdl> + </wsdls> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>3.3.0.Beta1</version> + </dependency> + </dependencies> +</project> Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>testWsConsume</name> + <groupId>org.jboss.ws.plugins.maven.tests</groupId> + <artifactId>testWsConsume</artifactId> + <packaging>jar</packaging> + <version>@pom.version@</version> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <maxmem>256M</maxmem> + <fork>${compiler.fork}</fork> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins.maven</groupId> + <artifactId>jaxws-tools-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>First execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar</targetPackage> + </configuration> + </execution> + <execution> + <id>Second execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test2.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar2</targetPackage> + <sourceDirectory>${project.build.directory}/generated/java-sources</sourceDirectory> + <extension>true</extension> + </configuration> + </execution> + <execution> + <id>Third execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + <wsdl>${basedir}/test2.wsdl</wsdl> + </wsdls> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.ws.metro</groupId> + <artifactId>jbossws-metro-client</artifactId> + <version>3.3.0.Beta1</version> + </dependency> + </dependencies> +</project> Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF 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-25 13:38:26 UTC (rev 11688) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2010-02-25 21:44:36 UTC (rev 11689) @@ -31,19 +31,48 @@ <artifactId>jaxws-tools-plugin</artifactId> <version>@pom.version@</version> <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar</targetPackage> <verbose>true</verbose> </configuration> <executions> <execution> + <id>First execution</id> <goals> <goal>wsconsume</goal> </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar</targetPackage> + </configuration> </execution> - </executions> + <execution> + <id>Second execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test2.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar2</targetPackage> + <sourceDirectory>${project.build.directory}/generated/java-sources</sourceDirectory> + <extension>true</extension> + </configuration> + </execution> + <execution> + <id>Third execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + <wsdl>${basedir}/test2.wsdl</wsdl> + </wsdls> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/test2.wsdl =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/test2.wsdl (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/test2.wsdl 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://webmethod2.samples.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://webmethod2.samples.jaxws.ws.test.jboss.org/" name="EndpointService"> +<types/> +<message name="echoString"> +<part name="arg0" type="xsd:string"/> +</message> +<message name="echoStringResponse"> +<part name="return" type="xsd:string"/> +</message> +<portType name="Endpoint"> +<operation name="echoString"> +<input message="tns:echoString"/> +<output message="tns:echoStringResponse"/> +</operation> +</portType> +<binding name="EndpointPortBinding" type="tns:Endpoint"> +<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> +<operation name="echoString"> +<soap:operation soapAction="urn:EchoString"/> +<input> +<soap:body use="literal" namespace="http://webmethod2.samples.jaxws.ws.test.jboss.org/"/> +</input> +<output> +<soap:body use="literal" namespace="http://webmethod2.samples.jaxws.ws.test.jboss.org/"/> +</output> +</operation> +</binding> +<service name="EndpointService"> +<port name="EndpointPort" binding="tns:EndpointPortBinding"> +<soap:address location="http://127.0.0.1:8080/jaxws-samples-webmethod2"/> +</port> +</service> +</definitions> \ No newline at end of file Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/test2.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/invoker.properties 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1 @@ +invoker.goals = clean package Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>testWsProvide</name> + <groupId>org.jboss.ws.plugins.maven.tests</groupId> + <artifactId>testWsProvide</artifactId> + <packaging>jar</packaging> + <version>@pom.version@</version> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <maxmem>256M</maxmem> + <fork>${compiler.fork}</fork> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins.maven</groupId> + <artifactId>jaxws-tools-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>First execution</id> + <goals> + <goal>wsprovide</goal> + </goals> + <configuration> + <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> + <generateWsdl>true</generateWsdl> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>3.3.0.Beta1</version> + </dependency> + </dependencies> +</project> Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>testWsProvide</name> + <groupId>org.jboss.ws.plugins.maven.tests</groupId> + <artifactId>testWsProvide</artifactId> + <packaging>jar</packaging> + <version>@pom.version@</version> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <maxmem>256M</maxmem> + <fork>${compiler.fork}</fork> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins.maven</groupId> + <artifactId>jaxws-tools-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>First execution</id> + <goals> + <goal>wsprovide</goal> + </goals> + <configuration> + <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> + <generateWsdl>true</generateWsdl> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.ws.metro</groupId> + <artifactId>jbossws-metro-client</artifactId> + <version>3.3.0.Beta1</version> + </dependency> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.5.0</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + + + </dependencies> +</project> Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-metro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>testWsProvide</name> + <groupId>org.jboss.ws.plugins.maven.tests</groupId> + <artifactId>testWsProvide</artifactId> + <packaging>jar</packaging> + <version>@pom.version@</version> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <maxmem>256M</maxmem> + <fork>${compiler.fork}</fork> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins.maven</groupId> + <artifactId>jaxws-tools-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>First execution</id> + <goals> + <goal>wsprovide</goal> + </goals> + <configuration> + <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> + <generateWsdl>true</generateWsdl> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>2.0.1.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-client</artifactId> + <version>3.3.0.Beta4</version> + </dependency> + </dependencies> +</project> Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/setup.bsh =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/setup.bsh (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/setup.bsh 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,7 @@ +import java.io.*; +import org.jboss.test.ws.plugins.tools.helpers.*; +import java.util.*; +import java.util.regex.*; + +TestWsProvideHelper helper = new TestWsProvideHelper(); +helper.setup(basedir, localRepositoryPath, context); \ No newline at end of file Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/tools/wsprovide/TestEndpoint.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/tools/wsprovide/TestEndpoint.java (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/tools/wsprovide/TestEndpoint.java 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,40 @@ +/* + * 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.wsprovide; + +import javax.jws.WebService; + +/** + * A simple test endpoint service implementation + * + * @author alessio.soldano(a)jboss.com + * @since 25-Feb-2010 + * + */ +@WebService +public class TestEndpoint +{ + public String test(String s) + { + return s; + } +} \ No newline at end of file Property changes on: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/src/main/java/org/jboss/test/ws/plugins/tools/wsprovide/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/verify.bsh =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/verify.bsh (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/verify.bsh 2010-02-25 21:44:36 UTC (rev 11689) @@ -0,0 +1,16 @@ +import java.io.*; +import org.jboss.test.ws.plugins.tools.helpers.*; +import java.util.*; +import java.util.regex.*; + +try +{ + TestWsProvideHelper helper = new TestWsProvideHelper(); + return helper.verify(basedir, localRepositoryPath, context); + +} +catch( Throwable t ) +{ + t.printStackTrace(); + return false; +}

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11688 - stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2010-02-25 08:38:26 -0500 (Thu, 25 Feb 2010) New Revision: 11688 Modified: stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java Log: Some intermediate code Modified: stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2010-02-25 10:22:44 UTC (rev 11687) +++ stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2010-02-25 13:38:26 UTC (rev 11688) @@ -133,9 +133,13 @@ } // Delegate to JBoss Entity Resolver - XMLInputSource source = getXMLInputSource(delegate.resolveEntity(null, namespaceURI), resId); - if (source != null) - return source; + InputSource is = delegate.resolveEntity(null, namespaceURI); + if (is != null) + { + XMLInputSource source = getXMLInputSource(is, resId); + if (source != null) + return source; + } } catch (SAXException e) { Modified: stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2010-02-25 10:22:44 UTC (rev 11687) +++ stack/native/branches/dlofthouse/JBWS-2930/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2010-02-25 13:38:26 UTC (rev 11688) @@ -507,15 +507,16 @@ private JBossXSNamespaceItem createNamespaceItemIfNotExistent(String ns) { - if (ns == null) - throw new IllegalArgumentException("Illegal null argument:ns"); + //if (ns == null) + // throw new IllegalArgumentException("Illegal null argument:ns"); JBossXSNamespaceItem jbnm = nsimap.get(ns); if (jbnm == null) { jbnm = new JBossXSNamespaceItem(ns, namespaceRegistry, qualifiedElements); nsimap.put(ns, jbnm); - registerNamespace(ns); + if (ns != null) + registerNamespace(ns); } return jbnm;

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11687 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-02-25 05:22:44 -0500 (Thu, 25 Feb 2010) New Revision: 11687 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2917] excluding test Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-25 10:22:12 UTC (rev 11686) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-25 10:22:44 UTC (rev 11687) @@ -45,6 +45,7 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-25 10:22:12 UTC (rev 11686) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-25 10:22:44 UTC (rev 11687) @@ -45,6 +45,7 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-25 10:22:12 UTC (rev 11686) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-25 10:22:44 UTC (rev 11687) @@ -45,6 +45,7 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-25 10:22:12 UTC (rev 11686) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-25 10:22:44 UTC (rev 11687) @@ -45,4 +45,5 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11686 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-02-25 05:22:12 -0500 (Thu, 25 Feb 2010) New Revision: 11686 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2917] excluding test Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-25 10:19:29 UTC (rev 11685) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-25 10:22:12 UTC (rev 11686) @@ -56,6 +56,7 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-25 10:19:29 UTC (rev 11685) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-25 10:22:12 UTC (rev 11686) @@ -56,6 +56,7 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-25 10:19:29 UTC (rev 11685) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-25 10:22:12 UTC (rev 11686) @@ -56,6 +56,7 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* # [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-25 10:19:29 UTC (rev 11685) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-25 10:22:12 UTC (rev 11686) @@ -56,4 +56,5 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11685 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-02-25 05:19:29 -0500 (Thu, 25 Feb 2010) New Revision: 11685 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2917] excluding test Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-25 10:17:43 UTC (rev 11684) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-02-25 10:19:29 UTC (rev 11685) @@ -10,5 +10,6 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/** org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-25 10:17:43 UTC (rev 11684) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-02-25 10:19:29 UTC (rev 11685) @@ -10,5 +10,6 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/** org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-25 10:17:43 UTC (rev 11684) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-02-25 10:19:29 UTC (rev 11685) @@ -10,5 +10,6 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/** org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-25 10:17:43 UTC (rev 11684) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-02-25 10:19:29 UTC (rev 11685) @@ -10,5 +10,6 @@ # [JBWS-2917] We're using buggy xalan version causing namespaces issues org/jboss/test/ws/jaxws/jbws2917/** org/jboss/test/ws/jaxws/jbws2937/** +org/jboss/test/ws/jaxws/jbws2942/** org/jboss/test/ws/jaxws/endpointReference/** org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.*

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11684 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws: wsaddressing and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-02-25 05:17:43 -0500 (Thu, 25 Feb 2010) New Revision: 11684 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/EndpointReferenceUtil.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java Log: [JBWS-2942] fixing NativeEndpointReference implementation to don't serialize empty metadata and reference parameters elements Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-02-25 09:23:21 UTC (rev 11683) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2010-02-25 10:17:43 UTC (rev 11684) @@ -173,8 +173,9 @@ try { - //we currently support W3CEndpointReference only - return new W3CEndpointReference(eprInfoset); + final NativeEndpointReference nativeEPR = new NativeEndpointReference(eprInfoset); + final Source source = EndpointReferenceUtil.getSourceFromEndpointReference(nativeEPR); + return new W3CEndpointReference(source); } catch (Exception e) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/EndpointReferenceUtil.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/EndpointReferenceUtil.java 2010-02-25 09:23:21 UTC (rev 11683) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/EndpointReferenceUtil.java 2010-02-25 10:17:43 UTC (rev 11684) @@ -68,7 +68,7 @@ throw new WebServiceException("EndpointReference of type " + clazz + " not supported."); } - private static Source getSourceFromEndpointReference(EndpointReference epr) + public static Source getSourceFromEndpointReference(EndpointReference epr) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); StreamResult result = new StreamResult(outputStream); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java 2010-02-25 09:23:21 UTC (rev 11683) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/NativeEndpointReference.java 2010-02-25 10:17:43 UTC (rev 11684) @@ -56,7 +56,7 @@ * @see EndpointReferenceUtil class. * * @author alessio.soldano(a)jboss.com - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>ok + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @since 28-Feb-2009 */ @XmlRootElement(name = "EndpointReference", namespace = NativeEndpointReference.WSA_NS) @@ -75,9 +75,9 @@ @XmlElement(name = "Address", namespace = WSA_NS) private Address address; @XmlElement(name = "ReferenceParameters", namespace = WSA_NS) - private Elements referenceParameters = new Elements(); + private Elements referenceParameters; @XmlElement(name = "Metadata", namespace = WSA_NS) - private Elements metadata = new Elements(); + private Elements metadata; @XmlAnyAttribute private Map<QName, String> attributes; @XmlAnyElement @@ -113,8 +113,14 @@ { NativeEndpointReference epr = jc.createUnmarshaller().unmarshal(source, NativeEndpointReference.class).getValue(); this.address = epr.address; - this.referenceParameters = epr.referenceParameters; - this.metadata = epr.metadata; + if ((epr.referenceParameters != null) && (!epr.referenceParameters.isEmpty())) + { + this.referenceParameters = epr.referenceParameters; + } + if ((epr.metadata != null) && (!epr.metadata.isEmpty())) + { + this.metadata = epr.metadata; + } this.attributes = epr.attributes; this.elements = epr.elements; if (epr.metadata != null) @@ -193,6 +199,9 @@ final String attrName = this.getNamespaceAttributeName(serviceName.getPrefix()); this.serviceNameElement.setAttribute(attrName, serviceName.getNamespaceURI()); this.serviceNameElement.setTextContent(this.toString(serviceName)); + if (this.metadata == null) + this.metadata = new Elements(); + this.metadata.addElement(this.serviceNameElement); } @@ -226,12 +235,18 @@ final String attrName = this.getNamespaceAttributeName(interfaceName.getPrefix()); interfaceNameElement.setAttribute(attrName, interfaceName.getNamespaceURI()); interfaceNameElement.setTextContent(this.toString(interfaceName)); + if (this.metadata == null) + this.metadata = new Elements(); + this.metadata.addElement(interfaceNameElement); } @XmlTransient public List<Element> getMetadata() { + if (this.metadata == null) + return null; + return this.metadata.getElements(); } @@ -240,6 +255,9 @@ if ((metadata == null) || (metadata.size() == 0)) return; + if (this.metadata == null) + this.metadata = new Elements(); + this.metadata.setElements(metadata); } @@ -268,12 +286,18 @@ return; this.wsdlLocation = wsdlLocation; + if (this.metadata == null) + this.metadata = new Elements(); + this.metadata.addAttribute(WSDL_LOCATION_QNAME, wsdlLocation); } @XmlTransient public List<Element> getReferenceParameters() { + if (this.referenceParameters == null) + return null; + return this.referenceParameters.getElements(); } @@ -282,6 +306,9 @@ if ((metadata == null) || (metadata.size() == 0)) return; + if (this.referenceParameters == null) + this.referenceParameters = new Elements(); + this.referenceParameters.setElements(metadata); } @@ -499,6 +526,15 @@ } this.attributes.put(attrName, attrValue); } + + @XmlTransient + public boolean isEmpty() + { + final boolean noAttributes = this.attributes == null || this.attributes.size() == 0; + final boolean noElements = this.elements == null || this.elements.size() == 0; + + return noAttributes && noElements; + } } }

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11683 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-02-25 04:23:21 -0500 (Thu, 25 Feb 2010) New Revision: 11683 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java Log: [JBWS-2942] enhancing test Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java 2010-02-25 09:11:37 UTC (rev 11682) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java 2010-02-25 09:23:21 UTC (rev 11683) @@ -39,13 +39,15 @@ private static final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" + " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" + + " <Metadata/>\n" + "</EndpointReference>\n"; public void testToString() throws Exception { + assertTrue("Lost empty <Metadata/>", this.getXML(XML_SOURCE).indexOf("<Metadata") != -1); StreamSource source = new StreamSource(new StringReader(XML_SOURCE)); EndpointReference epRef = EndpointReference.readFrom(source); - assertTrue("Empty <Metadata/> detected", epRef.toString().indexOf("<Metadata") == -1); + assertTrue("Empty <Metadata/> serialized", epRef.toString().indexOf("<Metadata") == -1); } private String getXML(final String s) throws Exception

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11682 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws: jbws2942 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2010-02-25 04:11:37 -0500 (Thu, 25 Feb 2010) New Revision: 11682 Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java Log: [JBWS-2942] providing test case Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2942/JBWS2942TestCase.java 2010-02-25 09:11:37 UTC (rev 11682) @@ -0,0 +1,55 @@ +/* + * 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.jaxws.jbws2942; + +import java.io.StringReader; + +import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.EndpointReference; + +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; + +/** + * [JBWS-2942] Do not add empty Metadata tag to EndpointReference. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class JBWS2942TestCase extends JBossWSTest +{ + private static final String XML_SOURCE = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n" + + "<EndpointReference xmlns='http://www.w3.org/2005/08/addressing'>\n" + + " <Address>http://localhost:8080/jaxws-endpointReference</Address>\n" + + "</EndpointReference>\n"; + + public void testToString() throws Exception + { + StreamSource source = new StreamSource(new StringReader(XML_SOURCE)); + EndpointReference epRef = EndpointReference.readFrom(source); + assertTrue("Empty <Metadata/> detected", epRef.toString().indexOf("<Metadata") == -1); + } + + private String getXML(final String s) throws Exception + { + return DOMUtils.node2String(DOMUtils.parse(s)); + } +}

14 years, 10 months

1
0
0 / 0

JBossWS SVN: r11681 - in projects/plugins/maven/jaxws-tools/trunk: .settings and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-02-24 12:58:15 -0500 (Wed, 24 Feb 2010) New Revision: 11681 Added: projects/plugins/maven/jaxws-tools/trunk/.classpath projects/plugins/maven/jaxws-tools/trunk/.project projects/plugins/maven/jaxws-tools/trunk/.settings/ projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.core.prefs projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.ui.prefs projects/plugins/maven/jaxws-tools/trunk/.settings/org.maven.ide.eclipse.prefs Log: Adding Eclipse project Added: projects/plugins/maven/jaxws-tools/trunk/.classpath =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/.classpath (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/.classpath 2010-02-24 17:58:15 UTC (rev 11681) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: projects/plugins/maven/jaxws-tools/trunk/.project =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/.project (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/.project 2010-02-24 17:58:15 UTC (rev 11681) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jaxws-tools-maven-plugin</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-24 17:58:15 UTC (rev 11681) @@ -0,0 +1,261 @@ +#Wed Feb 24 15:08:13 CET 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=3 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=168 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=3 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true Added: projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/.settings/org.eclipse.jdt.ui.prefs 2010-02-24 17:58:15 UTC (rev 11681) @@ -0,0 +1,4 @@ +#Wed Feb 24 15:08:13 CET 2010 +eclipse.preferences.version=1 +formatter_profile=_JBossWSCodeStyle +formatter_settings_version=11 Added: projects/plugins/maven/jaxws-tools/trunk/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/.settings/org.maven.ide.eclipse.prefs 2010-02-24 17:58:15 UTC (rev 11681) @@ -0,0 +1,9 @@ +#Wed Feb 24 15:07:54 CET 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2010