Author: heiko.braun(a)jboss.com Date: 2007-01-12 11:39:05 -0500 (Fri, 12 Jan 2007) New Revision: 1947 Modified: trunk/jbossws-tests/ant-import/build-interop.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java Log: Fix interop build Modified: trunk/jbossws-tests/ant-import/build-interop.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-interop.xml 2007-01-12 14:57:54 UTC (rev 1946) +++ trunk/jbossws-tests/ant-import/build-interop.xml 2007-01-12 16:39:05 UTC (rev 1947) @@ -8,7 +8,7 @@ <!-- $Id$ --> -<project name="JBossWS-Interop" default="interop.build" basedir="../../../"> +<project name="JBossWS-Interop" default="interop.build" basedir="../"> <import file="../build.xml"/> @@ -17,14 +17,14 @@ <property name="jbossws.client.jar" value="jbossws-client.jar"/> <path id="jwsdp.classpath"> - <fileset dir="${jwsdp.home}/jaxrpc/lib"/> + <!--fileset dir="${jwsdp.home}/jaxrpc/lib"/> <fileset dir="${jwsdp.home}/jwsdp-shared/lib"> <include name="activation.jar"/> <include name="mail.jar"/> <include name="jax-qname.jar"/> </fileset> <fileset dir="${jwsdp.home}/saaj/lib"/> - <fileset dir="${jwsdp.home}/jaxp/lib"/> + <fileset dir="${jwsdp.home}/jaxp/lib"/--> </path> <path id="wscompile.tools.classpath"> @@ -37,14 +37,14 @@ <path refid="javac.classpath"/> </path> - <taskdef name="wscompile" classname="com.sun.xml.rpc.tools.ant.Wscompile"> + <!--taskdef name="wscompile" classname="com.sun.xml.rpc.tools.ant.Wscompile"> <classpath refid="jwsdp.classpath"/> </taskdef> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="javac.classpath"/> <classpath path="${build.test.dir}/classes"/> - </taskdef> + </taskdef--> <!-- BUILD MACROS Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-12 14:57:54 UTC (rev 1946) +++ trunk/jbossws-tests/build.xml 2007-01-12 16:39:05 UTC (rev 1947) @@ -207,7 +207,7 @@ <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${tests.java.dir}"/> - <exclude name="org/jboss/test/ws/interop/**"/> + <!--exclude name="org/jboss/test/ws/interop/**"/--> <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> <classpath refid="javac.classpath"/> </javac> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2007-01-12 14:57:54 UTC (rev 1946) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropClientConfig.java 2007-01-12 16:39:05 UTC (rev 1947) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.interop.microsoft; -import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMUtils; import org.w3c.dom.Element; import java.net.URL; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2007-01-12 14:57:54 UTC (rev 1946) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/InteropConfigFactory.java 2007-01-12 16:39:05 UTC (rev 1947) @@ -22,7 +22,7 @@ package org.jboss.test.ws.interop.microsoft; import org.jboss.logging.Logger; -import org.jboss.ws.utils.DOMUtils; +import org.jboss.ws.core.utils.DOMUtils; import org.w3c.dom.Element; import java.io.IOException; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java 2007-01-12 14:57:54 UTC (rev 1946) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/sep06/wsa10/AddressingTestCase.java 2007-01-12 16:39:05 UTC (rev 1947) @@ -25,9 +25,9 @@ import org.jboss.test.ws.interop.microsoft.ClientScenario; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.ws.addressing.AddressingClientUtil; -import org.jboss.ws.jaxrpc.StubExt; +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.jaxrpc.StubExt; +import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.w3c.dom.Element; import javax.xml.ws.addressing.*; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2007-01-12 14:57:54 UTC (rev 1946) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/interop/microsoft/addressing/wsa10/AddressingTestCase.java 2007-01-12 16:39:05 UTC (rev 1947) @@ -5,9 +5,10 @@ import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.interop.microsoft.ClientScenario; import org.jboss.test.ws.interop.microsoft.InteropConfigFactory; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.ws.addressing.AddressingClientUtil; -import org.jboss.ws.jaxrpc.StubExt; + +import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.core.jaxrpc.StubExt; +import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.w3c.dom.Element; import javax.naming.InitialContext;