[jboss-cvs] JBossAS SVN: r57247 - in branches/JBoss_4_0_3_SP1_CP: jaxrpc/src/main/org/jboss/axis/soap testsuite/imports testsuite/src/main/org/jboss/test/webservice testsuite/src/main/org/jboss/test/webservice/jbws801 testsuite/src/resources/webservice testsuite/src/resources/webservice/jbws801 testsuite/src/resources/webservice/jbws801/WEB-INF testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Sep 27 19:16:19 EDT 2006


Author: ryan.campbell at jboss.com
Date: 2006-09-27 19:16:18 -0400 (Wed, 27 Sep 2006)
New Revision: 57247

Added:
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/JBWS801TestCase.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachment.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachmentImpl.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/jaxrpc-mapping.xml
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/web.xml
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/webservices.xml
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/LargeAttachment.wsdl
Removed:
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/JBWS801TestCase.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachment.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachmentImpl.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/jaxrpc-mapping.xml
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/web.xml
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/webservices.xml
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/LargeAttachment.wsdl
Modified:
   branches/JBoss_4_0_3_SP1_CP/jaxrpc/src/main/org/jboss/axis/soap/SOAPConnectionImpl.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml
Log:
ASPATCH-33: JBWS-841: SAAJ does not offer timeout control, and default timeout of 60 seconds is too small

Modified: branches/JBoss_4_0_3_SP1_CP/jaxrpc/src/main/org/jboss/axis/soap/SOAPConnectionImpl.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/jaxrpc/src/main/org/jboss/axis/soap/SOAPConnectionImpl.java	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/jaxrpc/src/main/org/jboss/axis/soap/SOAPConnectionImpl.java	2006-09-27 23:16:18 UTC (rev 57247)
@@ -107,6 +107,7 @@
       try
       {
          Call call = createCall(endpoint);
+
          ((org.jboss.axis.Message)request).setMessageContext(call.getMessageContext());
          SOAPEnvelopeAxisImpl env = ((org.jboss.axis.Message)request).getSOAPEnvelope();
          Attachments attachments = ((org.jboss.axis.Message)
@@ -120,6 +121,11 @@
                call.addAttachmentPart(attachment);
             }
          }
+         
+         // Set timeout
+         Object timeout = request.getProperty("org.jboss.webservice.timeout");
+         if (timeout != null)
+            call.setTimeout(new Integer(timeout.toString())); 
 
          call.setReturnClass(SOAPMessage.class);
          call.invoke(env, request.getMimeHeaders());

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/imports/test-jars.xml	2006-09-27 23:16:18 UTC (rev 57247)
@@ -5205,6 +5205,20 @@
       </metainf>
     </jar>
 
