Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 34368 invoked from network); 29 Apr 2005 11:38:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Apr 2005 11:38:46 -0000 Received: (qmail 12808 invoked by uid 500); 29 Apr 2005 11:39:58 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 12766 invoked by uid 500); 29 Apr 2005 11:39:57 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 12749 invoked by uid 99); 29 Apr 2005 11:39:57 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 29 Apr 2005 04:39:56 -0700 Received: (qmail 34350 invoked by uid 65534); 29 Apr 2005 11:38:39 -0000 Message-ID: <20050429113839.34349.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 -0000 To: axis-cvs@ws.apache.org From: chinthaka@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/im= pl/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= =3D165296&r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llo= m/factory/OMLinkedListImplFactory.java (original) +++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llo= m/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; } =20 - /** - * Method createSOAPBody - * - * @param envelope - * @return - */ - public SOAPBody createSOAPBody(SOAPEnvelope envelope) { - SOAPBody soapBody =3D new SOAPBodyImpl(envelope); - return soapBody; - } =20 - /** - * 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 =3D - new OMNamespaceImpl(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, - SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX); - SOAPEnvelopeImpl env =3D new SOAPEnvelopeImpl(ns); - SOAPBodyImpl bodyImpl =3D new SOAPBodyImpl(env); - env.addChild(bodyImpl); - - SOAPHeaderImpl headerImpl =3D new SOAPHeaderImpl(env); - headerImpl.setComplete(true); - env.addChild(headerImpl); - return env; - } } Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/im= pl/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=3D165= 296&r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llo= m/factory/OMXMLBuilderFactory.java (original) +++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llo= m/factory/OMXMLBuilderFactory.java Fri Apr 29 04:38:28 2005 @@ -16,6 +16,7 @@ package org.apache.axis.om.impl.llom.factory; =20 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; =20 @@ -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); } =20 /** Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/O= MBodyTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/OMBodyTest.java?rev=3D165296&r1=3D165295&r2=3D16529= 6&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyT= est.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyT= est.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 E= xception("Testing soap fault"))); + soapBody.addChild(soapFactory.createSOAPFault(soapBody, new Except= ion("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/O= MEnvelopeTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/OMEnvelopeTest.java?rev=3D165296&r1=3D165295&r2=3D1= 65296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMEnvel= opeTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMEnvel= opeTest.java Fri Apr 29 04:38:28 2005 @@ -49,7 +49,7 @@ } =20 public void testDefaultEnveleope() { - SOAPEnvelope env =3D OMFactory.newInstance().getDefaultEnvelope(); + SOAPEnvelope env =3D OMAbstractFactory.getSOAP11Factory().getDefau= ltEnvelope(); 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/O= MNavigatorTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/OMNavigatorTest.java?rev=3D165296&r1=3D165295&r2=3D= 165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavig= atorTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavig= atorTest.java Fri Apr 29 04:38:28 2005 @@ -40,7 +40,7 @@ protected void setUp() throws Exception { XMLStreamReader xmlStreamReader =3D XMLInputFactory.newInstance(). createXMLStreamReader(new FileReader(getTestResour= ceFile("soap/soapmessage1.xml"))); - OMFactory factory =3D OMFactory.newInstance(); + SOAPFactory factory =3D OMAbstractFactory.getSOAP11Factory(); builder =3D new StAXSOAPModelBuilder(factory, xmlStreamReader); envelope =3D (SOAPEnvelope) builder.getDocumentElement(); tempFile =3D File.createTempFile("temp", "xml"); Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/O= MTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/OMTest.java?rev=3D165296&r1=3D165295&r2=3D165296&vi= ew=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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; =20 /** * Constructor. @@ -41,7 +41,7 @@ protected void setUp() throws Exception { File file =3D getTestResourceFile("soap/sample1.xml"); XMLStreamReader parser =3D XMLInputFactory.newInstance().createXML= StreamReader(new FileReader(file)); - fac =3D OMFactory.newInstance(); + fac =3D OMAbstractFactory.getSOAP11Factory(); OMXMLParserWrapper builder =3D new StAXSOAPModelBuilder(fac, parse= r); envelope =3D (SOAPEnvelope) builder.getDocumentElement(); } Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/O= MTestCase.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/OMTestCase.java?rev=3D165296&r1=3D165295&r2=3D16529= 6&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestC= ase.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestC= ase.java Fri Apr 29 04:38:28 2005 @@ -31,12 +31,14 @@ protected static final String IN_FILE_NAME =3D "soap/soapmessage.xml"; protected StAXSOAPModelBuilder builder; protected OMFactory ombuilderFactory; + protected SOAPFactory soapFactory; =20 protected SOAPEnvelope soapEnvelope; =20 public OMTestCase(String testName) { super(testName); - ombuilderFactory =3D OMFactory.newInstance(); + ombuilderFactory =3D OMAbstractFactory.getOMFactory(); + soapFactory =3D OMAbstractFactory.getSOAP11Factory(); } =20 protected void setUp() throws Exception { @@ -49,13 +51,13 @@ fileName =3D IN_FILE_NAME; } XMLStreamReader parser =3D XMLInputFactory.newInstance().createXML= StreamReader(new FileReader(getTestResourceFile(fileName))); - builder =3D new StAXSOAPModelBuilder(OMFactory.newInstance(), pars= er); + builder =3D new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Fa= ctory(), parser); return builder; } =20 protected StAXSOAPModelBuilder getOMBuilder(InputStream in) throws Exc= eption { XMLStreamReader parser =3D XMLInputFactory.newInstance().createXML= StreamReader(in); - builder =3D new StAXSOAPModelBuilder(OMFactory.newInstance(), pars= er); + builder =3D new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Fa= ctory(), parser); return builder; } =20 Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/O= MTestUtils.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/OMTestUtils.java?rev=3D165296&r1=3D165295&r2=3D1652= 96&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestU= tils.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestU= tils.java Fri Apr 29 04:38:28 2005 @@ -34,7 +34,7 @@ public class OMTestUtils { public static OMXMLParserWrapper getOMBuilder(File file) throws Except= ion { XMLStreamReader parser =3D XMLInputFactory.newInstance().createXML= StreamReader(new FileReader(file)); - OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMFactory.newInstance(), parser); + OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMAbstractFactory.getSOAP11Factory(), parser); return builder; } =20 Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/S= OAPFaultTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/SOAPFaultTest.java?rev=3D165296&r1=3D165295&r2=3D16= 5296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFau= ltTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFau= ltTest.java Fri Apr 29 04:38:28 2005 @@ -40,7 +40,7 @@ public void testSOAPFault() throws Exception { // soapEnvelope =3D (SOAPEnvelope) OMTestUtils.getOMBuilder(getTest= ResourceFile("soap/minimalMessage.xml")).getDocumentElement(); // SOAPBody soapBody =3D soapEnvelope.getBody(); -// SOAPFault soapFault =3D OMFactory.newInstance().createSOAPFault(= soapBody, new Exception("Something has gone wrong som where !!")); +// SOAPFault soapFault =3D OMAbstractFactory.getSOAP11Factory().cre= ateSOAPFault(soapBody, new Exception("Something has gone wrong som where !!= ")); // soapBody.addFault(soapFault); // soapFault.setCode(null); // assertEquals("faultcode returned is incorrect", soapFault.getCod= e().getLocalName(), "Axis"); Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/S= taxParserTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/StaxParserTest.java?rev=3D165296&r1=3D165295&r2=3D1= 65296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxPar= serTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxPar= serTest.java Fri Apr 29 04:38:28 2005 @@ -45,11 +45,11 @@ //make the parsers parser1 =3D XMLInputFactory.newInstance().createXMLStreamReader(ne= w ByteArrayInputStream(xmlDocument.getBytes())); =20 - OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXOMBui= lder(OMFactory.newInstance(), + OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXOMBui= lder(OMAbstractFactory.getSOAP11Factory(), XMLInputFactory.newInstance().createXMLStreamReader(new By= teArrayInputStream(xmlDocument.getBytes()))); parser2 =3D builder.getDocumentElement().getXMLStreamReaderWithout= Caching(); =20 - OMXMLParserWrapper builder2 =3D OMXMLBuilderFactory.createStAXOMBu= ilder(OMFactory.newInstance(), + OMXMLParserWrapper builder2 =3D OMXMLBuilderFactory.createStAXOMBu= ilder(OMAbstractFactory.getSOAP11Factory(), XMLInputFactory.newInstance().createXMLStreamReader(new By= teArrayInputStream(xmlDocument.getBytes()))); parser3 =3D builder2.getDocumentElement().getXMLStreamReader(); =20 Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/f= actory/OMLinkedListImplFactoryTest.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/= test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java?rev=3D1652= 96&r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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; =20 -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; =20 @@ -41,14 +30,14 @@ super(testName); } =20 - OMFactory omFactory; + SOAPFactory omFactory; OMNamespace namespace; String nsUri =3D "http://www.apache.org/~chinthaka"; String nsPrefix =3D "myhome"; =20 protected void setUp() throws Exception { super.setUp(); - omFactory =3D OMFactory.newInstance(); + omFactory =3D OMAbstractFactory.getSOAP11Factory(); namespace =3D omFactory.createOMNamespace(nsUri, nsPrefix); } =20 Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/i= mpl/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=3D165296&r1= =3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/bu= ilder/StAXOMBuilderTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/bu= ilder/StAXOMBuilderTest.java Fri Apr 29 04:38:28 2005 @@ -20,11 +20,7 @@ =20 import javax.xml.stream.XMLInputFactory; =20 -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; =20 @@ -42,7 +38,7 @@ =20 protected void setUp() throws Exception { testFile =3D new FileReader(getTestResourceFile("non_soap.xml")); - stAXOMBuilder =3D OMXMLBuilderFactory.createStAXOMBuilder(OMFactor= y=2EnewInstance(), XMLInputFactory.newInstance().createXMLStreamReader(test= File)); + stAXOMBuilder =3D OMXMLBuilderFactory.createStAXOMBuilder(OMAbstra= ctFactory.getSOAP11Factory(), XMLInputFactory.newInstance().createXMLStream= Reader(testFile)); } =20 public void testGetRootElement() throws Exception { Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/i= mpl/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=3D16= 5296&r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/se= rializer/ElementSerializerTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/se= rializer/ElementSerializerTest.java Fri Apr 29 04:38:28 2005 @@ -24,15 +24,7 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; =20 -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; =20 public class ElementSerializerTest extends AbstractTestCase { @@ -51,7 +43,7 @@ tempFile =3D File.createTempFile("temp", "xml"); writer =3D XMLOutputFactory.newInstance(). createXMLStreamWriter(new FileOutputStream(tempFile)); - builder =3D OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFacto= ry.newInstance(), reader); + builder =3D OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAbstr= actFactory.getSOAP11Factory(), reader); } =20 public void testElementSerilization() throws Exception { @@ -91,7 +83,7 @@ } =20 public void testDualNamespaces1() throws Exception { - OMFactory factory =3D OMFactory.newInstance(); + OMFactory factory =3D OMAbstractFactory.getOMFactory(); OMNamespace ns1 =3D factory.createOMNamespace("bar", "x"); OMNamespace ns2 =3D factory.createOMNamespace("bar", "y"); OMElement root =3D factory.createOMElement("root", ns1); @@ -107,7 +99,7 @@ } =20 public void testDualNamespaces2() throws Exception { - OMFactory factory =3D OMFactory.newInstance(); + OMFactory factory =3D OMAbstractFactory.getOMFactory(); OMNamespace ns1 =3D factory.createOMNamespace("bar", "x"); OMElement root =3D factory.createOMElement("root", ns1); OMNamespace ns2 =3D root.declareNamespace("bar", "y"); Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/i= mpl/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= =3D165296&r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/se= rializer/NoNamespaceSerializerTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/se= rializer/NoNamespaceSerializerTest.java Fri Apr 29 04:38:28 2005 @@ -10,10 +10,7 @@ =20 import junit.framework.TestCase; =20 -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; =20 /* @@ -78,8 +75,8 @@ createXMLStreamReader(new InputStreamReader(new ByteArrayI= nputStream(xmlTextTwo.getBytes()))); writer =3D XMLOutputFactory.newInstance(). createXMLStreamWriter(System.out); - builderOne =3D OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFa= ctory.newInstance(), readerOne); - builderTwo =3D OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMFa= ctory.newInstance(), readerTwo); + builderOne =3D OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAb= stractFactory.getSOAP11Factory(), readerOne); + builderTwo =3D OMXMLBuilderFactory.createStAXSOAPModelBuilder(OMAb= stractFactory.getSOAP11Factory(), readerTwo); } =20 =20 @@ -111,7 +108,7 @@ =20 public void submitPurchaseOrderTest() throws Exception { - OMFactory omFactory =3D OMFactory.newInstance(); + SOAPFactory omFactory =3D OMAbstractFactory.getSOAP11Factory(); SOAPEnvelope env =3D omFactory.getDefaultEnvelope(); OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXOMBui= lder(omFactory,XMLInputFactory.newInstance(). createXMLStreamReader(new InputStreamReader(new ByteArrayI= nputStream(xmlText2.getBytes())))); Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/i= mpl/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=3D165296&= r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/se= rializer/OMSerailizerTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/se= rializer/OMSerailizerTest.java Fri Apr 29 04:38:28 2005 @@ -24,11 +24,7 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; =20 -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; =20 @@ -59,7 +55,7 @@ } =20 public void testElementPullStream1() throws Exception { - OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMFactory.newInstance(), + OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMAbstractFactory.getSOAP11Factory(), reader); SOAPEnvelope env =3D (SOAPEnvelope) builder.getDocumentElement(); StreamingOMSerializer serializer =3D new StreamingOMSerializer(); @@ -67,7 +63,7 @@ } =20 public void testElementPullStream1WithCacheOff() throws Exception { - OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMFactory.newInstance(), + OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMAbstractFactory.getSOAP11Factory(), reader); SOAPEnvelope env =3D (SOAPEnvelope) builder.getDocumentElement(); StreamingOMSerializer serializer =3D new StreamingOMSerializer(); @@ -75,7 +71,7 @@ } =20 public void testElementPullStream2() throws Exception { - OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMFactory.newInstance(), + OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMAbstractFactory.getSOAP11Factory(), reader); SOAPEnvelope env =3D (SOAPEnvelope) builder.getDocumentElement(); SOAPBody body =3D env.getBody(); Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/i= mpl/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=3D165296&r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/st= reamwrapper/OMStaxStreamingWrapperTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/st= reamwrapper/OMStaxStreamingWrapperTest.java Fri Apr 29 04:38:28 2005 @@ -21,10 +21,7 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; =20 -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; =20 public class OMStaxStreamingWrapperTest extends AbstractTestCase { @@ -39,7 +36,7 @@ protected void setUp() throws Exception { XMLStreamReader xmlStreamReader =3D XMLInputFactory.newInstance(). createXMLStreamReader(new FileReader(getTestResour= ceFile("soap/soapmessage1.xml"))); - OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMFactory.newInstance(), xmlStreamReader); + OMXMLParserWrapper builder =3D OMXMLBuilderFactory.createStAXSOAPM= odelBuilder(OMAbstractFactory.getSOAP11Factory(), xmlStreamReader); envelope =3D (SOAPEnvelope) builder.getDocumentElement(); tempFile =3D File.createTempFile("temp", "xml"); =20 Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/i= mpl/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=3D165= 296&r1=3D165295&r2=3D165296&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/st= reamwrapper/OmStAXBuilderTest.java (original) +++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/st= reamwrapper/OmStAXBuilderTest.java Fri Apr 29 04:38:28 2005 @@ -24,14 +24,11 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; =20 -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; =20 public class OmStAXBuilderTest extends AbstractTestCase { - private OMFactory factory =3D null; + private SOAPFactory factory =3D null; private OMXMLParserWrapper builder; private File tempFile; =20 @@ -40,7 +37,7 @@ } =20 protected void setUp() throws Exception { - factory =3D OMFactory.newInstance(); + factory =3D OMAbstractFactory.getSOAP11Factory(); XMLStreamReader reader =3D XMLInputFactory.newInstance(). createXMLStreamReader(new FileReader(getTestResour= ceFile("soap/soapmessage.xml"))); builder =3D OMXMLBuilderFactory.createStAXSOAPModelBuilder(factory= , reader);