axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r165296 [2/2] - in /webservices/axis/trunk/java/modules: core/html/ core/samples/deployment/OutService/org/apache/axis/services/ core/samples/deployment/service1/org/apache/axis/sample/echo/ core/src/org/apache/axis/engine/ core/src/org/apache/axis/handlers/addressing/ core/src/org/apache/axis/receivers/ core/src/org/apache/axis/transport/http/ core/src/org/apache/axis/transport/mail/ core/test/org/apache/axis/engine/ core/test/org/apache/axis/handlers/addressing/ core/test/org/apache/axis/handlers/util/ samples/src/encoding/sample1/ samples/src/encoding/sample2/benchMark/ samples/src/interop/doclit/ samples/src/org/apache/axis/testUtils/ samples/src/userguide/sample1/ samples/test/org/apache/axis/encoding/ samples/test/org/apache/axis/engine/ samples/test/org/apache/axis/integration/ samples/test/org/apache/axis/om/builder/ xml/src/org/apache/axis/om/ xml/src/org/apache/axis/om/impl/llom/ xml/src/org/apache/axis/om/impl/llom/builder/ xml/src/org/apache/axis/om/impl/llom/factory/ xml/test/org/apache/axis/om/ xml/test/org/apache/axis/om/factory/ xml/test/org/apache/axis/om/impl/builder/ xml/test/org/apache/axis/om/impl/serializer/ xml/test/org/apache/axis/om/impl/streamwrapper/
Date Fri, 29 Apr 2005 11:38:29 GMT
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMLinkedListImplFactory.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMLinkedListImplFactory.java
(original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMLinkedListImplFactory.java
Fri Apr 29 04:38:28 2005
@@ -35,7 +35,7 @@
 /**
  * Class OMLinkedListImplFactory
  */
-public class OMLinkedListImplFactory extends OMFactory {
+public class OMLinkedListImplFactory implements OMFactory {
     /**
      * Field MAX_TO_POOL
      */
@@ -133,140 +133,5 @@
         return textNode;
     }
 
-    /**
-     * Method createSOAPBody
-     *
-     * @param envelope
-     * @return
-     */
-    public SOAPBody createSOAPBody(SOAPEnvelope envelope) {
-        SOAPBody soapBody = new SOAPBodyImpl(envelope);
-        return soapBody;
-    }
 
-    /**
-     * Method createSOAPBody
-     *
-     * @param envelope
-     * @param builder
-     * @return
-     */
-    public SOAPBody createSOAPBody(SOAPEnvelope envelope,
-                                   OMXMLParserWrapper builder) {
-        return new SOAPBodyImpl(envelope, builder);
-    }
-
-    /**
-     * Method createSOAPEnvelope
-     *
-     * @param ns
-     * @param builder
-     * @return
-     */
-    public SOAPEnvelope createSOAPEnvelope(OMNamespace ns,
-                                           OMXMLParserWrapper builder) {
-        return new SOAPEnvelopeImpl(ns, builder);
-    }
-
-    /**
-     * Method createSOAPEnvelope
-     *
-     * @param ns
-     * @return
-     */
-    public SOAPEnvelope createSOAPEnvelope(OMNamespace ns) {
-        return new SOAPEnvelopeImpl(ns);
-    }
-
-    /**
-     * Method createSOAPHeader
-     *
-     * @param envelope
-     * @return
-     */
-    public SOAPHeader createSOAPHeader(SOAPEnvelope envelope) {
-        return new SOAPHeaderImpl(envelope);
-    }
-
-    /**
-     * Method createSOAPHeader
-     *
-     * @param envelope
-     * @param builder
-     * @return
-     */
-    public SOAPHeader createSOAPHeader(SOAPEnvelope envelope,
-                                       OMXMLParserWrapper builder) {
-        return new SOAPHeaderImpl(envelope, builder);
-    }
-
-    /**
-     * Method createSOAPHeaderBlock
-     *
-     * @param localName
-     * @param ns
-     * @return
-     */
-    public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
-                                                 OMNamespace ns) {
-        return new SOAPHeaderBlockImpl(localName, ns);
-    }
-
-    /**
-     * Method createSOAPHeaderBlock
-     *
-     * @param localName
-     * @param ns
-     * @param parent
-     * @param builder
-     * @return
-     */
-    public SOAPHeaderBlock createSOAPHeaderBlock(String localName,
-                                                 OMNamespace ns, OMElement parent, OMXMLParserWrapper
builder) {
-        return new SOAPHeaderBlockImpl(localName, ns, parent, builder);
-    }
-
-    /**
-     * Method createSOAPFault
-     *
-     * @param parent
-     * @param e
-     * @return
-     */
-    public SOAPFault createSOAPFault(SOAPBody parent, Exception e) {
-        return new SOAPFaultImpl(parent, e);
-    }
-
-    /**
-     * Method createSOAPFault
-     *
-     * @param ns
-     * @param parent
-     * @param builder
-     * @return
-     */
-    public SOAPFault createSOAPFault(OMNamespace ns, SOAPBody parent,
-                                     OMXMLParserWrapper builder) {
-        return new SOAPFaultImpl(ns, parent, builder);
-    }
-
-    /**
-     * Method getDefaultEnvelope
-     *
-     * @return
-     */
-    public SOAPEnvelope getDefaultEnvelope() {
-        // Create an envelope
-        OMNamespace ns =
-        new OMNamespaceImpl(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
-                SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
-        SOAPEnvelopeImpl env = new SOAPEnvelopeImpl(ns);
-        SOAPBodyImpl bodyImpl = new SOAPBodyImpl(env);
-        env.addChild(bodyImpl);
-
-        SOAPHeaderImpl headerImpl = new SOAPHeaderImpl(env);
-        headerImpl.setComplete(true);
-        env.addChild(headerImpl);
-        return env;
-    }
 }

Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java
(original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java
Fri Apr 29 04:38:28 2005
@@ -16,6 +16,7 @@
 package org.apache.axis.om.impl.llom.factory;
 
 import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPFactory;
 import org.apache.axis.om.impl.llom.builder.StAXOMBuilder;
 import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
 
@@ -48,13 +49,13 @@
     /**
      * Method createStAXSOAPModelBuilder
      *
-     * @param ombuilderFactory
+     * @param soapFactory
      * @param parser
      * @return
      */
     public static StAXSOAPModelBuilder createStAXSOAPModelBuilder(
-            OMFactory ombuilderFactory, XMLStreamReader parser) {
-        return new StAXSOAPModelBuilder(ombuilderFactory, parser);
+            SOAPFactory soapFactory, XMLStreamReader parser) {
+        return new StAXSOAPModelBuilder(soapFactory, parser);
     }
 
     /**

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java Fri Apr
29 04:38:28 2005
@@ -35,7 +35,7 @@
      */
     public void testAddFault() {
         System.out.println("Adding SOAP fault to body ....");
-        soapBody.addChild(ombuilderFactory.createSOAPFault(soapBody, new Exception("Testing
soap fault")));
+        soapBody.addChild(soapFactory.createSOAPFault(soapBody, new Exception("Testing soap
fault")));
         System.out.println("\t checking for SOAP Fault ...");
         assertTrue("SOAP body has no SOAP fault", soapBody.hasFault());
         System.out.println("\t checking for not-nullity ...");

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMEnvelopeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMEnvelopeTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMEnvelopeTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMEnvelopeTest.java Fri
Apr 29 04:38:28 2005
@@ -49,7 +49,7 @@
     }
 
     public void testDefaultEnveleope() {
-        SOAPEnvelope env = OMFactory.newInstance().getDefaultEnvelope();
+        SOAPEnvelope env = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
         assertNotNull(env);
         assertNotNull("Header should not be null", env.getHeader());
         assertNotNull("Body should not be null", env.getBody());

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java Fri
Apr 29 04:38:28 2005
@@ -40,7 +40,7 @@
     protected void setUp() throws Exception {
         XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().
                         createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage1.xml")));
-        OMFactory factory = OMFactory.newInstance();
+        SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
         builder = new StAXSOAPModelBuilder(factory, xmlStreamReader);
         envelope = (SOAPEnvelope) builder.getDocumentElement();
         tempFile = File.createTempFile("temp", "xml");

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java Fri Apr 29
04:38:28 2005
@@ -29,7 +29,7 @@
  */
 public class OMTest extends AbstractTestCase {
     private SOAPEnvelope envelope;
-    private OMFactory fac;
+    private SOAPFactory fac;
 
     /**
      * Constructor.
@@ -41,7 +41,7 @@
     protected void setUp() throws Exception {
         File file = getTestResourceFile("soap/sample1.xml");
         XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new
FileReader(file));
-        fac = OMFactory.newInstance();
+        fac = OMAbstractFactory.getSOAP11Factory();
         OMXMLParserWrapper builder = new StAXSOAPModelBuilder(fac, parser);
         envelope = (SOAPEnvelope) builder.getDocumentElement();
     }

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java Fri Apr
29 04:38:28 2005
@@ -31,12 +31,14 @@
     protected static final String IN_FILE_NAME = "soap/soapmessage.xml";
     protected StAXSOAPModelBuilder builder;
     protected OMFactory ombuilderFactory;
+    protected SOAPFactory soapFactory;
 
     protected SOAPEnvelope soapEnvelope;
 
     public OMTestCase(String testName) {
         super(testName);
-        ombuilderFactory = OMFactory.newInstance();
+        ombuilderFactory = OMAbstractFactory.getOMFactory();
+        soapFactory = OMAbstractFactory.getSOAP11Factory();
     }
 
     protected void setUp() throws Exception {
@@ -49,13 +51,13 @@
             fileName = IN_FILE_NAME;
         }
         XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new
FileReader(getTestResourceFile(fileName)));
-        builder = new StAXSOAPModelBuilder(OMFactory.newInstance(), parser);
+        builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), parser);
         return builder;
     }
 
     protected StAXSOAPModelBuilder getOMBuilder(InputStream in) throws Exception {
         XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(in);
-        builder = new StAXSOAPModelBuilder(OMFactory.newInstance(), parser);
+        builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), parser);
         return builder;
     }
 

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestUtils.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestUtils.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestUtils.java Fri Apr
29 04:38:28 2005
@@ -34,7 +34,7 @@
 public class OMTestUtils {
     public static OMXMLParserWrapper getOMBuilder(File file) throws Exception {
         XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new
FileReader(file));
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
parser);
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
parser);
         return builder;
     }
 

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java Fri
Apr 29 04:38:28 2005
@@ -40,7 +40,7 @@
     public void testSOAPFault() throws Exception {
 //        soapEnvelope = (SOAPEnvelope) OMTestUtils.getOMBuilder(getTestResourceFile("soap/minimalMessage.xml")).getDocumentElement();
 //        SOAPBody soapBody = soapEnvelope.getBody();
-//        SOAPFault soapFault = OMFactory.newInstance().createSOAPFault(soapBody, new Exception("Something
has gone wrong som where !!"));
+//        SOAPFault soapFault = OMAbstractFactory.getSOAP11Factory().createSOAPFault(soapBody,
new Exception("Something has gone wrong som where !!"));
 //        soapBody.addFault(soapFault);
 //        soapFault.setCode(null);
 //        assertEquals("faultcode returned is incorrect", soapFault.getCode().getLocalName(),
"Axis");

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java Fri
Apr 29 04:38:28 2005
@@ -45,11 +45,11 @@
         //make the parsers
         parser1 = XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlDocument.getBytes()));
 
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(OMFactory.newInstance(),
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getSOAP11Factory(),
                 XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlDocument.getBytes())));
         parser2 = builder.getDocumentElement().getXMLStreamReaderWithoutCaching();
 
-        OMXMLParserWrapper builder2 = OMXMLBuilderFactory.createStAXOMBuilder(OMFactory.newInstance(),
+        OMXMLParserWrapper builder2 = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getSOAP11Factory(),
                 XMLInputFactory.newInstance().createXMLStreamReader(new ByteArrayInputStream(xmlDocument.getBytes())));
         parser3 = builder2.getDocumentElement().getXMLStreamReader();
 

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
(original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
Fri Apr 29 04:38:28 2005
@@ -15,18 +15,7 @@
  */
 package org.apache.axis.om.factory;
 
-import org.apache.axis.om.AbstractTestCase;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.OMTestUtils;
-import org.apache.axis.om.OMText;
-import org.apache.axis.om.OMXMLParserWrapper;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.SOAPFault;
-import org.apache.axis.om.SOAPHeader;
-import org.apache.axis.om.SOAPHeaderBlock;
+import org.apache.axis.om.*;
 import org.apache.axis.om.impl.llom.SOAPConstants;
 import org.apache.axis.om.impl.llom.soap11.SOAP11Constants;
 
@@ -41,14 +30,14 @@
         super(testName);
     }
 
-    OMFactory omFactory;
+   SOAPFactory omFactory;
     OMNamespace namespace;
     String nsUri = "http://www.apache.org/~chinthaka";
     String nsPrefix = "myhome";
 
     protected void setUp() throws Exception {
         super.setUp();
-        omFactory = OMFactory.newInstance();
+        omFactory = OMAbstractFactory.getSOAP11Factory();
         namespace = omFactory.createOMNamespace(nsUri, nsPrefix);
     }
 

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/builder/StAXOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/builder/StAXOMBuilderTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/builder/StAXOMBuilderTest.java
(original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/builder/StAXOMBuilderTest.java
Fri Apr 29 04:38:28 2005
@@ -20,11 +20,7 @@
 
 import javax.xml.stream.XMLInputFactory;
 
-import org.apache.axis.om.AbstractTestCase;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNode;
-import org.apache.axis.om.OMText;
+import org.apache.axis.om.*;
 import org.apache.axis.om.impl.llom.builder.StAXOMBuilder;
 import org.apache.axis.om.impl.llom.factory.OMXMLBuilderFactory;
 
@@ -42,7 +38,7 @@
 
     protected void setUp() throws Exception {
         testFile = new FileReader(getTestResourceFile("non_soap.xml"));
-        stAXOMBuilder = OMXMLBuilderFactory.createStAXOMBuilder(OMFactory.newInstance(),
XMLInputFactory.newInstance().createXMLStreamReader(testFile));
+        stAXOMBuilder = OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getSOAP11Factory(),
XMLInputFactory.newInstance().createXMLStreamReader(testFile));
     }
 
     public void testGetRootElement() throws Exception {

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java
(original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java
Fri Apr 29 04:38:28 2005
@@ -24,15 +24,7 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.axis.om.AbstractTestCase;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.OMNode;
-import org.apache.axis.om.OMText;
-import org.apache.axis.om.OMXMLParserWrapper;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
 import org.apache.axis.om.impl.llom.factory.OMXMLBuilderFactory;
 
 public class ElementSerializerTest extends AbstractTestCase {
@@ -51,7 +43,7 @@
         tempFile = File.createTempFile("temp", "xml");
         writer = XMLOutputFactory.newInstance().
                 createXMLStreamWriter(new FileOutputStream(tempFile));
-        builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
reader);
+        builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
reader);
     }
 
     public void testElementSerilization() throws Exception {
@@ -91,7 +83,7 @@
     }
 
     public void testDualNamespaces1() throws Exception {
-        OMFactory factory = OMFactory.newInstance();
+        OMFactory factory = OMAbstractFactory.getOMFactory();
         OMNamespace ns1 = factory.createOMNamespace("bar", "x");
         OMNamespace ns2 = factory.createOMNamespace("bar", "y");
         OMElement root = factory.createOMElement("root", ns1);
@@ -107,7 +99,7 @@
     }
 
     public void testDualNamespaces2() throws Exception {
-        OMFactory factory = OMFactory.newInstance();
+        OMFactory factory = OMAbstractFactory.getOMFactory();
         OMNamespace ns1 = factory.createOMNamespace("bar", "x");
         OMElement root = factory.createOMElement("root", ns1);
         OMNamespace ns2 = root.declareNamespace("bar", "y");

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java
(original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java
Fri Apr 29 04:38:28 2005
@@ -10,10 +10,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMXMLParserWrapper;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
 import org.apache.axis.om.impl.llom.factory.OMXMLBuilderFactory;
 
 /*
@@ -78,8 +75,8 @@
                 createXMLStreamReader(new InputStreamReader(new ByteArrayInputStream(xmlTextTwo.getBytes())));
         writer = XMLOutputFactory.newInstance().
                 createXMLStreamWriter(System.out);
-        builderOne = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
readerOne);
-        builderTwo = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
readerTwo);
+        builderOne = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
readerOne);
+        builderTwo = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
readerTwo);
     }
 
 
@@ -111,7 +108,7 @@
 
     public void submitPurchaseOrderTest()
             throws Exception {
-        OMFactory omFactory = OMFactory.newInstance();
+        SOAPFactory omFactory = OMAbstractFactory.getSOAP11Factory();
         SOAPEnvelope env = omFactory.getDefaultEnvelope();
         OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(omFactory,XMLInputFactory.newInstance().
                 createXMLStreamReader(new InputStreamReader(new ByteArrayInputStream(xmlText2.getBytes()))));

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java
(original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java
Fri Apr 29 04:38:28 2005
@@ -24,11 +24,7 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.axis.om.AbstractTestCase;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMXMLParserWrapper;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
 import org.apache.axis.om.impl.llom.factory.OMXMLBuilderFactory;
 import org.apache.axis.om.impl.llom.serialize.StreamingOMSerializer;
 
@@ -59,7 +55,7 @@
     }
 
     public void testElementPullStream1() throws Exception {
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
                 reader);
         SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
         StreamingOMSerializer serializer = new StreamingOMSerializer();
@@ -67,7 +63,7 @@
     }
 
     public void testElementPullStream1WithCacheOff() throws Exception {
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
                 reader);
         SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
         StreamingOMSerializer serializer = new StreamingOMSerializer();
@@ -75,7 +71,7 @@
     }
 
     public void testElementPullStream2() throws Exception {
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
                 reader);
         SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
         SOAPBody body = env.getBody();

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
(original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
Fri Apr 29 04:38:28 2005
@@ -21,10 +21,7 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.axis.om.AbstractTestCase;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMXMLParserWrapper;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
 import org.apache.axis.om.impl.llom.factory.OMXMLBuilderFactory;
 
 public class OMStaxStreamingWrapperTest extends AbstractTestCase {
@@ -39,7 +36,7 @@
     protected void setUp() throws Exception {
         XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().
                         createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage1.xml")));
-        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFactory.newInstance(),
xmlStreamReader);
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(),
xmlStreamReader);
         envelope = (SOAPEnvelope) builder.getDocumentElement();
         tempFile = File.createTempFile("temp", "xml");
 

Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java
(original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java
Fri Apr 29 04:38:28 2005
@@ -24,14 +24,11 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.axis.om.AbstractTestCase;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMXMLParserWrapper;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
 import org.apache.axis.om.impl.llom.factory.OMXMLBuilderFactory;
 
 public class OmStAXBuilderTest extends AbstractTestCase {
-    private OMFactory factory = null;
+    private SOAPFactory factory = null;
     private OMXMLParserWrapper builder;
     private File tempFile;
 
@@ -40,7 +37,7 @@
     }
 
     protected void setUp() throws Exception {
-        factory = OMFactory.newInstance();
+        factory = OMAbstractFactory.getSOAP11Factory();
         XMLStreamReader reader = XMLInputFactory.newInstance().
                         createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage.xml")));
         builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(factory, reader);



Mime
View raw message