Author: chamikara
Date: Sat Sep 30 03:26:38 2006
New Revision: 451573
URL: http://svn.apache.org/viewvc?view=rev&rev=451573
Log:
Applied the patch from Matt
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?view=diff&rev=451573&r1=451572&r2=451573
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
Sat Sep 30 03:26:38 2006
@@ -85,8 +85,8 @@
while(acks.hasNext()) {
OMElement ack = (OMElement) acks.next();
AckRequested ackReq = new
AckRequested(headerName.getNamespaceURI());
- ackReq.fromOMElement(ack);
- processAckRequestedHeader(message, ackReq);
+ ackReq.fromOMElement(ack);
+ processAckRequestedHeader(message, ack,
ackReq);
}
}
}
@@ -95,9 +95,9 @@
log.debug("Exit:
AckRequestedProcessor::processAckRequestHeaders");
}
- public void processAckRequestedHeader(MessageContext msgContext,
AckRequested ackRequested) throws SandeshaException {
+ public void processAckRequestedHeader(MessageContext msgContext,
OMElement soapHeader, AckRequested ackRequested) throws SandeshaException {
if (log.isDebugEnabled())
- log.debug("Enter:
AckRequestedProcessor::processAckRequestedHeader");
+ log.debug("Enter:
AckRequestedProcessor::processAckRequestedHeader " + soapHeader);
// TODO: Note that this RMMessageContext is not really any use
- but we need to create it
// so that it can be passed to the fault handling chain. It's
really no more than a
@@ -124,8 +124,7 @@
SecurityManager secManager =
SandeshaUtil.getSecurityManager(configurationContext);
SecurityToken token =
secManager.recoverSecurityToken(tokenBean.getValue());
- //TODO get the ackRequested element from the
SOAPEnvelope.
-// secManager.checkProofOfPossession(token,
ackRequested.getOMElement(), msgContext);
+ secManager.checkProofOfPossession(token, soapHeader,
msgContext);
}
// Setting the ack depending on AcksTo.
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=451573&r1=451572&r2=451573
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
Sat Sep 30 03:26:38 2006
@@ -79,8 +79,8 @@
while(acks.hasNext()) {
OMElement ack = (OMElement) acks.next();
SequenceAcknowledgement seqAck = new
SequenceAcknowledgement(headerName.getNamespaceURI());
- seqAck.fromOMElement(ack);
- processAckHeader(message, seqAck);
+ seqAck.fromOMElement(ack);
+ processAckHeader(message, ack, seqAck);
}
}
}
@@ -90,11 +90,11 @@
log.debug("Exit:
AcknowledgementProcessor::processAckHeaders");
}
- private void processAckHeader(MessageContext msgCtx,
SequenceAcknowledgement sequenceAck)
+ private void processAckHeader(MessageContext msgCtx, OMElement
soapHeader, SequenceAcknowledgement sequenceAck)
throws SandeshaException
{
if (log.isDebugEnabled())
- log.debug("Enter:
AcknowledgementProcessor::processAckHeader");
+ log.debug("Enter:
AcknowledgementProcessor::processAckHeader " + soapHeader);
// TODO: Note that this RMMessageContext is not really any use
- but we need to create it
// so that it can be passed to the fault handling chain. It's
really no more than a
@@ -130,8 +130,7 @@
SecurityManager secManager =
SandeshaUtil.getSecurityManager(configCtx);
SecurityToken token =
secManager.recoverSecurityToken(tokenBean.getValue());
- //TODO get the element from the SOAP Envelope
-// secManager.checkProofOfPossession(token,
sequsenceAck.getOMElement(), msgCtx);
+ secManager.checkProofOfPossession(token, soapHeader,
msgCtx);
}
Iterator ackRangeIterator =
sequenceAck.getAcknowledgementRanges().iterator();
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=451573&r1=451572&r2=451573
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Sat Sep 30 03:26:38 2006
@@ -19,6 +19,8 @@
import java.util.ArrayList;
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -111,12 +113,16 @@
SequencePropertyBean tokenBean =
seqPropMgr.retrieve(propertyKey,
Sandesha2Constants.SequenceProperties.SECURITY_TOKEN);
if(tokenBean != null) {
SecurityManager secManager =
SandeshaUtil.getSecurityManager(msgCtx.getConfigurationContext());
- OMElement body = msgCtx.getEnvelope().getBody();
- SecurityToken token =
secManager.recoverSecurityToken(tokenBean.getValue());
- //TODO get the element from the SOAP Envelope
-// secManager.checkProofOfPossession(token,
sequence.getOMElement(), msgCtx);
+ QName seqName = new
QName(rmMsgCtx.getRMNamespaceValue(), Sandesha2Constants.WSRM_COMMON.SEQUENCE);
+
+ SOAPEnvelope envelope = msgCtx.getEnvelope();
+ OMElement body = envelope.getBody();
+ OMElement seqHeader =
envelope.getHeader().getFirstChildWithName(seqName);
+
+ SecurityToken token =
secManager.recoverSecurityToken(tokenBean.getValue());
+ secManager.checkProofOfPossession(token, seqHeader,
msgCtx);
secManager.checkProofOfPossession(token, body, msgCtx);
}
Modified:
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?view=diff&rev=451573&r1=451572&r2=451573
==============================================================================
---
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/java/src/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
Sat Sep 30 03:26:38 2006
@@ -70,9 +70,6 @@
if (log.isDebugEnabled())
log.debug("Enter:
CreateSeqResponseMsgProcessor::processInMessage");
- SOAPFactory factory =
SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(createSeqResponseRMMsgCtx
- .getSOAPEnvelope()));
-
ConfigurationContext configCtx =
createSeqResponseRMMsgCtx.getMessageContext().getConfigurationContext();
StorageManager storageManager =
SandeshaUtil.getSandeshaStorageManager(configCtx, configCtx
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
