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/05/05 07:16:37 UTC
svn commit: r168272 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/clientapi/ core/src/org/apache/axis/context/
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/test/org/apache/axis/engine/
xml/src/org/apache/axis/om/impl/llom/builder/
xml/src/org/apache/axis/om/impl/llom/factory/
xml/src/org/apache/axis/om/impl/llom/soap11/ xml/test/org/apache/axis/om/
Author: chinthaka
Date: Wed May 4 22:16:36 2005
New Revision: 168272
URL: http://svn.apache.org/viewcvs?rev=168272&view=rev
Log: (empty)
Added:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java
Removed:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.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/test/org/apache/axis/engine/HandlerFailureTest.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/StAXSOAPModelBuilder.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java
webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap11/SOAP11Factory.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
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/clientapi/Call.java Wed May 4 22:16:36 2005
@@ -9,7 +9,7 @@
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.miheaders.RelatesTo;
import org.apache.axis.addressing.om.MessageInformationHeadersCollection;
-import org.apache.axis.context.BasicMEPContext;
+import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
@@ -195,7 +195,7 @@
null,
transportIn,
transportOut,
- new BasicMEPContext(axisOperation, null));
+ new BasicOperationContext(axisOperation, null));
msgctx.setEnvelope(env);
msgctx.setMessageInformationHeaders(messageInfoHeaders);
Added: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java?rev=168272&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java (added)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java Wed May 4 22:16:36 2005
@@ -0,0 +1,145 @@
+package org.apache.axis.context;
+
+/*
+ * 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.
+ *
+ *
+ */
+
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.engine.AxisFault;
+import org.apache.wsdl.WSDLConstants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author chathura@opensource.lk
+ *
+ */
+
+/**
+ * This class will provide the functionality to support the two basic MEPs
+ * IN_OUT and IN_ONLY.
+ *
+ * @author chathura@opensource.lk
+ */
+
+public class BasicOperationContext extends AbstractContext implements OperationContext {
+
+ private ArrayList messageContextList;
+
+ private String MepId;
+
+ private AxisOperation axisOperation;
+
+ public BasicOperationContext(AxisOperation axisOperation,ServiceContext serviceContext) {
+ super(serviceContext);
+ this.axisOperation = axisOperation;
+
+// Most frequently used MEPs are IN ONLY and IN-OUT MEP. So the number of messagecontext for those MEPs are at most 2. Setting the initial capacity of the arrayList to 2.
+ messageContextList = new ArrayList(2);
+ }
+ /**
+ *
+ * When a new message is added to the <code>MEPContext</code> the logic
+ * should be included remove the MEPContext from the table in the
+ * <code>EngineContext</code>. Example: IN_IN_OUT At the second IN
+ * message the MEPContext should be removed from the AxisOperation
+ *
+ * @param msgContext
+ */
+ public void addMessageContext(MessageContext msgContext) throws AxisFault {
+ if (WSDLConstants.MEP_URI_IN_ONLY.equals(this.axisOperation.getMessageExchangePattern())){
+ messageContextList.add(msgContext);
+ } else if(WSDLConstants.MEP_URI_IN_OUT.equals(this.axisOperation.getMessageExchangePattern())){
+ messageContextList.add(msgContext);
+ }
+
+ if(this.isComplete())
+ msgContext.getEngineContext().removeMEP(this);
+
+
+ }
+
+ /**
+ * @param index
+ * @return
+ */
+ public MessageContext getMessageContext(int index) {
+ return (MessageContext) messageContextList.get(index);
+ }
+
+ public MessageContext removeMessageContext(MessageContext ctxt) {
+ messageContextList.remove(ctxt.getMessageID());
+ return ctxt;
+ }
+
+ public List getAllMessageContexts() {
+ return this.messageContextList;
+ }
+
+ public MessageContext getMessageContext(String messageID) throws AxisFault {
+ if (null != messageID) {
+ for (int i = 0; i < this.messageContextList.size(); i++) {
+ if (messageID.equals(((MessageContext) (this.messageContextList
+ .get(i))).getMessageID())) {
+ return ((MessageContext) (this.messageContextList.get(i)));
+ }
+ }
+ }
+
+ throw new AxisFault(" Message does not exist in the current MEP : Invalid MessageID :" + messageID);
+ }
+
+ public void addMessageContext(String messageLabel, MessageContext msgContext) throws AxisFault {
+ // TODO : Chathura
+ }
+
+ /**
+ * @return Returns the mepId.
+ */
+ public String getMepId() {
+ return MepId;
+ }
+
+ /**
+ * @param mepId The mepId to set.
+ */
+ public void setMepId(String mepId) {
+ MepId = mepId;
+ }
+
+ /**
+ * Chathura, please implement this method to return the last in message of the MEP.
+ * I want this for addressing - Chinthaka
+ * @return
+ */
+ public MessageContext getLastInMessageContext(){
+ return null;
+ }
+
+ public boolean isComplete(){
+ if (WSDLConstants.MEP_URI_IN_ONLY.equals(this.axisOperation.getMessageExchangePattern())){
+ if(1 == this.messageContextList.size())
+ return true;
+ }else if(WSDLConstants.MEP_URI_IN_OUT.equals(this.axisOperation.getMessageExchangePattern())){
+ if(2 == this.messageContextList.size())
+ return true;
+ }
+
+ return false;
+ }
+}
\ No newline at end of file
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java Wed May 4 22:16:36 2005
@@ -25,7 +25,7 @@
public static OperationContext createMEP(String mepURI,boolean serverSide,AxisOperation axisOp,ServiceContext serviceContext) throws AxisFault{
if(MEP_URI_IN_ONLY.equals(mepURI) || MEP_URI_IN_OUT.equals(mepURI)){
- return new BasicMEPContext(axisOp,serviceContext);
+ return new BasicOperationContext(axisOp,serviceContext);
}else{
throw new AxisFault("Cannot handle the MEP "
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -170,7 +170,7 @@
new BufferedReader(
new InputStreamReader(req.getInputStream())));
StAXBuilder builder =
- new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), reader);
+ new StAXSOAPModelBuilder(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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -123,7 +123,7 @@
AxisEngine axisEngine = new AxisEngine();
try {
XMLStreamReader xmlreader = XMLInputFactory.newInstance().createXMLStreamReader(in);
- StAXBuilder builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), xmlreader);
+ StAXBuilder builder = new StAXSOAPModelBuilder(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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -141,7 +141,7 @@
ByteArrayInputStream bais = new ByteArrayInputStream(mimeMessage.getContent().toString().getBytes());
XMLStreamReader reader = XMLInputFactory.newInstance()
.createXMLStreamReader(bais);
- StAXBuilder builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), reader);
+ StAXBuilder builder = new StAXSOAPModelBuilder(reader);
msgContext.setEnvelope((SOAPEnvelope) builder
.getDocumentElement());
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -22,7 +22,7 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.BasicMEPContext;
+import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
@@ -59,7 +59,7 @@
AxisOperation axisOp = new AxisOperation(operationName);
- mc = new MessageContext(engineContext, null, null, transportIn,transportOut,new BasicMEPContext(axisOp,null));
+ mc = new MessageContext(engineContext, null, null, transportIn,transportOut,new BasicOperationContext(axisOp,null));
mc.setTransportOut(transportOut);
mc.setServerSide(true);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -22,7 +22,7 @@
import org.apache.axis.addressing.AddressingConstants;
import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.context.BasicMEPContext;
+import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.EngineContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.ServiceContext;
@@ -67,7 +67,7 @@
null,
transportIn,
transport,
- new BasicMEPContext(axisOp, null));
+ new BasicOperationContext(axisOp, null));
mc.setTransportOut(transport);
mc.setServerSide(true);
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -21,7 +21,7 @@
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.context.BasicOperationContext;
import org.apache.axis.description.AxisGlobal;
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPFactory;
@@ -35,7 +35,7 @@
public void testMesssageContext() throws AxisFault {
EngineConfiguration er = new EngineConfigurationImpl(new AxisGlobal());
EngineContext engineContext = new EngineContext(er);
- MessageContext msgctx = new MessageContext(engineContext, null,null,null,null,new BasicMEPContext(null,null));
+ MessageContext msgctx = new MessageContext(engineContext, null,null,null,null,new BasicOperationContext(null,null));
SOAPFactory omFac = OMAbstractFactory.getSOAP11Factory();
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -7,7 +7,7 @@
import org.apache.axis.addressing.AnyContentType;
import org.apache.axis.addressing.EndpointReference;
import org.apache.axis.addressing.ServiceName;
-import org.apache.axis.context.BasicMEPContext;
+import org.apache.axis.context.BasicOperationContext;
import org.apache.axis.context.MessageContext;
import org.apache.axis.handlers.util.TestUtil;
import org.apache.axis.om.OMFactory;
@@ -49,7 +49,7 @@
super.setUp();
outHandler = new AddressingOutHandler();
testUtil = new TestUtil();
- msgCtxt = new MessageContext(null, null, null, null,null,new BasicMEPContext(null,null));
+ msgCtxt = new MessageContext(null, null, null, null,null,new BasicOperationContext(null,null));
}
public void testAddToSOAPHeader() throws Exception {
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -42,7 +42,7 @@
fileName = IN_FILE_NAME;
}
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new FileReader(getTestResourceFile(fileName)));
- builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), parser);
+ builder = new StAXSOAPModelBuilder(parser);
return builder;
}
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -50,7 +50,7 @@
// private static final String ADDRESS = "http://127.0.0.1:8080/axis/services/" + SERVICE_NAME;
private EndpointReference targetEPR = new EndpointReference(AddressingConstants.WSA_TO, ADDRESS);
private QName serviceName = new QName("", SERVICE_NAME);
- //private QName serviceName = new QName("", targetEPR.getAddress());
+ //private QName serviceName = new QName("", targetEPR.getValue());
private QName operationName = new QName(OPERATION_NAME);
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -27,10 +27,6 @@
* or just an XML model. This class will give some common functionality of OM Building from StAX.
*/
public abstract class StAXBuilder implements OMXMLParserWrapper {
- /**
- * Field ombuilderFactory
- */
- protected OMFactory ombuilderFactory;
/**
* Field parser
@@ -76,9 +72,8 @@
* @param parser
*/
protected StAXBuilder(OMFactory ombuilderFactory, XMLStreamReader parser) {
- this.ombuilderFactory = ombuilderFactory;
this.parser = parser;
- omfactory = OMAbstractFactory.getOMFactory();
+ omfactory = ombuilderFactory;
}
/**
@@ -88,7 +83,6 @@
*/
protected StAXBuilder(XMLStreamReader parser) {
this(OMAbstractFactory.getOMFactory(), parser);
- omfactory = OMAbstractFactory.getOMFactory();
}
/**
@@ -97,7 +91,7 @@
* @param ombuilderFactory
*/
public void setOmbuilderFactory(OMFactory ombuilderFactory) {
- this.ombuilderFactory = ombuilderFactory;
+ this.omfactory = ombuilderFactory;
}
/**
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=168272&r1=168271&r2=168272&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 Wed May 4 22:16:36 2005
@@ -64,14 +64,12 @@
/**
* Constructor StAXSOAPModelBuilder
*
- * @param ombuilderFactory
* @param parser
*/
- public StAXSOAPModelBuilder(SOAPFactory ombuilderFactory,
- XMLStreamReader parser) {
- super(ombuilderFactory, parser);
- this.soapFactory = ombuilderFactory;
+ public StAXSOAPModelBuilder(XMLStreamReader parser) {
+ super(parser);
identifySOAPVersion();
+
parseHeaders();
}
@@ -86,13 +84,17 @@
envelopeNamespace = getSOAPEnvelope().findNamespace(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, "");
} else {
log.info("SOAP 1.2 message received ..");
+ soapFactory = OMAbstractFactory.getSOAP12Factory();
}
if (envelopeNamespace == null) {
throw new OMException("Invalid SOAP message. Doesn't have proper namespace declaration !!");
} else {
log.info("SOAP 1.1 message received ..");
+ soapFactory = OMAbstractFactory.getSOAP11Factory();
}
+
+ omfactory = soapFactory;
}
private void parseHeaders() {
@@ -109,15 +111,6 @@
}
}
- /**
- * Constructor StAXSOAPModelBuilder
- *
- * @param parser
- */
- public StAXSOAPModelBuilder(XMLStreamReader parser) {
- // TODO FIX ME
- this(OMAbstractFactory.getSOAP11Factory(), parser);
- }
/**
* Method getSOAPEnvelope
@@ -179,7 +172,7 @@
envelope =
(SOAPEnvelopeImpl) soapFactory.createSOAPEnvelope(null,
this);
- element = (OMElementImpl) envelope;
+ element = envelope;
processNamespaceData(element, true);
} else if (elementLevel == 2) {
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/OMXMLBuilderFactory.java Wed May 4 22:16:36 2005
@@ -55,7 +55,7 @@
*/
public static StAXSOAPModelBuilder createStAXSOAPModelBuilder(
SOAPFactory soapFactory, XMLStreamReader parser) {
- return new StAXSOAPModelBuilder(soapFactory, parser);
+ return new StAXSOAPModelBuilder(parser);
}
/**
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/factory/SOAPLinkedListImplFactory.java Wed May 4 22:16:36 2005
@@ -20,7 +20,7 @@
* the License.
* <p/>
*/
-public class SOAPLinkedListImplFactory extends OMLinkedListImplFactory implements SOAPFactory {
+public abstract class SOAPLinkedListImplFactory extends OMLinkedListImplFactory implements SOAPFactory {
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
@@ -70,7 +70,7 @@
return new SOAPEnvelopeImpl(ns);
}
- /**
+ /**
* Method createSOAPHeader
*
* @param envelope
Modified: webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap11/SOAP11Factory.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap11/SOAP11Factory.java (original)
+++ webservices/axis/trunk/java/modules/xml/src/org/apache/axis/om/impl/llom/soap11/SOAP11Factory.java Wed May 4 22:16:36 2005
@@ -2,6 +2,7 @@
import org.apache.axis.om.OMFactory;
import org.apache.axis.om.SOAPFactory;
+import org.apache.axis.om.SOAPEnvelope;
import org.apache.axis.om.impl.llom.factory.SOAPLinkedListImplFactory;
/**
@@ -24,4 +25,5 @@
/**
* Eran Chinthaka (chinthaka@apache.org)
*/
+
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMNavigatorTest.java Wed May 4 22:16:36 2005
@@ -41,7 +41,7 @@
XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().
createXMLStreamReader(new FileReader(getTestResourceFile("soap/soapmessage1.xml")));
SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
- builder = new StAXSOAPModelBuilder(factory, xmlStreamReader);
+ builder = new StAXSOAPModelBuilder(xmlStreamReader);
envelope = (SOAPEnvelope) builder.getDocumentElement();
tempFile = File.createTempFile("temp", "xml");
writer = XMLOutputFactory.newInstance().createXMLStreamWriter(new FileOutputStream(tempFile));
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTest.java Wed May 4 22:16:36 2005
@@ -42,7 +42,7 @@
File file = getTestResourceFile("soap/sample1.xml");
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new FileReader(file));
fac = OMAbstractFactory.getSOAP11Factory();
- OMXMLParserWrapper builder = new StAXSOAPModelBuilder(fac, parser);
+ OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser);
envelope = (SOAPEnvelope) builder.getDocumentElement();
}
Modified: webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java?rev=168272&r1=168271&r2=168272&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java (original)
+++ webservices/axis/trunk/java/modules/xml/test/org/apache/axis/om/OMTestCase.java Wed May 4 22:16:36 2005
@@ -51,13 +51,13 @@
fileName = IN_FILE_NAME;
}
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(new FileReader(getTestResourceFile(fileName)));
- builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), parser);
+ builder = new StAXSOAPModelBuilder(parser);
return builder;
}
protected StAXSOAPModelBuilder getOMBuilder(InputStream in) throws Exception {
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(in);
- builder = new StAXSOAPModelBuilder(OMAbstractFactory.getSOAP11Factory(), parser);
+ builder = new StAXSOAPModelBuilder(parser);
return builder;
}