[jbossws-commits] JBossWS SVN: r3302 - in trunk: integration/spi/src/main/java/org/jboss/ws/integration and 12 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-05-30 04:43:49 -0400 (Wed, 30 May 2007) New Revision: 3302 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java Modified: trunk/build/etc/wsconsume.bat trunk/build/etc/wsconsume.sh trunk/build/etc/wsprovide.bat trunk/build/etc/wsprovide.sh trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java trunk/jbossws-core/src/main/resources/samples/build.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java Log: Rename ANT tasks and command line wrapper Modified: trunk/build/etc/wsconsume.bat =================================================================== --- trunk/build/etc/wsconsume.bat 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/build/etc/wsconsume.bat 2007-05-30 08:43:49 UTC (rev 3302) @@ -42,7 +42,7 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxb-xjc.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-rt.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-tools.jar -set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-integration-tools.jar +set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jbossall-client.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-jaxrpc.jar @@ -52,4 +52,4 @@ set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/mail.jar rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.command.wsconsume %* +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSCONSUME_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSConsume %* Modified: trunk/build/etc/wsconsume.sh =================================================================== --- trunk/build/etc/wsconsume.sh 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/build/etc/wsconsume.sh 2007-05-30 08:43:49 UTC (rev 3302) @@ -53,12 +53,6 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/activation.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/getopt.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/javassist.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar" @@ -66,8 +60,15 @@ WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-integration-tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-rt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxws-tools.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/stax-api.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$JBOSS_HOME/client/jaxb-xjc.jar" + # For Cygwin, switch paths to Windows format before running java if $cygwin; then JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` @@ -81,4 +82,4 @@ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ -classpath "$WSCONSUME_CLASSPATH" \ - org.jboss.wsf.spi.tools.command.wsconsume "$@" + org.jboss.wsf.spi.tools.cmd.WSConsume "$@" Modified: trunk/build/etc/wsprovide.bat =================================================================== --- trunk/build/etc/wsprovide.bat 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/build/etc/wsprovide.bat 2007-05-30 08:43:49 UTC (rev 3302) @@ -43,6 +43,7 @@ set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-saaj.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/log4j.jar set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/mail.jar +set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jbossws-spi.jar rem Execute the JVM -"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.command.wsprovide %* +"%JAVA%" %JAVA_OPTS% -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" -Dlog4j.configuration=wstools-log4j.xml -classpath "%WSPROVIDE_CLASSPATH%" org.jboss.wsf.spi.tools.cmd.WSProvide %* Modified: trunk/build/etc/wsprovide.sh =================================================================== --- trunk/build/etc/wsprovide.sh 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/build/etc/wsprovide.sh 2007-05-30 08:43:49 UTC (rev 3302) @@ -60,7 +60,7 @@ WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/log4j.jar" WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/mail.jar" -WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-integration-tools.jar" +WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar" # For Cygwin, switch paths to Windows format before running java if $cygwin; then @@ -75,4 +75,4 @@ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ -Dlog4j.configuration=wstools-log4j.xml \ -classpath "$WSPROVIDE_CLASSPATH" \ - org.jboss.wsf.spi.tools.command.wsprovide "$@" + org.jboss.wsf.spi.tools.cmd.WSProvide "$@" Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/FactoryLoader.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -35,8 +35,15 @@ // $Id$ /** - * Load a factory using the factory lookup procedure - * + * Load a factory using this ordered lookup procedure + * + * <ol> + * <li>Use the system property + * <li>Use the properties file "lib/jaxm.properties" in the JRE directory + * <li>Use the Services API (as detailed in the JAR specification), if available, to determine the classname + * <li>Use the default factory implementation class + * </ol> + * * @author Thomas.Diesler(a)jboss.com * @since 14-Dec-2006 */ @@ -46,15 +53,7 @@ { } - /** - * Load a factory using this ordered lookup procedure - * - * <ol> - * <li>Use the system property - * <li>Use the properties file "lib/jaxm.properties" in the JRE directory - * <li>Use the Services API (as detailed in the JAR specification), if available, to determine the classname - * <li>Use the default factory implementation class - * </ol> + /** * * @return the factory impl, or null */ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumerFactory.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -24,7 +24,7 @@ import org.jboss.wsf.spi.tools.WSContractConsumer; /** - * WSContractConsumerFactory defines the contract for a WSContractConsumer factory. + * Creates WSContractConsumer implementations. * * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> */ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProviderFactory.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -24,7 +24,7 @@ import org.jboss.wsf.spi.tools.WSContractProvider; /** - * WSContractProviderFactory defines the contract for a WSContractProvider factory. + * Creates WSContractProvider implementations. * * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> */ Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java (from rev 3296, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -0,0 +1,305 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt 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.wsf.spi.tools.ant; + +import org.apache.tools.ant.*; +import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.List; + +/** + * Ant task which consumes a Web Service contract. + * + * <table border="1"> + * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> + * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> + * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> + * <tr><td>catalog</td><td> Oasis XML Catalog file for entity resolution</td><td>none</td></tr> + * <tr><td>package</td><td> The target Java package for generated code.</td><td>generated</td></tr> + * <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr> + * <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation&lt;/td&gt;&lt;td&gt;generated&lt;/td&gt;&lt;/tr&gt; + * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> + * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> + * <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr> + * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> + * </table> + * <b>* = required.</b> + * + * <p>Example: + * + * <pre> + * &lt;WSConsumeTask + * fork=&quot;true&quot; + * verbose=&quot;true&quot; + * destdir=&quot;output&quot; + * sourcedestdir=&quot;gen-src&quot; + * keep=&quot;true&quot; + * wsdllocation=&quot;handEdited.wsdl&quot; + * wsdl=&quot;foo.wsdl&quot;&gt; + * &lt;binding dir=&quot;binding-files&quot; includes=&quot;*.xml&quot; excludes=&quot;bad.xml&quot;/&gt; + * &lt;/wsimport&gt; + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class WSConsumeTask extends Task +{ + private CommandlineJava command = new CommandlineJava(); + private String wsdl = null; + private File destdir = null; + private File sourcedestdir = null; + private List<File> bindingFiles = new ArrayList<File>(); + private File catalog = null; + private String wsdlLocation = null; + private String targetPackage = null; + private boolean keep = false; + private boolean verbose = false; + private boolean fork = false; + private boolean debug = false; + + // Not actually used right now + public void setDebug(boolean debug) + { + this.debug = debug; + } + + public Commandline.Argument createJvmarg() + { + return command.createVmArgument(); + } + + public void setBinding(File bindingFile) + { + bindingFiles.add(bindingFile); + } + + public void setCatalog(File catalog) + { + this.catalog = catalog; + } + + public void setDestdir(File destdir) + { + this.destdir = destdir; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + public void setKeep(boolean keep) + { + this.keep = keep; + } + + public void setSourcedestdir(File sourcedestdir) + { + this.sourcedestdir = sourcedestdir; + } + + public void setPackage(String targetPackage) + { + this.targetPackage = targetPackage; + } + + public void setVerbose(boolean verbose) + { + this.verbose = verbose; + } + + public void setWsdl(String wsdl) + { + this.wsdl = wsdl; + } + + public void setWsdlLocation(String wsdlLocation) + { + this.wsdlLocation = wsdlLocation; + } + + public void addConfiguredBinding(FileSet fs) + { + DirectoryScanner ds = fs.getDirectoryScanner(getProject()); + File baseDir = ds.getBasedir(); + for (String file : ds.getIncludedFiles()) + { + bindingFiles.add(new File(baseDir, file)); + } + } + + public void executeNonForked() + { + ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); + ClassLoader antLoader = this.getClass().getClassLoader(); + Thread.currentThread().setContextClassLoader(antLoader); + try + { + WSContractConsumer importer = WSContractConsumer.newInstance(); + importer.setGenerateSource(keep); + if (destdir != null) + importer.setOutputDirectory(destdir); + if (sourcedestdir != null) + importer.setSourceDirectory(sourcedestdir); + if (targetPackage != null) + importer.setTargetPackage(targetPackage); + if (wsdlLocation != null) + importer.setWsdlLocation(wsdlLocation); + if (catalog != null) + importer.setCatalog(catalog); + if (bindingFiles != null && bindingFiles.size() > 0) + importer.setBindingFiles(bindingFiles); + + log("Consuming wsdl: " + wsdl, Project.MSG_INFO); + + if (verbose) + { + importer.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); + } + + try + { + importer.setAdditionalCompilerClassPath(getTaskClassPathStrings()); + importer.consume(wsdl); + } + catch (MalformedURLException e) + { + throw new BuildException(e, getLocation()); + } + } + finally + { + Thread.currentThread().setContextClassLoader(prevCL); + } + } + + public void execute() throws BuildException + { + if (wsdl == null) + throw new BuildException("The wsdl attribute must be specified!", getLocation()); + + if (fork) + executeForked(); + else + executeNonForked(); + } + + private Path getTaskClassPath() + { + // Why is everything in the Ant API a big hack??? + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); + } + + return new Path(getProject()); + } + + private List<String> getTaskClassPathStrings() + { + // Why is everything in the Ant API a big hack??? + List<String> strings = new ArrayList<String>(); + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + for (String string : ((AntClassLoader)cl).getClasspath().split(File.pathSeparator)) + strings.add(string); + } + + return strings; + } + + private void executeForked() throws BuildException + { + command.setClassname(org.jboss.wsf.spi.tools.cmd.WSConsume.class.getName()); + + Path path = command.createClasspath(getProject()); + path.append(getTaskClassPath()); + + if (keep) + command.createArgument().setValue("-k"); + + for (File file : bindingFiles) + { + command.createArgument().setValue("-b"); + command.createArgument().setFile(file); + } + + if (catalog != null) + { + command.createArgument().setValue("-c"); + command.createArgument().setFile(catalog); + } + + if (targetPackage != null) + { + command.createArgument().setValue("-p"); + command.createArgument().setValue(targetPackage); + } + + if (wsdlLocation != null) + { + command.createArgument().setValue("-w"); + command.createArgument().setValue(wsdlLocation); + } + + if (destdir != null) + { + command.createArgument().setValue("-o"); + command.createArgument().setFile(destdir); + } + + if (sourcedestdir != null) + { + command.createArgument().setValue("-s"); + command.createArgument().setFile(sourcedestdir); + } + + if (!verbose) + command.createArgument().setValue("-q"); + + // Always dump traces + command.createArgument().setValue("-t"); + command.createArgument().setValue(wsdl); + + if (verbose) + log("Command invoked: " + command.getJavaCommand().toString()); + + ExecuteJava execute = new ExecuteJava(); + execute.setClasspath(path); + execute.setJavaCommand(command.getJavaCommand()); + if (execute.fork(this) != 0) + throw new BuildException("Could not invoke WSConsumeTask", getLocation()); + } +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java (from rev 3296, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -0,0 +1,266 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt 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.wsf.spi.tools.ant; + +import org.apache.tools.ant.AntClassLoader; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.taskdefs.ExecuteJava; +import org.apache.tools.ant.taskdefs.LogOutputStream; +import org.apache.tools.ant.types.Commandline; +import org.apache.tools.ant.types.CommandlineJava; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.Reference; +import org.jboss.wsf.spi.tools.WSContractProvider; + +import java.io.File; +import java.io.PrintStream; + +/** + * Ant task which invokes provides a Web Service contract and portable JAX-WS wrapper classes. + * + * <table border="1"> + * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> + * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> + * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> + * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> + * <tr><td>resourcedestdir</td><td>The output directory for resource artifacts (WSDL/XSD).</td><td>value of destdir</td></tr> + * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> + * <tr><td>genwsdl</td><td>Whether or not to generate WSDL.</td><td>false</td><tr> + * <tr><td>verbose</td><td>Enables more informational output about cmd progress.</td><td>false</td><tr> + * <tr><td>sei*</td><td>Service Endpoint Implementation.</td><td></td><tr> + * <tr><td>classpath</td><td>The classpath that contains the service endpoint implementation.</td><td>""</tr> + * </table> + * <b>* = required.</b> + * + * <p>Example: + * + * <pre> + * &lt;target name=&quot;test-wsproivde&quot; depends=&quot;init&quot;&gt; + * &lt;taskdef name=&quot;WSProvideTask&quot; classname=&quot;org.jboss.wsf.spi.tools.ant.WSProvideTask&quot;&gt; + * &lt;classpath refid=&quot;core.classpath&quot;/&gt; + * &lt;/taskdef&gt; + * &lt;WSProvideTask + * fork=&quot;false&quot; + * keep=&quot;true&quot; + * destdir=&quot;out&quot; + * resourcedestdir=&quot;out-resource&quot; + * sourcedestdir=&quot;out-source&quot; + * genwsdl=&quot;true&quot; + * verbose=&quot;true&quot; + * sei=&quot;org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedServiceImpl&quot;&gt; + * &lt;classpath&gt; + * &lt;pathelement path=&quot;${tests.output.dir}/classes&quot;/&gt; + * &lt;/classpath&gt; + * &lt;/WSProvideTask&gt; + * &lt;/target&gt; + * </pre> + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class WSProvideTask extends Task +{ + private Path classpath = new Path(getProject()); + private CommandlineJava command = new CommandlineJava(); + private String sei = null; + private File destdir = null; + private File resourcedestdir = null; + private File sourcedestdir = null; + private boolean keep = false; + private boolean genwsdl = false; + private boolean verbose = false; + private boolean fork = false; + private boolean debug = false; + + // Not actually used right now + public void setDebug(boolean debug) + { + this.debug = debug; + } + + public Commandline.Argument createJvmarg() + { + return command.createVmArgument(); + } + + public void setClasspath(Path classpath) + { + this.classpath = classpath; + } + + public void setClasspathRef(Reference ref) + { + createClasspath().setRefid(ref); + } + + public Path createClasspath() + { + return classpath; + } + + public void setDestdir(File destdir) + { + this.destdir = destdir; + } + + public void setKeep(boolean keep) + { + this.keep = keep; + } + + public void setSei(String sei) + { + this.sei = sei; + } + + public void setFork(boolean fork) + { + this.fork = fork; + } + + public void setResourcedestdir(File resourcedestdir) + { + this.resourcedestdir = resourcedestdir; + } + + public void setSourcedestdir(File sourcedestdir) + { + this.sourcedestdir = sourcedestdir; + } + + public void setVerbose(boolean verbose) + { + this.verbose = verbose; + } + + public void setGenwsdl(boolean genwsdl) + { + this.genwsdl = genwsdl; + } + + private ClassLoader getClasspathLoader(ClassLoader parent) + { + return new AntClassLoader(parent, getProject(), classpath, false); + } + + public void executeNonForked() + { + ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); + ClassLoader antLoader = this.getClass().getClassLoader(); + Thread.currentThread().setContextClassLoader(antLoader); + try + { + WSContractProvider gen = WSContractProvider.newInstance(); + gen.setClassLoader(getClasspathLoader(antLoader)); + if (verbose) + gen.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); + gen.setGenerateSource(keep); + gen.setGenerateWsdl(genwsdl); + if (destdir != null) + gen.setOutputDirectory(destdir); + if (resourcedestdir != null) + gen.setResourceDirectory(resourcedestdir); + if (sourcedestdir != null) + gen.setSourceDirectory(sourcedestdir); + + log("Generating from endpoint: " + sei, Project.MSG_INFO); + + gen.provide(sei); + } + finally + { + Thread.currentThread().setContextClassLoader(prevCL); + } + } + + public void execute() throws BuildException + { + if (sei == null) + throw new BuildException("The sei attribute must be specified!", getLocation()); + + if (fork) + executeForked(); + else + executeNonForked(); + } + + private Path getTaskClassPath() + { + // Why is everything in the Ant API a big hack??? + ClassLoader cl = this.getClass().getClassLoader(); + if (cl instanceof AntClassLoader) + { + return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); + } + + return new Path(getProject()); + } + + private void executeForked() throws BuildException + { + command.setClassname(org.jboss.wsf.spi.tools.cmd.WSProvide.class.getName()); + + Path path = command.createClasspath(getProject()); + path.append(getTaskClassPath()); + path.append(classpath); + + if (keep) + command.createArgument().setValue("-k"); + + if (genwsdl) + command.createArgument().setValue("-w"); + + if (destdir != null) + { + command.createArgument().setValue("-o"); + command.createArgument().setFile(destdir); + } + if (resourcedestdir != null) + { + command.createArgument().setValue("-r"); + command.createArgument().setFile(resourcedestdir); + } + if (sourcedestdir != null) + { + command.createArgument().setValue("-s"); + command.createArgument().setFile(sourcedestdir); + } + + if (!verbose) + command.createArgument().setValue("-q"); + + // Always dump traces + command.createArgument().setValue("-t"); + command.createArgument().setValue(sei); + + if (verbose) + log("Command invoked: " + command.getJavaCommand().toString()); + + ExecuteJava execute = new ExecuteJava(); + execute.setClasspath(path); + execute.setJavaCommand(command.getJavaCommand()); + if (execute.fork(this) != 0) + throw new BuildException("Could not invoke WSProvideTask", getLocation()); + } +} \ No newline at end of file Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html 2007-05-30 08:43:49 UTC (rev 3302) @@ -1,187 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> -<head> -</head> -<body bgcolor="white"> - -Provides classes and interfaces for handling text, dates, numbers, currency, messages and -collation in a manner independent of natural languages. This means your main application -or applet can be written to be language-independent, and it can rely upon -separate, dynamically-linked localized resources. This allows the flexibility -of adding localizations for new localizations at any time. -<p> -These classes are capable of formatting dates, numbers, and messages, parsing; -searching and sorting strings; and iterating over characters, words, sentences, -and line breaks. This package contains three main groups of classes and -interfaces: -<ul> -<li>Classes for formatting and parsing -<li>Classes for iteration over text -<li>Classes for string collation -</ul> - - -</ul> -<h3>Formatting and Parsing</h3> - -<em>Formatting</em> is the conversion of number and date objects to -strings. <em>P</em><em>arsing</em> is the reverse operation of -converting strings into number and date objects. -<p> - -Dates and numbers are represented internally in a -locale-independent way. For example, dates are kept as milliseconds -since January 1, 1970, 00:00:00 UCT. When these objects are printed or -displayed, they must be converted to localized strings. The -locale-specific parts of a date string, such as the time zone string, -are separately imported from a locale-specific resource bundle. -<p> - -The <code>format()</code> method converts the <code>Date</code> -object from -604656780000 milliseconds to the form "Tuesday, November -3, 1997 9:47am CST" for the U. S. English locale. The figure shows how the -<code>format()</code> method of subclasses of <code>Format</code> -enable instances of <code>Number</code>, <code>Date</code>, -<code>String</code>, and other objects to be formatted to -locale-specific strings. -<p> - -Conversely, the <code>parseObject()</code> method (and -<code>parse()</code> method in subclasses) perform the reverse -operation of parsing localized strings and converting them to -<code>Number</code>, <code>Date</code>,<code> </code>and -<code>String</code> objects. The figure -shows how the <code>parse()</code> method is complementary to -<code>format()</code>. Any <code>String</code> formatted by -<code>format()</code> is guaranteed to be parseable by -<code>parseObject()</code>. -<p> - -Java provides six subclasses of {@link Format} for formatting -dates, numbers, and messages: {@link DateFormat}, -{@link SimpleDateFormat}, {@link NumberFormat}, -{@link DecimalFormat}, {@link ChoiceFormat}, and -{@link MessageFormat}. - -<h3>String Collation</h3> - -The term "<em>collate"</em> means to determine the proper sort -sequence for two or more strings. It can also tell if two strings -match, for searching. The <code>Collator</code> class and its subclass -<code>RuleBasedCollator</code> perform locale-sensitive string -comparison. You use these classes to build searching and alphabetical -sorting routines for natural language text. They can distinguish -characters based on the base character, accent marks, and -uppercase/lowercase properties. -<p> - -{@link Collator} is an abstract base class. Subclasses -implement specific collation strategies. One subclass, -{@link RuleBasedCollator}, is currently provided and is -applicable to a wide set of languages. Other subclasses may be created -to handle more specialized -needs. {@link CollationElementIterator} provides an iterator for -stepping through each character of a locale-specific string according -to the rules of a specific <code>Collator</code> -object. {@link CollationKey} enables fast sorting of strings by -representing a string as a sort key under the rules of a specific -<code>Collator</code> object. - -<h3>Word Breaks</h3> - -While the Java types <code>char</code> and <code>Character</code> -represent Unicode characters, sometimes Unicode characters combine to -form a more complex character that has its own semantic value, a -<em>user character</em>. The {@link BreakIterator} class makes it -possible to iterate over these user characters. A break iterator can -find the location of character, word, or sentence boundaries or -potential line-break boundaries. This makes it possible for a program -to properly select characters for text operations such as highlighting -a character, cutting a word, moving to the next sentence, or -word-wrapping at a line ending. These operations are performed in a -locale-sensitive manner, meaning that they honor the boundaries of -text for a particular locale. - - -<h3>Locale-Sensitive Classes</h3> - -Many, but not all, of the classes in java.text are locale-sensitive, -meaning you have to create a different instance for each locale. The -following table lists which are locale-sensitive and which are not. -<p> - -<table border=1 cellspacing=0 cellpadding=6> -<tr valign=top> -<td> -<b>Locale-Sensitive Classes</b><br> - -NumberFormat<br> -DecimalFormat<br> -DecimalFormatSymbols<br> -MessageFormat<br> -DateFormat<br> -SimpleDateFormat<br> -DateFormatSymbols<br> -Collator<br> -RuleBasedCollator<br> -CollationElementIterator<br> -CollationKey<br> -BreakIterator<br> -</td> - -<td> -<b>Locale-Independent Classes</b><br> - -Format<br> -ChoiceFormat<br> -FieldPosition<br> -ParsePosition<br> -ParseException<br> -StringCharacterIterator<br> -CharacterIterator -</td> -</tr> - -</table> - -<p> - - -<h2>Package Specification</h2> - - (none) - - -<h2>Related Documentation </h2> - -The following classes are used by the java.text classes. -<ul> - <li>{@link java.lang.Character} (for getType) - <li>{@link java.util.Locale} - <li>{@link java.util.Calendar} - <li>{@link java.util.GregorianCalendar} - <li>{@link java.util.Date} - <li>{@link java.util.ResourceBundle} - <li>{@link java.util.ListResourceBundle} - <li>{@link java.util.PropertyResourceBundle} - <li>{@link java.util.TimeZone} - <li>{@link java.util.SimpleTimeZone} -</ul> - - -For overviews, tutorials, examples, guides, and tool documentation, please see: -<ul> - <li><a href="http://java.sun.com/products/jdk/1.1/docs/guide/intl/index.htm... 1.1.x Internationalization Documentation</a> - - <li><a href="http://java.sun.com/products/jdk/1.2/docs/guide/intl/index.htm... 1.2.x Input Method Framework Documentation</a> -</ul> -<br> - -@since JDK1.1 - - -<!-- This file was created with Quadralay WebWorks Publisher 3.5.0 --> -<!-- Last updated: Thu Jan 15 10:16:56 1998 --> - -</body> -</html> Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsconsume.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -1,305 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt 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.wsf.spi.tools.ant; - -import org.apache.tools.ant.*; -import org.apache.tools.ant.taskdefs.ExecuteJava; -import org.apache.tools.ant.taskdefs.LogOutputStream; -import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.Path; -import org.jboss.wsf.spi.tools.WSContractConsumer; - -import java.io.File; -import java.io.PrintStream; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.List; - -/** - * Ant task which consumes a Web Service contract. - * - * <table border="1"> - * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> - * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> - * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> - * <tr><td>catalog</td><td> Oasis XML Catalog file for entity resolution</td><td>none</td></tr> - * <tr><td>package</td><td> The target Java package for generated code.</td><td>generated</td></tr> - * <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr> - * <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation&lt;/td&gt;&lt;td&gt;generated&lt;/td&gt;&lt;/tr&gt; - * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> - * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> - * <tr><td>verbose</td><td>Enables more informational output about command progress.</td><td>false</td><tr> - * <tr><td>wsdl*</td><td>The WSDL file or URL</td><td>n/a</td><tr> - * </table> - * <b>* = required.</b> - * - * <p>Example: - * - * <pre> - * &lt;wsconsume - * fork=&quot;true&quot; - * verbose=&quot;true&quot; - * destdir=&quot;output&quot; - * sourcedestdir=&quot;gen-src&quot; - * keep=&quot;true&quot; - * wsdllocation=&quot;handEdited.wsdl&quot; - * wsdl=&quot;foo.wsdl&quot;&gt; - * &lt;binding dir=&quot;binding-files&quot; includes=&quot;*.xml&quot; excludes=&quot;bad.xml&quot;/&gt; - * &lt;/wsimport&gt; - * </pre> - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class wsconsume extends Task -{ - private CommandlineJava command = new CommandlineJava(); - private String wsdl = null; - private File destdir = null; - private File sourcedestdir = null; - private List<File> bindingFiles = new ArrayList<File>(); - private File catalog = null; - private String wsdlLocation = null; - private String targetPackage = null; - private boolean keep = false; - private boolean verbose = false; - private boolean fork = false; - private boolean debug = false; - - // Not actually used right now - public void setDebug(boolean debug) - { - this.debug = debug; - } - - public Commandline.Argument createJvmarg() - { - return command.createVmArgument(); - } - - public void setBinding(File bindingFile) - { - bindingFiles.add(bindingFile); - } - - public void setCatalog(File catalog) - { - this.catalog = catalog; - } - - public void setDestdir(File destdir) - { - this.destdir = destdir; - } - - public void setFork(boolean fork) - { - this.fork = fork; - } - - public void setKeep(boolean keep) - { - this.keep = keep; - } - - public void setSourcedestdir(File sourcedestdir) - { - this.sourcedestdir = sourcedestdir; - } - - public void setPackage(String targetPackage) - { - this.targetPackage = targetPackage; - } - - public void setVerbose(boolean verbose) - { - this.verbose = verbose; - } - - public void setWsdl(String wsdl) - { - this.wsdl = wsdl; - } - - public void setWsdlLocation(String wsdlLocation) - { - this.wsdlLocation = wsdlLocation; - } - - public void addConfiguredBinding(FileSet fs) - { - DirectoryScanner ds = fs.getDirectoryScanner(getProject()); - File baseDir = ds.getBasedir(); - for (String file : ds.getIncludedFiles()) - { - bindingFiles.add(new File(baseDir, file)); - } - } - - public void executeNonForked() - { - ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); - ClassLoader antLoader = this.getClass().getClassLoader(); - Thread.currentThread().setContextClassLoader(antLoader); - try - { - WSContractConsumer importer = WSContractConsumer.newInstance(); - importer.setGenerateSource(keep); - if (destdir != null) - importer.setOutputDirectory(destdir); - if (sourcedestdir != null) - importer.setSourceDirectory(sourcedestdir); - if (targetPackage != null) - importer.setTargetPackage(targetPackage); - if (wsdlLocation != null) - importer.setWsdlLocation(wsdlLocation); - if (catalog != null) - importer.setCatalog(catalog); - if (bindingFiles != null && bindingFiles.size() > 0) - importer.setBindingFiles(bindingFiles); - - log("Consuming wsdl: " + wsdl, Project.MSG_INFO); - - if (verbose) - { - importer.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); - } - - try - { - importer.setAdditionalCompilerClassPath(getTaskClassPathStrings()); - importer.consume(wsdl); - } - catch (MalformedURLException e) - { - throw new BuildException(e, getLocation()); - } - } - finally - { - Thread.currentThread().setContextClassLoader(prevCL); - } - } - - public void execute() throws BuildException - { - if (wsdl == null) - throw new BuildException("The wsdl attribute must be specified!", getLocation()); - - if (fork) - executeForked(); - else - executeNonForked(); - } - - private Path getTaskClassPath() - { - // Why is everything in the Ant API a big hack??? - ClassLoader cl = this.getClass().getClassLoader(); - if (cl instanceof AntClassLoader) - { - return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); - } - - return new Path(getProject()); - } - - private List<String> getTaskClassPathStrings() - { - // Why is everything in the Ant API a big hack??? - List<String> strings = new ArrayList<String>(); - ClassLoader cl = this.getClass().getClassLoader(); - if (cl instanceof AntClassLoader) - { - for (String string : ((AntClassLoader)cl).getClasspath().split(File.pathSeparator)) - strings.add(string); - } - - return strings; - } - - private void executeForked() throws BuildException - { - command.setClassname(org.jboss.wsf.spi.tools.command.wsconsume.class.getName()); - - Path path = command.createClasspath(getProject()); - path.append(getTaskClassPath()); - - if (keep) - command.createArgument().setValue("-k"); - - for (File file : bindingFiles) - { - command.createArgument().setValue("-b"); - command.createArgument().setFile(file); - } - - if (catalog != null) - { - command.createArgument().setValue("-c"); - command.createArgument().setFile(catalog); - } - - if (targetPackage != null) - { - command.createArgument().setValue("-p"); - command.createArgument().setValue(targetPackage); - } - - if (wsdlLocation != null) - { - command.createArgument().setValue("-w"); - command.createArgument().setValue(wsdlLocation); - } - - if (destdir != null) - { - command.createArgument().setValue("-o"); - command.createArgument().setFile(destdir); - } - - if (sourcedestdir != null) - { - command.createArgument().setValue("-s"); - command.createArgument().setFile(sourcedestdir); - } - - if (!verbose) - command.createArgument().setValue("-q"); - - // Always dump traces - command.createArgument().setValue("-t"); - command.createArgument().setValue(wsdl); - - if (verbose) - log("Command invoked: " + command.getJavaCommand().toString()); - - ExecuteJava execute = new ExecuteJava(); - execute.setClasspath(path); - execute.setJavaCommand(command.getJavaCommand()); - if (execute.fork(this) != 0) - throw new BuildException("Could not invoke wsconsume", getLocation()); - } -} \ No newline at end of file Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/wsprovide.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -1,266 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt 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.wsf.spi.tools.ant; - -import org.apache.tools.ant.AntClassLoader; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.ExecuteJava; -import org.apache.tools.ant.taskdefs.LogOutputStream; -import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.CommandlineJava; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.Reference; -import org.jboss.wsf.spi.tools.WSContractProvider; - -import java.io.File; -import java.io.PrintStream; - -/** - * Ant task which invokes provides a Web Service contract and portable JAX-WS wrapper classes. - * - * <table border="1"> - * <tr align="left" BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"><th>Attribute</th><th>Description</th><th>Default</th></tr> - * <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr> - * <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr> - * <tr><td>destdir</td><td>The output directory for generated artifacts.</td><td>"output"</td></tr> - * <tr><td>resourcedestdir</td><td>The output directory for resource artifacts (WSDL/XSD).</td><td>value of destdir</td></tr> - * <tr><td>sourcedestdir</td><td>The output directory for Java source.</td><td>value of destdir</td></tr> - * <tr><td>genwsdl</td><td>Whether or not to generate WSDL.</td><td>false</td><tr> - * <tr><td>verbose</td><td>Enables more informational output about command progress.</td><td>false</td><tr> - * <tr><td>sei*</td><td>Service Endpoint Implementation.</td><td></td><tr> - * <tr><td>classpath</td><td>The classpath that contains the service endpoint implementation.</td><td>""</tr> - * </table> - * <b>* = required.</b> - * - * <p>Example: - * - * <pre> - * &lt;target name=&quot;test-wsproivde&quot; depends=&quot;init&quot;&gt; - * &lt;taskdef name=&quot;wsprovide&quot; classname=&quot;org.jboss.wsf.spi.tools.ant.wsprovide&quot;&gt; - * &lt;classpath refid=&quot;core.classpath&quot;/&gt; - * &lt;/taskdef&gt; - * &lt;wsprovide - * fork=&quot;false&quot; - * keep=&quot;true&quot; - * destdir=&quot;out&quot; - * resourcedestdir=&quot;out-resource&quot; - * sourcedestdir=&quot;out-source&quot; - * genwsdl=&quot;true&quot; - * verbose=&quot;true&quot; - * sei=&quot;org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrappedServiceImpl&quot;&gt; - * &lt;classpath&gt; - * &lt;pathelement path=&quot;${tests.output.dir}/classes&quot;/&gt; - * &lt;/classpath&gt; - * &lt;/wsprovide&gt; - * &lt;/target&gt; - * </pre> - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class wsprovide extends Task -{ - private Path classpath = new Path(getProject()); - private CommandlineJava command = new CommandlineJava(); - private String sei = null; - private File destdir = null; - private File resourcedestdir = null; - private File sourcedestdir = null; - private boolean keep = false; - private boolean genwsdl = false; - private boolean verbose = false; - private boolean fork = false; - private boolean debug = false; - - // Not actually used right now - public void setDebug(boolean debug) - { - this.debug = debug; - } - - public Commandline.Argument createJvmarg() - { - return command.createVmArgument(); - } - - public void setClasspath(Path classpath) - { - this.classpath = classpath; - } - - public void setClasspathRef(Reference ref) - { - createClasspath().setRefid(ref); - } - - public Path createClasspath() - { - return classpath; - } - - public void setDestdir(File destdir) - { - this.destdir = destdir; - } - - public void setKeep(boolean keep) - { - this.keep = keep; - } - - public void setSei(String sei) - { - this.sei = sei; - } - - public void setFork(boolean fork) - { - this.fork = fork; - } - - public void setResourcedestdir(File resourcedestdir) - { - this.resourcedestdir = resourcedestdir; - } - - public void setSourcedestdir(File sourcedestdir) - { - this.sourcedestdir = sourcedestdir; - } - - public void setVerbose(boolean verbose) - { - this.verbose = verbose; - } - - public void setGenwsdl(boolean genwsdl) - { - this.genwsdl = genwsdl; - } - - private ClassLoader getClasspathLoader(ClassLoader parent) - { - return new AntClassLoader(parent, getProject(), classpath, false); - } - - public void executeNonForked() - { - ClassLoader prevCL = Thread.currentThread().getContextClassLoader(); - ClassLoader antLoader = this.getClass().getClassLoader(); - Thread.currentThread().setContextClassLoader(antLoader); - try - { - WSContractProvider gen = WSContractProvider.newInstance(); - gen.setClassLoader(getClasspathLoader(antLoader)); - if (verbose) - gen.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO))); - gen.setGenerateSource(keep); - gen.setGenerateWsdl(genwsdl); - if (destdir != null) - gen.setOutputDirectory(destdir); - if (resourcedestdir != null) - gen.setResourceDirectory(resourcedestdir); - if (sourcedestdir != null) - gen.setSourceDirectory(sourcedestdir); - - log("Generating from endpoint: " + sei, Project.MSG_INFO); - - gen.provide(sei); - } - finally - { - Thread.currentThread().setContextClassLoader(prevCL); - } - } - - public void execute() throws BuildException - { - if (sei == null) - throw new BuildException("The sei attribute must be specified!", getLocation()); - - if (fork) - executeForked(); - else - executeNonForked(); - } - - private Path getTaskClassPath() - { - // Why is everything in the Ant API a big hack??? - ClassLoader cl = this.getClass().getClassLoader(); - if (cl instanceof AntClassLoader) - { - return new Path(getProject(), ((AntClassLoader)cl).getClasspath()); - } - - return new Path(getProject()); - } - - private void executeForked() throws BuildException - { - command.setClassname(org.jboss.wsf.spi.tools.command.wsprovide.class.getName()); - - Path path = command.createClasspath(getProject()); - path.append(getTaskClassPath()); - path.append(classpath); - - if (keep) - command.createArgument().setValue("-k"); - - if (genwsdl) - command.createArgument().setValue("-w"); - - if (destdir != null) - { - command.createArgument().setValue("-o"); - command.createArgument().setFile(destdir); - } - if (resourcedestdir != null) - { - command.createArgument().setValue("-r"); - command.createArgument().setFile(resourcedestdir); - } - if (sourcedestdir != null) - { - command.createArgument().setValue("-s"); - command.createArgument().setFile(sourcedestdir); - } - - if (!verbose) - command.createArgument().setValue("-q"); - - // Always dump traces - command.createArgument().setValue("-t"); - command.createArgument().setValue(sei); - - if (verbose) - log("Command invoked: " + command.getJavaCommand().toString()); - - ExecuteJava execute = new ExecuteJava(); - execute.setClasspath(path); - execute.setJavaCommand(command.getJavaCommand()); - if (execute.fork(this) != 0) - throw new BuildException("Could not invoke wsprovide", getLocation()); - } -} \ No newline at end of file Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html (from rev 3296, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/package.html) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/package.html 2007-05-30 08:43:49 UTC (rev 3302) @@ -0,0 +1,55 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head> +</head> +<body bgcolor="white"> + +A stack indepedent SPI that's provides entry points to command line tools and ANT +tasks that generate JAX-WS artefacts from WSDL or wrapper beans and WSDL from existing sources. + +<h3>Service provider responsibilities</h3> + +A service provider needs to implement both the factory and the actual <code>WSContractConsumer</code> +or <code>WSContractProvider</code>. +The ANT tasks and the command line tools offer static client interfaces and rely on a standard WSF service factory +mechanism that allows pluggability of different implementations: + +<ul> + <li>See org.jboss.ws.integration.FactoryLoader</li> +</ul> + +<h3>ANT tasks</h3> +<ul> + <li>{@link org.jboss.wsf.spi.tools.ant.WSConsumeTask}</li> + <li>{@link org.jboss.wsf.spi.tools.ant.WSProvideTask}</li> +</ul> + +<h3>Command line interfaces and shell scripts</h3> + +The shell scripts are installed with the JBossAS installation +and can be found in the JBOSS_HOME/bin directory. +<p/> + +They delegate to the following command line implementations: +<ul> + <li>{@link org.jboss.wsf.spi.tools.cmd.WSConsume}</li> + <li>{@link org.jboss.wsf.spi.tools.cmd.WSProvide}</li> +</ul> + + +<h2>Related Documentation</h2> + +<ul> + <li>{@link org.jboss.ws.integration.FactoryLoader} +</ul> + +For overviews, tutorials, examples, guides, and tool documentation, please see: +<ul> + <li><a href="http://labs.jboss.com/jbossws/">JBossWS Userguide</a> +</ul> +<br> + +@since JBossWS 2.1 + +</body> +</html> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-30 08:43:49 UTC (rev 3302) @@ -74,7 +74,7 @@ <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts"> <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.wsconsume"> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath refid="ws.stack.classpath"/> <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -179,7 +179,7 @@ <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts."> <!-- Define the JAX-WS wsprovide task --> - <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.wsprovide"> + <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> <classpath refid="ws.stack.classpath"/> <classpath refid="thirdparty.classpath"/> <classpath location="${core.dir}/thirdparty/concurrent.jar"/> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/deployer/domainAssertion/NopAssertionDeployer.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -30,7 +30,7 @@ * deploy a policy assertion. It is used as a placeholder by * PolicyDeployer in case no modification to umdm or anything * else is actually required (for example when running the - * wsprovide tool). + * WSProvideTask tool). * * @author Stefano Maestri <mailto:stefano.maestri@javalinux.it> * @author Alessio Soldano <mailto:alessio.soldano@javalinux.it> Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -70,7 +70,7 @@ /** * Creates a new PolicyMetaDataBuilder for server side policy processing. * - * @param toolMode True if running wsprovide (no policy deployments) + * @param toolMode True if running WSProvideTask (no policy deployments) * @return */ public static PolicyMetaDataBuilder getServerSidePolicyMetaDataBuilder(boolean toolMode) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -203,7 +203,7 @@ private String execPasswordCmd(String keyStorePasswordCmd) throws WSSecurityException { - if(log.isDebugEnabled()) log.debug("Executing command: " + keyStorePasswordCmd); + if(log.isDebugEnabled()) log.debug("Executing cmd: " + keyStorePasswordCmd); try { Runtime rt = Runtime.getRuntime(); @@ -218,7 +218,7 @@ } catch (Exception e) { - throw new WSSecurityException("Problems executing password command: " + keyStorePasswordCmd, e); + throw new WSSecurityException("Problems executing password cmd: " + keyStorePasswordCmd, e); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -46,7 +46,7 @@ private static Logger log = Logger.getLogger(WSTools.class); /** - * Entry point for the command line scripts. + * Entry point for the cmd line scripts. * Just passes the arguments to * @see generate(String) * @param args Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -70,7 +70,7 @@ import org.jboss.wsf.spi.utils.JavaUtils; /** - * Helper class used by the command line tool "jbossws" + * Helper class used by the cmd line tool "jbossws" * and ant task "wstools" * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana * @since Aug 19, 2005 Modified: trunk/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-05-30 08:43:49 UTC (rev 3302) @@ -236,17 +236,17 @@ <!-- Generating sources --> <!-- ================================================================== --> - <target name="wsconsume" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5"> + <target name="WSConsumeTask" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5"> - <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> + <!-- Define the JAX-WS WSConsumeTask task --> + <taskdef name="WSConsumeTask" classname="org.jboss.ws.tools.jaxws.ant.WSConsumeTask"> <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> + <classpath location="${thirdparty.dir}/jbossws-WSConsumeTask-impl.jar"/> <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/WSConsumeTask/java" keep="true"/> </target> <!-- @@ -328,17 +328,17 @@ <!-- Generate JAX-WS sources --> - <target name="wsprovide" depends="compile" description="Provide the JAX-WS contracts." if="HAVE_JDK_1.5"> + <target name="WSProvideTask" depends="compile" description="Provide the JAX-WS contracts." if="HAVE_JDK_1.5"> - <!-- Define the JAX-WS wsprovide task --> - <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> + <!-- Define the JAX-WS WSProvideTask task --> + <taskdef name="WSProvideTask" classname="org.jboss.ws.tools.jaxws.ant.WSProvideTask"> <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> </taskdef> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> + <wsprovide resourcedestdir="${tests.output.dir}/WSProvideTask/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> </target> <target name="generate-resources" depends="servicegen,wstools,wsprovide"> @@ -372,7 +372,7 @@ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> <src path="${tests.java.dir}"/> - <src path="${tests.output.dir}/wsconsume/java"/> + <src path="${tests.output.dir}/WSConsumeTask/java"/> <classpath refid="javac.classpath"/> </javac> </target> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -68,7 +68,7 @@ private Hello getPort() throws Exception { - URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL wsdlURL = new File("WSProvideTask/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -64,7 +64,7 @@ private Hello getPort() throws Exception { - URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL wsdlURL = new File("WSProvideTask/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL(); QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -33,8 +33,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxws.client.ServiceExt; /** * Test WS-Security with RPC/Literal @@ -68,7 +66,7 @@ private Hello getPort() throws Exception { - URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy/HelloService.wsdl").toURL(); + URL wsdlURL = new File("WSProvideTask/resources/jaxws/samples/wssecurityAnnotatedpolicy/HelloService.wsdl").toURL(); QName serviceName = new QName("http://org.jboss.ws/samples/wssecurityAnnotatedpolicy", "HelloService"); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-30 08:43:26 UTC (rev 3301) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/WSContractProviderTestCase.java 2007-05-30 08:43:49 UTC (rev 3302) @@ -42,7 +42,7 @@ public void testBasic() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/wsprovide/basic/out"); + File outputDir = new File("tools/WSProvideTask/basic/out"); gen.setOutputDirectory(outputDir); gen.provide(DocWrappedServiceImpl.class); @@ -84,7 +84,7 @@ public void testSource() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/wsprovide/source/out"); + File outputDir = new File("tools/WSProvideTask/source/out"); gen.setOutputDirectory(outputDir); gen.setGenerateSource(true); gen.provide(DocWrappedServiceImpl.class); @@ -96,8 +96,8 @@ public void testSourceDir() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/wsprovide/sourcedir/out"); - File sourceDir = new File("tools/wsprovide/sourcedir/source"); + File outputDir = new File("tools/WSProvideTask/sourcedir/out"); + File sourceDir = new File("tools/WSProvideTask/sourcedir/source"); gen.setOutputDirectory(outputDir); gen.setSourceDirectory(sourceDir); @@ -112,7 +112,7 @@ public void testWsdl() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/wsprovide/wsdl/out"); + File outputDir = new File("tools/WSProvideTask/wsdl/out"); gen.setOutputDirectory(outputDir); gen.setGenerateWsdl(true); gen.provide(DocWrappedServiceImpl.class); @@ -130,8 +130,8 @@ public void testResourceDir() throws Exception { WSContractProvider gen = getGenerator(); - File outputDir = new File("tools/wsprovide/resourcedir/out"); - File wsdlDir = new File("tools/wsprovide/resourcedir/wsdl"); + File outputDir = new File("tools/WSProvideTask/resourcedir/out"); + File wsdlDir = new File("tools/WSProvideTask/resourcedir/wsdl"); gen.setOutputDirectory(outputDir); gen.setResourceDirectory(wsdlDir); gen.setGenerateWsdl(true);