Author: gatfora
Date: Tue Jan 23 06:56:24 2007
New Revision: 499040
URL: http://svn.apache.org/viewvc?view=rev&rev=499040
Log:
Remove a few compile warnings and refactor getting of RMS/RMD Beans from
Fault/Sequence/AcknowledgementManager
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?view=diff&rev=499040&r1=499039&r2=499040
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
Tue Jan 23 06:56:24 2007
@@ -20,9 +20,9 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.handlers.AbstractHandler;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.RMMsgContext;
@@ -112,7 +112,7 @@
if(log.isDebugEnabled()) log.debug("Message Type: " +
messageType);
if (messageType ==
Sandesha2Constants.MessageTypes.UNKNOWN) {
MessageContext requestMsgCtx =
msgCtx.getOperationContext().getMessageContext(
-
OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+
WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (msgCtx.isServerSide()) { // for the server side
RMMsgContext reqRMMsgCtx =
MsgInitializer.initializeMessage(requestMsgCtx);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?view=diff&rev=499040&r1=499039&r2=499040
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Tue Jan 23 06:56:24 2007
@@ -30,8 +30,8 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2006Constants;
import org.apache.commons.logging.Log;
@@ -188,7 +188,7 @@
if (inOutMessage) {
OperationContext
operationContext = applicationMessage.getOperationContext();
if
(operationContext!=null) {
- MessageContext
responseMessage =
operationContext.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+ MessageContext
responseMessage =
operationContext.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if
(responseMessage==null) {
syncResponseNeeded = true;
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?view=diff&rev=499040&r1=499039&r2=499040
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
Tue Jan 23 06:56:24 2007
@@ -20,14 +20,11 @@
import java.util.Collection;
import java.util.HashMap;
-import javax.xml.stream.XMLStreamReader;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisModule;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
@@ -276,6 +273,7 @@
}
}
+
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java?view=diff&rev=499040&r1=499039&r2=499040
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/AcknowledgementManager.java
Tue Jan 23 06:56:24 2007
@@ -87,8 +87,7 @@
String outboundInternalSeq =
rmsBean.getInternalSequenceID();
String inboundSequenceId =
SandeshaUtil.getServerSideIncomingSeqIdFromInternalSeqId(outboundInternalSeq);
- boolean validSequence =
SequenceManager.isValidIncomingSequence (inboundSequenceId,storageManager);
- if (validSequence) {
+ if
(SandeshaUtil.getRMDBeanFromSequenceId(storageManager, inboundSequenceId) !=
null) {
if(log.isDebugEnabled())
log.debug("Piggybacking ack for " + inboundSequenceId);
RMMsgCreator.addAckMessage(rmMessageContext, rmsBean, inboundSequenceId,
storageManager);
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java?view=diff&rev=499040&r1=499039&r2=499040
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/FaultManager.java
Tue Jan 23 06:56:24 2007
@@ -17,7 +17,6 @@
package org.apache.sandesha2.util;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -48,9 +47,6 @@
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.StorageManager;
-import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
-import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
@@ -140,41 +136,24 @@
if (log.isDebugEnabled())
log.debug("Enter:
FaultManager::checkForUnknownSequence, " + sequenceID);
- MessageContext messageContext =
rmMessageContext.getMessageContext();
-
- RMSBeanMgr createSeqMgr = storageManager.getRMSBeanMgr();
-
boolean validSequence = false;
// Look for an outbound sequence
- RMSBean createSeqFindBean = new RMSBean();
- createSeqFindBean.setSequenceID(sequenceID);
-
- Collection coll = createSeqMgr.find(createSeqFindBean);
- if (!coll.isEmpty()) {
+ if (SandeshaUtil.getRMSBeanFromSequenceId(storageManager,
sequenceID) != null) {
validSequence = true;
-
- } else {
// Look for an inbound sequence
- RMDBeanMgr mgr = storageManager.getRMDBeanMgr();
-
- RMDBean selector = new RMDBean();
- selector.setSequenceID(sequenceID);
-
- coll = mgr.find(selector);
- if(!coll.isEmpty()) {
+ } else if(SandeshaUtil.getRMDBeanFromSequenceId(storageManager,
sequenceID) != null) {
validSequence = true;
- }
}
- String rmNamespaceValue =
rmMessageContext.getRMNamespaceValue();
-
if (!validSequence) {
if (log.isDebugEnabled())
log.debug("Sequence not valid " + sequenceID);
// Return an UnknownSequence error
+ MessageContext messageContext =
rmMessageContext.getMessageContext();
+
int SOAPVersion =
SandeshaUtil.getSOAPVersion(messageContext.getEnvelope());
FaultData data = new FaultData();
@@ -188,7 +167,7 @@
SOAPFactory factory =
SOAPAbstractFactory.getSOAPFactory(SOAPVersion);
OMElement identifierElement =
factory.createOMElement(Sandesha2Constants.WSRM_COMMON.IDENTIFIER,
- rmNamespaceValue,
Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
+ rmMessageContext.getRMNamespaceValue(),
Sandesha2Constants.WSRM_COMMON.NS_PREFIX_RM);
identifierElement.setText(sequenceID);
data.setDetail(identifierElement);
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java?view=diff&rev=499040&r1=499039&r2=499040
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SequenceManager.java
Tue Jan 23 06:56:24 2007
@@ -357,14 +357,4 @@
}
return sequenceTimedOut;
}
-
- public static boolean isValidIncomingSequence (String sequenceId,
StorageManager storageManager) throws SandeshaException {
- RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
- RMDBean bean = rmdBeanMgr.retrieve(sequenceId);
-
- if (bean!=null)
- return true;
- else
- return false;
- }
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=499040&r1=499039&r2=499040
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/SenderWorker.java
Tue Jan 23 06:56:24 2007
@@ -12,7 +12,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
-import org.apache.axis2.context.OperationContextFactory;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.engine.Handler.InvocationResponse;
import org.apache.axis2.transport.RequestResponseTransport;
@@ -133,7 +132,7 @@
MessageContext inMsg = null;
OperationContext op =
msgCtx.getOperationContext();
if (op != null)
- inMsg =
op.getMessageContext(OperationContextFactory.MESSAGE_LABEL_IN_VALUE);
+ inMsg =
op.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
if (inMsg != null)
t = (RequestResponseTransport)
inMsg.getProperty(RequestResponseTransport.TRANSPORT_CONTROL);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
