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:23:28 UTC
svn commit: r168273 - in /webservices/axis/trunk/java/modules/core:
src/org/apache/axis/context/BasicOperationContext.java
src/org/apache/axis/context/EngineContext.java
src/org/apache/axis/context/OperationContext.java
src/org/apache/axis/description/AxisOperation.java
test/org/apache/axis/context/MEPContextTest.java
Author: chinthaka
Date: Wed May 4 22:23:27 2005
New Revision: 168273
URL: http://svn.apache.org/viewcvs?rev=168273&view=rev
Log:
Refactoring MEPContext to OperationContext
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/AxisOperation.java
webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java
Modified: 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=168273&r1=168272&r2=168273&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/BasicOperationContext.java Wed May 4 22:23:27 2005
@@ -106,6 +106,8 @@
public void addMessageContext(String messageLabel, MessageContext msgContext) throws AxisFault {
// TODO : Chathura
+ throw new UnsupportedOperationException();
+
}
/**
@@ -128,10 +130,16 @@
* @return
*/
public MessageContext getLastInMessageContext(){
- return null;
+ throw new UnsupportedOperationException();
+
+ }
+
+ public void cleanup() throws AxisFault {
+ //TODO Chathura
+ throw new UnsupportedOperationException();
}
-
- public boolean isComplete(){
+
+ public boolean isComplete(){
if (WSDLConstants.MEP_URI_IN_ONLY.equals(this.axisOperation.getMessageExchangePattern())){
if(1 == this.messageContextList.size())
return true;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java?rev=168273&r1=168272&r2=168273&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/EngineContext.java Wed May 4 22:23:27 2005
@@ -145,13 +145,13 @@
}
public void removeMEP(OperationContext mepContext) throws AxisFault{
- if(!mepContext.isComplete())
- throw new AxisFault("Illegal attempt to drop the global reference of an incomplete MEPContext");
- Iterator iterator = mepContext.getAllMessageContexts().iterator();
- while(iterator.hasNext()){
- MessageContext msgContext = ((MessageContext)iterator.next());
- this.mepContextMap.remove(msgContext.getMessageID());
- }
+// if(!mepContext.isComplete())
+// throw new AxisFault("Illegal attempt to drop the global reference of an incomplete MEPContext");
+// Iterator iterator = mepContext.getAllMessageContexts().iterator();
+// while(iterator.hasNext()){
+// MessageContext msgContext = ((MessageContext)iterator.next());
+// this.mepContextMap.remove(msgContext.getMessageID());
+// }
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java?rev=168273&r1=168272&r2=168273&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/context/OperationContext.java Wed May 4 22:23:27 2005
@@ -25,4 +25,5 @@
public MessageContext getMessageContext(String messageLabel) throws AxisFault;
public void addMessageContext(String messageLabel, MessageContext msgContext) throws AxisFault;
public MessageContext getLastInMessageContext();
+ public void cleanup() throws AxisFault;
}
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=168273&r1=168272&r2=168273&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 Wed May 4 22:23:27 2005
@@ -112,33 +112,35 @@
*/
public OperationContext findMEPContext(MessageContext msgContext, boolean serverside)
throws AxisFault {
-
- OperationContext 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,this,msgContext.getServiceContext());
-
-
- } else {
- // So this message is part of an ongoing MEP
- mepContext = msgContext.getEngineContext().getMEPContext(msgContext.getRelatesTo().getValue());
-
- if (null == mepContext) {
- throw new AxisFault(
- "Cannot relate the message in the operation :"
- + this.getName() + " :Unrelated RelatesTO value "+msgContext.getRelatesTo().getValue());
- }
-
- }
-
- msgContext.getEngineContext().addMEPContext(msgContext.getMessageID(), mepContext);
- mepContext.addMessageContext(msgContext);
- msgContext.setMepContext(mepContext);
- return mepContext;
+ //TODO : Chathura Fix me
+ throw new UnsupportedOperationException();
+
+// OperationContext 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,this,msgContext.getServiceContext());
+//
+//
+// } else {
+// // So this message is part of an ongoing MEP
+// mepContext = msgContext.getEngineContext().getMEPContext(msgContext.getRelatesTo().getValue());
+//
+// if (null == mepContext) {
+// throw new AxisFault(
+// "Cannot relate the message in the operation :"
+// + this.getName() + " :Unrelated RelatesTO value "+msgContext.getRelatesTo().getValue());
+// }
+//
+// }
+//
+// msgContext.getEngineContext().addMEPContext(msgContext.getMessageID(), mepContext);
+// mepContext.addMessageContext(msgContext);
+// msgContext.setMepContext(mepContext);
+// return mepContext;
}
Modified: webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java?rev=168273&r1=168272&r2=168273&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java (original)
+++ webservices/axis/trunk/java/modules/core/test/org/apache/axis/context/MEPContextTest.java Wed May 4 22:23:27 2005
@@ -44,12 +44,12 @@
messageContext1.setMessageID(new Long(System.currentTimeMillis()).toString());
AxisOperation axisOperation = new AxisOperation(new QName("test"));
- MEPContext mepContext1 = axisOperation.findMEPContext(messageContext1, true);
+ OperationContext mepContext1 = axisOperation.findMEPContext(messageContext1, true);
MessageContext messageContext2 = this.getBasicMessageContext();
messageContext2.setMessageID(new Long(System.currentTimeMillis()).toString());
messageContext2.getMessageInformationHeaders().setRelatesTo(new RelatesTo(messageContext1.getMessageID()));
- MEPContext mepContext2 = axisOperation.findMEPContext(messageContext2, true);
+ OperationContext mepContext2 = axisOperation.findMEPContext(messageContext2, true);
assertEquals(mepContext1, mepContext2);
}