JBossWS SVN: r6981 - stack/native/trunk/modules/testsuite/native-tests/scripts.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-09 02:21:47 -0400 (Fri, 09 May 2008)
New Revision: 6981
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
Log:
layout
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2008-05-09 06:15:22 UTC (rev 6980)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2008-05-09 06:21:47 UTC (rev 6981)
@@ -218,7 +218,7 @@
</classes>
</war>
- <!-- jaxws-samples-wseventing.war -->
+ <!-- jaxws-samples-wseventing -->
<war warfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wseventing/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wseventing/Sysmon**.class"/>
@@ -231,7 +231,6 @@
<include name="wsdl/ws-addr.xsd"/>
</webinf>
</war>
-
<jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wseventing-sink.jar">
<fileset dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wseventing/EventSink*.class"/>
16 years, 8 months
JBossWS SVN: r6980 - stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-09 02:15:22 -0400 (Fri, 09 May 2008)
New Revision: 6980
Modified:
stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java
Log:
Add nocompile
Modified: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java
===================================================================
--- stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-05-08 21:11:59 UTC (rev 6979)
+++ stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroConsumerImpl.java 2008-05-09 06:15:22 UTC (rev 6980)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.stack.metro.tools;
+// $Id$
+
import org.jboss.wsf.spi.tools.WSContractConsumer;
import java.io.File;
@@ -36,31 +38,31 @@
*
* @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
* @author <a href="heiko.braun(a)jboss.com">Heiko Braun</a>
- * @version $Revision$
*/
public class MetroConsumerImpl extends WSContractConsumer
{
- private List<File> bindingFiles = null;
- private File catalog = null;
+ private List<File> bindingFiles = null;
+ private File catalog = null;
private boolean extension;
- 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 = new ArrayList<String>();
+ 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 = new ArrayList<String>();
private String target = "2.0";
+ private boolean nocompile;
@Override
- public void setBindingFiles(List<File> bindingFiles) {
- this.bindingFiles = bindingFiles;
- }
+ public void setBindingFiles(List<File> bindingFiles) {
+ this.bindingFiles = bindingFiles;
+ }
- @Override
- public void setCatalog(File catalog) {
- this.catalog = catalog;
- }
+ @Override
+ public void setCatalog(File catalog) {
+ this.catalog = catalog;
+ }
@Override
public void setExtension(boolean extension)
@@ -69,102 +71,113 @@
}
@Override
- public void setGenerateSource(boolean generateSource) {
- this.generateSource = generateSource;
- }
+ 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 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 setOutputDirectory(File directory) {
+ // TODO Auto-generated method stub
+ outputDir = directory;
+ }
- @Override
- public void setSourceDirectory(File directory) {
- sourceDir = directory;
- }
+ @Override
+ public void setSourceDirectory(File directory) {
+ sourceDir = directory;
+ }
- @Override
- public void setTargetPackage(String targetPackage) {
- this.targetPackage = targetPackage;
- }
+ @Override
+ public void setTargetPackage(String targetPackage) {
+ this.targetPackage = targetPackage;
+ }
- @Override
- public void setWsdlLocation(String wsdlLocation) {
- this.wsdlLocation = wsdlLocation;
- }
+ @Override
+ public void setWsdlLocation(String wsdlLocation) {
+ this.wsdlLocation = wsdlLocation;
+ }
- public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) {
- this.additionalCompilerClassPath = additionalCompilerClassPath;
- }
+ public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath) {
+ this.additionalCompilerClassPath = additionalCompilerClassPath;
+ }
@Override
- public void setTarget(String target) {
- this.target = target;
- }
+ public void setTarget(String target) {
+ this.target = target;
+ }
@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());
+ public void setNoCompile(boolean nocompile)
+ {
+ this.nocompile = nocompile;
+ }
+
+ @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 (catalog != null) {
+ args.add("-catalog");
+ args.add(catalog.getAbsolutePath());
+ }
if (extension)
{
args.add("-extension");
}
- if (generateSource) {
- args.add("-keep");
- if (sourceDir != null) {
- if (!sourceDir.exists() && !sourceDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
+ if (nocompile)
+ {
+ args.add("-Xnocompile");
+ }
- args.add("-s");
- args.add(sourceDir.getAbsolutePath());
- }
- }
+ if (generateSource) {
+ args.add("-keep");
+ if (sourceDir != null) {
+ if (!sourceDir.exists() && !sourceDir.mkdirs())
+ throw new IllegalStateException("Could not make directory: " + sourceDir.getName());
- if (targetPackage != null) {
- args.add("-p");
- args.add(targetPackage);
- }
+ args.add("-s");
+ args.add(sourceDir.getAbsolutePath());
+ }
+ }
- if (wsdlLocation != null) {
- args.add("-wsdllocation");
- args.add(wsdlLocation);
- }
+ if (targetPackage != null) {
+ args.add("-p");
+ args.add(targetPackage);
+ }
- PrintStream stream = messageStream;
- if (stream != null) {
- args.add("-verbose");
- } else {
- stream = new NullPrintStream();
- }
+ if (wsdlLocation != null) {
+ args.add("-wsdllocation");
+ args.add(wsdlLocation);
+ }
- if (!outputDir.exists() && !outputDir.mkdirs())
- throw new IllegalStateException("Could not make directory: " + outputDir.getName());
+ PrintStream stream = messageStream;
+ if (stream != null) {
+ args.add("-verbose");
+ } else {
+ stream = new NullPrintStream();
+ }
- // Always add the output directory and the wsdl location
- args.add("-d");
- args.add(outputDir.getAbsolutePath());
+ 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());
+
// Always set the target
if(!target.equals("2.0"))
throw new IllegalArgumentException("WSConsume (metro) only supports JAX-WS 2.0");
@@ -187,29 +200,27 @@
}
try
- {
- // enforce woodstox
- if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))
- System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
+ {
+ // enforce woodstox
+ if(null == System.getProperty("javax.xml.stream.XMLInputFactory"))
+ System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory");
- WsimportTool compileTool = new WsimportTool(stream);
- boolean success = compileTool.run(args.toArray(new String[0]));
+ WsimportTool compileTool = new WsimportTool(stream);
+ boolean success = compileTool.run(args.toArray(new String[0]));
- if(!success) throw new IllegalStateException("WsImport invocation failed");
- }
- catch (Throwable t)
- {
- if (messageStream != null)
- {
- messageStream.println("Failed to invoke WsImport");
- t.printStackTrace(messageStream);
- }
- else
- {
- t.printStackTrace();
- }
- }
-
- }
-
+ if(!success) throw new IllegalStateException("WsImport invocation failed");
+ }
+ catch (Throwable t)
+ {
+ if (messageStream != null)
+ {
+ messageStream.println("Failed to invoke WsImport");
+ t.printStackTrace(messageStream);
+ }
+ else
+ {
+ t.printStackTrace();
+ }
+ }
+ }
}
16 years, 8 months
JBossWS SVN: r6979 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 17:11:59 -0400 (Thu, 08 May 2008)
New Revision: 6979
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
add-test-source
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-08 16:25:45 UTC (rev 6978)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-08 21:11:59 UTC (rev 6979)
@@ -117,7 +117,7 @@
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
- <goal>add-source</goal>
+ <goal>add-test-source</goal>
</goals>
<configuration>
<sources>
16 years, 8 months
JBossWS SVN: r6978 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 12:25:45 -0400 (Thu, 08 May 2008)
New Revision: 6978
Modified:
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
Log:
prevent mkdir output
Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:20:39 UTC (rev 6977)
+++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:25:45 UTC (rev 6978)
@@ -23,8 +23,8 @@
</classpath>
</taskdef>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
</target>
<!--
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:20:39 UTC (rev 6977)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:25:45 UTC (rev 6978)
@@ -23,13 +23,13 @@
</classpath>
</taskdef>
- <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
- <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" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
+ <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" destdir="${tests.output.dir}" nocompile="true" keep="true" verbose="false"/>
</target>
<!--
16 years, 8 months
JBossWS SVN: r6977 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 12:20:39 -0400 (Thu, 08 May 2008)
New Revision: 6977
Modified:
stack/native/trunk/.classpath
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/pom.xml
Log:
Add build-helper-maven-plugin to add target/wsconsume/java
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2008-05-08 16:18:23 UTC (rev 6976)
+++ stack/native/trunk/.classpath 2008-05-08 16:20:39 UTC (rev 6977)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="modules/saaj/src/main/java"/>
- <classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/>
<classpathentry kind="src" path="modules/jaxrpc/src/main/java"/>
<classpathentry kind="src" path="modules/jaxws/src/main/java"/>
<classpathentry kind="src" path="modules/jaxws-ext/src/main/java"/>
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-05-08 16:18:23 UTC (rev 6976)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-05-08 16:20:39 UTC (rev 6977)
@@ -45,6 +45,7 @@
private File catalog;
private boolean extension;
private boolean generateSource;
+ private boolean nocompile;
private File outputDir = new File("output");
private File sourceDir;
private String targetPackage;
@@ -107,17 +108,25 @@
this.wsdlLocation = wsdlLocation;
}
+ @Override
public void setAdditionalCompilerClassPath(List<String> additionalCompilerClassPath)
{
this.additionalCompilerClassPath = additionalCompilerClassPath;
}
+ @Override
public void setTarget(String target)
{
this.target = target;
}
@Override
+ public void setNoCompile(boolean nocompile)
+ {
+ this.nocompile = nocompile;
+ }
+
+ @Override
public void consume(URL wsdl)
{
List<String> args = new ArrayList<String>();
@@ -142,6 +151,11 @@
args.add("-extension");
}
+ if (nocompile)
+ {
+ args.add("-Xnocompile");
+ }
+
if (generateSource)
{
args.add("-keep");
Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:18:23 UTC (rev 6976)
+++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:20:39 UTC (rev 6977)
@@ -23,8 +23,8 @@
</classpath>
</taskdef>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
</target>
<!--
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:18:23 UTC (rev 6976)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 16:20:39 UTC (rev 6977)
@@ -23,13 +23,13 @@
</classpath>
</taskdef>
- <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
- <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" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" nocompile="true" keep="true" verbose="false"/>
+ <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" nocompile="true" keep="true" verbose="false"/>
</target>
<!--
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-05-08 16:18:23 UTC (rev 6976)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-08 16:20:39 UTC (rev 6977)
@@ -110,6 +110,24 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/wsconsume/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args}</argLine>
16 years, 8 months
JBossWS SVN: r6976 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 12:18:23 -0400 (Thu, 08 May 2008)
New Revision: 6976
Modified:
maven/parent/trunk/pom.xml
Log:
Add build-helper-maven-plugin
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2008-05-08 16:06:12 UTC (rev 6975)
+++ maven/parent/trunk/pom.xml 2008-05-08 16:18:23 UTC (rev 6976)
@@ -77,6 +77,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2.SP1</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
16 years, 8 months
JBossWS SVN: r6975 - in spi/trunk/src: main/java/org/jboss/wsf/spi/tools and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 12:06:12 -0400 (Thu, 08 May 2008)
New Revision: 6975
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java
Log:
Add support for -Xnocompile
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java 2008-05-08 15:14:27 UTC (rev 6974)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java 2008-05-08 16:06:12 UTC (rev 6975)
@@ -24,10 +24,13 @@
// $Id$
import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext;
+import org.w3c.dom.Element;
import java.security.Principal;
+import java.util.Collection;
import javax.ejb.EJBContext;
+import javax.xml.ws.EndpointReference;
import javax.xml.ws.handler.MessageContext;
/**
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2008-05-08 15:14:27 UTC (rev 6974)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java 2008-05-08 16:06:12 UTC (rev 6975)
@@ -123,6 +123,13 @@
public abstract void setGenerateSource(boolean generateSource);
/**
+ * Enables/Disables Java source compilation.
+ *
+ * @param nocompile whether or not to compile Java source.
+ */
+ public abstract void setNoCompile(boolean nocompile);
+
+ /**
* Sets the target package for generated source. If not specified the default
* is based off of the XML namespace.
*
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-05-08 15:14:27 UTC (rev 6974)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-05-08 16:06:12 UTC (rev 6975)
@@ -93,6 +93,7 @@
private boolean verbose;
private boolean fork;
private boolean debug;
+ private boolean nocompile;
private String target;
// Not actually used right now
@@ -156,6 +157,11 @@
this.verbose = verbose;
}
+ public void setNoCompile(boolean nocompile)
+ {
+ this.nocompile = nocompile;
+ }
+
public void setWsdl(String wsdl)
{
this.wsdl = wsdl;
@@ -183,35 +189,36 @@
Thread.currentThread().setContextClassLoader(antLoader);
try
{
- WSContractConsumer importer = WSContractConsumer.newInstance();
- importer.setGenerateSource(keep);
- importer.setExtension(extension);
+ WSContractConsumer consumer = WSContractConsumer.newInstance();
+ consumer.setGenerateSource(keep);
+ consumer.setExtension(extension);
+ consumer.setNoCompile(nocompile);
if (destdir != null)
- importer.setOutputDirectory(destdir);
+ consumer.setOutputDirectory(destdir);
if (sourcedestdir != null)
- importer.setSourceDirectory(sourcedestdir);
+ consumer.setSourceDirectory(sourcedestdir);
if (targetPackage != null)
- importer.setTargetPackage(targetPackage);
+ consumer.setTargetPackage(targetPackage);
if (wsdlLocation != null)
- importer.setWsdlLocation(wsdlLocation);
+ consumer.setWsdlLocation(wsdlLocation);
if (catalog != null)
- importer.setCatalog(catalog);
+ consumer.setCatalog(catalog);
if (bindingFiles != null && bindingFiles.size() > 0)
- importer.setBindingFiles(bindingFiles);
+ consumer.setBindingFiles(bindingFiles);
if (target != null)
- importer.setTarget(target);
+ consumer.setTarget(target);
log("Consuming wsdl: " + wsdl, Project.MSG_INFO);
if (verbose)
{
- importer.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO)));
+ consumer.setMessageStream(new PrintStream(new LogOutputStream(this, Project.MSG_INFO)));
}
try
{
- importer.setAdditionalCompilerClassPath(getTaskClassPathStrings());
- importer.consume(wsdl);
+ consumer.setAdditionalCompilerClassPath(getTaskClassPathStrings());
+ consumer.consume(wsdl);
}
catch (MalformedURLException e)
{
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2008-05-08 15:14:27 UTC (rev 6974)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java 2008-05-08 16:06:12 UTC (rev 6975)
@@ -192,35 +192,35 @@
private int importServices(URL wsdl)
{
- WSContractConsumer importer = WSContractConsumer.newInstance();
+ WSContractConsumer consumer = WSContractConsumer.newInstance();
- importer.setGenerateSource(generateSource);
- importer.setOutputDirectory(outputDir);
- importer.setExtension(extension);
+ consumer.setGenerateSource(generateSource);
+ consumer.setOutputDirectory(outputDir);
+ consumer.setExtension(extension);
if (sourceDir != null)
- importer.setSourceDirectory(sourceDir);
+ consumer.setSourceDirectory(sourceDir);
if (! quiet)
- importer.setMessageStream(System.out);
+ consumer.setMessageStream(System.out);
if (catalog != null)
- importer.setCatalog(catalog);
+ consumer.setCatalog(catalog);
if (targetPackage != null)
- importer.setTargetPackage(targetPackage);
+ consumer.setTargetPackage(targetPackage);
if (wsdlLocation != null)
- importer.setWsdlLocation(wsdlLocation);
+ consumer.setWsdlLocation(wsdlLocation);
if (bindingFiles != null && bindingFiles.size() > 0)
- importer.setBindingFiles(bindingFiles);
+ consumer.setBindingFiles(bindingFiles);
if(target!=null)
- importer.setTarget(target);
+ consumer.setTarget(target);
try
{
- importer.consume(wsdl);
+ consumer.consume(wsdl);
return 0;
}
catch (Throwable t)
Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java
===================================================================
--- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2008-05-08 15:14:27 UTC (rev 6974)
+++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2008-05-08 16:06:12 UTC (rev 6975)
@@ -107,4 +107,10 @@
{
LAST_EVENT += "setExtension";
}
+
+ @Override
+ public void setNoCompile(boolean nocompile)
+ {
+ LAST_EVENT += "setNoCompile";
+ }
}
16 years, 8 months
JBossWS SVN: r6974 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 11:14:27 -0400 (Thu, 08 May 2008)
New Revision: 6974
Modified:
stack/native/trunk/build.xml
Log:
echo java.version
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-05-08 15:06:18 UTC (rev 6973)
+++ stack/native/trunk/build.xml 2008-05-08 15:14:27 UTC (rev 6974)
@@ -78,7 +78,8 @@
<xmlproperty file="${stack.dir}/pom.xml"/>
<property name="version.id" value="${project.version}"/>
-
+
+ <echo message="java.version=${java.version}"/>
<echo message="version.id=${version.id}"/>
<echo message="integration.target=${jbossws.integration.target}"/>
16 years, 8 months
JBossWS SVN: r6973 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 11:06:18 -0400 (Thu, 08 May 2008)
New Revision: 6973
Modified:
stack/native/trunk/pom.xml
stack/native/trunk/profiles.xml.example
Log:
Add property java.jdk15.home=/usr/java/jdk1.5
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-05-08 13:09:51 UTC (rev 6972)
+++ stack/native/trunk/pom.xml 2008-05-08 15:06:18 UTC (rev 6973)
@@ -466,6 +466,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerVersion>1.5</compilerVersion>
+ <executable>${java.jdk15.home}/bin/javac</executable>
<fork>true</fork>
</configuration>
</plugin>
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2008-05-08 13:09:51 UTC (rev 6972)
+++ stack/native/trunk/profiles.xml.example 2008-05-08 15:06:18 UTC (rev 6973)
@@ -11,6 +11,7 @@
</property>
</activation>
<properties>
+ <java.jdk15.home>/usr/java/jdk1.5</java.jdk15.home>
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
16 years, 8 months
JBossWS SVN: r6972 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-08 09:09:51 -0400 (Thu, 08 May 2008)
New Revision: 6972
Modified:
stack/native/trunk/build.xml
Log:
Add -Dmaven.opts=-U
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-05-08 13:09:45 UTC (rev 6971)
+++ stack/native/trunk/build.xml 2008-05-08 13:09:51 UTC (rev 6972)
@@ -92,28 +92,28 @@
<target name="prepare-deploy" depends="prepare">
- <echo message="**********************************"/>
- <echo message="* mvn package assembly:directory *"/>
- <echo message="**********************************"/>
+ <!-- Use a system property to overwrite the empty default value -->
+ <property name="maven.opts" value=""/>
+ <echo/>
+ <echo message="mvn ${maven.opts} package assembly:directory"/>
+ <echo/>
+
<delete dir="${deploy.artifacts.dir}"/>
<exec dir="${basedir}" executable="mvn" failonerror="true">
- <arg value="package"/>
- <arg value="assembly:directory"/>
+ <arg line="${maven.opts} package assembly:directory"/>
</exec>
</target>
<target name="build-bin-dist" depends="prepare-deploy" description="Build the binary distribution">
- <echo message="********************************************"/>
- <echo message="* mvn -Pbindist package assembly:directory *"/>
- <echo message="********************************************"/>
+ <echo/>
+ <echo message="mvn ${maven.opts} -Pbindist package assembly:directory"/>
+ <echo/>
<delete dir="${stack.output.dir}/jbossws-native-dist"/>
<exec dir="${basedir}" executable="mvn" failonerror="true">
- <arg value="-Pbindist"/>
- <arg value="package"/>
- <arg value="assembly:directory"/>
+ <arg line="${maven.opts} -Pbindist package assembly:directory"/>
</exec>
</target>
16 years, 8 months