Author: gatfora
Date: Wed May  2 05:18:53 2007
New Revision: 534413

URL: http://svn.apache.org/viewvc?view=rev&rev=534413
Log:
Make a CreateSequenceRefused fault if RM is not enabled for a particular 
service and it receives a CreateSequence message

Modified:
    
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
    
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
    
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties

Modified: 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?view=diff&rev=534413&r1=534412&r2=534413
==============================================================================
--- 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
 (original)
+++ 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
 Wed May  2 05:18:53 2007
@@ -106,6 +106,7 @@
        public static final String 
cannotDerriveRetransInterval="cannotDerriveRetransInterval";
        public static final String 
cannotDerriveInactivityTimeout="cannotDerriveInactivityTimeout";
        public static final String noCreateSeqParts="noCreateSeqParts";
+       public static final String 
reliableMessagingNotEnabled="reliableMessagingNotEnabled";
        public static final String noAcceptPart="noAcceptPart";
        public static final String 
noAcksToPartInCreateSequence="noAcksToPartInCreateSequence";
        public static final String tempSeqIdNotSet="tempSeqIdNotSet";

Modified: 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?view=diff&rev=534413&r1=534412&r2=534413
==============================================================================
--- 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
 (original)
+++ 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
 Wed May  2 05:18:53 2007
@@ -27,6 +27,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -68,6 +69,18 @@
                        log.debug("Enter: 
CreateSeqMsgProcessor::processInMessage");
 
                try {
+                       if (createSeqRMMsg.getMessageContext().getAxisService() 
!= null) {
+                               Parameter unreliableParam = 
createSeqRMMsg.getMessageContext().getAxisService().getParameter(SandeshaClientConstants.UNRELIABLE_MESSAGE);
+                               if (null != unreliableParam && 
"true".equals(unreliableParam.getValue())) {
+                                       
FaultManager.makeCreateSequenceRefusedFault(createSeqRMMsg, 
+                                                       
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.reliableMessagingNotEnabled,
 createSeqRMMsg.getMessageContext().getAxisService().getName()), 
+                                                       new Exception());
+                                       
+                                       log.debug("Exit: 
CreateSeqMsgProcessor::processInMessage, Service has disabled RM " + false);
+                                       return false;
+                               }
+                       }
+                       
                        CreateSequence createSeqPart = (CreateSequence) 
createSeqRMMsg
                                        
.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
                        if (createSeqPart == null) {

Modified: 
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=534413&r1=534412&r2=534413
==============================================================================
--- 
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
 (original)
+++ 
webservices/sandesha/trunk/java/modules/core/src/main/resources/org/apache/sandesha2/i18n/resource.properties
 Wed May  2 05:18:53 2007
@@ -121,6 +121,7 @@
 cannotDerriveRetransInterval=Cannot derive the ''Retransmission Interval'' 
from the passed string {0}.
 cannotDerriveInactivityTimeout=Cannot derive the ''Inactivity Timeout'' from 
the passed string {0}.
 noCreateSeqParts=No ''CreateSequence'' part is present in the create sequence 
message.
+reliableMessagingNotEnabled=WS-RM not enabled for service with name {0}.
 noAcceptPart=An ''Accept'' part has not been generated for the ''create 
sequence request'' with an offer part.
 noAcksToPartInCreateSequence=No ''AcksTo'' part is present in the create 
sequence message.
 tempSeqIdNotSet=Error: ''TempSequenceId'' is not set.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to