Author: thomas.diesler(a)jboss.com Date: 2007-02-04 14:30:13 -0500 (Sun, 04 Feb 2007) New Revision: 2271 Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/jbossws-core/build.xml branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java Log: Include server stuff in client jar, the ServiceObjectFactory needs it Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-04 17:50:46 UTC (rev 2270) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-04 19:30:13 UTC (rev 2271) @@ -226,7 +226,6 @@ </fileset> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/core/server/**"/> <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> </fileset> @@ -311,14 +310,18 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> - <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> + <!-- The JBossAS testsuite references jbossws from thirdparty --> <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar"/> + </fileset> </copy> <!-- Copy jboss-xml-binding.jar --> <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> @@ -353,14 +356,16 @@ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/> <!-- The JBossAS testsuite references jbosswsfrom thirdparty --> - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-client.jar"/> - </fileset> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws14/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws14-client.jar"/> + <include name="jbossws14-core.jar"/> + <include name="jbossws14-jboss40-integration.jar"/> + </fileset> </copy> <!-- Copy jboss-xml-binding.jar --> <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> Modified: branches/jbossws-1.2.0/jbossws-core/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/build.xml 2007-02-04 17:50:46 UTC (rev 2270) +++ branches/jbossws-1.2.0/jbossws-core/build.xml 2007-02-04 19:30:13 UTC (rev 2271) @@ -146,7 +146,6 @@ <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/core/server/**"/> </fileset> <fileset dir="${core.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-04 17:50:46 UTC (rev 2270) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-04 19:30:13 UTC (rev 2271) @@ -177,7 +177,7 @@ endpointAddress = serviceEndpoint.getServiceEndpointInfo().getServerEndpointMetaData().getEndpointAddress(); } - catch (Exception ex) + catch (Throwable ex) { // ignore, we are probably a remote client }