[jbossws-commits] JBossWS SVN: r3282 - in trunk: build/ant-import and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue May 29 10:35:48 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-05-29 10:35:48 -0400 (Tue, 29 May 2007)
New Revision: 3282
Modified:
trunk/build/ant-import/build-testsuite.xml
trunk/build/version.properties
trunk/integration/spi/.classpath
trunk/integration/spi/ant-import/build-thirdparty.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/version.properties
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java
Log:
Fix classpath issues
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/build/ant-import/build-testsuite.xml 2007-05-29 14:35:48 UTC (rev 3282)
@@ -87,7 +87,6 @@
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
- <pathelement location="${jboss.client}/jbossws-spi.jar"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
@@ -125,7 +124,6 @@
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
- <pathelement location="${jboss.client}/jbossws-spi.jar"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/build/version.properties 2007-05-29 14:35:48 UTC (rev 3282)
@@ -14,6 +14,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
+apache-ant=1.6.5
dom4j=1.6.1
jboss-common-core=2.0.2.GA
jboss-common-logging-log4j=2.0.2.GA
Modified: trunk/integration/spi/.classpath
===================================================================
--- trunk/integration/spi/.classpath 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/integration/spi/.classpath 2007-05-29 14:35:48 UTC (rev 3282)
@@ -19,5 +19,7 @@
<classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/ant.jar"/>
+ <classpathentry kind="lib" path="thirdparty/getopt.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-29 14:35:48 UTC (rev 3282)
@@ -39,6 +39,7 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/jbossws-core/.classpath 2007-05-29 14:35:48 UTC (rev 3282)
@@ -34,5 +34,7 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/xmlunit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-29 14:35:48 UTC (rev 3282)
@@ -27,6 +27,7 @@
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
@@ -72,20 +73,20 @@
<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">
- <classpath refid="ws.stack.classpath"/>
- <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.wsconsume">
+ <classpath refid="ws.stack.classpath"/>
+ <classpath location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
- <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
- <classpath location="${core.dir}/thirdparty/stax-api.jar"/>
- <classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
- <classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
- <classpath location="${core.dir}/thirdparty/wstx.jar"/>
- </taskdef>
+ <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxb-impl.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxws-rt.jar"/>
+ <classpath location="${core.dir}/thirdparty/jaxws-tools.jar"/>
+ <classpath location="${core.dir}/thirdparty/stax-api.jar"/>
+ <classpath location="${core.dir}/thirdparty/stax-ex.jar"/>
+ <classpath location="${core.dir}/thirdparty/streambuffer.jar"/>
+ <classpath location="${core.dir}/thirdparty/wstx.jar"/>
+ </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" 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" keep="true" verbose="false"/>
@@ -93,8 +94,8 @@
<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" 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" 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" 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" 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" 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" 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" 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" keep="true" verbose="false"/>
</target>
Modified: trunk/jbossws-core/version.properties
===================================================================
--- trunk/jbossws-core/version.properties 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/jbossws-core/version.properties 2007-05-29 14:35:48 UTC (rev 3282)
@@ -9,7 +9,6 @@
jbpm-bpel=1.1.0.Beta5
# Thirdparty library versions
-apache-ant=1.6.5
apache-collections=3.1
apache-log4j=1.2.8
apache-logging=1.1.0.jboss
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -1,13 +1,14 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.ws.WSException;
import javax.jws.WebService;
import javax.jws.WebMethod;
import javax.ejb.Stateless;
import javax.activation.DataHandler;
import javax.xml.bind.annotation.XmlAttachmentRef;
+import javax.xml.ws.WebServiceException;
+
import java.io.IOException;
import java.rmi.RemoteException;
@@ -26,7 +27,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
@@ -36,14 +37,14 @@
{
try
{
- if(null == payload) throw new WSException("Payload was null");
+ if(null == payload) throw new WebServiceException("Payload was null");
System.out.println("Got " + payload.getData().getContent());
DataHandler dataHandler = new DataHandler("Server data", "text/plain");
return new DocumentPayloadWithoutRef(dataHandler);
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -1,11 +1,11 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.ws.WSException;
import javax.ejb.Stateless;
import javax.jws.WebService;
import javax.jws.WebMethod;
+import javax.xml.ws.WebServiceException;
import javax.activation.DataHandler;
import java.rmi.RemoteException;
import java.io.IOException;
@@ -26,7 +26,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
@@ -42,7 +42,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -1,13 +1,14 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.ws.WSException;
import javax.activation.DataHandler;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.ejb.Stateless;
import javax.xml.bind.annotation.XmlAttachmentRef;
+import javax.xml.ws.WebServiceException;
+
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -69,7 +70,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2007-05-29 13:31:56 UTC (rev 3281)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/WrappedEndpointImpl.java 2007-05-29 14:35:48 UTC (rev 3282)
@@ -21,12 +21,11 @@
*/
package org.jboss.test.ws.jaxws.samples.xop.doclit;
-import org.jboss.ws.WSException;
-
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.bind.annotation.XmlMimeType;
import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceException;
import javax.activation.DataHandler;
import java.io.IOException;
@@ -48,7 +47,7 @@
}
catch (IOException e)
{
- throw new WSException(e);
+ throw new WebServiceException(e);
}
}
}
More information about the jbossws-commits
mailing list