Author: jason.greene(a)jboss.com Date: 2007-02-09 01:23:29 -0500 (Fri, 09 Feb 2007) New Revision: 2310 Added: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerFactoryImpl.java subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerImpl.java Removed: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/impl/ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WebServiceImporterImpl.java subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WebServiceImporterProviderImpl.java Modified: subprojects/jbossws-wsconsume-impl/.classpath subprojects/jbossws-wsconsume-impl/build.xml subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/NullPrintStream.java subprojects/jbossws-wsconsume-impl/lib/jbossws-client.jar Log: rename Modified: subprojects/jbossws-wsconsume-impl/.classpath =================================================================== --- subprojects/jbossws-wsconsume-impl/.classpath 2007-02-09 05:55:53 UTC (rev 2309) +++ subprojects/jbossws-wsconsume-impl/.classpath 2007-02-09 06:23:29 UTC (rev 2310) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="sun/src/main"/> - <classpathentry kind="src" path="jbossws/src/main"/> + <classpathentry kind="src" path="jboss/src/main"/> <classpathentry kind="lib" path="lib/activation.jar"/> <classpathentry kind="lib" path="lib/jaxb-api.jar"/> <classpathentry kind="lib" path="lib/jaxb-impl.jar"/> Modified: subprojects/jbossws-wsconsume-impl/build.xml =================================================================== --- subprojects/jbossws-wsconsume-impl/build.xml 2007-02-09 05:55:53 UTC (rev 2309) +++ subprojects/jbossws-wsconsume-impl/build.xml 2007-02-09 06:23:29 UTC (rev 2310) @@ -75,7 +75,7 @@ <versionProp file="${output.classes}/org/jboss/com/sun/tools/ws/version.properties" /> <javac destdir="${output.classes}" debug="true"> <src path="sun/src/main"/> - <src path="jbossws/src/main"/> + <src path="jboss/src/main"/> <classpath refid="compile.classpath"/> </javac> </target> Copied: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl (from rev 2309, subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/impl) Modified: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/NullPrintStream.java =================================================================== --- subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/impl/NullPrintStream.java 2007-02-09 05:55:53 UTC (rev 2309) +++ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/NullPrintStream.java 2007-02-09 06:23:29 UTC (rev 2310) @@ -19,7 +19,7 @@ * 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.tools.jaxws.impl; +package org.jboss.ws.tools.jaxws.wsconsume.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; Copied: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerFactoryImpl.java (from rev 2309, subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/impl/WebServiceImporterProviderImpl.java) =================================================================== --- subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerFactoryImpl.java (rev 0) +++ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerFactoryImpl.java 2007-02-09 06:23:29 UTC (rev 2310) @@ -0,0 +1,36 @@ +/* +* 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.ws.tools.jaxws.wsconsume.impl; + +import org.jboss.ws.tools.jaxws.api.WSContractConsumer; +import org.jboss.ws.tools.jaxws.spi.WSContractConsumerFactory; +/** + * Provider implementation that uses SUN wsimport. + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +public class WSContractConsumerFactoryImpl implements WSContractConsumerFactory { + public WSContractConsumer createImporter() { + return new WSContractConsumerImpl(); + } +} Copied: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerImpl.java (from rev 2309, subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/impl/WebServiceImporterImpl.java) =================================================================== --- subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerImpl.java (rev 0) +++ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WSContractConsumerImpl.java 2007-02-09 06:23:29 UTC (rev 2310) @@ -0,0 +1,168 @@ +/* +* 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.ws.tools.jaxws.wsconsume.impl; + +import java.io.File; +import java.io.PrintStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.com.sun.tools.ws.wscompile.CompileTool; +import org.jboss.ws.tools.jaxws.api.WSContractConsumer; + +/** + * Sun based implementation. + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +public class WSContractConsumerImpl extends WSContractConsumer { + private List<File> bindingFiles = null; + private File catalog = null; + private boolean generateSource = false; + private File outputDir = new File("output"); + private File sourceDir = null; + private String targetPackage = null; + private PrintStream messageStream = null; + private String wsdlLocation = null; + private List<String> additionalCompilerClassPath = null; + + @Override + public void setBindingFiles(List<File> bindingFiles) { + this.bindingFiles = bindingFiles; + } + + @Override + public void setCatalog(File catalog) { + this.catalog = catalog; + } + + @Override + public void setGenerateSource(boolean generateSource) { + this.generateSource = generateSource; + } + + @Override + public void setMessageStream(PrintStream messageStream) { + // TODO Auto-generated method stub + this.messageStream = messageStream; + } + + @Override + public void setOutputDirectory(File directory) { + // TODO Auto-generated method stub + outputDir = directory; + } + + @Override + public void setSourceDirectory(File directory) { + sourceDir = directory; + } + + @Override + public void setTargetPackage(String targetPackage) { + this.targetPackage = targetPackage; + } + + @Override + public void setWsdlLocation(String wsdlLocation) { + this.wsdlLocation = wsdlLocation; + } + + public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) { + this.additionalCompilerClassPath = additionalCompilerClassPath; + } + + @Override + public void consume(URL wsdl) { + List<String> args = new ArrayList<String>(); + if (bindingFiles != null) { + for (File file : bindingFiles) { + args.add("-b"); + args.add(file.getAbsolutePath()); + + } + } + + if (catalog != null) { + args.add("-catalog"); + args.add(catalog.getAbsolutePath()); + } + + if (generateSource) { + args.add("-keep"); + if (sourceDir != null) { + if (!sourceDir.exists() && !sourceDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); + + args.add("-s"); + args.add(sourceDir.getAbsolutePath()); + } + } + + if (targetPackage != null) { + args.add("-p"); + args.add(targetPackage); + } + + if (wsdlLocation != null) { + args.add("-wsdllocation"); + args.add(wsdlLocation); + } + + PrintStream stream = messageStream; + if (stream != null) { + args.add("-verbose"); + } else { + stream = new NullPrintStream(); + } + + if (!outputDir.exists() && !outputDir.mkdirs()) + throw new IllegalStateException("Could not make directory: " + outputDir.getName()); + + // Always add the output directory and the wsdl location + args.add("-d"); + args.add(outputDir.getAbsolutePath()); + args.add(wsdl.toString()); + + // WSToolsObjectFactory tools = WSToolsObjectFactory.newInstance(); + // tools.wsimport(stream, args.toArray(new String[0])); + + // We have to manipulate internals since they don't expose a way to set + // the classpath that is used for compilation + CompileTool tool = new CompileTool(stream, "wsimport") { + @Override + public boolean run(String[] args) { + StringBuilder builder = new StringBuilder(); + if (additionalCompilerClassPath != null && additionalCompilerClassPath.size() > 0) { + for (String entry : additionalCompilerClassPath) + builder.append(entry).append(File.pathSeparatorChar); + builder.setLength(builder.length() - 1); + } + userClasspath = builder.toString(); + return super.run(args); + } + }; + tool.run(args.toArray(new String[0])); + } +} Deleted: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WebServiceImporterImpl.java =================================================================== --- subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/impl/WebServiceImporterImpl.java 2007-02-09 05:55:53 UTC (rev 2309) +++ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WebServiceImporterImpl.java 2007-02-09 06:23:29 UTC (rev 2310) @@ -1,169 +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.ws.tools.jaxws.impl; - -import java.io.File; -import java.io.OutputStream; -import java.io.PrintStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.com.sun.tools.ws.wscompile.CompileTool; -import org.jboss.ws.tools.jaxws.api.WebServiceImporter; - -/** - * Sun based implementation. - * - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - * @version $Revision$ - */ -public class WebServiceImporterImpl extends WebServiceImporter { - private List<File> bindingFiles = null; - private File catalog = null; - private boolean generateSource = false; - private File outputDir = new File("output"); - private File sourceDir = null; - private String targetPackage = null; - private PrintStream messageStream = null; - private String wsdlLocation = null; - private List<String> additionalCompilerClassPath = null; - - @Override - public void setBindingFiles(List<File> bindingFiles) { - this.bindingFiles = bindingFiles; - } - - @Override - public void setCatalog(File catalog) { - this.catalog = catalog; - } - - @Override - public void setGenerateSource(boolean generateSource) { - this.generateSource = generateSource; - } - - @Override - public void setMessageStream(PrintStream messageStream) { - // TODO Auto-generated method stub - this.messageStream = messageStream; - } - - @Override - public void setOutputDirectory(File directory) { - // TODO Auto-generated method stub - outputDir = directory; - } - - @Override - public void setSourceDirectory(File directory) { - sourceDir = directory; - } - - @Override - public void setTargetPackage(String targetPackage) { - this.targetPackage = targetPackage; - } - - @Override - public void setWsdlLocation(String wsdlLocation) { - this.wsdlLocation = wsdlLocation; - } - - public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) { - this.additionalCompilerClassPath = additionalCompilerClassPath; - } - - @Override - public void importServices(URL wsdl) { - List<String> args = new ArrayList<String>(); - if (bindingFiles != null) { - for (File file : bindingFiles) { - args.add("-b"); - args.add(file.getAbsolutePath()); - - } - } - - if (catalog != null) { - args.add("-catalog"); - args.add(catalog.getAbsolutePath()); - } - - if (generateSource) { - args.add("-keep"); - if (sourceDir != null) { - if (!sourceDir.exists() && !sourceDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + sourceDir.getName()); - - args.add("-s"); - args.add(sourceDir.getAbsolutePath()); - } - } - - if (targetPackage != null) { - args.add("-p"); - args.add(targetPackage); - } - - if (wsdlLocation != null) { - args.add("-wsdllocation"); - args.add(wsdlLocation); - } - - PrintStream stream = messageStream; - if (stream != null) { - args.add("-verbose"); - } else { - stream = new NullPrintStream(); - } - - if (!outputDir.exists() && !outputDir.mkdirs()) - throw new IllegalStateException("Could not make directory: " + outputDir.getName()); - - // Always add the output directory and the wsdl location - args.add("-d"); - args.add(outputDir.getAbsolutePath()); - args.add(wsdl.toString()); - - // WSToolsObjectFactory tools = WSToolsObjectFactory.newInstance(); - // tools.wsimport(stream, args.toArray(new String[0])); - - // We have to manipulate internals since they don't expose a way to set - // the classpath that is used for compilation - CompileTool tool = new CompileTool(stream, "wsimport") { - @Override - public boolean run(String[] args) { - StringBuilder builder = new StringBuilder(); - if (additionalCompilerClassPath != null && additionalCompilerClassPath.size() > 0) { - for (String entry : additionalCompilerClassPath) - builder.append(entry).append(File.pathSeparatorChar); - builder.setLength(builder.length() - 1); - } - userClasspath = builder.toString(); - return super.run(args); - } - }; - tool.run(args.toArray(new String[0])); - } -} Deleted: subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WebServiceImporterProviderImpl.java =================================================================== --- subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/impl/WebServiceImporterProviderImpl.java 2007-02-09 05:55:53 UTC (rev 2309) +++ subprojects/jbossws-wsconsume-impl/jboss/src/main/org/jboss/ws/tools/jaxws/wsconsume/impl/WebServiceImporterProviderImpl.java 2007-02-09 06:23:29 UTC (rev 2310) @@ -1,36 +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.ws.tools.jaxws.impl; - -import org.jboss.ws.tools.jaxws.api.WebServiceImporter; -import org.jboss.ws.tools.jaxws.spi.WebServiceImporterProvider; -/** - * Provider implementation that uses SUN wsimport. - * - * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> - * @version $Revision$ - */ -public class WebServiceImporterProviderImpl implements WebServiceImporterProvider { - public WebServiceImporter createImporter() { - return new WebServiceImporterImpl(); - } -} Modified: subprojects/jbossws-wsconsume-impl/lib/jbossws-client.jar =================================================================== (Binary files differ)