You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2006/05/04 19:12:30 UTC
svn commit: r399776 - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: ./ client/ handlers/
msgprocessors/ policy/ storage/beanmanagers/ storage/inmemory/ util/ workers/
Author: chamikara
Date: Thu May 4 10:12:26 2006
New Revision: 399776
URL: http://svn.apache.org/viewcvs?rev=399776&view=rev
Log:
Removed unnecessary code
Made loggers static (Thanx Dennis for the comment)
Removed:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgValidator.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.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/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.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/storage/beanmanagers/CreateSeqBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java Thu May 4 10:12:26 2006
@@ -22,7 +22,6 @@
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.modules.Module;
import org.apache.axis2.modules.ModulePolicyExtension;
import org.apache.axis2.modules.PolicyExtension;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/client/SandeshaClient.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/client/SandeshaClient.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/client/SandeshaClient.java Thu May 4 10:12:26 2006
@@ -65,7 +65,7 @@
public class SandeshaClient {
- private static Log log = LogFactory.getLog(SandeshaClient.class);
+ private static final Log log = LogFactory.getLog(SandeshaClient.class);
/**
* Users can get a SequenceReport of the sequence defined by the information given from the
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Thu May 4 10:12:26 2006
@@ -57,7 +57,7 @@
public class SandeshaGlobalInHandler extends AbstractHandler {
- protected Log log = LogFactory.getLog(SandeshaGlobalInHandler.class
+ private static final Log log = LogFactory.getLog(SandeshaGlobalInHandler.class
.getName());
public void invoke(MessageContext msgContext) throws AxisFault {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java Thu May 4 10:12:26 2006
@@ -42,7 +42,7 @@
public class SandeshaInHandler extends AbstractHandler {
- protected Log log = LogFactory.getLog(SandeshaInHandler.class.getName());
+ private static final Log log = LogFactory.getLog(SandeshaInHandler.class.getName());
public QName getName() {
return new QName(Sandesha2Constants.IN_HANDLER_NAME);
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java Thu May 4 10:12:26 2006
@@ -46,7 +46,7 @@
public class SandeshaOutHandler extends AbstractHandler {
- protected Log log = LogFactory.getLog(SandeshaOutHandler.class.getName());
+ private static final Log log = LogFactory.getLog(SandeshaOutHandler.class.getName());
public void invoke(MessageContext msgCtx) throws AxisFault {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java Thu May 4 10:12:26 2006
@@ -62,7 +62,7 @@
*/
public class AckRequestedProcessor implements MsgProcessor {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AckRequestedProcessor.class);
public void processInMessage(RMMsgContext rmMsgCtx) throws SandeshaException {
@@ -207,21 +207,11 @@
// messages related to an incoming
//sequence is the actual sequence ID
-// RMPolicyBean policyBean = (RMPolicyBean) rmMsgCtx
-// .getProperty(Sandesha2Constants.WSP.RM_POLICY_BEAN);
-
-// long ackInterval = PropertyManager.getInstance()
-// .getAcknowledgementInterval();
-
//operation is the lowest level, Sandesha2 can be engaged.
SandeshaPropertyBean propertyBean = SandeshaUtil.getPropertyBean(msgContext.getAxisOperation());
long ackInterval = propertyBean.getAcknowledgementInaterval();
-
- // if (policyBean != null) {
-// ackInterval = policyBean.getAcknowledgementInaterval();
-// }
//Ack will be sent as stand alone, only after the retransmitter
// interval.
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Thu May 4 10:12:26 2006
@@ -53,7 +53,7 @@
public class AcknowledgementProcessor implements MsgProcessor {
- Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(AcknowledgementProcessor.class);
public void processInMessage(RMMsgContext rmMsgCtx) throws SandeshaException {
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java Thu May 4 10:12:26 2006
@@ -84,7 +84,7 @@
private boolean letInvoke = false;
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(ApplicationMsgProcessor.class );
public void processInMessage(RMMsgContext rmMsgCtx) throws SandeshaException {
@@ -175,12 +175,10 @@
return;
}
-
//setting mustUnderstand to false.
sequence.setMustUnderstand(false);
rmMsgCtx.addSOAPEnvelope();
-
//throwing a fault if the sequence is closed.
faultMessageContext = faultManager. checkForSequenceClosed(rmMsgCtx,sequenceId);
if (faultMessageContext != null) {
@@ -196,8 +194,6 @@
return;
}
-
-
Transaction lastUpdatedTimeTransaction = storageManager.getTransaction();
//updating the last activated time of the sequence.
@@ -392,18 +388,6 @@
rmMsgCtx.addSOAPEnvelope();
}
- LastMessage lastMessage = (LastMessage) sequence.getLastMessage();
-
-// if (lastMessage!=null) {
-// long messageNumber = sequence.getMessageNumber().getMessageNumber();
-// SequencePropertyBean lastMessageBean = new SequencePropertyBean ();
-// lastMessageBean.setSequenceID(sequenceId);
-// lastMessageBean.setName(Sandesha2Constants.SequenceProperties.LAST_MESSAGE);
-// lastMessageBean.setValue(new Long(messageNumber).toString());
-//
-// seqPropMgr.insert(lastMessageBean);
-// }
-
RMMsgContext ackRMMessage = AcknowledgementManager.generateAckMessage(rmMsgCtx,sequenceId);
AxisEngine engine = new AxisEngine (configCtx);
@@ -434,24 +418,6 @@
//retrieving the the storage manager
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configContext);
SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropretyBeanMgr();
-
-// Parameter policyParam = msgContext.getParameter(Sandesha2Constants.SANDESHA2_POLICY_BEAN);
-// if (policyParam == null) {
-// SandeshaPropertyBean propertyBean = PropertyManager.getInstance().getPropertyBean();
-// Parameter parameter = new Parameter();
-// parameter.setName(Sandesha2Constants.SANDESHA2_POLICY_BEAN);
-// parameter.setValue(propertyBean);
-//
-// // TODO this should be added to the AxisMessage
-// try {
-// if (msgContext.getAxisOperation() != null)
-// msgContext.getAxisOperation().addParameter(parameter);
-// else if (msgContext.getAxisService() != null)
-// msgContext.getAxisService().addParameter(parameter);
-// } catch (AxisFault e) {
-// throw new SandeshaException (e);
-// }
-// }
Transaction outHandlerTransaction = storageManager.getTransaction();
boolean serverSide = msgContext.isServerSide();
@@ -960,12 +926,6 @@
lastMessage = true;
sequence.setLastMessage(new LastMessage(factory,rmNamespaceValue));
-// // saving the last message no.
-// SequencePropertyBean lastOutMsgBean = new SequencePropertyBean(
-// internalSequenceId,
-// Sandesha2Constants.SequenceProperties.LAST_OUT_MESSAGE,
-// new Long(messageNumber).toString());
-// sequencePropertyMgr.insert(lastOutMsgBean);
}
} else {
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java Thu May 4 10:12:26 2006
@@ -57,7 +57,7 @@
public class CreateSeqMsgProcessor implements MsgProcessor {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(CreateSeqMsgProcessor.class);
public void processInMessage(RMMsgContext createSeqRMMsg)
throws SandeshaException {
@@ -84,8 +84,7 @@
return;
}
-
-
+
MessageContext outMessage = null;
outMessage = Utils.createOutMessageContext(createSeqMsg); //createing a new response message.
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Thu May 4 10:12:26 2006
@@ -60,7 +60,7 @@
public class CreateSeqResponseMsgProcessor implements MsgProcessor {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(CreateSeqResponseMsgProcessor.class);
public void processInMessage(RMMsgContext createSeqResponseRMMsgCtx)
throws SandeshaException {
@@ -86,7 +86,6 @@
ackProcessTransaction.commit();
-
//Processing the create sequence response.
Transaction createSeqResponseTransaction = storageManager.getTransaction();
@@ -220,7 +219,6 @@
offerProcessTransaction.commit();
-
Transaction updateAppMessagesTransaction = storageManager.getTransaction();
SenderBean target = new SenderBean();
@@ -256,7 +254,6 @@
log.debug(message);
throw new SandeshaException(message);
}
-
Identifier identifier = new Identifier(factory,assumedRMNamespace);
identifier.setIndentifer(newOutSequenceId);
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Thu May 4 10:12:26 2006
@@ -65,7 +65,7 @@
public class TerminateSeqMsgProcessor implements MsgProcessor {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(TerminateSeqMsgProcessor.class);
public void processInMessage(RMMsgContext terminateSeqRMMsg)
throws SandeshaException {
@@ -106,7 +106,6 @@
} catch (AxisFault e) {
throw new SandeshaException ("Could not send the fault message",e);
}
-
return;
}
@@ -122,16 +121,12 @@
sequencePropertyBeanMgr.insert(terminateReceivedBean);
-
//add the terminate sequence response if required.
if (SpecSpecificConstants.isTerminateSequenceResponseRequired (terminateSeqRMMsg.getRMSpecVersion()))
addTerminateSequenceResponse (terminateSeqRMMsg,sequenceId);
-
-
setUpHighestMsgNumbers(context,storageManager,sequenceId,terminateSeqRMMsg);
-
terminateReceivedTransaction.commit();
Transaction terminateTransaction = storageManager.getTransaction();
@@ -146,20 +141,13 @@
terminateTransaction.commit();
-// SandeshaUtil.stopSenderForTheSequence(sequenceId,context);
-
//removing an entry from the listener
String transport = terminateSeqMsg.getTransportIn().getName().getLocalPart();
Transaction lastUpdatedTransaction = storageManager.getTransaction();
SequenceManager.updateLastActivatedTime(sequenceId,context);
-
-
- lastUpdatedTransaction.commit();
-
-
-
+ lastUpdatedTransaction.commit();
terminateSeqRMMsg.pause();
}
@@ -318,10 +306,6 @@
throw new SandeshaException ("Could not register an outInAxisOperation");
}
-
-
-
-
if (terminated != null
&& "true".equals(terminated)) {
String message = "Terminate was added previously.";
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqResponseMsgProcessor.java Thu May 4 10:12:26 2006
@@ -29,7 +29,7 @@
*/
public class TerminateSeqResponseMsgProcessor implements MsgProcessor {
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(TerminateSeqResponseMsgProcessor.class);
public void processInMessage(RMMsgContext terminateResRMMsg)
throws SandeshaException {
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyProcessor.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyProcessor.java Thu May 4 10:12:26 2006
@@ -25,7 +25,7 @@
public class RMPolicyProcessor {
- Log logger = LogFactory.getLog(this.getClass().getName());
+ private static final Log logger = LogFactory.getLog(RMPolicyProcessor.class);
PolicyReader prdr = 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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyToken.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMPolicyToken.java Thu May 4 10:12:26 2006
@@ -38,7 +38,7 @@
private ArrayList childTokens = null;
- private Log logger = LogFactory.getLog(this.getClass().getName());
+ private static final Log logger = LogFactory.getLog(RMPolicyToken.class);
public RMPolicyToken(String token, int type, String[] attribs,
Object h) throws SecurityException, NoSuchMethodException {
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMProcessorContext.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/policy/RMProcessorContext.java Thu May 4 10:12:26 2006
@@ -27,7 +27,7 @@
private int action = NONE;
- private Log logger = LogFactory.getLog(this.getClass().getName());
+ private static final Log logger = LogFactory.getLog(RMProcessorContext.class);
public RMProcessorContext() {
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/CreateSeqBeanMgr.java Thu May 4 10:12:26 2006
@@ -45,5 +45,4 @@
public CreateSeqBean findUnique (CreateSeqBean bean) throws SandeshaException;
- //public ResultSet find(String query);
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java Thu May 4 10:12:26 2006
@@ -38,8 +38,6 @@
public InvokerBean retrieve(String key) throws SandeshaStorageException;
- //public ResultSet find(String query);
-
public Collection find(InvokerBean bean) throws SandeshaStorageException;
public InvokerBean findUnique (InvokerBean bean) throws SandeshaException;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java Thu May 4 10:12:26 2006
@@ -38,8 +38,6 @@
public boolean insert(NextMsgBean bean) throws SandeshaStorageException;
- //public ResultSet find(String query);
-
public Collection find(NextMsgBean bean) throws SandeshaStorageException;
public boolean update(NextMsgBean bean) throws SandeshaStorageException;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java Thu May 4 10:12:26 2006
@@ -38,8 +38,6 @@
public boolean insert(SenderBean bean) throws SandeshaStorageException;
- //public ResultSet find(String query);
-
public Collection find(SenderBean bean) throws SandeshaStorageException;
public Collection find(String internalSequenceID) throws SandeshaStorageException;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java Thu May 4 10:12:26 2006
@@ -38,8 +38,6 @@
public boolean insert(SequencePropertyBean bean) throws SandeshaStorageException;
- //public ResultSet find(String query);
-
public Collection find(SequencePropertyBean bean) throws SandeshaStorageException;
public SequencePropertyBean findUnique (SequencePropertyBean bean) throws SandeshaException;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java Thu May 4 10:12:26 2006
@@ -37,7 +37,7 @@
public class InMemoryCreateSeqBeanMgr implements CreateSeqBeanMgr {
- Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(InMemoryCreateSeqBeanMgr.class);
private Hashtable table = null;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java Thu May 4 10:12:26 2006
@@ -37,7 +37,7 @@
public class InMemoryInvokerBeanMgr implements InvokerBeanMgr {
- Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(InMemoryInvokerBeanMgr.class);
private Hashtable table = null;
public InMemoryInvokerBeanMgr(AbstractContext context) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java Thu May 4 10:12:26 2006
@@ -37,7 +37,7 @@
public class InMemoryNextMsgBeanMgr implements NextMsgBeanMgr {
- Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(InMemoryNextMsgBeanMgr.class);
private Hashtable table = null;
public InMemoryNextMsgBeanMgr(AbstractContext context) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java Thu May 4 10:12:26 2006
@@ -37,7 +37,7 @@
public class InMemorySenderBeanMgr implements SenderBeanMgr {
- Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(InMemorySenderBeanMgr.class);
private Hashtable table = null;
public InMemorySenderBeanMgr(AbstractContext context) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java Thu May 4 10:12:26 2006
@@ -37,7 +37,7 @@
public class InMemorySequencePropertyBeanMgr implements SequencePropertyBeanMgr {
- Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(InMemorySequencePropertyBeanMgr.class);
private Hashtable table = null;
public InMemorySequencePropertyBeanMgr(AbstractContext context) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Thu May 4 10:12:26 2006
@@ -116,185 +116,6 @@
storageMap.put(key,msgContext);
}
-
-// public MessageContext retrieveMessageContext(String key, ConfigurationContext configContext) throws SandeshaStorageException {
-// // TODO remove this temporary method
-//
-//
-// HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
-//
-// if (storageMap==null)
-// return null;
-//
-// MessageStoreBean messageStoreBean = (MessageStoreBean) storageMap.get(key);
-// if (messageStoreBean==null)
-// return null;
-//
-// MessageContext messageContext = new MessageContext ();
-// try {
-// String soapEnvelopeStr = messageStoreBean.getSOAPEnvelopeString();
-// StringReader strReader = new StringReader (soapEnvelopeStr);
-//
-// XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(strReader);
-//
-// SOAPFactory factory = null;
-// if (messageStoreBean.getSOAPVersion()==Sandesha2Constants.SOAPVersion.v1_1) {
-// factory = OMAbstractFactory.getSOAP11Factory();
-// } else if (messageStoreBean.getSOAPVersion()==Sandesha2Constants.SOAPVersion.v1_2) {
-// factory = OMAbstractFactory.getSOAP12Factory();
-// } else {
-// throw new SandeshaStorageException ("Unknows SOAP version");
-// }
-//
-// //TODO make this SOAP version indipendent
-// OMXMLParserWrapper wrapper = OMXMLBuilderFactory.createStAXSOAPModelBuilder(
-// factory, reader);
-// SOAPEnvelope envelope = (SOAPEnvelope) wrapper.getDocumentElement();
-// messageContext.setEnvelope(envelope);
-//
-// AxisConfiguration axisConfiguration = configContext.getAxisConfiguration();
-//
-// String transportOutStr = messageStoreBean.getTransportOut();
-// if (transportOutStr!=null) {
-// QName transportOutName = SandeshaUtil.getQNameFromString(transportOutStr);
-// TransportOutDescription transportOut = configContext.getAxisConfiguration().getTransportOut(transportOutName);
-// messageContext.setTransportOut(transportOut);
-// }
-//
-// String serviceGroupName = messageStoreBean.getAxisServiceGroup();
-// if (serviceGroupName!=null) {
-// AxisServiceGroup serviceGroup = axisConfiguration.getServiceGroup(serviceGroupName);
-// if (serviceGroup!=null)
-// messageContext.setAxisServiceGroup(serviceGroup);
-// } else {
-// AxisServiceGroup serviceGroup = new AxisServiceGroup (axisConfiguration);
-// messageContext.setAxisServiceGroup(serviceGroup);
-// }
-//
-// String serviceName = messageStoreBean.getAxisService();
-// if (serviceName!=null) {
-// AxisService service = axisConfiguration.getService(serviceName);
-// if (service!=null)
-// messageContext.setAxisService(service);
-// }
-//
-// String operationNameStr = messageStoreBean.getAxisOperation();
-// String operationMEPStr = messageStoreBean.getAxisOperationMEP();
-// if ((operationNameStr!=null || operationMEPStr!=null) && messageContext.getAxisService()!=null) {
-//
-// AxisOperation operation = null;
-// if (operationNameStr!=null) {
-// QName operationName = SandeshaUtil.getQNameFromString(operationNameStr);
-// operation = messageContext.getAxisService().getOperation(operationName);
-// }
-//
-// if (operation==null && operationMEPStr!=null)
-// operation = AxisOperationFactory.getOperationDescription(operationMEPStr);
-//
-// if (operation!=null) {
-// messageContext.setAxisOperation(operation);
-//
-// //TODO set the correct message receiver.
-// MessageReceiver messageReceiver = axisConfiguration.getMessageReceiver(messageStoreBean.getAxisOperationMEP());
-//
-// }
-// }
-//
-//
-// //setting contexts TODO is this necessary?
-// if (messageContext.getAxisServiceGroup()!=null){
-// ServiceGroupContext serviceGroupCtx = new ServiceGroupContext (configContext,messageContext.getAxisServiceGroup());
-// messageContext.setServiceGroupContext(serviceGroupCtx);
-// }
-//
-// if (messageContext.getAxisService()!=null) {
-// ServiceContext serviceContext = new ServiceContext (messageContext.getAxisService(),messageContext.getServiceGroupContext());
-// serviceContext.setParent(messageContext.getServiceGroupContext());
-// messageContext.setServiceContext(serviceContext);
-// }
-//
-// if (messageContext.getAxisOperation()!=null) {
-// OperationContext operationContext = new OperationContext (messageContext.getAxisOperation());
-// operationContext.setParent(messageContext.getServiceContext());
-// messageContext.setOperationContext(operationContext);
-// }
-//
-//
-// messageContext.setServerSide(messageStoreBean.isServerSide());
-// messageContext.setFLOW(messageStoreBean.getFlow());
-//
-// messageContext.setProperty(MessageContextConstants.TRANSPORT_URL,messageStoreBean.getTransportTo());
-// messageContext.setTo(new EndpointReference (messageStoreBean.getToURL()));
-//
-// } catch (XMLStreamException e) {
-// throw new SandeshaStorageException (e.getMessage());
-// } catch (FactoryConfigurationError e) {
-// throw new SandeshaStorageException (e.getMessage());
-// } catch (AxisFault e) {
-// throw new SandeshaStorageException (e.getMessage());
-// }
-//
-// return messageContext;
-// }
-//
-// public void storeMessageContext(String key,MessageContext msgContext) {
-// // TODO Auto-generated method stub
-//
-// HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
-//
-// if (storageMap==null) {
-// storageMap = new HashMap ();
-// getContext().setProperty(MESSAGE_MAP_KEY,storageMap);
-// }
-//
-// SOAPEnvelope envelope = msgContext.getEnvelope();
-// String str = envelope.toString();
-//
-// int SOAPVersion = 0;
-// if (msgContext.isSOAP11())
-// SOAPVersion = Sandesha2Constants.SOAPVersion.v1_1;
-// else
-// SOAPVersion = Sandesha2Constants.SOAPVersion.v1_2;
-//
-// MessageStoreBean bean = new MessageStoreBean ();
-//
-// TransportOutDescription transportOutDescription = msgContext.getTransportOut();
-// AxisServiceGroup serviceGroup = msgContext.getAxisServiceGroup();
-// AxisService service = msgContext.getAxisService();
-// AxisOperation operation = msgContext.getAxisOperation();
-//
-// if (transportOutDescription!=null) {
-// QName name = transportOutDescription.getName();
-// bean.setTransportOut(SandeshaUtil.getStringFromQName(name));
-// }
-//
-// if (serviceGroup!=null) {
-// bean.setAxisServiceGroup(serviceGroup.getServiceGroupName());
-// }
-//
-// if (service!=null) {
-// bean.setAxisService(service.getName());
-// }
-//
-// if (operation!=null) {
-// QName name = operation.getName();
-// if (name!=null)
-// bean.setAxisOperation(SandeshaUtil.getStringFromQName(name));
-// bean.setAxisOperationMEP(operation.getMessageExchangePattern());
-// }
-//
-// bean.setFlow(msgContext.getFLOW());
-// bean.setServerSide(msgContext.isServerSide());
-//
-// bean.setStoredKey(key);
-// bean.setSOAPEnvelopeString(str);
-// bean.setSOAPVersion(SOAPVersion);
-//
-// bean.setToURL(msgContext.getTo().getAddress());
-// bean.setTransportTo((String) msgContext.getProperty(MessageContextConstants.TRANSPORT_URL));
-//
-// storageMap.put(key,bean);
-// }
public void updateMessageContext(String key,MessageContext msgContext) throws SandeshaStorageException {
HashMap storageMap = (HashMap) getContext().getProperty(MESSAGE_MAP_KEY);
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java Thu May 4 10:12:26 2006
@@ -94,44 +94,6 @@
boolean refuseSequence = false;
String reason = "";
-// SequenceOffer offer = createSequence.getSequenceOffer();
-// if (offer != null) {
-//
-// String offeredSequenceId = offer.getIdentifer().getIdentifier();
-// if (offeredSequenceId == null || "".equals(offeredSequenceId)) {
-// refuseSequence = true;
-// reason = "Offered sequenceId is invalid";
-// }
-//
-// if (!refuseSequence) {
-// NextMsgBeanMgr nextMsgBeanMgr = storageManager
-// .getNextMsgBeanMgr();
-// Collection collection = nextMsgBeanMgr.retrieveAll();
-// Iterator it = collection.iterator();
-// while (it.hasNext()) {
-//
-// NextMsgBean nextMsgBean = (NextMsgBean) it.next();
-// String tempSequenceID = nextMsgBean.getSequenceID();
-//
-// if (tempSequenceID.equals(offeredSequenceId)) {
-// refuseSequence = true;
-// reason = "An incoming sequence with offered sequenceId has been already established";
-// }
-//
-// }
-//
-// SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager
-// .getSequencePropretyBeanMgr();
-// SequencePropertyBean sequencePropertyBean = sequencePropertyBeanMgr
-// .retrieve(offeredSequenceId,Sandesha2Constants.SequenceProperties.INTERNAL_SEQUENCE_ID);
-// if (sequencePropertyBean != null) {
-// refuseSequence = true;
-// reason = "A outgoing sequence with offered sequenceId has been already established";
-// }
-// }
-//
-// }
-
if (refuseSequence) {
FaultData data = new FaultData();
data.setType(Sandesha2Constants.SOAPFaults.FaultType.CREATE_SEQUENCE_REFUSED);
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java Thu May 4 10:12:26 2006
@@ -38,7 +38,7 @@
public class MessageRetransmissionAdjuster {
- Log log = LogFactory.getLog( getClass());
+ private static final Log log = LogFactory.getLog(MessageRetransmissionAdjuster.class);
public boolean adjustRetransmittion(
SenderBean retransmitterBean,ConfigurationContext configContext) throws SandeshaException {
@@ -107,7 +107,6 @@
}
long newTimeToSend = 0;
- //newTimeToSend = lastSentTime + newInterval;
long timeNow = System.currentTimeMillis();
newTimeToSend = timeNow + newInterval;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/PropertyManager.java Thu May 4 10:12:26 2006
@@ -46,7 +46,7 @@
public class PropertyManager {
- Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(PropertyManager.class);
public static SandeshaPropertyBean loadPropertiesFromDefaultValues() throws SandeshaException{
SandeshaPropertyBean propertyBean = new SandeshaPropertyBean ();
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java Thu May 4 10:12:26 2006
@@ -71,24 +71,6 @@
private static void initializeCreation(MessageContext relatedMessage,
MessageContext newMessage) throws SandeshaException {
-
-// Parameter policyParam = relatedMessage
-// .getParameter(Sandesha2Constants.SANDESHA2_POLICY_BEAN);
-//
-// if (policyParam != null) {
-//
-// try {
-// // TODO this should be added to the AxisMessage
-// if (newMessage.getAxisOperation() != null)
-// newMessage.getAxisOperation().addParameter(policyParam);
-// else if (newMessage.getAxisService() != null) {
-// newMessage.getAxisService().addParameter(policyParam);
-//
-// }
-// } catch (AxisFault e) {
-// throw new SandeshaException(e.getMessage());
-// }
-// }
if (relatedMessage.getAxisService()!=null && newMessage.getAxisService()!=null &&
newMessage.getAxisService()!=relatedMessage.getAxisService()) {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java Thu May 4 10:12:26 2006
@@ -226,9 +226,6 @@
}
public static void startInvokerForTheSequence(ConfigurationContext context, String sequenceID) {
-// if (!invoker.isInvokerStarted()) {
-// invoker.runInvokerForTheSequence(context, sequenceID);
-// }
InOrderInvoker invoker = (InOrderInvoker) context.getProperty(Sandesha2Constants.INVOKER);
if (invoker!=null)
@@ -423,28 +420,6 @@
boolean rmGlobalMsg = false;
String action = msgCtx.getWSAAction();
-// SOAPEnvelope env = msgCtx.getEnvelope();
-// SOAPHeader header = null;
-// if (env != null)
-// header = env.getHeader();
-// else {
-// log.error("SOAP envelope is null");
-// return false;
-// }
-
- // TODO make this spec indipendent
-
-// OMElement sequenceElem = null;
-// if (header != null)
-// sequenceElem = header.getFirstChildWithName(new QName(Sandesha2Constants.SPEC_2005_02.NS_URI,
-// Sandesha2Constants.WSRM_COMMON.SEQUENCE));
-//
-// if (sequenceElem == null)
-// sequenceElem = header.getFirstChildWithName(new QName(Sandesha2Constants.SPEC_2005_10.NS_URI,
-// Sandesha2Constants.WSRM_COMMON.SEQUENCE));
-//
-// if (sequenceElem != null)
-// rmGlobalMsg = true;
if (Sandesha2Constants.SPEC_2005_02.Actions.ACTION_CREATE_SEQUENCE.equals(action))
@@ -452,12 +427,6 @@
if (Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CREATE_SEQUENCE.equals(action))
rmGlobalMsg = true;
-
-// if (Sandesha2Constants.SPEC_2005_10.Actions.ACTION_TERMINATE_SEQUENCE.equals(action))
-// rmGlobalMsg = true;
-//
-// if (Sandesha2Constants.SPEC_2005_10.Actions.ACTION_CLOSE_SEQUENCE.equals(action))
-// rmGlobalMsg = true;
return rmGlobalMsg;
}
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=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java Thu May 4 10:12:26 2006
@@ -382,7 +382,6 @@
else
sequencePropertyBeanMgr.update(lastActivatedBean);
- // lastActivatedTransaction.commit();
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/TerminateManager.java Thu May 4 10:12:26 2006
@@ -190,12 +190,8 @@
seqPropMgr.insert(seqTerminatedBean);
cleanSendingSideData(configContext,internalSequenceID,serverSide);
-
-
}
-
-
private static void doUpdatesIfNeeded (String sequenceID, SequencePropertyBean propertyBean, SequencePropertyBeanMgr seqPropMgr) throws SandeshaException {
boolean addEntryWithSequenceID = false;
@@ -229,9 +225,7 @@
//TODO amazingly this property does not seem to get deleted without following - in the hibernate impl
//(even though the lines efter current methodcall do this).
seqPropMgr.delete (propertyBean.getSequenceID(),propertyBean.getName());
- }
-
-
+ }
}
private static boolean isProportyDeletable (String name) {
@@ -268,7 +262,6 @@
SequencePropertyBean seqTerminatedBean = new SequencePropertyBean (internalSequenceID,Sandesha2Constants.SequenceProperties.SEQUENCE_TIMED_OUT,Sandesha2Constants.VALUE_TRUE);
seqPropMgr.insert(seqTerminatedBean);
-
cleanSendingSideData(context,internalSequenceID,serverside);
}
@@ -297,8 +290,6 @@
}
//removing retransmitterMgr entries
- //SenderBean findRetransmitterBean = new SenderBean ();
- //findRetransmitterBean.setInternalSequenceID(internalSequenceId);
Collection collection = retransmitterBeanMgr.find(internalSequenceID);
Iterator iterator = collection.iterator();
while (iterator.hasNext()) {
@@ -329,15 +320,12 @@
sequencePropertyBeanMgr.delete(sequencePropertyBean.getSequenceID(),sequencePropertyBean.getName());
}
}
-
-// SandeshaUtil.stopSenderForTheSequence(internalSequenceID,configContext);
}
public static void addTerminateSequenceMessage(RMMsgContext referenceMessage,
String outSequenceId, String internalSequenceId)
throws SandeshaException {
-
ConfigurationContext configurationContext = referenceMessage.getMessageContext().getConfigurationContext();
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(configurationContext);
@@ -354,7 +342,6 @@
&& "true".equals(terminated.getValue())) {
String message = "Terminate was added previously.";
log.info(message);
-// return;
}
RMMsgContext terminateRMMessage = RMMsgCreator
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java Thu May 4 10:12:26 2006
@@ -56,7 +56,7 @@
private boolean runInvoker = false;
private ArrayList workingSequences = new ArrayList();
private ConfigurationContext context = null;
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(InOrderInvoker.class);
public synchronized void stopInvokerForTheSequence(String sequenceID) {
workingSequences.remove(sequenceID);
@@ -199,11 +199,9 @@
throw new SandeshaException(e);
}
- //Transaction postInvocationTransaction = storageManager.getTransaction();
//undating the next msg to invoke
- //terminate (AfterInvocation)
if (rmMsg.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
Sequence sequence = (Sequence) rmMsg
.getMessagePart(Sandesha2Constants.MessageParts.SEQUENCE);
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=399776&r1=399775&r2=399776&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Thu May 4 10:12:26 2006
@@ -62,7 +62,7 @@
private boolean stopSenderAfterWork = false;
private ArrayList workingSequences = new ArrayList();
private ConfigurationContext context = null;
- private Log log = LogFactory.getLog(getClass());
+ private static final Log log = LogFactory.getLog(Sender.class);
private ThreadPool threadPool = new ThreadPool ();
public synchronized void stopSenderForTheSequence(String sequenceID) {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org