axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: xml-axis-wsif/java/test/faults FaultMsgTest.java
Date Wed, 10 Jul 2002 13:26:51 GMT
whitlock    2002/07/10 06:26:50

  Modified:    java/test/invocation DynamicInvokerTest.java
               java/test/async AsyncTests.java
               java/src/org/apache/wsif/compiler/schema/tools
                        Schema2Java.java Conventions.java
               java/src/org/apache/wsif/base WSIFClientProxy.java
                        WSIFServiceImpl.java
               java/test/stockquote StockquoteTest.java
               java/samples/stockquote/wsiftypes StockQuote.java
               java/src/org/apache/wsif/compiler MessageCompiler.java
               java/test/addressbook AddressBookTest.java
               java/src/org/apache/wsif/compiler/util StreamFactory.java
                        Utils.java
               java/samples/addressbook/wsiftypes AddressBook.java
               java/src/org/apache/wsif/util WSIFUtils.java
               java/test/inout InoutTest.java
               java/test/performance SpeedTest.java
               java/src/org/apache/wsif WSIFConstants.java
               java/test/faults FaultMsgTest.java
  Log:
  Remove soap dependency from the framework
  
  Revision  Changes    Path
  1.3       +9 -6      xml-axis-wsif/java/test/invocation/DynamicInvokerTest.java
  
  Index: DynamicInvokerTest.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/invocation/DynamicInvokerTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DynamicInvokerTest.java	21 Jun 2002 11:12:10 -0000	1.2
  +++ DynamicInvokerTest.java	10 Jul 2002 13:26:49 -0000	1.3
  @@ -107,19 +107,22 @@
           doit("JavaPort", "java");
       }
       public void testSoapJms() {
  -        if (TestUtilities.areWeTesting("jms"))
  -            doit("SOAPJMSPort", "soap");
  +        doit("SOAPJMSPort", "soap");
       }
       public void testAxisJms() {
  -        if (TestUtilities.areWeTesting("jms"))
  -            doit("SOAPJMSPort", "axis");
  +        doit("SOAPJMSPort", "axis");
       }
       public void testNativeJms() {
  -        if (TestUtilities.areWeTesting("jms"))
  -            doit("NativeJmsPort", "");
  +        doit("NativeJmsPort", "");
       }
   
       private void doit(String portName, String protocol) {
  +        if (portName != null
  +            && portName.toUpperCase().indexOf("JMS") != -1
  +            && !TestUtilities.areWeTesting("jms")) {
  +            return;
  +        }
  +
           try {
               HashMap map =
                   DynamicInvoker.invokeMethod(
  
  
  
  1.7       +3 -2      xml-axis-wsif/java/test/async/AsyncTests.java
  
  Index: AsyncTests.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/async/AsyncTests.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AsyncTests.java	24 Jun 2002 16:15:28 -0000	1.6
  +++ AsyncTests.java	10 Jul 2002 13:26:49 -0000	1.7
  @@ -154,8 +154,9 @@
      * Query Stockquote sample
      */
     public void doitStockquote(String portName, String protocol) {
  -    if ( portName.indexOf( "JMS" ) != -1 && !TestUtilities.areWeTesting("jms")
) { 
  -       return;
  +    if (portName.toUpperCase().indexOf("JMS") != -1
  +        && !TestUtilities.areWeTesting("jms")) {
  +        return;
       }
   
       if ( protocol.equals("axis") ) {
  
  
  
  1.6       +14 -14    xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Schema2Java.java
  
  Index: Schema2Java.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Schema2Java.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Schema2Java.java	9 Jul 2002 10:37:12 -0000	1.5
  +++ Schema2Java.java	10 Jul 2002 13:26:49 -0000	1.6
  @@ -72,8 +72,8 @@
   
   import javax.xml.namespace.QName;
   
  -import org.apache.soap.Constants;
  -import org.apache.soap.util.xml.DOMUtils;
  +import com.ibm.wsdl.util.xml.DOMUtils;
  +import org.apache.wsif.WSIFConstants;
   import org.apache.wsif.compiler.schema.SchemaException;
   import org.apache.wsif.compiler.util.StreamFactory;
   import org.apache.wsif.compiler.util.TypeMapping;
  @@ -119,24 +119,24 @@
   
           // SOAP encoding simple types
           registry.put(
  -            new QName(Constants.NS_URI_SOAP_ENC, "string"),
  +            new QName(WSIFConstants.NS_URI_SOAP_ENC, "string"),
               "java.lang.String");
           registry.put(
  -            new QName(Constants.NS_URI_SOAP_ENC, "integer"),
  +            new QName(WSIFConstants.NS_URI_SOAP_ENC, "integer"),
               "java.lang.Integer");
           registry.put(
  -            new QName(Constants.NS_URI_SOAP_ENC, "boolean"),
  +            new QName(WSIFConstants.NS_URI_SOAP_ENC, "boolean"),
               "boolean");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "float"), "float");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "double"), "double");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "binary"), "byte[]");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "long"), "long");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "int"), "int");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "short"), "short");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "byte"), "byte");
  -        registry.put(new QName(Constants.NS_URI_SOAP_ENC, "void"), "void");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "float"), "float");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "double"), "double");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "binary"), "byte[]");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "long"), "long");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "int"), "int");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "short"), "short");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "byte"), "byte");
  +        registry.put(new QName(WSIFConstants.NS_URI_SOAP_ENC, "void"), "void");
           registry.put(
  -            new QName(Constants.NS_URI_SOAP_ENC, "ur-type"),
  +            new QName(WSIFConstants.NS_URI_SOAP_ENC, "ur-type"),
               "java.lang.Object");
       }
   
  
  
  
  1.2       +1 -1      xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Conventions.java
  
  Index: Conventions.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/schema/tools/Conventions.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Conventions.java	6 Jun 2002 08:28:49 -0000	1.1
  +++ Conventions.java	10 Jul 2002 13:26:50 -0000	1.2
  @@ -61,7 +61,7 @@
   import java.util.Hashtable;
   import java.util.StringTokenizer;
   
  -import org.apache.soap.util.xml.DOMUtils;
  +import com.ibm.wsdl.util.xml.DOMUtils;
   import org.w3c.dom.Element;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
  
  
  
  1.2       +0 -1      xml-axis-wsif/java/src/org/apache/wsif/base/WSIFClientProxy.java
  
  Index: WSIFClientProxy.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFClientProxy.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WSIFClientProxy.java	9 Jul 2002 13:53:05 -0000	1.1
  +++ WSIFClientProxy.java	10 Jul 2002 13:26:50 -0000	1.2
  @@ -73,7 +73,6 @@
   import javax.wsdl.PortType;
   import javax.xml.namespace.QName;
   
  -import org.apache.soap.Constants;
   import org.apache.wsif.WSIFException;
   import org.apache.wsif.WSIFMessage;
   import org.apache.wsif.WSIFOperation;
  
  
  
  1.9       +10 -11    xml-axis-wsif/java/src/org/apache/wsif/base/WSIFServiceImpl.java
  
  Index: WSIFServiceImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFServiceImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WSIFServiceImpl.java	10 Jul 2002 09:54:57 -0000	1.8
  +++ WSIFServiceImpl.java	10 Jul 2002 13:26:50 -0000	1.9
  @@ -88,7 +88,6 @@
   import javax.wsdl.extensions.UnknownExtensionSerializer;
   import javax.xml.namespace.QName;
   
  -import org.apache.soap.Constants;
   import org.apache.wsif.WSIFConstants;
   import org.apache.wsif.WSIFException;
   import org.apache.wsif.WSIFMessageFactory;
  @@ -1030,9 +1029,9 @@
                   TypeMapping tm = (TypeMapping) typeMappingIterator.next();
                   if (tm != null) {
                       String namespaceURI = tm.elementType.getNamespaceURI();
  -                    if (!namespaceURI.equals(Constants.NS_URI_1999_SCHEMA_XSD)
  -                        && !namespaceURI.equals(Constants.NS_URI_2000_SCHEMA_XSD)
  -                        && !namespaceURI.equals(Constants.NS_URI_2001_SCHEMA_XSD))
{
  +                    if (!namespaceURI.equals(WSIFConstants.NS_URI_1999_SCHEMA_XSD)
  +                        && !namespaceURI.equals(WSIFConstants.NS_URI_2000_SCHEMA_XSD)
  +                        && !namespaceURI.equals(WSIFConstants.NS_URI_2001_SCHEMA_XSD))
{
                           QName element = tm.elementType;
                           if (element != null) {
                               types.add(element);
  @@ -1052,13 +1051,13 @@
           HashMap typeReg = new HashMap();
           List typesElList = Utils.getAllTypesElements(def);
           if (typesElList.size() > 0) {
  -            String schemaURI1999 = Constants.NS_URI_1999_SCHEMA_XSD;
  +            String schemaURI1999 = WSIFConstants.NS_URI_1999_SCHEMA_XSD;
               Schema2Java s2j1999 = new Schema2Java(schemaURI1999);
               QName qElemSchema1999 = new QName(schemaURI1999, "schema");
  -            String schemaURI2000 = Constants.NS_URI_2000_SCHEMA_XSD;
  +            String schemaURI2000 = WSIFConstants.NS_URI_2000_SCHEMA_XSD;
               Schema2Java s2j2000 = new Schema2Java(schemaURI2000);
               QName qElemSchema2000 = new QName(schemaURI2000, "schema");
  -            String schemaURI2001 = Constants.NS_URI_2001_SCHEMA_XSD;
  +            String schemaURI2001 = WSIFConstants.NS_URI_2001_SCHEMA_XSD;
               Schema2Java s2j2001 = new Schema2Java(schemaURI2001);
               QName qElemSchema2001 = new QName(schemaURI2001, "schema");
   
  @@ -1100,10 +1099,10 @@
                   if (tm.elementType != null && tm.elementType.getNamespaceURI()
!= null) {
                       String namespaceURI = tm.elementType.getNamespaceURI();
                       if (namespaceURI != null
  -                        && !namespaceURI.equals(Constants.NS_URI_1999_SCHEMA_XSD)
  -                        && !namespaceURI.equals(Constants.NS_URI_2000_SCHEMA_XSD)
  -                        && !namespaceURI.equals(Constants.NS_URI_2001_SCHEMA_XSD)
  -                        && !namespaceURI.equals(Constants.NS_URI_SOAP_ENC)
  +                        && !namespaceURI.equals(WSIFConstants.NS_URI_1999_SCHEMA_XSD)
  +                        && !namespaceURI.equals(WSIFConstants.NS_URI_2000_SCHEMA_XSD)
  +                        && !namespaceURI.equals(WSIFConstants.NS_URI_2001_SCHEMA_XSD)
  +                        && !namespaceURI.equals(WSIFConstants.NS_URI_SOAP_ENC)
                           && tm.javaType != null) {
                           String packageName = Utils.getPackageName(tm.javaType);
                           if (packageName != null && !packageName.equals("")) {
  
  
  
  1.5       +2 -1      xml-axis-wsif/java/test/stockquote/StockquoteTest.java
  
  Index: StockquoteTest.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/stockquote/StockquoteTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StockquoteTest.java	21 Jun 2002 11:12:09 -0000	1.4
  +++ StockquoteTest.java	10 Jul 2002 13:26:50 -0000	1.5
  @@ -115,7 +115,8 @@
       }
   
       private void doit(String portName, String protocol) {
  -        if (portName.indexOf("JMS") != -1 && !TestUtilities.areWeTesting("jms"))
  +        if (portName.toUpperCase().indexOf("JMS") != -1
  +            && !TestUtilities.areWeTesting("jms"))
               return;
   
           if (protocol.equals("axis")) {
  
  
  
  1.2       +0 -1      xml-axis-wsif/java/samples/stockquote/wsiftypes/StockQuote.java
  
  Index: StockQuote.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/samples/stockquote/wsiftypes/StockQuote.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StockQuote.java	6 Jun 2002 08:28:47 -0000	1.1
  +++ StockQuote.java	10 Jul 2002 13:26:50 -0000	1.2
  @@ -62,7 +62,6 @@
   import org.w3c.dom.*;
   import org.xml.sax.*;
   import javax.xml.parsers.*;
  -import org.apache.soap.util.xml.*;
   
   
   /**
  
  
  
  1.4       +2 -2      xml-axis-wsif/java/src/org/apache/wsif/compiler/MessageCompiler.java
  
  Index: MessageCompiler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/MessageCompiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MessageCompiler.java	24 Jun 2002 13:11:20 -0000	1.3
  +++ MessageCompiler.java	10 Jul 2002 13:26:50 -0000	1.4
  @@ -76,7 +76,7 @@
   import javax.wsdl.xml.WSDLReader;
   import javax.xml.namespace.QName;
   
  -import org.apache.soap.Constants;
  +import org.apache.wsif.WSIFConstants;
   import org.apache.wsif.WSIFException;
   import org.apache.wsif.wsdl.WSIFWSDLFactoryImpl;
   
  @@ -123,7 +123,7 @@
               "double",
               "Object" };
   
  -    private static final String SCHEMA_URI = Constants.NS_URI_1999_SCHEMA_XSD;
  +    private static final String SCHEMA_URI = WSIFConstants.NS_URI_1999_SCHEMA_XSD;
   
       /**
        * This creates a Java class source file for each message
  
  
  
  1.10      +2 -1      xml-axis-wsif/java/test/addressbook/AddressBookTest.java
  
  Index: AddressBookTest.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/addressbook/AddressBookTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AddressBookTest.java	1 Jul 2002 08:46:24 -0000	1.9
  +++ AddressBookTest.java	10 Jul 2002 13:26:50 -0000	1.10
  @@ -164,7 +164,8 @@
       }
   
       private void doit(String portName, String protocol) {
  -        if (portName.indexOf("JMS") != -1 && !TestUtilities.areWeTesting("jms"))
  +        if (portName.toUpperCase().indexOf("JMS") != -1
  +            && !TestUtilities.areWeTesting("jms"))
               return;
   
           if (protocol.equals("axis")) {
  
  
  
  1.2       +39 -2     xml-axis-wsif/java/src/org/apache/wsif/compiler/util/StreamFactory.java
  
  Index: StreamFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/util/StreamFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StreamFactory.java	6 Jun 2002 08:28:50 -0000	1.1
  +++ StreamFactory.java	10 Jul 2002 13:26:50 -0000	1.2
  @@ -64,8 +64,8 @@
   import java.io.InputStream;
   import java.io.OutputStream;
   import java.net.URL;
  +import java.net.MalformedURLException;
   
  -import org.apache.soap.util.StringUtils;
   import org.apache.wsif.WSIFException;
   import org.apache.wsif.compiler.schema.tools.Conventions;
   
  @@ -130,7 +130,7 @@
           Object content = null;
   
           try {
  -            url = StringUtils.getURL(null, fileName);
  +            url = getURL(null, fileName, 1);
               content = url.getContent();
           } catch (SecurityException e) {
               throw new IOException(
  @@ -149,5 +149,42 @@
           } else {
               throw new IOException("The content of '" + fileName + "' is not a stream.");
           }
  +    }
  +
  +    private static URL getURL(URL contextURL, String spec, int recursiveDepth)
  +        throws MalformedURLException {
  +        URL url = null;
  +    
  +        try {
  +            url = new URL(contextURL, spec);
  +    
  +            try {
  +                url.openStream();
  +            } catch (IOException ioe1) {
  +                throw new MalformedURLException("This file was not found: " + url);
  +            }
  +        } catch (MalformedURLException e1) {
  +            url = new URL("file", "", spec);
  +    
  +            try {
  +                url.openStream();
  +            } catch (IOException ioe2) {
  +                if (contextURL != null) {
  +                    String contextFileName = contextURL.getFile();
  +                    String parentName = new File(contextFileName).getParent();
  +    
  +                    if (parentName != null && recursiveDepth < 3) {
  +                        return getURL(
  +                            new URL("file", "", parentName + '/'),
  +                            spec,
  +                            recursiveDepth + 1);
  +                    }
  +                }
  +    
  +                throw new MalformedURLException("This file was not found: " + url);
  +            }
  +        }
  +    
  +        return url;
       }
   }
  
  
  
  1.3       +2 -2      xml-axis-wsif/java/src/org/apache/wsif/compiler/util/Utils.java
  
  Index: Utils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/compiler/util/Utils.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Utils.java	24 Jun 2002 13:11:17 -0000	1.2
  +++ Utils.java	10 Jul 2002 13:26:50 -0000	1.3
  @@ -73,7 +73,7 @@
   import javax.wsdl.extensions.UnknownExtensibilityElement;
   import javax.xml.namespace.QName;
   
  -import org.apache.soap.Constants;
  +import org.apache.wsif.WSIFConstants;
   import org.apache.wsif.WSIFException;
   
   import com.ibm.wsdl.util.StringUtils;
  @@ -167,7 +167,7 @@
               return tm.javaType;
           } else if (
               encodingStyleURI != null
  -                && encodingStyleURI.equals(Constants.NS_URI_LITERAL_XML)) {
  +                && encodingStyleURI.equals(WSIFConstants.NS_URI_LITERAL_XML)) {
               return "org.w3c.dom.Element";
           } else {
               throw new IllegalArgumentException("No mapping was found for '" + type + "'.");
  
  
  
  1.2       +0 -1      xml-axis-wsif/java/samples/addressbook/wsiftypes/AddressBook.java
  
  Index: AddressBook.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/samples/addressbook/wsiftypes/AddressBook.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AddressBook.java	6 Jun 2002 08:28:46 -0000	1.1
  +++ AddressBook.java	10 Jul 2002 13:26:50 -0000	1.2
  @@ -60,7 +60,6 @@
   import java.util.*;
   import org.w3c.dom.*;
   import javax.xml.parsers.*;
  -import org.apache.soap.util.xml.*;
   
   import addressbook.wsiftypes.*;
   
  
  
  
  1.8       +3 -3      xml-axis-wsif/java/src/org/apache/wsif/util/WSIFUtils.java
  
  Index: WSIFUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/WSIFUtils.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WSIFUtils.java	26 Jun 2002 14:08:52 -0000	1.7
  +++ WSIFUtils.java	10 Jul 2002 13:26:50 -0000	1.8
  @@ -797,11 +797,11 @@
       public static void createSimpleTypesMap() {
           synchronized (simpleTypesMapCreated) {
               if (!simpleTypesMapCreated.booleanValue()) {
  -                new Schema2Java(org.apache.soap.Constants.NS_URI_1999_SCHEMA_XSD).getRegistry(
  +                new Schema2Java(WSIFConstants.NS_URI_1999_SCHEMA_XSD).getRegistry(
                       simpleTypesMap);
  -                new Schema2Java(org.apache.soap.Constants.NS_URI_2000_SCHEMA_XSD).getRegistry(
  +                new Schema2Java(WSIFConstants.NS_URI_2000_SCHEMA_XSD).getRegistry(
                       simpleTypesMap);
  -                new Schema2Java(org.apache.soap.Constants.NS_URI_2001_SCHEMA_XSD).getRegistry(
  +                new Schema2Java(WSIFConstants.NS_URI_2001_SCHEMA_XSD).getRegistry(
                       simpleTypesMap);
                   simpleTypesMapCreated = new Boolean(true);
               }
  
  
  
  1.7       +9 -5      xml-axis-wsif/java/test/inout/InoutTest.java
  
  Index: InoutTest.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/inout/InoutTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- InoutTest.java	24 Jun 2002 13:11:20 -0000	1.6
  +++ InoutTest.java	10 Jul 2002 13:26:50 -0000	1.7
  @@ -268,7 +268,8 @@
       }
   
       private void doit(String portName, String protocol, String style, String cmd) {
  -        if (portName.indexOf("JMS") != -1 && !TestUtilities.areWeTesting("jms"))
  +        if (portName.toUpperCase().indexOf("JMS") != -1
  +            && !TestUtilities.areWeTesting("jms"))
               return;
   
           if (protocol.equals(SOAP)) {
  @@ -291,10 +292,13 @@
   
           try {
               WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
  -                WSIFService service = factory.getService(wsdlLocation, null, // serviceNS
  -        null, // serviceName
  -        "http://wsifservice.inout/", // portTypeNS
  -    "Inout"); // portTypeName
  +            WSIFService service =
  +                factory.getService(
  +                    wsdlLocation,
  +                    null,
  +                    null,
  +                    "http://wsifservice.inout/",
  +                    "Inout");
   
               service.mapType(
                   new QName("http://wsiftypes.inout/", "arrayofint"),
  
  
  
  1.3       +2 -1      xml-axis-wsif/java/test/performance/SpeedTest.java
  
  Index: SpeedTest.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/performance/SpeedTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SpeedTest.java	9 Jul 2002 12:11:15 -0000	1.2
  +++ SpeedTest.java	10 Jul 2002 13:26:50 -0000	1.3
  @@ -206,7 +206,8 @@
           String testName;
           String testNamePrefix = protocol + "." + portName;
   
  -        if (portName.indexOf("JMS") != -1 && !TestUtilities.areWeTesting("jms"))
  +        if (portName.toUpperCase().indexOf("JMS") != -1
  +            && !TestUtilities.areWeTesting("jms"))
               return;
   
           if (protocol.equals("axis")) {
  
  
  
  1.8       +15 -0     xml-axis-wsif/java/src/org/apache/wsif/WSIFConstants.java
  
  Index: WSIFConstants.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFConstants.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WSIFConstants.java	9 Jul 2002 12:02:33 -0000	1.7
  +++ WSIFConstants.java	10 Jul 2002 13:26:50 -0000	1.8
  @@ -160,4 +160,19 @@
       public static final String JMS_PROP_OUTPUT_NAME =
           "WSIF_OUTPUT_NAME";
   
  +    public static final String NS_URI_1999_SCHEMA_XSD = 
  +        "http://www.w3.org/1999/XMLSchema";
  +        
  +    public static final String NS_URI_2000_SCHEMA_XSD = 
  +        "http://www.w3.org/2000/10/XMLSchema";
  +        
  +    public static final String NS_URI_2001_SCHEMA_XSD = 
  +        "http://www.w3.org/2001/XMLSchema";
  +        
  +    public static final String NS_URI_SOAP_ENC = 
  +        "http://schemas.xmlsoap.org/soap/encoding/";
  +        
  +    public static final String NS_URI_LITERAL_XML = 
  +        "http://xml.apache.org/xml-soap/literalxml";
  +        
   }
  
  
  
  1.5       +8 -8      xml-axis-wsif/java/test/faults/FaultMsgTest.java
  
  Index: FaultMsgTest.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/test/faults/FaultMsgTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FaultMsgTest.java	25 Jun 2002 11:04:40 -0000	1.4
  +++ FaultMsgTest.java	10 Jul 2002 13:26:50 -0000	1.5
  @@ -65,7 +65,7 @@
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   import junit.textui.TestRunner;
  -import org.apache.axis.AxisFault;
  +//import org.apache.axis.AxisFault;
   import org.apache.wsif.WSIFConstants;
   import org.apache.wsif.WSIFMessage;
   import org.apache.wsif.WSIFOperation;
  @@ -199,13 +199,13 @@
               Object fobject = fault1.getObjectPart(WSIFConstants.SOAP_FAULT_OBJECT);
   
               assertEquals("fault message name", WSIFConstants.SOAP_FAULT_MSG_NAME, name);
  -            if ("axis".equals(protocol)) {
  -                assertTrue("fault obj type", fobject instanceof org.apache.axis.AxisFault);
  -                System.out.println( "AxisFault=" + fobject );
  -            } else {
  -                assertTrue("fault obj type", fobject instanceof org.apache.soap.Fault);
  -                System.out.println( "SOAPFault=" + fobject );
  -            }
  +//            if ("axis".equals(protocol)) {
  +//                assertTrue("fault obj type", fobject instanceof org.apache.axis.AxisFault);
  +//                System.out.println( "AxisFault=" + fobject );
  +//            } else {
  +//                assertTrue("fault obj type", fobject instanceof org.apache.soap.Fault);
  +//                System.out.println( "SOAPFault=" + fobject );
  +//            }
   
               // now a call where the remote service returns a fault;
               //  doesn't seem any diff?
  
  
  

Mime
View raw message