[jbossws-commits] JBossWS SVN: r3582 - in branches/jbossws-2.0: jbossws-core and 9 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Jun 14 10:43:47 EDT 2007


Author: thomas.diesler at jboss.com
Date: 2007-06-14 10:43:46 -0400 (Thu, 14 Jun 2007)
New Revision: 3582

Added:
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java
   branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1666/
Removed:
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java
Modified:
   branches/jbossws-2.0/build/etc/default.mf
   branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
   branches/jbossws-2.0/jbossws-core/build.xml
   branches/jbossws-2.0/jbossws-core/src/main/etc/default.mf
   branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh
   branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java
   branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1666/WEB-INF/web.xml
Log:
[JBWS-1666] Simplify jbosws jar dependencies

Modified: branches/jbossws-2.0/build/etc/default.mf
===================================================================
--- branches/jbossws-2.0/build/etc/default.mf	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/build/etc/default.mf	2007-06-14 14:43:46 UTC (rev 3582)
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.2
 Created-By: @java.vm.version@ (@java.vm.vendor@)
 Specification-Title: @specification.title@
 Specification-Version: @specification.version@

Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml	2007-06-14 14:43:46 UTC (rev 3582)
@@ -264,6 +264,13 @@
       </fileset>
     </jar>
 
+    <!-- jaxws-jbws1666 -->
+    <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/classes">
+        <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/>
+      </classes>
+    </war>
+
 	 <!-- jaxws namespace -->
     <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/classes">

Modified: branches/jbossws-2.0/jbossws-core/build.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/build.xml	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/jbossws-core/build.xml	2007-06-14 14:43:46 UTC (rev 3582)
@@ -224,7 +224,7 @@
 
 	<target name="main" description="Executes the default target (most)." depends="most"/>
 
-	<target name="most" description="Builds almost everything." depends="jars,tests-jars"/>
+	<target name="most" description="Builds almost everything." depends="jars"/>
 
 	<target name="all" description="Create a distribution zip file" depends="most">
 	</target>

Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/default.mf
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/etc/default.mf	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/jbossws-core/src/main/etc/default.mf	2007-06-14 14:43:46 UTC (rev 3582)
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.2
 Created-By: @java.vm.version@ (@java.vm.vendor@)
 Specification-Title: @specification.title@
 Specification-Version: @specification.version@
@@ -9,5 +9,5 @@
 Implementation-Vendor: @implementation.vendor@
 Implementation-Vendor-Id: @implementation.vendor.id@
 Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar jboss-saaj.jar 
-  jboss-xml-binding.jar javassist.jar mail.jar activation.jar 
-  jaxb-api.jar jaxb-impl.jar policy.jar wsdl4j.jar
\ No newline at end of file
+  activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar 
+  mail.jar jboss-remoting.jar jboss-xml-binding.jar  policy.jar wsdl4j.jar
\ No newline at end of file

Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/jbossws-core/src/main/etc/wsrunclient.sh	2007-06-14 14:43:46 UTC (rev 3582)
@@ -56,28 +56,16 @@
 JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
 
 # Setup the client classpath
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/activation.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/mail.jar"
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/javassist.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-api.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxb-impl.jar"
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-client.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jbossws-spi.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxws.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-jaxrpc.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-saaj.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-xml-binding.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/policy.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
 
-# subset of jbossall-client.jar:
+# JBossAS-5.0 subset of jbossall-client.jar
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-logging-spi.jar"
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-common-core.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/concurrent.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-remoting.jar"
 