+    <!-- jbws801 -->
+    <war warfile="${build.lib}/ws4ee-jbws801.war"
+      webxml="${build.resources}/webservice/jbws801/WEB-INF/web.xml">
+      <classes dir="${build.classes}">
+        <include name="org/jboss/test/webservice/jbws801/LargeAttachmentImpl.class"/>
+        <include name="org/jboss/test/webservice/jbws801/LargeAttachment.class"/>
+      </classes>
+      <webinf dir="${build.resources}/webservice/jbws801/WEB-INF">
+        <include name="wsdl/LargeAttachment.wsdl"/>
+        <include name="jaxrpc-mapping.xml"/>
+        <include name="webservices.xml"/>
+      </webinf>
+    </war>
+
     <!-- ws4ee-attachment -->
     <war warfile="${build.lib}/ws4ee-attachment.war"
       webxml="${build.resources}/webservice/attachment/WEB-INF/web.xml">

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801 (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/main/org/jboss/test/webservice/jbws801)

Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/JBWS801TestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/main/org/jboss/test/webservice/jbws801/JBWS801TestCase.java	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/JBWS801TestCase.java	2006-09-27 23:16:18 UTC (rev 57247)
@@ -1,205 +0,0 @@
-/*
-  * 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.webservice.jbws801;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.xml.soap.AttachmentPart;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
-
-import junit.framework.Test;
-
-import org.jboss.test.webservice.WebserviceTestBase;
-
-public class JBWS801TestCase extends WebserviceTestBase
-{
-   private static final String NS_PREFIX = "ns1";
-   private static final String NS_URI = "http://org.jboss.webservice/jbws801";
-   private static final String CID_MIMEPART = "big";
-
-   public JBWS801TestCase(String name)
-   {
-      super(name);
-   }
-
-   /** Deploy the test ear */
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(JBWS801TestCase.class, "ws4ee-jbws801.war");
-   }
-
-   public void testLargeFile() throws Exception
-   {
-      if (isJBossWSAvailable())
-      {
-         System.out.println("FIXME: JBWS-801");
-         return;
-      }
-      long size = 600L * 1024L * 1024L;
-
-      String methodName = "sendLargeFile";
-      SOAPMessage msg = setupMimeMessage(methodName);
-      DataHandler handler = new DataHandler(new GeneratorDataSource(size));
-      addAttachmentPart(msg, handler);
-      sendAndValidateMimeMessage(methodName, msg, size);
-   }
-
-   private static class GeneratorDataSource implements DataSource
-   {
-      private long size;
-
-      public GeneratorDataSource(long size)
-      {
-         this.size = size;
-      }
-
-      public String getContentType()
-      {
-         return "application/octet-stream";
-      }
-
-      public InputStream getInputStream() throws IOException
-      {
-         return new FakeInputStream(size);
-      }
-
-      public String getName()
-      {
-         return null;
-      }
-
-      public OutputStream getOutputStream() throws IOException
-      {
-         return null;
-      }
-   }
-
-   private static class FakeInputStream extends InputStream
-   {
-      private long size;
-
-      public FakeInputStream(long size)
-      {
-         this.size = size;
-      }
-
-      public int read(byte[] b, int off, int len) throws IOException
-      {
-         if (len < 1)
-            return 0;
-
-         if (size == 0)
-            return -1;
-
-         int ret = (int) Math.min(size, len);
-         Arrays.fill(b, off, off + ret, (byte)1);
-         size -= ret;
-
-         return ret;
-      }
-
-      public int read() throws IOException
-      {
-         if (size > 0)
-         {
-            size--;
-            return 1;
-         }
-
-         return -1;
-      }
-   }
-
-   private SOAPMessage setupMimeMessage(String rpcMethodName)
-      throws Exception
-   {
-      MessageFactory mf = MessageFactory.newInstance();
-
-      // Create a soap message from the message factory.
-      SOAPMessage msg = mf.createMessage();
-
-      // Message creation takes care of creating the SOAPPart - a required part of the message as per the SOAP 1.1 spec.
-      SOAPPart sp = msg.getSOAPPart();
-
-      // Retrieve the envelope from the soap part to start building the soap message.
-      SOAPEnvelope envelope = sp.getEnvelope();
-
-      // Create a soap body from the envelope.
-      SOAPBody bdy = envelope.getBody();
-
-      // Add a soap body element
-      bdy.addBodyElement(envelope.createName(rpcMethodName, NS_PREFIX, NS_URI));
-
-      return msg;
-   }
-
-   private void addAttachmentPart(SOAPMessage msg, DataHandler dataHandler)
-   {
-      // Create the attachment part
-      AttachmentPart ap = msg.createAttachmentPart(dataHandler);
-      ap.setContentId(CID_MIMEPART);
-
-      // Add the attachments to the message.
-      msg.addAttachmentPart(ap);
-   }
-
-   /** Send the message and validate the result
-    */
-   private void sendAndValidateMimeMessage(String rpcMethodName, SOAPMessage msg, long count)
-      throws SOAPException, MalformedURLException
-   {
-      SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance();
-      SOAPConnection con = conFactory.createConnection();
-      msg.setProperty("org.jboss.webservice.timeout", "3600000");
-      SOAPMessage resMessage = con.call(msg, new URL("http://" + getServerHost() + ":8080/ws4ee-jbws801"));
-      SOAPBody soapBody = resMessage.getSOAPBody();
-      SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapBody.getParentElement();
-
-      Name rpcName = soapEnvelope.createName(rpcMethodName + "Response", NS_PREFIX, NS_URI);
-      Iterator childElements = soapBody.getChildElements(rpcName);
-      assertTrue("Expexted child: " + rpcName, childElements.hasNext());
-
-      SOAPElement bodyChild = (SOAPElement)childElements.next();
-      Name resName = soapEnvelope.createName("result");
-      SOAPElement resElement = (SOAPElement)bodyChild.getChildElements(resName).next();
-      String value = resElement.getValue();
-
-      assertEquals(count, Long.parseLong(value));
-   }
-}

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/JBWS801TestCase.java (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/main/org/jboss/test/webservice/jbws801/JBWS801TestCase.java)

Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachment.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachment.java	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachment.java	2006-09-27 23:16:18 UTC (rev 57247)
@@ -1,34 +0,0 @@
-/*
-  * 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.webservice.jbws801;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import javax.activation.DataHandler;
-import javax.xml.transform.Source;
-
-
-public interface LargeAttachment extends Remote
-{
-   long sendLargeFile() throws RemoteException;
-}

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachment.java (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachment.java)

Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachmentImpl.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachmentImpl.java	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachmentImpl.java	2006-09-27 23:16:18 UTC (rev 57247)
@@ -1,85 +0,0 @@
-/*
-  * 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.webservice.jbws801;
-
-import java.io.InputStream;
-import java.rmi.RemoteException;
-import java.util.Iterator;
-
-import javax.xml.rpc.ServiceException;
-import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-import javax.xml.soap.AttachmentPart;
-import javax.xml.soap.SOAPMessage;
-
-public class LargeAttachmentImpl implements LargeAttachment, ServiceLifecycle
-{
-   private ServletEndpointContext context;
-
-   public long sendLargeFile() throws RemoteException
-   {
-      
-      try {
-         Thread.sleep(5000);
-      } catch (Exception e) {}
-      long count = 0;
-      SOAPMessage message = ((SOAPMessageContext) context.getMessageContext()).getMessage();
-      try
-      {
-         byte[] buffer = new byte[1024];
-         for (Iterator iter = message.getAttachments(); iter.hasNext(); )
-         {
-            AttachmentPart part = (AttachmentPart) iter.next();
-
-            InputStream inputStream = part.getDataHandler().getInputStream();
-            int read = 0;
-            do
-            {
-               count += read;
-               read = inputStream.read(buffer);
-            }
-            while (read != -1);
-         }
-      }
-      catch (Exception e)
-      {
-         throw new RemoteException(e.getMessage());
-      }
-
-      System.out.println("[Size = " + count + "]");
-      return count;
-   }
-
-
-   // ServiceLifecycle *******************************************************************************************
-
-   public void init(Object context) throws ServiceException
-   {
-      this.context = (ServletEndpointContext)context;
-   }
-
-   public void destroy()
-   {
-      this.context = null;
-   }
-}

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachmentImpl.java (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/main/org/jboss/test/webservice/jbws801/LargeAttachmentImpl.java)

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801 (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801)

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF)

Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/jaxrpc-mapping.xml	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/jaxrpc-mapping.xml	2006-09-27 23:16:18 UTC (rev 57247)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee    http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
-  <package-mapping>
-    <package-type>org.jboss.webservice.jbws801</package-type>
-    <namespaceURI>http://org.jboss.webservice/jbws801</namespaceURI>
-  </package-mapping>
-  <service-interface-mapping>
-    <service-interface>org.jboss.webservice.jbws801.LargeAttachment_Service</service-interface>
-    <wsdl-service-name xmlns:serviceNS="http://org.jboss.webservice/jbws801">serviceNS:LargeAttachment</wsdl-service-name>
-    <port-mapping>
-      <port-name>LargeLargeAttachmentPort</port-name>
-      <java-port-name>LargeLargeAttachmentPort</java-port-name>
-    </port-mapping>
-  </service-interface-mapping>
-  <service-endpoint-interface-mapping>
-    <service-endpoint-interface>org.jboss.test.webservice.jbws801.LargeAttachment</service-endpoint-interface>
-    <wsdl-port-type xmlns:portTypeNS="http://org.jboss.webservice/jbws801">portTypeNS:LargeAttachment</wsdl-port-type>
-    <wsdl-binding xmlns:bindingNS="http://org.jboss.webservice/jbws801">bindingNS:LargeAttachmentBinding</wsdl-binding>
-    <service-endpoint-method-mapping>
-      <java-method-name>sendLargeFile</java-method-name>
-      <wsdl-operation>sendLargeFile</wsdl-operation>
-      <wsdl-return-value-mapping>
-        <method-return-value>long</method-return-value>
-        <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.webservice/jbws801">wsdlMsgNS:LargeAttachment_sendResponse</wsdl-message>
-        <wsdl-message-part-name>result</wsdl-message-part-name>
-      </wsdl-return-value-mapping>
-    </service-endpoint-method-mapping>
-  </service-endpoint-interface-mapping>
-</java-wsdl-mapping>

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/jaxrpc-mapping.xml (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/jaxrpc-mapping.xml)

Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/web.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/web.xml	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/web.xml	2006-09-27 23:16:18 UTC (rev 57247)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-  version="2.4">
-
-  <servlet>
-    <servlet-name>LargeAttachmentJSE</servlet-name>
-    <servlet-class>org.jboss.test.webservice.jbws801.LargeAttachmentImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>LargeAttachmentJSE</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-
-</web-app>
-

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/web.xml (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/web.xml)

Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/webservices.xml
===================================================================
--- branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/webservices.xml	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/webservices.xml	2006-09-27 23:16:18 UTC (rev 57247)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:impl="http://org.jboss.webservice/jbws801"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
-  version="1.1">
-
-  <webservice-description>
-    <webservice-description-name>LargeAttachmentService</webservice-description-name>
-    <wsdl-file>WEB-INF/wsdl/LargeAttachment.wsdl</wsdl-file>
-    <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
-    <port-component>
-      <port-component-name>LargeAttachmentPort</port-component-name>
-      <wsdl-port>impl:LargeAttachmentPort</wsdl-port>
-      <service-endpoint-interface>org.jboss.test.webservice.jbws801.LargeAttachment</service-endpoint-interface>
-      <service-impl-bean>
-        <servlet-link>LargeAttachmentJSE</servlet-link>
-      </service-impl-bean>
-    </port-component>
-  </webservice-description>
-</webservices>

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/webservices.xml (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/webservices.xml)

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl)

Deleted: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/LargeAttachment.wsdl
===================================================================
--- branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/LargeAttachment.wsdl	2006-09-27 22:45:53 UTC (rev 57246)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/LargeAttachment.wsdl	2006-09-27 23:16:18 UTC (rev 57247)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<definitions name="LargeAttachment" targetNamespace="http://org.jboss.webservice/jbws801"
-  xmlns:tns="http://org.jboss.webservice/jbws801" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/">
-  <types/>
-
-  <message name="LargeAttachment_sendLargeFile"/>
-  <message name="LargeAttachment_sendLargeFileResponse">
-    <part name="result" type="xsd:long"/>
-  </message>
-
-  <portType name="LargeAttachment">
-    <operation name="sendLargeFile">
-      <input message="tns:LargeAttachment_sendLargeFile"/>
-      <output message="tns:LargeAttachment_sendLargeFileResponse"/>
-    </operation>
-  </portType>
-
-  <binding name="LargeAttachmentBinding" type="tns:LargeAttachment">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-
-    <operation name="sendLargeFile">
-      <soap:operation soapAction=""/>
-      <input>
-       <soap:body part="message" use="literal" namespace="http://org.jboss.webservice/attachment"/>
-      </input>
-      <output>
-        <soap:body use="literal" namespace="http://org.jboss.webservice/attachment"/>
-      </output>
-    </operation>
-  </binding>
-
-  <service name="LargeAttachment">
-    <port name="LargeAttachmentPort" binding="tns:LargeAttachmentBinding">
-      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
-    </port>
-  </service>
-</definitions>

Copied: branches/JBoss_4_0_3_SP1_CP/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/LargeAttachment.wsdl (from rev 57246, branches/JBoss_4_0_3_SP1_JBWS-841/testsuite/src/resources/webservice/jbws801/WEB-INF/wsdl/LargeAttachment.wsdl)




More information about the jboss-cvs-commits mailing list