You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/04/29 13:38:29 UTC
svn commit: r165296 [1/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/
Author: chinthaka
Date: Fri Apr 29 04:38:28 2005
New Revision: 165296
URL: http://svn.apache.org/viewcvs?rev=165296&view=rev
Log:
Adding SOAP and OM Factories. Refer mail to the mailing list for more details
Modified:
webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp
webservices/axis/trunk/java/modules/core/samples/deployment/OutService/org/apache/axis/services/OutService.java
webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoProvider.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java
webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java
webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java
webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/OMFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMElementImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMLinkedListImplFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMBodyTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMEnvelopeTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestUtils.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/SOAPFaultTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/StaxParserTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/builder/StAXOMBuilderTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/ElementSerializerTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/NoNamespaceSerializerTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/serializer/OMSerailizerTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/impl/streamwrapper/OmStAXBuilderTest.java
Modified: webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp Fri Apr 29 04:38:28 2005
@@ -310,7 +310,7 @@
return location;
}
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
OMNamespace ns =
fac.createOMNamespace("http://apache.ws.apache.org/samples", "samples");
private SOAPEnvelope createRawMessage(
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/OutService/org/apache/axis/services/OutService.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/OutService/org/apache/axis/services/OutService.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/OutService/org/apache/axis/services/OutService.java (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/OutService/org/apache/axis/services/OutService.java Fri Apr 29 04:38:28 2005
@@ -2,9 +2,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.SOAPEnvelope;
-import org.apache.axis.om.OMNode;
+import org.apache.axis.om.*;
import java.util.Date;
@@ -25,7 +23,7 @@
}
private void sentOutMessage() {
- OMFactory omFactory = OMFactory.newInstance();
+ SOAPFactory omFactory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope env = omFactory.getDefaultEnvelope();
OMNode testNode = omFactory.createText("This is auto generated messge by the server at " + new Date());
env.getBody().addChild(testNode);
Modified: webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoProvider.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoProvider.java (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/service1/org/apache/axis/sample/echo/EchoProvider.java Fri Apr 29 04:38:28 2005
@@ -1,19 +1,19 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.axis.sample.echo;
import java.lang.reflect.Method;
@@ -24,11 +24,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
@@ -145,7 +141,7 @@
new EchoStructEncoder(null));
}
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope responseEnvelope = fac.getDefaultEnvelope();
OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Fri Apr 29 04:38:28 2005
@@ -24,6 +24,7 @@
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPBody;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.transport.TransportSender;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -217,7 +218,7 @@
faultContext.setProcessingFault(true);
faultContext.setServerSide(true);
SOAPEnvelope envelope =
- OMFactory.newInstance().getDefaultEnvelope();
+ OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
// TODO do we need to set old Headers back?
SOAPBody body = envelope.getBody();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingOutHandler.java Fri Apr 29 04:38:28 2005
@@ -17,11 +17,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.handlers.AbstractHandler;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPHeader;
-import org.apache.axis.om.SOAPHeaderBlock;
+import org.apache.axis.om.*;
/**
* Copyright 2001-2004 The Apache Software Foundation.
@@ -46,7 +42,7 @@
* Eran Chinthaka (chinthaka@apache.org)
*/
OMNamespace addressingNamespace =
- OMFactory.newInstance().createOMNamespace(WSA_NAMESPACE, "wsa");
+ OMAbstractFactory.getSOAP11Factory().createOMNamespace(WSA_NAMESPACE, "wsa");
public void invoke(MessageContext msgContext) throws AxisFault {
MessageInformationHeadersCollection messageInformationHeaders =
msgContext.getMessageInformationHeaders();
@@ -104,7 +100,7 @@
if (!"".equals(value) && value != null) {
SOAPHeaderBlock soapHeaderBlock =
soapHeader.addHeaderBlock(type, addressingNamespace);
- soapHeaderBlock.addChild(OMFactory.newInstance().createText(value));
+ soapHeaderBlock.addChild(OMAbstractFactory.getSOAP11Factory().createText(value));
return soapHeaderBlock;
}
return null;
@@ -122,7 +118,7 @@
SOAPHeaderBlock soapHeaderBlock =
soapHeader.addHeaderBlock(type, addressingNamespace);
OMElement addressElement =
- OMFactory.newInstance().createOMElement(
+ OMAbstractFactory.getSOAP11Factory().createOMElement(
EPR_ADDRESS,
addressingNamespace);
soapHeaderBlock.addChild(addressElement);
@@ -135,7 +131,7 @@
SOAPHeaderBlock soapHeaderBlock =
soapHeader.addHeaderBlock(EPR_PORT_TYPE, addressingNamespace);
soapHeaderBlock.addChild(
- OMFactory.newInstance().createText(
+ OMAbstractFactory.getSOAP11Factory().createText(
portType.getPrefix() + ":" + portType.getLocalPart()));
}
@@ -150,7 +146,7 @@
serviceName.getPortName(),
addressingNamespace);
soapHeaderBlock.addChild(
- OMFactory.newInstance().createText(
+ OMAbstractFactory.getSOAP11Factory().createText(
serviceName.getName().getPrefix()
+ ":"
+ serviceName.getName().getLocalPart()));
@@ -173,9 +169,9 @@
QName key = (QName) iterator.next();
String value = referenceParameters.getReferenceValue(key);
OMElement omElement =
- OMFactory.newInstance().createOMElement(key, soapHeader);
+ OMAbstractFactory.getSOAP11Factory().createOMElement(key, soapHeader);
soapHeader.addChild(omElement);
- omElement.addChild(OMFactory.newInstance().createText(value));
+ omElement.addChild(OMAbstractFactory.getSOAP11Factory().createText(value));
}
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageRecevier.java Fri Apr 29 04:38:28 2005
@@ -22,10 +22,7 @@
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wsdl.WSDLService;
@@ -102,7 +99,7 @@
// invoke the WebService
OMElement result = (OMElement) method.invoke(obj, parms);
- envelope = OMFactory.newInstance().getDefaultEnvelope();
+ envelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
envelope.getBody().setFirstChild(result);
} else if (WSDLService.STYLE_RPC.equals(msgContext.getMessageStyle())) {
@@ -111,8 +108,8 @@
// invoke the WebService
OMElement result = (OMElement) method.invoke(obj, parms);
- OMFactory fac = OMFactory.newInstance();
- envelope = OMFactory.newInstance().getDefaultEnvelope();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
+ envelope = fac.getDefaultEnvelope();
OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
OMElement responseMethodName = fac.createOMElement(methodName + "Response", ns);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java Fri Apr 29 04:38:28 2005
@@ -45,6 +45,7 @@
import org.apache.axis.engine.EngineRegistryFactory;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
@@ -169,7 +170,7 @@
new BufferedReader(
new InputStreamReader(req.getInputStream())));
StAXBuilder builder =
- new StAXSOAPModelBuilder(OMFactory.newInstance(), reader);
+ new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), reader);
msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/HTTPTransportReceiver.java Fri Apr 29 04:38:28 2005
@@ -30,6 +30,7 @@
import org.apache.axis.engine.AxisFault;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.axis.transport.TransportReceiver;
@@ -122,7 +123,7 @@
AxisEngine axisEngine = new AxisEngine();
try {
XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in);
- StAXBuilder builder = new StAXSOAPModelBuilder(OMFactory.newInstance(), xmlreader);
+ StAXBuilder builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), xmlreader);
msgContext.setEnvelope((SOAPEnvelope) builder.getDocumentElement());
} catch (Exception e) {
throw new AxisFault(e.getMessage(), e);
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/mail/MailWorker.java Fri Apr 29 04:38:28 2005
@@ -16,18 +16,6 @@
package org.apache.axis.transport.mail;
-import java.io.ByteArrayInputStream;
-import java.io.Writer;
-import java.util.Properties;
-
-import javax.mail.Message;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
import org.apache.axis.Constants;
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
@@ -35,7 +23,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.engine.AxisEngine;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.builder.StAXBuilder;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
@@ -44,6 +32,17 @@
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import java.io.ByteArrayInputStream;
+import java.io.Writer;
+import java.util.Properties;
+
public class MailWorker implements Runnable {
protected static Log log = LogFactory.getLog(MailWorker.class.getName());
@@ -71,12 +70,12 @@
/**
* Constructor for MailWorker
- *
+ *
* @param server
* @param mimeMessage
*/
public MailWorker(SimpleMailListner server, MimeMessage mimeMessage,
- EngineContext reg) {
+ EngineContext reg) {
this.server = server;
this.mimeMessage = mimeMessage;
this.reg = reg;
@@ -91,9 +90,9 @@
MessageContext msgContext = null;
// create and initialize a message context
try {
- msgContext = new MessageContext(this.reg, null, null,
- reg.getEngineConfig().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
- reg.getEngineConfig().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+ msgContext = new MessageContext(this.reg, null, null,
+ reg.getEngineConfig().getTransportIn(new QName(Constants.TRANSPORT_HTTP)),
+ reg.getEngineConfig().getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
msgContext.setServerSide(true);
} catch (AxisFault af) {
log.error("Error occured while creating the message context", af);
@@ -122,68 +121,64 @@
responseMsg = null;
- try {
- // parse all headers into hashtable
- parseHeaders(mimeMessage, contentType, contentLocation,
- soapAction);
-
- String soapActionString = soapAction.toString();
- if (soapActionString != null) {
- //msgContext.setUseSOAPAction(true); Not present CT
- // 07-Feb-2005
- msgContext.setProperty(MessageContext.SOAP_ACTION,
- soapActionString);
- }
-
- System.out
- .println("This is the data that is to be processed \n "
- + mimeMessage.getContent().toString() + "\n");
-
- ByteArrayInputStream bais = new ByteArrayInputStream(
- mimeMessage.getContent().toString().getBytes());
- XMLStreamReader reader = XMLInputFactory.newInstance()
- .createXMLStreamReader(bais);
- StAXBuilder builder = new StAXSOAPModelBuilder(OMFactory
- .newInstance(), reader);
-
- msgContext.setEnvelope((SOAPEnvelope) builder
- .getDocumentElement());
-
- //A writer is created and sent to the engine so that the engine
- // can write straight to the writer
- String replyTo = ((InternetAddress) mimeMessage.getReplyTo()[0])
- .getAddress();
- String sendFrom = ((InternetAddress) mimeMessage
- .getAllRecipients()[0]).getAddress();
- String subject = mimeMessage.getSubject();
- msgContext.setProperty(MailConstants.FROM_ADDRESS, sendFrom);
- msgContext.setProperty(MailConstants.TO_ADDRESS, replyTo);
- msgContext.setProperty(MailConstants.SUBJECT, subject);
- Writer wr = getMailWriter(server.getHost(), msgContext);
-
- msgContext.setProperty(MessageContext.TRANSPORT_WRITER, wr);
- msgContext.setTo(new EndpointReference(
- AddressingConstants.WSA_TO, replyTo));
-
- // invoke the Axis engine
- engine.receive(msgContext);
-
- sendMessage(wr);
-
- } catch (Exception e) {
- e.printStackTrace();
- AxisFault af;
- if (e instanceof AxisFault) {
- af = (AxisFault) e;
- //log.debug(Messages.getMessage("serverFault00"), af);
- // CT 07-Feb-2005
- log.debug(
- "Error occured while trying to process the mail.",
- af);
- } else {
- af = AxisFault.makeFault(e);
- }
+ try {
+ // parse all headers into hashtable
+ parseHeaders(mimeMessage, contentType, contentLocation,
+ soapAction);
+
+ String soapActionString = soapAction.toString();
+ if (soapActionString != null) {
+ //msgContext.setUseSOAPAction(true); Not present CT
+ // 07-Feb-2005
+ msgContext.setProperty(MessageContext.SOAP_ACTION,
+ soapActionString);
+ }
+
+ System.out
+ .println("This is the data that is to be processed \n "
+ + mimeMessage.getContent().toString() + "\n");
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(mimeMessage.getContent().toString().getBytes());
+ XMLStreamReader reader = XMLInputFactory.newInstance()
+ .createXMLStreamReader(bais);
+ StAXBuilder builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), reader);
+
+ msgContext.setEnvelope((SOAPEnvelope) builder
+ .getDocumentElement());
+
+ //A writer is created and sent to the engine so that the engine
+ // can write straight to the writer
+ String replyTo = ((InternetAddress) mimeMessage.getReplyTo()[0])
+ .getAddress();
+ String sendFrom = ((InternetAddress) mimeMessage
+ .getAllRecipients()[0]).getAddress();
+ String subject = mimeMessage.getSubject();
+ msgContext.setProperty(MailConstants.FROM_ADDRESS, sendFrom);
+ msgContext.setProperty(MailConstants.TO_ADDRESS, replyTo);
+ msgContext.setProperty(MailConstants.SUBJECT, subject);
+ Writer wr = getMailWriter(server.getHost(), msgContext);
+
+ msgContext.setProperty(MessageContext.TRANSPORT_WRITER, wr);
+ msgContext.setTo(new EndpointReference(AddressingConstants.WSA_TO, replyTo));
+
+ // invoke the Axis engine
+ engine.receive(msgContext);
+
+ sendMessage(wr);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ AxisFault af;
+ if (e instanceof AxisFault) {
+ af = (AxisFault) e;
+ //log.debug(Messages.getMessage("serverFault00"), af);
+ // CT 07-Feb-2005
+ log.debug("Error occured while trying to process the mail.",
+ af);
+ } else {
+ af = AxisFault.makeFault(e);
}
+ }
/*
*
@@ -244,19 +239,15 @@
/**
* Read all mime headers, returning the value of Content-Length and
* SOAPAction.
- *
- * @param mimeMessage
- * InputStream to read from
- * @param contentType
- * The content type.
- * @param contentLocation
- * The content location
- * @param soapAction
- * StringBuffer to return the soapAction into
+ *
+ * @param mimeMessage InputStream to read from
+ * @param contentType The content type.
+ * @param contentLocation The content location
+ * @param soapAction StringBuffer to return the soapAction into
*/
private void parseHeaders(MimeMessage mimeMessage,
- StringBuffer contentType, StringBuffer contentLocation,
- StringBuffer soapAction) throws Exception {
+ StringBuffer contentType, StringBuffer contentLocation,
+ StringBuffer soapAction) throws Exception {
contentType.append(mimeMessage.getContentType());
contentLocation.append(mimeMessage.getContentID());
String values[] = mimeMessage
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EnginePausingTest.java Fri Apr 29 04:38:28 2005
@@ -33,6 +33,8 @@
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.wsdl.WSDLService;
public class EnginePausingTest extends AbstractEngineTest {
@@ -61,7 +63,7 @@
mc = new MessageContext(engineContext, null, null, transportIn,transportOut,new BasicMEPContext(axisOp));
mc.setTransportOut(transportOut);
mc.setServerSide(true);
- OMFactory omFac = OMFactory.newInstance();
+ SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
mc.setEnvelope(omFac.getDefaultEnvelope());
AxisService service = new AxisService(serviceName);
service.setMessageReceiver(new NullMessageReceiver());
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/EngineWithoutPhaseResolvingTest.java Fri Apr 29 04:38:28 2005
@@ -32,6 +32,8 @@
import org.apache.axis.description.AxisTransportIn;
import org.apache.axis.description.AxisTransportOut;
import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.wsdl.WSDLService;
public class EngineWithoutPhaseResolvingTest extends AbstractEngineTest {
@@ -61,7 +63,7 @@
mc = new MessageContext(engineContext, null, null, transportIn,transport,new BasicMEPContext(axisOp));
mc.setTransportOut(transport);
mc.setServerSide(true);
- OMFactory omFac = OMFactory.newInstance();
+ SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
mc.setEnvelope(omFac.getDefaultEnvelope());
service = new AxisService(serviceName);
service.setMessageReceiver(new NullMessageReceiver());
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/engine/MessageContextTest.java Fri Apr 29 04:38:28 2005
@@ -1,27 +1,31 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.axis.engine;
-import org.apache.axis.AbstractTestCase;
-import org.apache.axis.context.BasicMEPContext;
-import org.apache.axis.context.EngineContext;
-import org.apache.axis.context.MessageContext;
-import org.apache.axis.description.AxisGlobal;
-import org.apache.axis.om.OMFactory;
+import org.apache.axis.AbstractTestCase;
+
+import org.apache.axis.AbstractTestCase;
+import org.apache.axis.context.EngineContext;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.context.BasicMEPContext;
+import org.apache.axis.description.AxisGlobal;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.om.OMAbstractFactory;
public class MessageContextTest extends AbstractTestCase {
public MessageContextTest(String testName) {
@@ -29,11 +33,13 @@
}
public void testMesssageContext() throws AxisFault {
- EngineConfiguration er = new EngineConfigurationImpl(new AxisGlobal());
+ EngineConfiguration er = new EngineConfigurationImpl(new AxisGlobal());
EngineContext engineContext = new EngineContext(er);
MessageContext msgctx = new MessageContext(engineContext, null,null,null,null,new BasicMEPContext(null));
- msgctx.setEnvelope(OMFactory.newInstance().getDefaultEnvelope());
+ SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
+
+ msgctx.setEnvelope(omFac.getDefaultEnvelope());
assertNotNull(msgctx.getEnvelope());
msgctx.setFaultTo(null);
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/addressing/AddressingOutHandlerTest.java Fri Apr 29 04:38:28 2005
@@ -12,6 +12,8 @@
import org.apache.axis.handlers.util.TestUtil;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.axis.om.impl.llom.util.XMLComparator;
@@ -62,7 +64,8 @@
}
epr.setReferenceParameters(anyContentType);
- SOAPEnvelope defaultEnvelope = OMFactory.newInstance().getDefaultEnvelope();
+
+ SOAPEnvelope defaultEnvelope = OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
defaultEnvelope.getHeader().declareNamespace(WSA_NAMESPACE, "wsa");
outHandler.addToSOAPHeader(epr, WSA_FROM, defaultEnvelope.getHeader());
@@ -107,7 +110,7 @@
// mIHeaders.setRelatesTo(relatesTo);
//
// msgCtxt.setMessageInformationHeaders(mIHeaders);
-// msgCtxt.setEnvelope(OMFactory.newInstance().getDefaultEnvelope());
+// msgCtxt.setEnvelope(OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope());
// outHandler.invoke(msgCtxt);
//
// XMLComparator xmlComparator = new XMLComparator();
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/handlers/util/TestUtil.java Fri Apr 29 04:38:28 2005
@@ -7,6 +7,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMAbstractFactory;
import org.apache.axis.om.impl.llom.builder.StAXSOAPModelBuilder;
/**
@@ -41,7 +42,7 @@
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;
}
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoProvider.java Fri Apr 29 04:38:28 2005
@@ -23,11 +23,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
@@ -144,7 +140,7 @@
new EchoStructEncoder(null));
}
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope responseEnvelope = fac.getDefaultEnvelope();
OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/EchoStub.java Fri Apr 29 04:38:28 2005
@@ -21,17 +21,12 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
public class EchoStub {
- private OMFactory fac;
+ private SOAPFactory fac;
private OMNamespace ns =
fac.createOMNamespace("http://apache.ws.apache.org/samples", "samples");
private OMNamespace arrayNs =
@@ -40,7 +35,7 @@
OMConstants.ARRAY_ITEM_NS_PREFIX);
OMNamespace targetNs = fac.createOMNamespace("http://axis.apache.org", "s");
public EchoStub() {
- fac = OMFactory.newInstance();
+ fac = OMAbstractFactory.getSOAP11Factory();
}
public EchoStruct[] echoEchoStructArray(EchoStruct[] in) throws Exception {
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample1/Sampler.java Fri Apr 29 04:38:28 2005
@@ -21,12 +21,7 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
@@ -60,7 +55,7 @@
}
long start = System.currentTimeMillis();
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
OMNamespace ns =
fac.createOMNamespace(
"http://apache.ws.apache.org/samples",
Modified: webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/encoding/sample2/benchMark/BenchProvider.java Fri Apr 29 04:38:28 2005
@@ -24,11 +24,7 @@
import org.apache.axis.context.MessageContext;
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
import org.apache.axis.testUtils.SimpleJavaProvider;
@@ -166,7 +162,7 @@
outobj = new SimpleTypeEncoder(result);
}
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope responseEnvelope = fac.getDefaultEnvelope();
OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropProvider.java Fri Apr 29 04:38:28 2005
@@ -27,12 +27,7 @@
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
import org.apache.axis.testUtils.SimpleJavaProvider;
@@ -150,7 +145,7 @@
WSDLInteropTestDocLitPortType benchmark = (WSDLInteropTestDocLitPortType) obj;
Object result = null;
OMElement returnelement = null;
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
OMNamespace ns = fac.createOMNamespace("http://soapinterop.org/xsd", "doclitTypes");
if ("echoVoid".equals(methodName)) {
Modified: webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/interop/doclit/InteropStub.java Fri Apr 29 04:38:28 2005
@@ -7,12 +7,7 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.OMText;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
/*
@@ -35,7 +30,7 @@
private static final String INTEROP_NS_URI = "http://soapinterop.org/xsd";
private static final String INTEROP_PREFIX = "itop";
- private OMFactory factory ;
+ private SOAPFactory factory ;
//private XMLOutputFactory outputFactory;
private OMNamespace interopNS;
private String endpointURL;
@@ -67,7 +62,7 @@
public InteropStub(String endpointURL) {
this.endpointURL = endpointURL;
- factory= OMFactory.newInstance();
+ factory= OMAbstractFactory.getSOAP11Factory();
//outputFactory = XMLOutputFactory.newInstance();
this.interopNS = this.factory.createOMNamespace(INTEROP_NS_URI,INTEROP_PREFIX);
Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/ObjectToOMBuilder.java Fri Apr 29 04:38:28 2005
@@ -19,14 +19,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMException;
-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.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
@@ -38,7 +31,7 @@
private Log log = LogFactory.getLog(getClass());
private Encoder outObject;
private OMElement startElement;
- private OMFactory omFactory;
+ private SOAPFactory omFactory;
private boolean buildStarted = false;
private boolean cache = true;
private ContentHandler externalContentHandler;
@@ -66,7 +59,7 @@
*/
public ObjectToOMBuilder(OMElement startElement, Encoder outObject) {
- omFactory = OMFactory.newInstance();
+ omFactory = OMAbstractFactory.getSOAP11Factory();
this.outObject = outObject;
initStartElement(startElement);
@@ -82,7 +75,7 @@
public ObjectToOMBuilder(Encoder outObject){
this.outObject = outObject;
- omFactory = OMFactory.newInstance();
+ omFactory = OMAbstractFactory.getSOAP11Factory();
}
public void setStartElement(OMElement startElement) {
Modified: webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/org/apache/axis/testUtils/SimpleJavaProvider.java Fri Apr 29 04:38:28 2005
@@ -26,11 +26,7 @@
import org.apache.axis.description.AxisOperation;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.MessageReceiver;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.receivers.AbstractInOutSyncMessageReceiver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -102,7 +98,7 @@
//invoke the WebService
Object result = method.invoke(obj, parms);
Encoder outobj = new SimpleTypeEncoder(result);
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope responseEnvelope = fac.getDefaultEnvelope();
OMNamespace ns = fac.createOMNamespace("http://soapenc/", "res");
Modified: webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/userguide/sample1/ClientUtil.java Fri Apr 29 04:38:28 2005
@@ -1,10 +1,7 @@
package userguide.sample1;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -26,7 +23,7 @@
public class ClientUtil {
public static SOAPEnvelope getEchoSoapEnvelop(){
- OMFactory omFactory = OMFactory.newInstance();
+ SOAPFactory omFactory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope envelope = omFactory.getDefaultEnvelope();
OMNamespace namespace = envelope.declareNamespace("http://sample1.org/sample1", "sample1");
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/encoding/EncodingTest.java Fri Apr 29 04:38:28 2005
@@ -26,28 +26,27 @@
import junit.framework.TestCase;
import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
public class EncodingTest extends TestCase {
-
+ OMFactory fac;
/**
* @param testName
*/
public EncodingTest(String testName) {
super(testName);
+ fac = OMAbstractFactory.getOMFactory();
}
public void testDeserializingInt() throws SecurityException, NoSuchMethodException, AxisFault {
Method method = Echo.class.getMethod("echoInt", new Class[]{int.class});
- OMNamespace omNs = OMFactory.newInstance().createOMNamespace("http://host/my", "my");
- OMFactory omfac = OMFactory.newInstance();
- OMElement omel = omfac.createOMElement("value", omNs);
- omel.addChild(omfac.createText("1234"));
+
+ OMNamespace omNs = fac.createOMNamespace("http://host/my", "my");
+ OMElement omel = fac.createOMElement("value", omNs);
+ omel.addChild(fac.createText("1234"));
deserialize(method, omel.getXMLStreamReader());
}
@@ -55,10 +54,9 @@
public void testDeserializingString() throws SecurityException, NoSuchMethodException, AxisFault {
Method method = Echo.class.getMethod("echoInt", new Class[]{int.class});
- OMNamespace omNs = OMFactory.newInstance().createOMNamespace("http://host/my", "my");
- OMFactory omfac = OMFactory.newInstance();
- OMElement omel = omfac.createOMElement("value", omNs);
- omel.addChild(omfac.createText("1234"));
+ OMNamespace omNs = fac.createOMNamespace("http://host/my", "my");
+ OMElement omel = fac.createOMElement("value", omNs);
+ omel.addChild(fac.createText("1234"));
deserialize(method, omel.getXMLStreamReader());
}
@@ -66,13 +64,12 @@
public void testDeserializingStringArray() throws SecurityException, NoSuchMethodException, AxisFault {
Method method = Echo.class.getMethod("echoStringArray", new Class[]{String[].class});
- OMNamespace omNs = OMFactory.newInstance().createOMNamespace("http://host/my", "my");
- OMFactory omfac = OMFactory.newInstance();
- OMElement omel = omfac.createOMElement("Array", omNs);
+ OMNamespace omNs = fac.createOMNamespace("http://host/my", "my");
+ OMElement omel = fac.createOMElement("Array", omNs);
for (int i = 0; i < 5; i++) {
- OMElement temp = omfac.createOMElement("val", omNs);
- temp.addChild(omfac.createText(String.valueOf(i)));
+ OMElement temp = fac.createOMElement("val", omNs);
+ temp.addChild(fac.createText(String.valueOf(i)));
omel.addChild(temp);
}
@@ -80,13 +77,12 @@
}
public void testDeserializingStringArrayVal() throws SecurityException, NoSuchMethodException, AxisFault, XMLStreamException, FactoryConfigurationError {
- OMNamespace omNs = OMFactory.newInstance().createOMNamespace("http://host/my", "my");
- OMFactory omfac = OMFactory.newInstance();
- OMElement omel = omfac.createOMElement("Array", omNs);
+ OMNamespace omNs = fac.createOMNamespace("http://host/my", "my");
+ OMElement omel = fac.createOMElement("Array", omNs);
for (int i = 0; i < 5; i++) {
- OMElement temp = omfac.createOMElement("val", omNs);
- temp.addChild(omfac.createText(String.valueOf(i)));
+ OMElement temp = fac.createOMElement("val", omNs);
+ temp.addChild(fac.createText(String.valueOf(i)));
omel.addChild(temp);
}
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/CallUnregisteredServiceTest.java Fri Apr 29 04:38:28 2005
@@ -28,11 +28,7 @@
import org.apache.axis.clientapi.Call;
import org.apache.axis.context.MessageContext;
import org.apache.axis.integration.UtilServer;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.transport.http.SimpleHTTPServer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -66,7 +62,8 @@
public void testEchoXMLSync() throws Exception {
try {
- OMFactory fac = OMFactory.newInstance();
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
+
SOAPEnvelope reqEnv = fac.getDefaultEnvelope();
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java Fri Apr 29 04:38:28 2005
@@ -33,11 +33,7 @@
import org.apache.axis.description.AxisOperation;
import org.apache.axis.description.AxisService;
import org.apache.axis.integration.UtilServer;
-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.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.transport.http.SimpleHTTPServer;
import org.apache.axis.util.Utils;
import org.apache.commons.logging.Log;
@@ -80,24 +76,8 @@
}
-// public void testEchoXMLSync() throws Exception {
-// OMFactory fac = OMFactory.newInstance();
-//
-// SOAPEnvelope reqEnv = createEnvelope(fac);
-//
-// org.apache.axis.clientapi.Call call = new org.apache.axis.clientapi.Call();
-// call.setOpName(operationName);
-// call.setTransport(Constants.TRANSPORT_HTTP);
-// call.setTo(targetEPR);
-// call.setAction(operationName.getLocalPart());
-// SOAPEnvelope resEnv = call.sendReceiveSync(reqEnv);
-//
-// resEnv.serializeWithCache(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out));
-// OMNode omNode = resEnv.getBody().getFirstChild();
-// assertNotNull(omNode);
-// }
- private SOAPEnvelope createEnvelope(OMFactory fac) {
+ private SOAPEnvelope createEnvelope(SOAPFactory fac) {
SOAPEnvelope reqEnv = fac.getDefaultEnvelope();
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement method = fac.createOMElement("echoOMElement", omNs);
@@ -109,6 +89,42 @@
}
// public void testEchoXMLASync() throws Exception {
+// SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
+//
+// SOAPEnvelope reqEnv = createEnvelope(fac);
+//
+// org.apache.axis.clientapi.Call call = new org.apache.axis.clientapi.Call();
+//
+// call.setTo(targetEPR);
+// call.setListenerTransport("http", false);
+//
+// Callback callback = new Callback() {
+// public void onComplete(AsyncResult result) {
+// try {
+// result.getResponseEnvelope().serializeWithCache(XMLOutputFactory.newInstance()
+// .createXMLStreamWriter(System.out));
+// } catch (XMLStreamException e) {
+// reportError(e);
+// } finally {
+// finish = true;
+// }
+// }
+//
+// public void reportError(Exception e) {
+// e.printStackTrace();
+// finish = true;
+// }
+// };
+//
+// call.sendReceiveAsync(reqEnv, callback);
+// while (!finish) {
+// Thread.sleep(1000);
+// }
+//
+// log.info("send the reqest");
+// }
+
+// public void testEchoXMLASync() throws Exception {
// OMFactory fac = OMFactory.newInstance();
//
// SOAPEnvelope reqEnv = createEnvelope(fac);
@@ -144,11 +160,11 @@
// log.info("send the reqest");
// }
//
-
- public void testEchoXMLCompleteASync() throws Exception {
- OMFactory fac = OMFactory.newInstance();
+ public void testEchoXMLCompleteASync() throws Exception {
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
+
SOAPEnvelope reqEnv = fac.getDefaultEnvelope();
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement method = fac.createOMElement("echoOMElement", omNs);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java Fri Apr 29 04:38:28 2005
@@ -32,11 +32,7 @@
import org.apache.axis.description.FlowImpl;
import org.apache.axis.handlers.AbstractHandler;
import org.apache.axis.integration.UtilServer;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.transport.http.SimpleHTTPServer;
import org.apache.axis.util.Utils;
import org.apache.commons.logging.Log;
@@ -142,8 +138,8 @@
private void callTheService() throws Exception {
try {
- OMFactory fac = OMFactory.newInstance();
-
+ SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
+
SOAPEnvelope reqEnv = fac.getDefaultEnvelope();
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement method = fac.createOMElement("echoOMElement", omNs);
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/EchoTest.java Fri Apr 29 04:38:28 2005
@@ -33,12 +33,7 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.clientapi.Call;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.SOAPBody;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.testUtils.ArrayTypeEncoder;
import org.apache.axis.testUtils.Encoder;
import org.apache.axis.testUtils.ObjectToOMBuilder;
@@ -47,7 +42,7 @@
public class EchoTest extends TestCase {
- private final OMFactory fac = OMFactory.newInstance();
+ private final SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
private final OMNamespace ns =
fac.createOMNamespace("http://apache.ws.apache.org/samples", "samples");
private final OMNamespace arrayNs =
Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/om/builder/ObjectToOMBuilderTest.java Fri Apr 29 04:38:28 2005
@@ -25,10 +25,7 @@
import junit.framework.TestCase;
-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.*;
import org.apache.axis.om.builder.dummy.DummyOutObject;
import org.apache.axis.om.impl.llom.SOAPConstants;
import org.apache.axis.om.impl.llom.soap11.SOAP11Constants;
@@ -47,7 +44,7 @@
protected void setUp() throws Exception {
super.setUp();
Encoder outObject = new DummyOutObject();
- OMFactory omFactory = OMFactory.newInstance();
+ OMFactory omFactory = OMAbstractFactory.getSOAP11Factory();
OMNamespace ns = omFactory.createOMNamespace(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX);
element = omFactory.createOMElement("Body", ns);
new ObjectToOMBuilder(element, outObject);
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/FactoryFinder.java Fri Apr 29 04:38:28 2005
@@ -15,30 +15,25 @@
*/
package org.apache.axis.om;
+import org.apache.axis.om.impl.llom.soap11.SOAP11Factory;
+
/**
* Class FactoryFinder
*/
class FactoryFinder {
- private static final String DEFAULT_CLASS_NAME =
+ private static final String DEFAULT_OM_FACTORY_CLASS_NAME =
"org.apache.axis.om.impl.llom.factory.OMLinkedListImplFactory";
+ private static final String DEFAULT_SOAP11_FACTORY_CLASS_NAME =
+ "org.apache.axis.om.impl.llom.soap11.SOAP11Factory";
+ private static final String DEFAULT_SOAP12_FACTORY_CLASS_NAME =
+ "org.apache.axis.om.impl.llom.soap11.SOAP12Factory";
+
private static final String OM_FACTORY_NAME_PROPERTY = "om.factory";
+ private static final String SOAP11_FACTORY_NAME_PROPERTY = "soap11.factory";
+ private static final String SOAP12_FACTORY_NAME_PROPERTY = "soap12.factory";
+
/**
- * Returns a factory using the default class loader
- * @see #findFactory(ClassLoader)
- * @return
- * @throws OMFactoryException
- */
- public static OMFactory findFactory()
- throws OMFactoryException {
- return findFactory(null);
- }
- /**
- * The searching for the factory class happens in the following order
- * 1. look for a system property called <b>om.factory</b>. this can be set by passing the
- * -Dom.factory="classname"
- * 2. Pick the default factory class. it is the class hardcoded at the constant
- * DEFAULT_CLASS_NAME
*
* @param loader
* @return
@@ -46,14 +41,16 @@
*/
- public static OMFactory findFactory(ClassLoader loader)
+ private static Object findFactory(ClassLoader loader, String factoryClass, String systemPropertyName)
throws OMFactoryException {
- String factoryClassName = DEFAULT_CLASS_NAME;
+ String factoryClassName = factoryClass;
+
//first look for a java system property
- if (System.getProperty(OM_FACTORY_NAME_PROPERTY)!=null){
- factoryClassName = OM_FACTORY_NAME_PROPERTY;
- };
+ if (System.getProperty(systemPropertyName) != null) {
+ factoryClassName = systemPropertyName;
+ }
+ ;
Object factory = null;
try {
@@ -65,6 +62,54 @@
} catch (Exception e) {
throw new OMFactoryException(e);
}
- return (OMFactory) factory;
+ return factory;
+ }
+
+ /**
+ * The searching for the factory class happens in the following order
+ * 1. look for a system property called <b>soap11.factory</b>. this can be set by
+ * passing the -Dsoap11.factory="classname"
+ * 2. Pick the default factory class.
+ * it is the class hardcoded at the constant DEFAULT_SOAP11_FACTORY_CLASS_NAME
+ *
+ * @param loader
+ * @return
+ * @throws OMFactoryException
+ */
+ public static SOAPFactory findSOAP11Factory(ClassLoader loader)
+ throws OMFactoryException {
+ return (SOAPFactory) findFactory(loader, DEFAULT_SOAP11_FACTORY_CLASS_NAME, SOAP11_FACTORY_NAME_PROPERTY);
+ }
+
+ /**
+ * The searching for the factory class happens in the following order
+ * 1. look for a system property called <b>soap12.factory</b>. this can be set by
+ * passing the -Dsoap12.factory="classname"
+ * 2. Pick the default factory class.
+ * it is the class hardcoded at the constant DEFAULT_SOAP12_FACTORY_CLASS_NAME
+ *
+ * @param loader
+ * @return
+ * @throws OMFactoryException
+ */
+ public static SOAPFactory findSOAP12Factory(ClassLoader loader)
+ throws OMFactoryException {
+ return (SOAPFactory) findFactory(loader, DEFAULT_SOAP12_FACTORY_CLASS_NAME, SOAP12_FACTORY_NAME_PROPERTY);
+ }
+
+ /**
+ * The searching for the factory class happens in the following order
+ * 1. look for a system property called <b>om.factory</b>. this can be set by
+ * passing the -Dom.factory="classname"
+ * 2. Pick the default factory class.
+ * it is the class hardcoded at the constant DEFAULT_OM_FACTORY_CLASS_NAME
+ *
+ * @param loader
+ * @return
+ * @throws OMFactoryException
+ */
+ public static OMFactory findOMFactory(ClassLoader loader)
+ throws OMFactoryException {
+ return (OMFactory) findFactory(loader, DEFAULT_OM_FACTORY_CLASS_NAME, OM_FACTORY_NAME_PROPERTY);
}
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/OMFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/OMFactory.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/OMFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/OMFactory.java Fri Apr 29 04:38:28 2005
@@ -20,7 +20,7 @@
/**
* Class OMFactory
*/
-public abstract class OMFactory {
+public interface OMFactory {
/**
* @param localName
* @param ns
@@ -87,103 +87,10 @@
*/
public abstract OMText createText(String s);
- /**
- * @param envelope
- * @return
- */
- public abstract SOAPBody createSOAPBody(SOAPEnvelope envelope);
- /**
- * @param envelope
- * @param builder
- * @return
- */
- public abstract SOAPBody createSOAPBody(SOAPEnvelope envelope,
- OMXMLParserWrapper builder);
-
- /**
- * @param ns
- * @param builder
- * @return
- */
- public abstract SOAPEnvelope createSOAPEnvelope(OMNamespace ns,
- OMXMLParserWrapper builder);
-
- /**
- * @param ns
- * @return
- */
- public abstract SOAPEnvelope createSOAPEnvelope(OMNamespace ns);
-
- /**
- * @param envelope
- * @return
- */
- public abstract SOAPHeader createSOAPHeader(SOAPEnvelope envelope);
-
- /**
- * @param envelope
- * @param builder
- * @return
- */
- public abstract SOAPHeader createSOAPHeader(SOAPEnvelope envelope,
- OMXMLParserWrapper builder);
-
- /**
- * @param localName
- * @param ns
- * @return
- */
- public abstract SOAPHeaderBlock createSOAPHeaderBlock(String localName,
- OMNamespace ns);
-
- /**
- * @param localName
- * @param ns
- * @param parent
- * @param builder
- * @return
- */
- public abstract SOAPHeaderBlock createSOAPHeaderBlock(String localName,
- OMNamespace ns, OMElement parent, OMXMLParserWrapper builder);
-
- /**
- * @param parent
- * @param e
- * @return
- */
- public abstract SOAPFault createSOAPFault(SOAPBody parent, Exception e);
-
- /**
- * @param ns
- * @param parent
- * @param builder
- * @return
- */
- public abstract SOAPFault createSOAPFault(OMNamespace ns, SOAPBody parent,
- OMXMLParserWrapper builder);
// make the constructor protected
- /**
- * Constructor OMFactory
- */
- protected OMFactory() {
- }
-
- /**
- * Method newInstance
- *
- * @return
- */
- public static OMFactory newInstance() {
- return FactoryFinder.findFactory();
- }
- /**
- * Method getDefaultEnvelope
- *
- * @return
- */
- public abstract SOAPEnvelope getDefaultEnvelope();
+
}
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMElementImpl.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMElementImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/OMElementImpl.java Fri Apr 29 04:38:28 2005
@@ -588,7 +588,7 @@
child = child.getNextSibling();
}
- this.addChild(OMFactory.newInstance().createText(this,text));
+ this.addChild(OMAbstractFactory.getOMFactory().createText(this,text));
}
/**
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/SOAPFaultImpl.java Fri Apr 29 04:38:28 2005
@@ -70,7 +70,7 @@
this.e = e;
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw));
- this.setDetailInformation(OMFactory.newInstance().createText(sw.getBuffer().toString()));
+ this.setDetailInformation(OMAbstractFactory.getSOAP11Factory().createText(sw.getBuffer().toString()));
}
/**
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/SAXOMBuilder.java Fri Apr 29 04:38:28 2005
@@ -19,10 +19,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMException;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNode;
+import org.apache.axis.om.*;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -35,7 +32,7 @@
OMElement nextElem = null;
- OMFactory factory = OMFactory.newInstance();
+ OMFactory factory = OMAbstractFactory.getOMFactory();
List prefixMappings = new ArrayList();
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXBuilder.java Fri Apr 29 04:38:28 2005
@@ -18,13 +18,7 @@
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
-import org.apache.axis.om.OMConstants;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMException;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.OMNode;
-import org.apache.axis.om.OMXMLParserWrapper;
+import org.apache.axis.om.*;
import org.apache.axis.om.impl.llom.OMElementImpl;
import org.apache.axis.om.impl.llom.OMNodeImpl;
@@ -84,7 +78,7 @@
protected StAXBuilder(OMFactory ombuilderFactory, XMLStreamReader parser) {
this.ombuilderFactory = ombuilderFactory;
this.parser = parser;
- omfactory = OMFactory.newInstance();
+ omfactory = OMAbstractFactory.getOMFactory();
}
/**
@@ -93,8 +87,8 @@
* @param parser
*/
protected StAXBuilder(XMLStreamReader parser) {
- this(OMFactory.newInstance(), parser);
- omfactory = OMFactory.newInstance();
+ this(OMAbstractFactory.getOMFactory(), parser);
+ omfactory = OMAbstractFactory.getOMFactory();
}
/**
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXOMBuilder.java Fri Apr 29 04:38:28 2005
@@ -15,13 +15,7 @@
*/
package org.apache.axis.om.impl.llom.builder;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMException;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.om.OMNode;
-import org.apache.axis.om.OMXMLParserWrapper;
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.*;
import org.apache.axis.om.impl.llom.OMDocument;
import javax.xml.stream.XMLStreamConstants;
@@ -51,7 +45,7 @@
public StAXOMBuilder(OMFactory ombuilderFactory, XMLStreamReader parser) {
super(ombuilderFactory, parser);
document = new OMDocument(this);
- omfactory = OMFactory.newInstance();
+ omfactory = OMAbstractFactory.getOMFactory();
}
/**
@@ -62,7 +56,7 @@
public StAXOMBuilder(XMLStreamReader parser) {
super(parser);
document = new OMDocument(this);
- omfactory = OMFactory.newInstance();
+ omfactory = OMAbstractFactory.getOMFactory();
}
/**
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java?rev=165296&r1=165295&r2=165296&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/builder/StAXSOAPModelBuilder.java Fri Apr 29 04:38:28 2005
@@ -38,6 +38,8 @@
private SOAPEnvelopeImpl envelope;
private OMNamespace envelopeNamespace;
+ private SOAPFactory soapFactory;
+
/**
* Field headerPresent
*/
@@ -65,9 +67,10 @@
* @param ombuilderFactory
* @param parser
*/
- public StAXSOAPModelBuilder(OMFactory ombuilderFactory,
+ public StAXSOAPModelBuilder(SOAPFactory ombuilderFactory,
XMLStreamReader parser) {
super(ombuilderFactory, parser);
+ this.soapFactory = ombuilderFactory;
identifySOAPVersion();
parseHeaders();
}
@@ -112,7 +115,8 @@
* @param parser
*/
public StAXSOAPModelBuilder(XMLStreamReader parser) {
- this(OMFactory.newInstance(), parser);
+ // TODO FIX ME
+ this(OMAbstractFactory.getSOAP11Factory(), parser);
}
/**
@@ -173,7 +177,7 @@
+ SOAPConstants.SOAPENVELOPE_LOCAL_NAME);
}
envelope =
- (SOAPEnvelopeImpl) ombuilderFactory.createSOAPEnvelope(null,
+ (SOAPEnvelopeImpl) soapFactory.createSOAPEnvelope(null,
this);
element = (OMElementImpl) envelope;
processNamespaceData(element, true);
@@ -189,7 +193,7 @@
}
headerPresent = true;
element =
- ombuilderFactory.createSOAPHeader((SOAPEnvelope) parent,
+ soapFactory.createSOAPHeader((SOAPEnvelope) parent,
this);
// envelope.setHeader((SOAPHeader)element);
@@ -200,7 +204,7 @@
}
bodyPresent = true;
element =
- ombuilderFactory.createSOAPBody((SOAPEnvelope) parent,
+ soapFactory.createSOAPBody((SOAPEnvelope) parent,
this);
// envelope.setBody((SOAPBody)element);
@@ -213,19 +217,19 @@
&& parent.getLocalName().equalsIgnoreCase(SOAPConstants.HEADER_LOCAL_NAME)) {
// this is a headerblock
- element = ombuilderFactory.createSOAPHeaderBlock(elementName, null,
+ element = soapFactory.createSOAPHeaderBlock(elementName, null,
parent, this);
processNamespaceData(element, false);
} else if ((elementLevel == 3) && parent.getLocalName().equalsIgnoreCase(SOAPConstants.BODY_LOCAL_NAME) && elementName.equalsIgnoreCase(SOAPConstants.BODY_FAULT_LOCAL_NAME)) {
// this is a headerblock
- element = ombuilderFactory.createSOAPFault(null, (SOAPBody) parent,
+ element = soapFactory.createSOAPFault(null, (SOAPBody) parent,
this);
processNamespaceData(element, false);
} else {
// this is neither of above. Just create an element
- element = ombuilderFactory.createOMElement(elementName, null,
+ element = soapFactory.createOMElement(elementName, null,
parent, this);
processNamespaceData(element, false);
}