+# JBossAS-4.2 subset of jbossall-client.jar
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-common-client.jar"
+
 while [ $# -ge 1 ]; do
    case $1 in
        "-classpath") WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$2"; shift;;

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/spi/Provider.java	2007-06-14 14:43:46 UTC (rev 3582)
@@ -95,7 +95,7 @@
       }
       catch (Exception ex)
       {
-         throw new WebServiceException("Unable to createEndpointReference Provider: " + ex.getMessage());
+         throw new WebServiceException("Unable to load Provider: " + ex.getMessage(), ex);
       }
 
    }

Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java	                        (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java	2007-06-14 14:43:46 UTC (rev 3582)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1666;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStreamReader;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+import org.jboss.wsf.spi.utils.IOUtils;
+
+/**
+ * [JBWS-1666] Simplify jbosws jar dependencies
+ * 
+ * http://jira.jboss.org/jira/browse/JBWS-1666
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 14-Jun-2007
+ */
+public class JBWS1666TestCase extends JBossWSTest
+{
+   public static Test suite()
+   {
+      return JBossWSTestSetup.newTestSetup(JBWS1666TestCase.class, "jaxws-jbws1666.war");
+   }
+
+   public void testPortAccess() throws Exception
+   {
+      String resStr = TestClient.testPortAccess(getServerHost());
+      assertEquals(TestClient.REQ_STR, resStr);
+   }
+
+   public void testClientAccess() throws Exception
+   {
+      String jbh = System.getProperty("jboss.home");
+      String jbc = jbh + "/client";
+      String jbl = jbh + "/lib";
+      
+      // Setup the classpath - do not modify this lightheartedly. 
+      // Maybe you should extend the Class-Path in the MANIFEST instead.
+      StringBuffer cp = new StringBuffer("./classes");
+      cp.append(":" + jbc + "/jbossws-client.jar");
+      cp.append(":" + jbc + "/jboss-common-client.jar");
+
+      Runtime rt = Runtime.getRuntime();
+
+      String command = "java -Djava.endorsed.dirs=" + jbl + "/endorsed -cp " + cp + " " + TestClient.class.getName() + " " + getServerHost();
+      Process proc = rt.exec(command);
+      int status = proc.waitFor();
+      if (status == 0)
+      {
+         BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+         String resStr = br.readLine();
+         assertEquals(TestClient.REQ_STR, resStr);
+      }
+      else
+      {
+         ByteArrayOutputStream baos = new ByteArrayOutputStream();
+         IOUtils.copyStream(baos, proc.getErrorStream());
+         String errStr = new String(baos.toByteArray());
+         fail(errStr);
+      }
+   }
+}


Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java	                        (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java	2007-06-14 14:43:46 UTC (rev 3582)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1666;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+public class TestClient
+{
+   public static final String REQ_STR = "Hello World!";
+
+   public static String testPortAccess(String serverHost) throws Exception
+   {
+      URL wsdlURL = new URL("http://" + serverHost + ":8080/jaxws-jbws1666?wsdl");
+
+      QName serviceName = new QName("http://org.jboss.ws/jbws1666", "TestEndpointImplService");
+      Service service = Service.create(wsdlURL, serviceName);
+      TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+      String resStr = port.echo(REQ_STR);
+      return resStr;
+   }
+
+   public static void main(String[] args) throws Exception
+   {
+      String serverHost = args[0];
+      String resStr = testPortAccess(serverHost);
+      System.out.println(resStr);
+   }
+}


Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java	                        (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java	2007-06-14 14:43:46 UTC (rev 3582)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1666;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1666")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface TestEndpoint
+{
+   String echo(String input);
+}


Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java	                        (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java	2007-06-14 14:43:46 UTC (rev 3582)
@@ -0,0 +1,37 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.test.ws.jaxws.jbws1666;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1666")
+ at SOAPBinding(style = SOAPBinding.Style.RPC)
+public class TestEndpointImpl
+{
+   @WebMethod
+   public String echo(String input)
+   {
+      return input;
+   }
+}


Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.java	2007-06-14 14:43:46 UTC (rev 3582)
@@ -1,16 +0,0 @@
-/*  
- * JBoss, the OpenSource EJB server
- * Distributable under LGPL license. See terms of license at gnu.org.
- */
-
-//Auto Generated by jbossws - Please do not edit!!!
-package org.jboss.test.ws.jaxws.jbws871;
-
-import javax.xml.rpc.Service;
-import javax.xml.rpc.ServiceException;
-
-public interface RpcArrayEndpointService extends Service
-{
-   public RpcArrayEndpoint getRpcArrayEndpointPort() throws ServiceException;
-
-}

Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java	2007-06-14 12:50:56 UTC (rev 3581)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wseventing/EventingSupport.java	2007-06-14 14:43:46 UTC (rev 3582)
@@ -27,7 +27,6 @@
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.rpc.Stub;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Service;
 import javax.xml.ws.addressing.AddressingBuilder;
@@ -182,30 +181,6 @@
       return filter;
    }
 
-   public static void setSubscriptionId(Stub stub, URI identifier)
-   {
-      stub._setProperty("subscriptionId", identifier);
-   }
-
-   public static URI setMessageId(Stub stub) throws Exception
-   {
-      URI messageId = new URI("http://www.example.org/eventSink/message#" + (msgId++));
-      //stub._setProperty(SOAPClientHandler.CLIENT_ADDRESSING_REQUEST_MESSAGE_ID, messageId);
-      return messageId;
-   }
-
-   protected void assertReplyAction(Stub stub, URI expectedAction) throws Exception
-   {
-      // see AddrConstraintsHandler
-      stub._setProperty("wsa:expectedReplyAction", expectedAction);
-   }
-
-   protected void assertRelatesTo(Stub stub, URI expectedRelatesTo) throws Exception
-   {
-      // see AddrConstraintsHandler
-      stub._setProperty("wsa:expectedRelatesTo", expectedRelatesTo);
-   }
-
    protected void assertWSDLAccess() throws MalformedURLException
    {
       WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();

Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1666 (from rev 3575, branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1178)

Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1666/WEB-INF/web.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1178/WEB-INF/web.xml	2007-06-13 21:25:17 UTC (rev 3575)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/jbws1666/WEB-INF/web.xml	2007-06-14 14:43:46 UTC (rev 3582)
@@ -5,12 +5,11 @@
   
   <servlet>
     <servlet-name>TestEndpoint</servlet-name>
-    <servlet-class>org.jboss.test.ws.jaxws.jbws1178.TestEndpoint</servlet-class>
+    <servlet-class>org.jboss.test.ws.jaxws.jbws1666.TestEndpointImpl</servlet-class>
   </servlet>
   
   <servlet-mapping>
     <servlet-name>TestEndpoint</servlet-name>
-    <!-- [JBWS-864] soap:address in wsdl ignores <url-pattern> -->
-    <url-pattern>/testpattern</url-pattern>
+    <url-pattern>/*</url-pattern>
   </servlet-mapping>
 </web-app>
\ No newline at end of file




More information about the jbossws-commits mailing list