You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/04/25 07:53:45 UTC
svn commit: r164540 - in /webservices/axis/trunk/java/modules:
core/src/org/apache/axis/context/ core/src/org/apache/axis/description/
core/src/org/apache/axis/engine/ samples/
Author: chathura
Date: Sun Apr 24 22:53:44 2005
New Revision: 164540
URL: http://svn.apache.org/viewcvs?rev=164540&view=rev
Log:
Unchecked (Runtime) Exception AddedMEPContext added to the core. MEPContextFactory is added to provide for the extensibility of the different MEPs that might occure (like IN_IN_OUT may be) in the future. BasicMEPContext is the default MEPContext that is capable of handling IN_OUT and IN_ONLY MEPs. AxisOperation is made MEPContext aware. ..
Removed the EchoTest.java for the time being.
Added:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java
Removed:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/InMEPContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/InOutMEPContext.java
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContextFactory.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/DescriptionConstants.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
webservices/axis/trunk/java/modules/samples/project.xml
Added: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java?rev=164540&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java (added)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicMEPContext.java Sun Apr 24 22:53:44 2005
@@ -0,0 +1,122 @@
+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 java.util.ArrayList;
+import java.util.List;
+
+import org.apache.axis.description.AxisOperation;
+import org.apache.axis.engine.AxisFault;
+import org.apache.wsdl.WSDLConstants;
+
+/**
+ * @author chathura@opensource.lk
+ *
+ */
+
+/**
+ * This class will provide the functionality to support the two basic MEPs
+ * IN_OUT IN_ONLY.
+ *
+ * @author chathura@opensource.lk
+ *
+ */
+
+public class BasicMEPContext extends AbstractContext implements MEPContext {
+
+ private ArrayList messageContextList;
+
+ private String MepId;
+
+ private AxisOperation axisOperation;
+
+ public BasicMEPContext() {
+ super();
+ messageContextList = new ArrayList();
+ }
+
+ public BasicMEPContext(AxisOperation axisOperation) {
+ this();
+ this.axisOperation = axisOperation;
+
+ }
+
+ /**
+ *
+ * When a new message is added to the <code>MEPContext</code> the logic
+ * should be included remove the MEPContext from the MEPMAp of the
+ * <code>AxisOperation</code>. Example: IN_IN_OUT At the second IN
+ * message the MEPContext should be removed from the AxisOperation
+ *
+ * @param ctxt
+ */
+ public void addMessageContext(MessageContext ctxt) {
+ if (WSDLConstants.MEP_URI_IN_ONLY.equals(this.axisOperation
+ .getMessageExchangePattern()))
+ // this.axisOperation.removeMEPContext(this);
+ messageContextList.add(ctxt);
+
+ }
+
+ /**
+ *
+ * @param messageId
+ * @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 doennot exist in the current MEP : Invalid MessageID :" + messageID);
+ }
+
+ /**
+ * @return Returns the mepId.
+ */
+ public String getMepId() {
+ return MepId;
+ }
+
+ /**
+ * @param mepId
+ * The mepId to set.
+ */
+ public void setMepId(String mepId) {
+ MepId = mepId;
+ }
+}
\ No newline at end of file
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContext.java?rev=164540&r1=164539&r2=164540&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/MEPContext.java Sun Apr 24 22:53:44 2005
@@ -2,6 +2,8 @@
import java.util.List;
+import org.apache.axis.engine.AxisFault;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -24,15 +26,22 @@
public String getMepId();
public void setMepId(String mepId);
- public MessageContext getInMessageContext(String messageID);
- public List getInMessageContexts();
-
- public MessageContext getOutMessageContext(String messageID);
- public List getOutMessageContexts();
+
+// public MessageContext getInMessageContext(String messageID);
+// public List getInMessageContexts();
+//
+// public MessageContext getOutMessageContext(String messageID);
+// public List getOutMessageContexts();
+
+// public void addInMessageContext(MessageContext msgctx);
+// public void addOutMessageContext(MessageContext msgctx);
+
+// public boolean isComplete();
+
+ public MessageContext getMessageContext(String msgID) throws AxisFault;
- public void addInMessageContext(MessageContext msgctx);
- public void addOutMessageContext(MessageContext msgctx);
+ public void addMessageContext(MessageContext msgContext) throws AxisFault;
- public boolean isComplete();
+ public List getAllMessageContexts();
}
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=164540&r1=164539&r2=164540&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 Sun Apr 24 22:53:44 2005
@@ -18,18 +18,17 @@
package org.apache.axis.context;
import org.apache.axis.engine.AxisFault;
+import org.apache.wsdl.WSDLConstants;
-public class MEPContextFactory {
- public static final String IN_ONLY_MEP = "in-only";
- public static final String IN_OUT_MEP = "in-out";
+public class MEPContextFactory implements WSDLConstants{
public static MEPContext createMEP(String mepURI,boolean serverSide) throws AxisFault{
- if(IN_ONLY_MEP.equals(mepURI)){
- return new InMEPContext(serverSide);
- }else if(IN_OUT_MEP.equals(mepURI)){
- return new InOutMEPContext(serverSide);
+ if(MEP_URI_IN_ONLY.equals(mepURI) || MEP_URI_IN_OUT.equals(mepURI)){
+ return new BasicMEPContext();
+
}else{
- throw new AxisFault("MEP " + mepURI + "Not known");
+ throw new AxisFault("Cannot handle the MEP "
+ + mepURI+" for the current invocation of Operation ");
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java?rev=164540&r1=164539&r2=164540&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java Sun Apr 24 22:53:44 2005
@@ -1,7 +1,13 @@
package org.apache.axis.description;
+import java.util.Map;
+
import javax.xml.namespace.QName;
+import org.apache.axis.context.MEPContext;
+import org.apache.axis.context.MEPContextFactory;
+import org.apache.axis.context.MessageContext;
+import org.apache.axis.engine.AxisFault;
import org.apache.wsdl.WSDLOperation;
import org.apache.wsdl.impl.WSDLOperationImpl;
@@ -48,4 +54,68 @@
(ParameterIncludeImpl) this.getComponentProperty(PARAMETER_KEY);
return (Parameter) paramInclude.getParameter(name);
}
+
+ /**
+ * This method is responsible for finding a MEPContext for an incomming
+ * messages. An incomming message can be of two states.
+ *
+ * 1)This is a new incomming message of a given MEP. 2)This message is a
+ * part of an MEP which has already begun.
+ *
+ * The method is special cased for the two MEPs
+ *
+ * #IN_ONLY #IN_OUT
+ *
+ * for two reasons. First reason is the wide usage and the second being that
+ * the need for the MEPContext to be saved for further incomming messages.
+ *
+ * In the event that MEP of this operation is different from the two MEPs
+ * deafulted above the decession of creating a new or this message relates
+ * to a MEP which already in business is decided by looking at the WSA
+ * Relates TO of the incomming message.
+ *
+ * @param msgContext
+ * @return
+ */
+ public MEPContext findMEPContext(MessageContext msgContext, boolean serverside)
+ throws AxisFault {
+
+ MEPContext mepContext = null;
+
+
+ if (null == msgContext.getRelatesTo()) {
+ //Its a new incomming message so get the factory to create a new
+ // one
+ mepContext = MEPContextFactory.createMEP(this
+ .getMessageExchangePattern(), serverside);
+
+ } else {
+ // So this message is part of an ongoing MEP
+ mepContext = this
+ .getSavedMEPContextFromComponentProperties(msgContext
+ .getRelatesTo().getAddress());
+ if (null == mepContext) {
+ throw new AxisFault(
+ "Cannot relate the message in the operation :"
+ + this.getName() + " :Invalid RelatedTO value");
+ }
+
+ }
+
+ this.addMEPContext(mepContext, msgContext.getMessageID());
+ mepContext.addMessageContext(msgContext);
+ return mepContext;
+
+ }
+
+ private void addMEPContext(MEPContext mepContext, String messageID) {
+ ((Map) this.getComponentProperty(MEP_MAP)).put(messageID, mepContext);
+ }
+
+ private MEPContext getSavedMEPContextFromComponentProperties(String messageID) {
+ return (MEPContext) ((Map) this.getComponentProperty(MEP_MAP)).get(messageID);
+
+ }
+
}
+
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/DescriptionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/DescriptionConstants.java?rev=164540&r1=164539&r2=164540&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/DescriptionConstants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/DescriptionConstants.java Sun Apr 24 22:53:44 2005
@@ -101,4 +101,9 @@
* Field SERVICE_CLASS_NAME
*/
public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME";
+
+ /**
+ * Key that will keep the <code>MEPContext</code>s in the <code>AxisOperation</code>
+ */
+ public static final String MEP_MAP = "MEP_MAP";
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java?rev=164540&r1=164539&r2=164540&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/ServiceHandlersChainBuilder.java Sun Apr 24 22:53:44 2005
@@ -54,7 +54,7 @@
if(param != null){
mepVal = (String)param.getValue();
}else{
- mepVal = MEPContextFactory.IN_OUT_MEP;
+ mepVal = MEPContextFactory.MEP_URI_IN_OUT;
}
//TODO find the MEP context
Modified: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?rev=164540&r1=164539&r2=164540&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis/trunk/java/modules/samples/project.xml Sun Apr 24 22:53:44 2005
@@ -94,6 +94,7 @@
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
<exclude>**/*InteropStubTest.java</exclude>
+ <exclude>**/*EchoTest.java</exclude>
<!-- <exclude>**/*TransportDeploymentTest.java</exclude> -->
<!-- <exclude>**/*BuildERWithDeploymentTest.java</exclude> -->
</excludes>