You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/04/08 17:05:31 UTC
svn commit: r392543 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: client/ handlers/
msgprocessors/ policy/ policy/processors/ util/
Author: chamikara
Date: Sat Apr 8 08:05:28 2006
New Revision: 392543
URL: http://svn.apache.org/viewcvs?rev=392543&view=rev
Log:
Updated the client code.
Removed:
webservices/sandesha/trunk/src/org/apache/sandesha2/client/RMClientAPI.java
webservices/sandesha/trunk/src/org/apache/sandesha2/client/RMClientConstants.java
webservices/sandesha/trunk/src/org/apache/sandesha2/client/RMFaultCallback.java
webservices/sandesha/trunk/src/org/apache/sandesha2/client/RMReport.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicy.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyToken.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMProcessorContext.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/AcknowledgementIntervalProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/ExponentialBackoffProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutMeasureProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InvokeInOrderProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MaximumRetransmissionCountProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MessageTypesToDropProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/RetransmissionItervalProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/StorageManagersProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Sat Apr 8 08:05:28 2006
@@ -39,9 +39,9 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.client.RMClientConstants;
-import org.apache.sandesha2.client.RMFaultCallback;
-import org.apache.sandesha2.client.RMClientAPI;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SandeshaFaultCallback;
+import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.msgprocessors.ApplicationMsgProcessor;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
@@ -90,7 +90,7 @@
if (requestMessage!=null) {
if(SandeshaUtil.isRetriableOnFaults(requestMessage)){
- RMFaultCallback faultCallback = (RMFaultCallback) operationContext.getProperty(RMClientConstants.RM_FAULT_CALLBACK);
+ SandeshaFaultCallback faultCallback = (SandeshaFaultCallback) operationContext.getProperty(SandeshaClientConstants.RM_FAULT_CALLBACK);
if (faultCallback!=null) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java Sat Apr 8 08:05:28 2006
@@ -39,8 +39,8 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.client.RMClientAPI;
-import org.apache.sandesha2.client.RMClientConstants;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.msgprocessors.ApplicationMsgProcessor;
import org.apache.sandesha2.msgprocessors.MsgProcessor;
import org.apache.sandesha2.msgprocessors.MsgProcessorFactory;
@@ -71,7 +71,6 @@
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.wsdl.WSDLConstants;
/**
* This is invoked in the outFlow of an RM endpoint
@@ -110,9 +109,9 @@
msgCtx.setProperty(Sandesha2Constants.APPLICATION_PROCESSING_DONE,
"true");
- String dummyMessageString = (String) msgCtx.getOptions().getProperty(RMClientConstants.DUMMY_MESSAGE);
+ String dummyMessageString = (String) msgCtx.getOptions().getProperty(SandeshaClientConstants.DUMMY_MESSAGE);
boolean dummyMessage = false;
- if (dummyMessageString!=null && RMClientAPI.VALUE_TRUE.equals(dummyMessageString))
+ if (dummyMessageString!=null && Sandesha2Constants.VALUE_TRUE.equals(dummyMessageString))
dummyMessage = true;
StorageManager storageManager = SandeshaUtil
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Sat Apr 8 08:05:28 2006
@@ -41,9 +41,9 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.client.RMClientConstants;
-import org.apache.sandesha2.client.RMFaultCallback;
-import org.apache.sandesha2.client.RMClientAPI;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SandeshaFaultCallback;
+import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
@@ -78,7 +78,6 @@
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.wsdl.WSDLConstants;
/**
* Responsible for processing an incoming Application message.
@@ -439,11 +438,11 @@
ConfigurationContext configContext = msgContext .getConfigurationContext();
//setting the Fault callback
- RMFaultCallback faultCallback = (RMFaultCallback) msgContext.getOptions().getProperty(RMClientConstants.RM_FAULT_CALLBACK);
+ SandeshaFaultCallback faultCallback = (SandeshaFaultCallback) msgContext.getOptions().getProperty(SandeshaClientConstants.RM_FAULT_CALLBACK);
if (faultCallback!=null) {
OperationContext operationContext = msgContext.getOperationContext();
if (operationContext!=null) {
- operationContext.setProperty(RMClientConstants.RM_FAULT_CALLBACK,faultCallback);
+ operationContext.setProperty(SandeshaClientConstants.RM_FAULT_CALLBACK,faultCallback);
}
}
@@ -491,7 +490,7 @@
// getting the request message and rmMessage.
MessageContext reqMsgCtx;
try {
- reqMsgCtx = msgContext.getOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ reqMsgCtx = msgContext.getOperationContext().getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
} catch (AxisFault e) {
throw new SandeshaException (e);
}
@@ -534,10 +533,10 @@
}
String to = toEPR.getAddress();
- String sequenceKey = (String) msgContext.getProperty(RMClientConstants.SEQUENCE_KEY);
+ String sequenceKey = (String) msgContext.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
internalSequenceId = SandeshaUtil.getInternalSequenceID(to,sequenceKey);
- String lastAppMessage = (String) msgContext.getProperty(RMClientConstants.LAST_MESSAGE);
+ String lastAppMessage = (String) msgContext.getProperty(SandeshaClientConstants.LAST_MESSAGE);
if (lastAppMessage!=null && "true".equals(lastAppMessage))
lastMessage = true;
}
@@ -546,7 +545,7 @@
the system will generate the message numbers */
//User should set it as a long object.
- Long messageNumberLng = (Long) msgContext.getProperty(RMClientConstants.MESSAGE_NUMBER);
+ Long messageNumberLng = (Long) msgContext.getProperty(SandeshaClientConstants.MESSAGE_NUMBER);
long givenMessageNumber = -1;
if (messageNumberLng!=null) {
@@ -577,16 +576,15 @@
//A dummy message is a one which will not be processed as a actual application message.
//The RM handlers will simply let these go.
- String dummyMessageString = (String) msgContext.getOptions().getProperty(RMClientConstants.DUMMY_MESSAGE);
+ String dummyMessageString = (String) msgContext.getOptions().getProperty(SandeshaClientConstants.DUMMY_MESSAGE);
boolean dummyMessage = false;
- if (dummyMessageString!=null && RMClientAPI.VALUE_TRUE.equals(dummyMessageString))
+ if (dummyMessageString!=null && Sandesha2Constants.VALUE_TRUE.equals(dummyMessageString))
dummyMessage = true;
//saving the used message number
if (!dummyMessage)
setNextMsgNo(configContext,internalSequenceId,messageNumber);
-
-
+
//set this as the response highest message.
SequencePropertyBean responseHighestMsgBean = new SequencePropertyBean (
internalSequenceId,
@@ -628,7 +626,7 @@
Sandesha2Constants.SequenceProperties.TO_EPR);
if (incomingToBean != null) {
String incomingTo = incomingToBean.getValue();
- msgContext.setProperty(RMClientConstants.AcksTo, incomingTo);
+ msgContext.setProperty(SandeshaClientConstants.AcksTo, incomingTo);
}
}
@@ -658,7 +656,7 @@
specVersion = specVersionBean.getValue();
} else {
//in the client side, user will set the RM version.
- specVersion = (String) msgContext.getProperty(RMClientConstants.RM_SPEC_VERSION);
+ specVersion = (String) msgContext.getProperty(SandeshaClientConstants.RM_SPEC_VERSION);
}
if (specVersion==null)
@@ -691,7 +689,7 @@
String acksTo = null;
if (serviceContext != null)
- acksTo = (String) msgContext.getProperty(RMClientConstants.AcksTo);
+ acksTo = (String) msgContext.getProperty(SandeshaClientConstants.AcksTo);
if (msgContext.isServerSide()) {
// we do not set acksTo value to anonymous when the create
@@ -766,7 +764,7 @@
MessageContext reqMsgCtx = null;
try {
- reqMsgCtx = msgContext.getOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+ reqMsgCtx = msgContext.getOperationContext().getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
} catch (AxisFault e) {
throw new SandeshaException (e);
}
@@ -990,7 +988,7 @@
OperationContext operationContext = msg.getOperationContext();
if (operationContext != null) {
- Object obj = msg.getProperty(RMClientConstants.LAST_MESSAGE);
+ Object obj = msg.getProperty(SandeshaClientConstants.LAST_MESSAGE);
if (obj != null && "true".equals(obj)) {
lastMessage = true;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Sat Apr 8 08:05:28 2006
@@ -31,9 +31,9 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.client.RMClientConstants;
-import org.apache.sandesha2.client.RMFaultCallback;
-import org.apache.sandesha2.client.RMClientAPI;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.client.SandeshaFaultCallback;
+import org.apache.sandesha2.client.SandeshaClient;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
@@ -231,11 +231,11 @@
MessageContext msgCtx = rmMsgCtx.getMessageContext();
//adding the RM_FAULT_CALLBACK
- RMFaultCallback faultCallback = (RMFaultCallback) msgCtx.getOptions().getProperty(RMClientConstants.RM_FAULT_CALLBACK);
+ SandeshaFaultCallback faultCallback = (SandeshaFaultCallback) msgCtx.getOptions().getProperty(SandeshaClientConstants.RM_FAULT_CALLBACK);
if (faultCallback!=null) {
OperationContext operationContext = msgCtx.getOperationContext();
if (operationContext!=null) {
- operationContext.setProperty(RMClientConstants.RM_FAULT_CALLBACK,faultCallback);
+ operationContext.setProperty(SandeshaClientConstants.RM_FAULT_CALLBACK,faultCallback);
}
}
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Sat Apr 8 08:05:28 2006
@@ -37,8 +37,8 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.client.RMClientAPI;
-import org.apache.sandesha2.client.RMClientConstants;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
@@ -291,7 +291,7 @@
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropretyBeanMgr();
String toAddress = rmMsgCtx.getTo().getAddress();
- String sequenceKey = (String) options.getProperty(RMClientConstants.SEQUENCE_KEY);
+ String sequenceKey = (String) options.getProperty(SandeshaClientConstants.SEQUENCE_KEY);
String internalSeqenceID = SandeshaUtil.getInternalSequenceID(toAddress,sequenceKey);
String outSequenceID = SandeshaUtil.getSequenceProperty(internalSeqenceID,Sandesha2Constants.SequenceProperties.OUT_SEQUENCE_ID,configurationContext);
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicy.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicy.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicy.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicy.java Sat Apr 8 08:05:28 2006
@@ -39,11 +39,4 @@
public static final RMPolicyToken storageManager = new RMPolicyToken(
"StorageManager", RMPolicyToken.SIMPLE_TOKEN, new String[]{});
-
- public static final String includeNever = "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";
-
- public static final String includeOnce = "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once";
-
- public static final String includeAlways = "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always";
-
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyProcessor.java Sat Apr 8 08:05:28 2006
@@ -35,12 +35,8 @@
RMProcessorContext rmProcessorContext = null;
public boolean setup() throws NoSuchMethodException {
- logger.debug("RMPolicyProcessor:setUp");
-
prdr = PolicyFactory.getPolicyReader(PolicyFactory.OM_POLICY_READER);
- /*
- * Initialize the top level security policy token.
- */
+
RMPolicyToken rpt = null;
RetransmissionItervalProcessor rip = new RetransmissionItervalProcessor();
@@ -124,8 +120,6 @@
* implmentation
*/
public boolean processPolicy(Policy policy) {
- logger.debug("RMPolicyProcessor:processPolicy");
-
if (!policy.isNormalized()) {
policy = (Policy) policy.normalize();
}
@@ -185,8 +179,6 @@
}
boolean processPrimitiveAssertion(PrimitiveAssertion pa) {
- logger.debug("RMPolicyManager:processPrimitiveAssertion");
-
boolean commit = true;
commit = startPolicyTransaction(pa);
@@ -211,8 +203,6 @@
}
public boolean startPolicyTransaction(PrimitiveAssertion pa) {
- logger.debug("RMPolicyProcessor:startPolicyTransaction");
-
String tokenName = pa.getName().getLocalPart();
RMPolicyToken rmpt = null;
@@ -263,8 +253,6 @@
}
public void abortPolicyTransaction(PrimitiveAssertion pa) {
- logger.debug("RMPolicyProcessor:abortPolicyTransaction");
-
RMPolicyToken currentToken = rmProcessorContext
.readCurrentSecurityToken();
if (currentToken == null) {
@@ -293,8 +281,6 @@
}
public void commitPolicyTransaction(PrimitiveAssertion pa) {
- logger.debug("RMPolicyProcessor:commitPolicyTransaction");
-
RMPolicyToken currentToken = rmProcessorContext
.readCurrentSecurityToken();
if (currentToken == null) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyToken.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyToken.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyToken.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyToken.java Sat Apr 8 08:05:28 2006
@@ -47,7 +47,6 @@
}
public RMPolicyToken(String token, int type, String[] attribs) {
- logger.debug("RMPolicyToken:RMPolicyTokey(String,int,String[])");
tokenName = token;
tokenType = type;
attributes = attribs;
@@ -65,7 +64,6 @@
}
public void setProcessTokenMethod(Object h) throws NoSuchMethodException {
- logger.debug("RMPolicyToken:setProcessTokenMethod");
if (h == null) {
return;
@@ -81,7 +79,6 @@
public boolean invokeProcessTokenMethod(RMProcessorContext spc)
throws IllegalArgumentException, IllegalAccessException,
InvocationTargetException {
- logger.debug("RMPolicyToken:invokeProcessTokenMethod");
if (processTokenMethod == null) {
return false;
@@ -97,17 +94,14 @@
}
public String getTokenName() {
- logger.debug("RMPolicyToken:getTokenName");
return tokenName;
}
public void setChildToken(RMPolicyToken spt) {
- logger.debug("RMPolicyToken:setChildToken");
childTokens.add(spt);
}
public RMPolicyToken getChildToken(String sptName) {
- logger.debug("RMPolicyToken:getChildToken");
Iterator it = childTokens.iterator();
while (it.hasNext()) {
RMPolicyToken tmpSpt = (RMPolicyToken) it.next();
@@ -120,7 +114,6 @@
public void removeChildToken(String sptName) {
- logger.debug("RMPolicyToken:removeChildToken");
Iterator it = childTokens.iterator();
while (it.hasNext()) {
RMPolicyToken tmpSpt = (RMPolicyToken) it.next();
@@ -132,7 +125,6 @@
}
public RMPolicyToken copy() {
- logger.debug("RMPolicyToken:copy");
RMPolicyToken spt = new RMPolicyToken(tokenName, tokenType,
attributes);
if (childTokens != null) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMProcessorContext.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMProcessorContext.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMProcessorContext.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMProcessorContext.java Sat Apr 8 08:05:28 2006
@@ -49,13 +49,11 @@
}
public void pushRMToken(RMPolicyToken spt) {
- logger.debug("RMProcessorContext:pushRMToken");
tokenStack.add(tokenStackPointer, spt);
tokenStackPointer++;
}
public RMPolicyToken popRMToken() {
- logger.debug("RMProcessorContext:popRMToken");
if (tokenStackPointer > 0) {
tokenStackPointer--;
return (RMPolicyToken) tokenStack.get(tokenStackPointer);
@@ -65,7 +63,6 @@
}
public RMPolicyToken readCurrentSecurityToken() {
- logger.debug("RMProcessorContext:readCurrentSecurityToken");
if (tokenStackPointer > 0) {
return (RMPolicyToken) tokenStack.get(tokenStackPointer - 1);
} else {
@@ -74,13 +71,11 @@
}
public void pushPolicyEngineData(PolicyEngineData ped) {
- logger.debug("RMProcessorContext:pushPolicyEngineData");
pedStack.add(pedStackPointer, ped);
pedStackPointer++;
}
public PolicyEngineData popPolicyEngineData() {
- logger.debug("RMProcessorContext:popPolicyEngineData");
if (pedStackPointer > 0) {
pedStackPointer--;
return (PolicyEngineData) pedStack.get(pedStackPointer);
@@ -90,7 +85,6 @@
}
public PolicyEngineData readCurrentPolicyEngineData() {
- logger.debug("RMProcessorContext:readCurrentPolicyEngineData");
if (pedStackPointer > 0) {
return (PolicyEngineData) pedStack.get(pedStackPointer - 1);
} else {
@@ -98,9 +92,7 @@
}
}
- public PolicyEngineData commitPolicyEngineData() {
- logger.debug("RMProcessorContext:commitPolicyEngineData");
-
+ public PolicyEngineData commitPolicyEngineData() {
if (pedStackPointer > 1) {
pedStackPointer--;
PolicyEngineData ped = (PolicyEngineData) pedStack.get(pedStackPointer);
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/AcknowledgementIntervalProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/AcknowledgementIntervalProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/AcknowledgementIntervalProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/AcknowledgementIntervalProcessor.java Sat Apr 8 08:05:28 2006
@@ -14,16 +14,10 @@
public void initializeAcknowledgementIterval(RMPolicyToken rmpt)
throws NoSuchMethodException {
- logger
- .debug("AcknowledgementIntervalProcessor:initializeAcknowledgementInterval");
}
public Object doAcknowledgementInterval(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/ExponentialBackoffProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/ExponentialBackoffProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/ExponentialBackoffProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/ExponentialBackoffProcessor.java Sat Apr 8 08:05:28 2006
@@ -14,14 +14,10 @@
public void initializeExponentialBackoff(RMPolicyToken rmpt)
throws NoSuchMethodException {
- logger.debug("ExponentialBackoffProcessor:initalizeExponentialBackoff");
}
public Object doExponentialBackoff(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutMeasureProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutMeasureProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutMeasureProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutMeasureProcessor.java Sat Apr 8 08:05:28 2006
@@ -12,15 +12,10 @@
public void initializeInactivityTimeoutMeasure(RMPolicyToken rmpt)
throws NoSuchMethodException {
- logger.debug("InactivityTimeoutMeasureProcessor:initializeInactivityTimeoutMeasure");
-
+
}
public Object doInactivityTimeoutMeasure(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InactivityTimeoutProcessor.java Sat Apr 8 08:05:28 2006
@@ -13,13 +13,10 @@
public void initializeInactivityTimeout(RMPolicyToken spt)
throws NoSuchMethodException {
- logger.debug("InactivityTimeoutProcessor:initializeInactivityTimeout");
+
}
public Object doInactivityTimeout(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InvokeInOrderProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InvokeInOrderProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InvokeInOrderProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/InvokeInOrderProcessor.java Sat Apr 8 08:05:28 2006
@@ -13,14 +13,9 @@
public void initializeInvokeInOrder(RMPolicyToken spt)
throws NoSuchMethodException {
- logger.debug("InvokeInOrderProcessor:initializeInvokeInOrder");
}
public Object doInvokeInOrder(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MaximumRetransmissionCountProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MaximumRetransmissionCountProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MaximumRetransmissionCountProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MaximumRetransmissionCountProcessor.java Sat Apr 8 08:05:28 2006
@@ -14,14 +14,9 @@
public void initializeMaximumRetransmissionCount(RMPolicyToken rmpt)
throws NoSuchMethodException {
- logger.debug("MaximumRetransmissionCountProcessor:initializeAcknowledgementInterval");
}
public Object doMaximumRetransmissionCount(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MessageTypesToDropProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MessageTypesToDropProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MessageTypesToDropProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/MessageTypesToDropProcessor.java Sat Apr 8 08:05:28 2006
@@ -13,14 +13,10 @@
public void initializeMessageTypesToDrop(RMPolicyToken spt)
throws NoSuchMethodException {
- logger.debug("MessgeTypesToDropProcessor:initializeMessgeTypesToDrop");
+
}
public Object doMessageTypesToDrop(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/RetransmissionItervalProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/RetransmissionItervalProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/RetransmissionItervalProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/RetransmissionItervalProcessor.java Sat Apr 8 08:05:28 2006
@@ -13,17 +13,11 @@
public void initializeRetranmissionIterval(RMPolicyToken spt)
throws NoSuchMethodException {
- logger
- .debug("RetransmissionIntervalProcessor:initializeRetransmissionInterval");
- ;
+ logger.debug("RetransmissionIntervalProcessor:initializeRetransmissionInterval");;
}
public Object doRetransmissionInterval(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/StorageManagersProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/StorageManagersProcessor.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/StorageManagersProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/processors/StorageManagersProcessor.java Sat Apr 8 08:05:28 2006
@@ -14,8 +14,6 @@
public void initializeStorageManager(RMPolicyToken rmpt)
throws NoSuchMethodException {
- logger.debug("StorageManagersProcessor:initializeStorageManager");
-
RMPolicyToken tmpRpt = RMPolicy.storageManager.copy();
tmpRpt.setProcessTokenMethod(this);
rmpt.setChildToken(tmpRpt);
@@ -27,10 +25,6 @@
}
public Object doStorageManagers(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
RMPolicyToken rmpt = rmpc.readCurrentSecurityToken();
switch (rmpc.getAction()) {
@@ -56,10 +50,6 @@
}
public Object doStorageManager(RMProcessorContext rmpc) {
- logger.debug("Processing "
- + rmpc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[rmpc.getAction()]);
-
PolicyEngineData ped = rmpc.readCurrentPolicyEngineData();
String cls = rmpc.getAssertion().getStrValue();
@@ -71,10 +61,6 @@
}
public Object doPermanentStorageManager(RMProcessorContext spc) {
- logger.debug("Processing "
- + spc.readCurrentSecurityToken().getTokenName() + ": "
- + RMProcessorContext.ACTION_NAMES[spc.getAction()]);
-
PolicyEngineData ped = spc.readCurrentPolicyEngineData();
String cls = spc.getAssertion().getStrValue();
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java Sat Apr 8 08:05:28 2006
@@ -39,7 +39,7 @@
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
-import org.apache.sandesha2.client.RMClientConstants;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
@@ -278,7 +278,7 @@
.getOperationContext();
if (operationcontext != null) {
String offeredSequence = (String) applicationMsgContext
- .getProperty(RMClientConstants.OFFERED_SEQUENCE_ID);
+ .getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
if (offeredSequence != null && !"".equals(offeredSequence)) {
SequenceOffer offerPart = new SequenceOffer(factory,rmNamespaceValue);
Identifier identifier = new Identifier(factory,rmNamespaceValue);
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java?rev=392543&r1=392542&r2=392543&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java Sat Apr 8 08:05:28 2006
@@ -28,8 +28,8 @@
import org.apache.sandesha2.Sandesha2Constants;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.Sandesha2Constants.WSA;
-import org.apache.sandesha2.client.RMClientAPI;
-import org.apache.sandesha2.client.RMClientConstants;
+import org.apache.sandesha2.client.SandeshaClient;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.policy.RMPolicyBean;
import org.apache.sandesha2.storage.StorageManager;
import org.apache.sandesha2.storage.Transaction;
@@ -207,7 +207,7 @@
EndpointReference toEPR = firstAplicationMsgCtx.getTo();
String acksTo = (String) firstAplicationMsgCtx
- .getProperty(RMClientConstants.AcksTo);
+ .getProperty(SandeshaClientConstants.AcksTo);
if (toEPR == null) {
String message = "WS-Addressing To is null";
@@ -323,7 +323,7 @@
String transportInProtocol = messageContext.getOptions().getTransportInProtocol();
- String acksTo = (String) messageContext.getProperty(RMClientConstants.AcksTo);
+ String acksTo = (String) messageContext.getProperty(SandeshaClientConstants.AcksTo);
String mep = messageContext.getAxisOperation().getMessageExchangePattern();
boolean startListnerForAsyncAcks = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org