Author: thomas.diesler(a)jboss.com Date: 2007-01-25 12:25:08 -0500 (Thu, 25 Jan 2007) New Revision: 2115 Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml branches/jbossws-1.2.0/integration-tomcat/build.xml branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Fix tomcat classpath Modified: branches/jbossws-1.2.0/build/ant-import/build-setup.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-25 16:20:03 UTC (rev 2114) +++ branches/jbossws-1.2.0/build/ant-import/build-setup.xml 2007-01-25 17:25:08 UTC (rev 2115) @@ -59,6 +59,7 @@ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> <property name="tomcat.common.dir" value="${tomcat.home}/common"/> + <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/> <available property="jboss50.available" file="${jboss50.client}/jboss-client.jar"/> <available property="jboss42.available" file="${jboss42.client}/jboss-client.jar"/> Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-01-25 16:20:03 UTC (rev 2114) +++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-01-25 17:25:08 UTC (rev 2115) @@ -144,12 +144,12 @@ <include name="xercesImpl.jar"/> </fileset> </copy> - <copy todir="${tomcat.common.dir}/lib" overwrite="true"> + <copy todir="${tomcat.common.lib}" overwrite="true"> <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> </fileset> <fileset dir="${tomcat.output.lib.dir}"> <include name="jbossws-tomcat-integration.jar"/> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 16:20:03 UTC (rev 2114) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-25 17:25:08 UTC (rev 2115) @@ -151,7 +151,9 @@ <!-- Init the various classpaths --> - <target name="init" depends="prepare,thirdparty"> + <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/> + + <target name="common-classpath" depends="prepare,thirdparty"> <!-- The combined compile classpath --> <path id="jbossws.jars.classpath"> @@ -180,7 +182,9 @@ <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> </path> - + </target> + + <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss"> <!-- The test client classpath --> <path id="test.client.classpath"> <path refid="jbossws.jars.classpath"/> @@ -201,6 +205,16 @@ </path> </target> + <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> + <!-- The test client classpath --> + <path id="test.client.classpath"> + <path refid="jbossws.jars.classpath"/> + <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> + <path refid="javac.classpath"/> + </path> + </target> + + <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-25 16:20:03 UTC (rev 2114) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2007-01-25 17:25:08 UTC (rev 2115) @@ -23,23 +23,31 @@ // $Id: SysmonTestCase.java 1994 2007-01-18 12:54:34Z heiko.braun(a)jboss.com $ +import java.io.File; +import java.net.URISyntaxException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.addressing.AddressingProperties; + import junit.framework.Test; + import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; import org.jboss.ws.extensions.addressing.AddressingClientUtil; import org.jboss.ws.extensions.eventing.EventingConstants; -import org.jboss.ws.extensions.eventing.jaxws.*; -import org.jboss.ws.core.StubExt; +import org.jboss.ws.extensions.eventing.jaxws.DeliveryType; +import org.jboss.ws.extensions.eventing.jaxws.EventSourceEndpoint; +import org.jboss.ws.extensions.eventing.jaxws.FilterType; +import org.jboss.ws.extensions.eventing.jaxws.GetStatus; +import org.jboss.ws.extensions.eventing.jaxws.Subscribe; +import org.jboss.ws.extensions.eventing.jaxws.SubscribeResponse; +import org.jboss.ws.extensions.eventing.jaxws.SubscriptionManagerEndpoint; +import org.jboss.ws.extensions.eventing.jaxws.Unsubscribe; -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.addressing.AddressingProperties; -import java.io.File; -import java.net.URISyntaxException; -import java.net.URL; - /** * Test the eventing example service. * @@ -69,23 +77,15 @@ if (subscriptionPort == null || managementPort == null) { - if (isTargetJBoss()) - { - URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL(); - QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventingService"); + URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL(); + QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "EventingService"); - Service service = Service.create(wsdlURL, defaultServiceName); - subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); - managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); + Service service = Service.create(wsdlURL, defaultServiceName); + subscriptionPort = (EventSourceEndpoint)service.getPort(EventSourceEndpoint.class); + managementPort = (SubscriptionManagerEndpoint)service.getPort(SubscriptionManagerEndpoint.class); - ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client"); - ((StubExt)managementPort).setConfigName("Standard WSAddressing Client"); - } - else - { - - throw new IllegalArgumentException("JBossAS is the only supported target"); - } + ((StubExt)subscriptionPort).setConfigName("Standard WSAddressing Client"); + ((StubExt)managementPort).setConfigName("Standard WSAddressing Client"); } } @@ -103,12 +103,9 @@ */ public void testUnsubscribe() throws Exception { - SubscribeResponse subscribeResponse = doSubscribe(null); //SysmonUtil.printSubscriptionDetails(subscribeResponse); - String subscriptionID = subscribeResponse.getSubscriptionId(); - // addressing correlation AddressingProperties unsubscribeProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.UNSUBSCRIBE_ACTION, eventSourceURI); SysmonUtil.setRequestProperties((BindingProvider)managementPort, unsubscribeProps); @@ -117,9 +114,12 @@ AddressingProperties getStatusProps = SysmonUtil.buildFollowupProperties(subscribeResponse, EventingConstants.GET_STATUS_ACTION, eventSourceURI); SysmonUtil.setRequestProperties((BindingProvider)managementPort, getStatusProps); - try { + try + { managementPort.getStatusOp(new GetStatus()); - } catch (Exception e) { + } + catch (Exception e) + { // Ignore return; } Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-25 16:20:03 UTC (rev 2114) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-25 17:25:08 UTC (rev 2115) @@ -1,12 +1,24 @@ +# Always excludes +org/jboss/test/ws/interop/** org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxws/benchmark/** + +# EJB/Injection excludes org/jboss/test/ws/jaxrpc/jbws1011/** -org/jboss/test/ws/jaxrpc/samples/dynamichandler/** -org/jboss/test/ws/jaxrpc/samples/jmstransport/** -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** -org/jboss/test/ws/jaxrpc/samples/secureejb/** -org/jboss/test/ws/jaxrpc/samples/wsbpel/** -org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* -org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase.* org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/samples/jsr181ejb/** org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/webserviceref/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/**