Dear Sandesha2 committers,
Please accept this patch which will add support for fault message
generation.
Best,
--Sanka
Index: src/org/apache/sandesha2/RMMsgCreator.java
===================================================================
--- src/org/apache/sandesha2/RMMsgCreator.java (revision 326340)
+++ src/org/apache/sandesha2/RMMsgCreator.java (working copy)
@@ -324,12 +324,10 @@
.getServiceGroupContext());
ackMsgCtx.setServiceGroupContextId(applicationMsgCtx
.getServiceGroupContextId());
- ackMsgCtx.setServiceContext(applicationMsgCtx.getServiceContext());
- ackMsgCtx.setServiceContextID(applicationMsgCtx
- .getServiceContextID());
- RMMsgContext ackRMMsgCtx = new RMMsgContext(ackMsgCtx);
+ RMMsgContext ackRMMsgCtx = new RMMsgContext(ackMsgCtx);
+
//TODO set a suitable description
OperationContext ackOpCtx = new OperationContext(applicationMsgCtx
.getOperationDescription());
Index: src/org/apache/sandesha2/wsrm/SequenceFault.java
===================================================================
--- src/org/apache/sandesha2/wsrm/SequenceFault.java (revision 326340)
+++ src/org/apache/sandesha2/wsrm/SequenceFault.java (working copy)
@@ -16,19 +16,14 @@
*/
package org.apache.sandesha2.wsrm;
-import java.util.Iterator;
-
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
import javax.xml.namespace.QName;
-import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMNamespace;
+import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Constants;
import org.apache.sandesha2.SOAPAbstractFactory;
@@ -38,12 +33,16 @@
* @author sanka
*/
-public class SequenceFault implements IOMRMElement {
+public class SequenceFault implements IOMRMPart {
private OMElement sequenceFaultElement;
private FaultCode faultCode;
- OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
+ private String subcode;
+
+ private String reason;
+
+ OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
Constants.SOAPVersion.DEFAULT).createOMNamespace(
Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
@@ -87,10 +86,15 @@
}
- public OMElement toOMElement(OMElement body) throws OMException {
+ public void toSOAPEnvelope(SOAPEnvelope envelope) {
+ SOAPHeader header = envelope.getHeader();
+ toOMElement(header);
+ }
- if (body == null || !(body instanceof SOAPBody))
- throw new OMException(
+ public OMElement toOMElement(OMElement header) throws OMException {
+
+ if (header == null || !(header instanceof SOAPHeader))
+ throw new OMException(
"Cant get Sequence Fault part from a non-header element");
if (sequenceFaultElement == null)
@@ -100,13 +104,13 @@
if (faultCode != null)
faultCode.toOMElement(sequenceFaultElement);
- body.addChild(sequenceFaultElement);
+ header.addChild(sequenceFaultElement);
sequenceFaultElement = SOAPAbstractFactory.getSOAPFactory(
Constants.SOAPVersion.DEFAULT).createOMElement(
Constants.WSRM.SEQUENCE_FAULT, rmNamespace);
- return body;
+ return header;
}
public void setFaultCode(FaultCode faultCode) {
@@ -125,4 +129,19 @@
return sequenceFaultElement;
}
+ public void setSubcode(String subcode) {
+ this.subcode = subcode;
+ }
+
+ public String getSubcode() {
+ return subcode;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public String getReason() {
+ return reason;
+ }
}
\ No newline at end of file
Index: src/org/apache/sandesha2/wsrm/FaultCode.java
===================================================================
--- src/org/apache/sandesha2/wsrm/FaultCode.java (revision 326340)
+++ src/org/apache/sandesha2/wsrm/FaultCode.java (working copy)
@@ -93,7 +93,18 @@
faultCodeElement.setText(faultCode);
sequenceFault.addChild(faultCodeElement);
- return sequenceFault;
+ faultCodeElement =
+ SOAPAbstractFactory.getSOAPFactory(Constants.SOAPVersion.DEFAULT).createOMElement(
+ Constants.WSRM.FAULT_CODE, rmNameSpace);
+
+ return sequenceFault;
}
+ public void setFault(String faultCode) {
+ this.faultCode = faultCode;
+ }
+
+ public String getFault() {
+ return faultCode;
+ }
}
\ No newline at end of file
Index: src/org/apache/sandesha2/Constants.java
===================================================================
--- src/org/apache/sandesha2/Constants.java (revision 326340)
+++ src/org/apache/sandesha2/Constants.java (working copy)
@@ -113,7 +113,9 @@
int TERMINATE_SEQ = 5;
- int MAX_MESSAGE_TYPE = 5;
+ int SEQUENCE = 6;
+
+ int MAX_MESSAGE_TYPE = 5;
}
public interface MessageParts {
Index: src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
===================================================================
--- src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (revision 326340)
+++ src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (working copy)
@@ -298,7 +298,7 @@
String to = toEPR.getAddress();
String operationName = msgCtx.getOperationContext()
- .getAxisOperation().getName().getLocalPart();
+ .getOperationDescription().getName().getLocalPart();
msgCtx.setWSAAction(to + "/" + operationName);
}
Index: src/org/apache/sandesha2/FaultMgr.java
===================================================================
--- src/org/apache/sandesha2/FaultMgr.java (revision 0)
+++ src/org/apache/sandesha2/FaultMgr.java (revision 0)
@@ -0,0 +1,355 @@
+package org.apache.sandesha2;
+
+import org.apache.sandesha2.wsrm.Sequence;
+import org.apache.sandesha2.wsrm.Identifier;
+import org.apache.sandesha2.wsrm.SequenceFault;
+import org.apache.sandesha2.wsrm.FaultCode;
+import org.apache.sandesha2.storage.AbstractBeanMgrFactory;
+import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.RetransmitterBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
+import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
+import org.apache.sandesha2.storage.beans.RetransmitterBean;
+import org.apache.sandesha2.storage.beans.SequencePropertyBean;
+import org.apache.sandesha2.storage.beans.StorageMapBean;
+import org.apache.sandesha2.util.SandeshaUtil;
+import org.apache.axis2.soap.*;
+import org.apache.axis2.soap.impl.llom.SOAPConstants;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMElement;
+import org.apache.axis2.AxisFault;
+
+import javax.xml.namespace.QName;
+import java.math.BigInteger;
+import java.util.Iterator;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: sanka
+ * Date: Oct 9, 2005
+ * Time: 11:10:07 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class FaultMgr {
+
+ private static final int SEQUENCE_FAULT = 10;
+ private static final String WSA_ACTION_FAULT = "http://schemas.xmlsoap.org/ws/2004/08/addressing/fault";;
+
+ private static final int SEQUENCE_TYPE = 22;
+ private static final int NON_SEQUENCE_TYPe = 23;
+
+ public static final int UNKNOWN_SEQUENCE_TYPE = 1;
+ public static final int MESSAGE_NUMBER_ROLLOVER_TYPE = 2;
+ public static final int INVALID_ACKNOWLEDGEMENT_TYPE = 3;
+
+
+ public static final String UNKNOW_SEQUENCE_CODE = "Sender";
+ public static final String UNKNOW_SEQUENCE_SUBCODE
+ = "wsrm:UnknowSequence";
+ public static final String UNKNOW_SEQUENCE_RESON
+ = "The vaule of wsrm:Identifier is not a known Sequence Identifer";
+
+ public static final String MESSAGE_NUMBER_ROLLOVER_CODE = "Sender";
+ public static final String MESSAGE_NUMBER_ROLLOVER_SUBCODE
+ = "wsrm:MessageNumberRollover";
+ public static final String MESSAGE_NUMBER_ROLLOVER_REASON
+ = "The maximum value of wsrm:MessageNumber has been exceeded.";
+
+ public static final String INVALID_ACKNOWLEDGEMENT_CODE = "Sender";
+ public static final String INVALID_ACKNOWLEDGEMENT_SUBCODE
+ = "wsrm:InvalidAcknowledgement";
+ public static final String INVALID_ACKNOWLEDGEMENT_REASON
+ = "The SequenceAcknowledgement violates the cumlative acknowledgement";
+
+ protected class FaultData {
+ int type;
+ String code;
+ String subcode;
+ String reason;
+ MessageContext msgCtx;
+ }
+
+ public FaultMgr() {
+ }
+
+ public RMMsgContext checkSequenceMessage(MessageContext msgCtx)
+ throws SandeshaException {
+
+ SOAPEnvelope envelope = msgCtx.getEnvelope();
+ OMElement element;
+
+ element = envelope.getHeader().getFirstChildWithName(
+ new QName(Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE));
+ //Sequence
+ if (element != null) {
+ OMElement identifier = element.getFirstChildWithName(
+ new QName(Constants.WSRM.NS_URI_RM, Constants.WSRM.IDENTIFIER));
+
+ String identifierString = identifier.getText().trim();
+ NextMsgBeanMgr mgr =
+ AbstractBeanMgrFactory.getInstance(msgCtx).getNextMsgBeanMgr();
+
+ if (mgr.retrieve(identifierString) == null) {
+ // throws new UnknownSequence fault
+ return getSequenceFault(FaultMgr.UNKNOWN_SEQUENCE_TYPE, msgCtx);
+ }
+
+ OMElement msgNumber = element.getFirstChildWithName(
+ new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.MSG_NUMBER));
+
+ BigInteger bigInteger = new BigInteger(msgNumber.getText().trim());
+
+ // throws new MessageNumberRollover fault
+ if (bigInteger.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) == 1) {
+ return getSequenceFault(FaultMgr.MESSAGE_NUMBER_ROLLOVER_TYPE,
+ msgCtx);
+ }
+
+ return null;
+ }
+
+ element = envelope.getHeader().getFirstChildWithName(
+ new QName(Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE_ACK));
+ //SequenceAcknowledgement
+ if (element != null) {
+ OMElement identifierPart = element.getFirstChildWithName(
+ new QName(Constants.WSRM.NS_URI_RM, Constants.WSRM.IDENTIFIER));
+ NextMsgBeanMgr mgr =
+ AbstractBeanMgrFactory.getInstance(msgCtx).getNextMsgBeanMgr();
+ if (mgr.retrieve(identifierPart.getText()) == null) {
+ //throw UnknownSequenceFault
+ return getSequenceFault(FaultMgr.UNKNOWN_SEQUENCE_TYPE, msgCtx);
+ }
+
+ String identifierString = identifierPart.getText().trim();
+ StorageMapBeanMgr smgr =
+ AbstractBeanMgrFactory.getInstance(msgCtx).getStorageMapBeanMgr();
+ SequencePropertyBeanMgr propertyBeanMgr =
+ AbstractBeanMgrFactory.getInstance(msgCtx).getSequencePropretyBeanMgr();
+
+ SequencePropertyBean propertyBean =
+ propertyBeanMgr.retrieve(identifierString,
+ Constants.SequenceProperties.TEMP_SEQUENCE_ID);
+
+ //TODO
+ String acksString = ""; //propertyBean.getAcksString();
+
+ String[] msgNumberStrs = acksString.split(",");
+
+ //TODO move this to a util class
+ long[] msgNumbers = new long[msgNumberStrs.length];
+ for (int i=0; i < msgNumbers.length; i++) {
+ msgNumbers[i] = Long.parseLong(msgNumberStrs[i]);
+ }
+
+ Iterator acks = element.getChildrenWithName(new QName(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.ACK_RANGE));
+ while (acks.hasNext()) {
+ OMElement ack = (OMElement) acks.next();
+
+ OMAttribute lowerAttrib = ack.getAttribute(
+ new QName(Constants.WSRM.LOWER));
+ long lower = Long.parseLong(lowerAttrib.getValue());
+
+ OMAttribute upperAttrib = ack.getAttribute(
+ new QName(Constants.WSRM.UPPER));
+ long upper = Long.parseLong(upperAttrib.getValue());
+
+ for (; lower <= upper; lower++) {
+ boolean found = false;
+ for (int j = 0; j < msgNumbers.length; j++) {
+ if (lower == msgNumbers[j]) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ //TODO throw new InvalidAcknowledgement
+ }
+ }
+ }
+
+ Iterator nacks = element.getChildrenWithName(new QName(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.NACK));
+
+ while (nacks.hasNext()) {
+ OMElement nack = (OMElement) nacks.next();
+ long msgNo = Long.parseLong(nack.getText());
+
+ boolean found = false;
+ for (int j = 0; j < msgNumbers.length; j++) {
+ if (msgNo == msgNumbers[j]) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ //TODO throw new InvalidAcknowledgement
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public RMMsgContext checkInvalidAcknowledge() {
+ return null;
+ }
+
+ public RMMsgContext getSequenceFault(int type, MessageContext msgCtx)
+ throws SandeshaException {
+
+ FaultData data = new FaultData();
+
+ switch (type) {
+ case FaultMgr.UNKNOWN_SEQUENCE_TYPE:
+ data.type = FaultMgr.UNKNOWN_SEQUENCE_TYPE;
+ data.code = FaultMgr.UNKNOW_SEQUENCE_CODE;
+ data.subcode = FaultMgr.UNKNOW_SEQUENCE_SUBCODE;
+ data.reason = FaultMgr.UNKNOW_SEQUENCE_RESON;
+ break;
+
+ case FaultMgr.MESSAGE_NUMBER_ROLLOVER_TYPE:
+ data.type = FaultMgr.MESSAGE_NUMBER_ROLLOVER_TYPE;
+ data.code = FaultMgr.MESSAGE_NUMBER_ROLLOVER_CODE;
+ data.subcode = FaultMgr.MESSAGE_NUMBER_ROLLOVER_SUBCODE;
+ data.reason = FaultMgr.MESSAGE_NUMBER_ROLLOVER_REASON;
+ break;
+
+ case FaultMgr.INVALID_ACKNOWLEDGEMENT_TYPE:
+ data.type = FaultMgr.INVALID_ACKNOWLEDGEMENT_TYPE;
+ data.code = FaultMgr.INVALID_ACKNOWLEDGEMENT_CODE;
+ data.subcode = FaultMgr.INVALID_ACKNOWLEDGEMENT_SUBCODE;
+ data.reason = FaultMgr.INVALID_ACKNOWLEDGEMENT_REASON;
+ break;
+ }
+
+ MessageContext newMsgCtx = SandeshaUtil.shallowCopy(msgCtx);
+// newMsgCtx.setServiceGroupContextId(msgCtx.getServiceGroupContextId());
+// newMsgCtx.setServiceContext(msgCtx.getServiceContext());
+ RMMsgContext newRMMsgCtx = new RMMsgContext(newMsgCtx);
+
+ SequenceFault seqFault = new SequenceFault();
+ seqFault.setSubcode(data.subcode);
+ seqFault.setReason(data.reason);
+
+ FaultCode faultCode = new FaultCode();
+ faultCode.setFault(data.code);
+ seqFault.setFaultCode(faultCode);
+
+ //TODO is it SEQUENCE_FAULT or just FAULT
+ newRMMsgCtx.setMessagePart(SEQUENCE_FAULT, seqFault);
+
+ SOAPEnvelope inMsgEnvelope = msgCtx.getEnvelope();
+
+ if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
+ msgCtx.getEnvelope().getNamespace().getName())) {
+ doSOAP11Encoding(data, newMsgCtx);
+
+ } else if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(
+ msgCtx.getEnvelope().getNamespace().getName())) {
+ doSOAP12Encoding(data, newMsgCtx);
+
+ } else {
+ //TODO should I throw an exception ?
+ }
+
+ return newRMMsgCtx;
+ }
+
+
+ public void doSOAP12Endoing(FaultData data, MessageContext msgCtx) {
+ msgCtx.setProperty(AddressingConstants.WSA_ACTION, WSA_ACTION_FAULT);
+
+ SOAPFactory factory =
+ SOAPAbstractFactory.getSOAPFactory(Constants.SOAPVersion.v1_2);
+ SOAPEnvelope envelope = factory.getDefaultFaultEnvelope();
+
+ SOAPFault fault = factory.createSOAPFault(envelope.getBody());
+ SOAPFaultCode faultCode = factory.createSOAPFaultCode(fault);
+ SOAPFaultValue faultValue = factory.createSOAPFaultValue(faultCode);
+ faultValue.setText(data.code);
+ SOAPFaultSubCode faultSubCode = factory.createSOAPFaultSubCode(faultCode);
+ SOAPFaultValue faultValue2 = factory.createSOAPFaultValue(faultSubCode);
+ faultValue2.setText(data.subcode);
+
+ //TODO
+ faultCode.setSubCode(faultSubCode);
+
+ SOAPFaultReason faultReason = factory.createSOAPFaultReason(fault);
+ SOAPFaultText faultText = factory.createSOAPFaultText(faultReason);
+ faultText.setText(data.reason);
+
+ SOAPFaultDetail faultDetail = factory.createSOAPFaultDetail(fault);
+ SOAPHeader header = data.msgCtx.getEnvelope().getHeader();
+ OMElement sequence = header.getFirstChildWithName(
+ new QName(Constants.WSRM.NS_URI_RM, Constants.WSRM.SEQUENCE));
+ OMElement identifier = sequence.getFirstChildWithName(
+ new QName(Constants.WSRM.NS_URI_RM, Constants.WSRM.IDENTIFIER));
+ identifier.detach();
+
+ faultDetail.addChild(identifier);
+
+ }
+
+ public void doSOAP11Encoding(FaultData data, MessageContext msgCtx)
+ throws SandeshaException {
+
+ SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(Constants.SOAPVersion.v1_1);
+ SOAPEnvelope faultMsgEnvelope = factory.getDefaultFaultEnvelope();
+
+ SOAPFault fault = factory.createSOAPFault(faultMsgEnvelope.getBody());
+ SOAPFaultCode soapFaultCode = factory.createSOAPFaultCode(fault);
+ SOAPFaultValue soapFaultValue =
+ factory.createSOAPFaultValue(soapFaultCode);
+ SOAPFaultReason faultReason = factory.createSOAPFaultReason(fault);
+
+ if (data.type == FaultMgr.UNKNOWN_SEQUENCE_TYPE) {
+ soapFaultValue.setText(data.code);
+
+ } else {
+// TODO sets the attribute xml:lang = "en" ..
+ soapFaultValue.setText(data.subcode);
+ }
+
+ faultReason.setText(data.reason);
+
+ try {
+ msgCtx.setEnvelope(faultMsgEnvelope);
+ } catch (AxisFault axisFault) {
+ throw new SandeshaException(axisFault.getMessage());
+ }
+ }
+
+ public void doSOAP12Encoding(FaultData data, MessageContext msgCtx)
+ throws SandeshaException {
+
+ SOAPFactory factory =
+ SOAPAbstractFactory.getSOAPFactory(Constants.SOAPVersion.v1_2);
+ SOAPEnvelope faultMsgEnvelope = factory.getDefaultFaultEnvelope();
+
+ SOAPFault fault = faultMsgEnvelope.getBody().getFault();
+ SOAPFaultCode soapFaultCode = fault.getCode();
+ soapFaultCode.getValue().setText(data.code);
+
+
+ SOAPFaultSubCode soapFaultSubCode
+ = factory.createSOAPFaultSubCode(soapFaultCode, soapFaultCode.getBuilder());
+ SOAPFaultValue soapFaultValue = factory.createSOAPFaultValue(soapFaultSubCode);
+ soapFaultValue.setText(data.subcode);
+ //soapFaultCode.setSubCode(soapFaultSubCode);
+
+ fault.getReason().getSOAPText().setText(data.reason);
+
+ try {
+ msgCtx.setEnvelope(faultMsgEnvelope);
+ } catch (AxisFault axisFault) {
+ throw new SandeshaException(axisFault.getMessage());
+ }
+ }
+
+
+
+}
Index: src/org/apache/sandesha2/RMMsgContext.java
===================================================================
--- src/org/apache/sandesha2/RMMsgContext.java (revision 326340)
+++ src/org/apache/sandesha2/RMMsgContext.java (working copy)
@@ -134,12 +134,6 @@
}
}
- public void test() {
- String opearaitonName = msgContext.getOperationContext()
- .getAxisOperation().getName().getLocalPart();
- System.out.println("Operation is:" + opearaitonName);
- }
-
public void serializeSOAPEnvelop() {
try {
SOAPEnvelope envelop = msgContext.getEnvelope();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
