You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/07/19 04:58:35 UTC

svn commit: r423350 [6/8] - in /webservices/sandesha/trunk/java: ./ src/org/apache/sandesha2/ src/org/apache/sandesha2/client/ src/org/apache/sandesha2/handlers/ src/org/apache/sandesha2/i18n/ src/org/apache/sandesha2/msgprocessors/ src/org/apache/sand...

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/PropertyManager.java Tue Jul 18 19:58:31 2006
@@ -30,6 +30,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
 import org.apache.sandesha2.policy.PolicyEngineData;
 import org.apache.sandesha2.policy.RMPolicyProcessor;
 import org.apache.sandesha2.policy.RMProcessorContext;
@@ -44,137 +46,137 @@
 
 	private static final Log log = LogFactory.getLog(PropertyManager.class);
 
-	public static SandeshaPropertyBean loadPropertiesFromDefaultValues() throws SandeshaException{
-		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean ();
+	public static SandeshaPropertyBean loadPropertiesFromDefaultValues() throws SandeshaException {
+		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean();
 		propertyBean.setAcknowledgementInterval(Sandesha2Constants.Properties.DefaultValues.AcknowledgementInterval);
 		propertyBean.setExponentialBackoff(Sandesha2Constants.Properties.DefaultValues.ExponentialBackoff);
-		propertyBean.setInactiveTimeoutInterval(
-				        Sandesha2Constants.Properties.DefaultValues.InactivityTimeout,
-						Sandesha2Constants.Properties.DefaultValues.InactivityTimeoutMeasure);
-		
+		propertyBean.setInactiveTimeoutInterval(Sandesha2Constants.Properties.DefaultValues.InactivityTimeout,
+				Sandesha2Constants.Properties.DefaultValues.InactivityTimeoutMeasure);
+
 		propertyBean.setInOrder(Sandesha2Constants.Properties.DefaultValues.InvokeInOrder);
 		propertyBean.setMsgTypesToDrop(null);
 		propertyBean.setRetransmissionInterval(Sandesha2Constants.Properties.DefaultValues.RetransmissionInterval);
-//		propertyBean.setStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.StorageManager);
+		// propertyBean.setStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.StorageManager);
 		propertyBean.setInMemoryStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.InMemoryStorageManager);
-		propertyBean.setPermanentStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.PermanentStorageManager);
-		propertyBean.setMaximumRetransmissionCount(Sandesha2Constants.Properties.DefaultValues.MaximumRetransmissionCount);
-		
+		propertyBean
+				.setPermanentStorageManagerClass(Sandesha2Constants.Properties.DefaultValues.PermanentStorageManager);
+		propertyBean
+				.setMaximumRetransmissionCount(Sandesha2Constants.Properties.DefaultValues.MaximumRetransmissionCount);
+
 		String msgTypesToDrop = Sandesha2Constants.Properties.DefaultValues.MessageTypesToDrop;
-		loadMessageTypesToDrop(msgTypesToDrop,propertyBean);
-		
+		loadMessageTypesToDrop(msgTypesToDrop, propertyBean);
+
 		return propertyBean;
 	}
 
-	public static SandeshaPropertyBean loadPropertiesFromPropertyFile(InputStream in) throws SandeshaException{
-		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean ();
+	public static SandeshaPropertyBean loadPropertiesFromPropertyFile(InputStream in) throws SandeshaException {
+		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean();
 		try {
 			if (in == null)
-				in = Thread.currentThread().getContextClassLoader()
-						.getResourceAsStream(Sandesha2Constants.PROPERTY_FILE);
+				in = Thread.currentThread().getContextClassLoader().getResourceAsStream(
+						Sandesha2Constants.PROPERTY_FILE);
 
 			Properties properties = new Properties();
 			if (in != null) {
 				properties.load(in);
 			}
 
-			String expoBackoffStr = properties
-					.getProperty(Sandesha2Constants.Properties.ExponentialBackoff);
-			loadExponentialBackoff(expoBackoffStr,propertyBean);
-
-			String retransmissionIntStr = properties
-					.getProperty(Sandesha2Constants.Properties.RetransmissionInterval);
-			loadRetransmissionInterval(retransmissionIntStr,propertyBean);
+			String expoBackoffStr = properties.getProperty(Sandesha2Constants.Properties.ExponentialBackoff);
+			loadExponentialBackoff(expoBackoffStr, propertyBean);
+
+			String retransmissionIntStr = properties.getProperty(Sandesha2Constants.Properties.RetransmissionInterval);
+			loadRetransmissionInterval(retransmissionIntStr, propertyBean);
 
 			String acknowledgementIntStr = properties
 					.getProperty(Sandesha2Constants.Properties.AcknowledgementInterval);
-			loadAcknowledgementInterval(acknowledgementIntStr,propertyBean);
+			loadAcknowledgementInterval(acknowledgementIntStr, propertyBean);
 
-			String inactivityTimeoutStr = properties
-					.getProperty(Sandesha2Constants.Properties.InactivityTimeout);
+			String inactivityTimeoutStr = properties.getProperty(Sandesha2Constants.Properties.InactivityTimeout);
 			String inactivityTimeoutMeasure = properties
 					.getProperty(Sandesha2Constants.Properties.InactivityTimeoutMeasure);
-			loadInactivityTimeout(inactivityTimeoutStr,
-					inactivityTimeoutMeasure,propertyBean);
+			loadInactivityTimeout(inactivityTimeoutStr, inactivityTimeoutMeasure, propertyBean);
+
+			// String storageMgrClassStr = properties
+			// .getProperty(Sandesha2Constants.Properties.StorageManager);
+			// loadStoragemanagerClass(storageMgrClassStr,propertyBean);
 
-//			String storageMgrClassStr = properties
-//					.getProperty(Sandesha2Constants.Properties.StorageManager);
-//			loadStoragemanagerClass(storageMgrClassStr,propertyBean);
-			
 			String inMemoryStorageMgrClassStr = properties
 					.getProperty(Sandesha2Constants.Properties.InMemoryStorageManager);
-			loadInMemoryStoragemanagerClass(inMemoryStorageMgrClassStr,propertyBean);
-			
+			loadInMemoryStoragemanagerClass(inMemoryStorageMgrClassStr, propertyBean);
+
 			String permanentStorageMgrClassStr = properties
 					.getProperty(Sandesha2Constants.Properties.PermanentStorageManager);
-			loadPermanentStoragemanagerClass(permanentStorageMgrClassStr,propertyBean);
+			loadPermanentStoragemanagerClass(permanentStorageMgrClassStr, propertyBean);
+
+			String inOrderInvocation = properties.getProperty(Sandesha2Constants.Properties.InOrderInvocation);
+			loadInOrderInvocation(inOrderInvocation, propertyBean);
 
-			String inOrderInvocation = properties
-					.getProperty(Sandesha2Constants.Properties.InOrderInvocation);
-			loadInOrderInvocation(inOrderInvocation,propertyBean);
-
-			String messageTypesToDrop = properties
-					.getProperty(Sandesha2Constants.Properties.MessageTypesToDrop);
-			loadMessageTypesToDrop(messageTypesToDrop,propertyBean);
+			String messageTypesToDrop = properties.getProperty(Sandesha2Constants.Properties.MessageTypesToDrop);
+			loadMessageTypesToDrop(messageTypesToDrop, propertyBean);
 
 		} catch (IOException e) {
-			throw new SandeshaException (e);
+			throw new SandeshaException(e);
 		}
-		
+
 		return propertyBean;
 	}
-
-	public static SandeshaPropertyBean loadPropertiesFromModuleDesc (AxisModule desc) throws SandeshaException{
-		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean ();
-		
-		Parameter expoBackoffParam = desc.getParameter (Sandesha2Constants.Properties.ExponentialBackoff);
+
+	public static SandeshaPropertyBean loadPropertiesFromModuleDesc(AxisModule desc) throws SandeshaException {
+		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean();
+
+		Parameter expoBackoffParam = desc.getParameter(Sandesha2Constants.Properties.ExponentialBackoff);
 		String expoBackoffStr = (String) expoBackoffParam.getValue();
-		loadExponentialBackoff(expoBackoffStr,propertyBean);
-		
-		Parameter retransmissionIntParam = desc.getParameter (Sandesha2Constants.Properties.RetransmissionInterval);
+		loadExponentialBackoff(expoBackoffStr, propertyBean);
+
+		Parameter retransmissionIntParam = desc.getParameter(Sandesha2Constants.Properties.RetransmissionInterval);
 		String retransmissionIntStr = (String) retransmissionIntParam.getValue();
-		loadRetransmissionInterval(retransmissionIntStr,propertyBean);
-		
+		loadRetransmissionInterval(retransmissionIntStr, propertyBean);
+
 		Parameter acknowledgementIntParam = desc.getParameter(Sandesha2Constants.Properties.AcknowledgementInterval);
 		String acknowledgementIntStr = (String) acknowledgementIntParam.getValue();
-		loadAcknowledgementInterval(acknowledgementIntStr,propertyBean);		
-		
+		loadAcknowledgementInterval(acknowledgementIntStr, propertyBean);
+
 		Parameter inactivityTimeoutParam = desc.getParameter(Sandesha2Constants.Properties.InactivityTimeout);
 		String inactivityTimeoutStr = (String) inactivityTimeoutParam.getValue();
-		Parameter inactivityTimeoutMeasureParam = desc.getParameter(Sandesha2Constants.Properties.InactivityTimeoutMeasure);
+		Parameter inactivityTimeoutMeasureParam = desc
+				.getParameter(Sandesha2Constants.Properties.InactivityTimeoutMeasure);
 		String inactivityTimeoutMeasure = (String) inactivityTimeoutMeasureParam.getValue();
-		loadInactivityTimeout(inactivityTimeoutStr,inactivityTimeoutMeasure,propertyBean);
-		
-//		Parameter storageMgrClassParam = desc.getParameter(Sandesha2Constants.Properties.StorageManager);
-//		String storageMgrClassStr = (String) storageMgrClassParam.getValue();
-//		loadStoragemanagerClass(storageMgrClassStr,propertyBean);
-		
-		Parameter inMemoryStorageMgrClassParam = desc.getParameter(Sandesha2Constants.Properties.InMemoryStorageManager);
+		loadInactivityTimeout(inactivityTimeoutStr, inactivityTimeoutMeasure, propertyBean);
+
+		// Parameter storageMgrClassParam =
+		// desc.getParameter(Sandesha2Constants.Properties.StorageManager);
+		// String storageMgrClassStr = (String) storageMgrClassParam.getValue();
+		// loadStoragemanagerClass(storageMgrClassStr,propertyBean);
+
+		Parameter inMemoryStorageMgrClassParam = desc
+				.getParameter(Sandesha2Constants.Properties.InMemoryStorageManager);
 		String inMemoryStorageMgrClassStr = (String) inMemoryStorageMgrClassParam.getValue();
-		loadInMemoryStoragemanagerClass(inMemoryStorageMgrClassStr,propertyBean);
-		
-		Parameter permanentStorageMgrClassParam = desc.getParameter(Sandesha2Constants.Properties.PermanentStorageManager);
+		loadInMemoryStoragemanagerClass(inMemoryStorageMgrClassStr, propertyBean);
+
+		Parameter permanentStorageMgrClassParam = desc
+				.getParameter(Sandesha2Constants.Properties.PermanentStorageManager);
 		String permanentStorageMgrClassStr = (String) permanentStorageMgrClassParam.getValue();
-		loadPermanentStoragemanagerClass(permanentStorageMgrClassStr,propertyBean);
-		
+		loadPermanentStoragemanagerClass(permanentStorageMgrClassStr, propertyBean);
+
 		Parameter inOrderInvocationParam = desc.getParameter(Sandesha2Constants.Properties.InOrderInvocation);
 		String inOrderInvocation = (String) inOrderInvocationParam.getValue();
-		loadInOrderInvocation (inOrderInvocation,propertyBean);
-		
-		Parameter messageTypesToDropParam = desc.getParameter(Sandesha2Constants.Properties.MessageTypesToDrop); 
+		loadInOrderInvocation(inOrderInvocation, propertyBean);
+
+		Parameter messageTypesToDropParam = desc.getParameter(Sandesha2Constants.Properties.MessageTypesToDrop);
 		String messageTypesToDrop = (String) messageTypesToDropParam.getValue();
-		loadMessageTypesToDrop (messageTypesToDrop,propertyBean);
-		
+		loadMessageTypesToDrop(messageTypesToDrop, propertyBean);
+
 		return propertyBean;
 	}
-	
-	public static SandeshaPropertyBean loadPropertiesFromModuleDescPolicy(AxisModule desc, SandeshaPropertyBean parentPropertyBean) throws SandeshaException {
-		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean ();
-		
+
+	public static SandeshaPropertyBean loadPropertiesFromModuleDescPolicy(AxisModule desc,
+			SandeshaPropertyBean parentPropertyBean) throws SandeshaException {
+		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean();
+
 		Policy policy = desc.getPolicyInclude().getEffectivePolicy();
 
 		if (policy == null) {
-			return null; //no pilicy is available in the module description
+			return null; // no pilicy is available in the module description
 		}
 
 		RMPolicyProcessor processor = new RMPolicyProcessor();
@@ -190,79 +192,79 @@
 		RMProcessorContext ctx = processor.getContext();
 		PolicyEngineData data = ctx.readCurrentPolicyEngineData();
 
-		
-		if (data.isAcknowledgementIntervalSet()) 
+		if (data.isAcknowledgementIntervalSet())
 			propertyBean.setAcknowledgementInterval(data.getAcknowledgementInterval());
 		else
 			propertyBean.setAcknowledgementInterval(parentPropertyBean.getAcknowledgementInaterval());
-		
+
 		if (data.isExponentialBackoffSet())
 			propertyBean.setExponentialBackoff(data.isExponentialBackoff());
 		else
 			propertyBean.setExponentialBackoff(parentPropertyBean.isExponentialBackoff());
-		
-		//Inactivity timeout given in the policy will affect only if it gives both the measure and the value.
-		//Otherwise value will be taken from the parent.
-		if (data.isInactivityTimeoutSet() && data.isInactivityTimeoutMeassureSet() )
-			propertyBean.setInactiveTimeoutInterval(data.getInactivityTimeout(),data.getInactivityTimeoutMeassure());
-		else 
+
+		// Inactivity timeout given in the policy will affect only if it gives
+		// both the measure and the value.
+		// Otherwise value will be taken from the parent.
+		if (data.isInactivityTimeoutSet() && data.isInactivityTimeoutMeassureSet())
+			propertyBean.setInactiveTimeoutInterval(data.getInactivityTimeout(), data.getInactivityTimeoutMeassure());
+		else
 			propertyBean.setInactiveTimeoutInterval(parentPropertyBean.getInactiveTimeoutInterval());
-		
-		if (data.isInvokeInOrderSet()) 
+
+		if (data.isInvokeInOrderSet())
 			propertyBean.setInOrder(data.isInvokeInOrder());
 		else
 			propertyBean.setInOrder(parentPropertyBean.isInOrder());
-		
+
 		if (data.isMaximumRetransmissionCountSet())
 			propertyBean.setMaximumRetransmissionCount(data.getMaximumRetransmissionCount());
-		else 
+		else
 			propertyBean.setMaximumRetransmissionCount(parentPropertyBean.getMaximumRetransmissionCount());
-		
-		if (data.isRetransmissionIntervalSet()) 
+
+		if (data.isRetransmissionIntervalSet())
 			propertyBean.setRetransmissionInterval(data.getRetransmissionInterval());
 		else
 			propertyBean.setRetransmissionInterval(parentPropertyBean.getRetransmissionInterval());
-			
-//		if (data.isStorageManagerSet())
-//			propertyBean.setStorageManagerClass(data.getStorageManager());
-//		else
-//			propertyBean.setStorageManagerClass(data.getStorageManager());
-		
+
+		// if (data.isStorageManagerSet())
+		// propertyBean.setStorageManagerClass(data.getStorageManager());
+		// else
+		// propertyBean.setStorageManagerClass(data.getStorageManager());
+
 		if (data.isInMemoryStorageManagerSet())
 			propertyBean.setInMemoryStorageManagerClass(data.getInMemoryStorageManager());
 		else
 			propertyBean.setInMemoryStorageManagerClass(data.getInMemoryStorageManager());
-		
-//		if (data.isStorageManagerSet())
-//			propertyBean.setStorageManagerClass(data.getStorageManager());
-//		else
-//			propertyBean.setStorageManagerClass(data.getStorageManager());
-		
+
+		// if (data.isStorageManagerSet())
+		// propertyBean.setStorageManagerClass(data.getStorageManager());
+		// else
+		// propertyBean.setStorageManagerClass(data.getStorageManager());
+
 		if (data.isInMemoryStorageManagerSet())
 			propertyBean.setInMemoryStorageManagerClass(data.getInMemoryStorageManager());
 		else
 			propertyBean.setInMemoryStorageManagerClass(data.getInMemoryStorageManager());
-		
+
 		if (data.isPermanentStorageManagerSet())
 			propertyBean.setPermanentStorageManagerClass(data.getPermanentStorageManager());
 		else
 			propertyBean.setPermanentStorageManagerClass(data.getPermanentStorageManager());
-		
-		if (data.isMessageTypesToDropSet()) 
-			loadMessageTypesToDrop(data.getMessageTypesToDrop(),propertyBean);
+
+		if (data.isMessageTypesToDropSet())
+			loadMessageTypesToDrop(data.getMessageTypesToDrop(), propertyBean);
 		else
 			propertyBean.setMsgTypesToDrop(parentPropertyBean.getMsgTypesToDrop());
-		
+
 		return propertyBean;
 	}
 
-	public static SandeshaPropertyBean loadPropertiesFromAxisDescription(AxisDescription desc, SandeshaPropertyBean parentPropertyBean)
-			throws SandeshaException {
-		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean ();
+	public static SandeshaPropertyBean loadPropertiesFromAxisDescription(AxisDescription desc,
+			SandeshaPropertyBean parentPropertyBean) throws SandeshaException {
+		SandeshaPropertyBean propertyBean = new SandeshaPropertyBean();
 		Policy policy = desc.getPolicyInclude().getEffectivePolicy();
 
 		if (policy == null) {
-			return null; //no policy is available in this axis description
+			return null; // no policy is available in this axis description
 		}
 
 		RMPolicyProcessor processor = new RMPolicyProcessor();
@@ -278,58 +280,59 @@
 		RMProcessorContext ctx = processor.getContext();
 		PolicyEngineData data = ctx.readCurrentPolicyEngineData();
 
-		if (data.isAcknowledgementIntervalSet()) 
+		if (data.isAcknowledgementIntervalSet())
 			propertyBean.setAcknowledgementInterval(data.getAcknowledgementInterval());
 		else
 			propertyBean.setAcknowledgementInterval(parentPropertyBean.getAcknowledgementInaterval());
-		
+
 		if (data.isExponentialBackoffSet())
 			propertyBean.setExponentialBackoff(data.isExponentialBackoff());
 		else
 			propertyBean.setExponentialBackoff(parentPropertyBean.isExponentialBackoff());
-		
-		//Inactivity timeout given in the policy will affect only if it gives both the measure and the value.
-		//Otherwise value will be taken from the parent.
-		if (data.isInactivityTimeoutSet() && data.isInactivityTimeoutMeassureSet() )
-			propertyBean.setInactiveTimeoutInterval(data.getInactivityTimeout(),data.getInactivityTimeoutMeassure());
-		else 
+
+		// Inactivity timeout given in the policy will affect only if it gives
+		// both the measure and the value.
+		// Otherwise value will be taken from the parent.
+		if (data.isInactivityTimeoutSet() && data.isInactivityTimeoutMeassureSet())
+			propertyBean.setInactiveTimeoutInterval(data.getInactivityTimeout(), data.getInactivityTimeoutMeassure());
+		else
 			propertyBean.setInactiveTimeoutInterval(parentPropertyBean.getInactiveTimeoutInterval());
-		
-		if (data.isInvokeInOrderSet()) 
+
+		if (data.isInvokeInOrderSet())
 			propertyBean.setInOrder(data.isInvokeInOrder());
 		else
 			propertyBean.setInOrder(parentPropertyBean.isInOrder());
-		
+
 		if (data.isMaximumRetransmissionCountSet())
 			propertyBean.setMaximumRetransmissionCount(data.getMaximumRetransmissionCount());
-		else 
+		else
 			propertyBean.setMaximumRetransmissionCount(parentPropertyBean.getMaximumRetransmissionCount());
-		
-		if (data.isRetransmissionIntervalSet()) 
+
+		if (data.isRetransmissionIntervalSet())
 			propertyBean.setRetransmissionInterval(data.getRetransmissionInterval());
 		else
 			propertyBean.setRetransmissionInterval(parentPropertyBean.getRetransmissionInterval());
-			
-//		if (data.isStorageManagerSet())
-//			propertyBean.setStorageManagerClass(data.getStorageManager());
-//		else
-//			propertyBean.setStorageManagerClass(data.getStorageManager());
-		
+
+		// if (data.isStorageManagerSet())
+		// propertyBean.setStorageManagerClass(data.getStorageManager());
+		// else
+		// propertyBean.setStorageManagerClass(data.getStorageManager());
+
 		if (data.isInMemoryStorageManagerSet())
 			propertyBean.setInMemoryStorageManagerClass(data.getInMemoryStorageManager());
 		else
 			propertyBean.setInMemoryStorageManagerClass(data.getInMemoryStorageManager());
-		
+
 		if (data.isPermanentStorageManagerSet())
 			propertyBean.setPermanentStorageManagerClass(data.getPermanentStorageManager());
 		else
 			propertyBean.setPermanentStorageManagerClass(data.getPermanentStorageManager());
-		
-		if (data.isMessageTypesToDropSet()) 
-			loadMessageTypesToDrop(data.getMessageTypesToDrop(),propertyBean);
+
+		if (data.isMessageTypesToDropSet())
+			loadMessageTypesToDrop(data.getMessageTypesToDrop(), propertyBean);
 		else
 			propertyBean.setMsgTypesToDrop(parentPropertyBean.getMsgTypesToDrop());
-		
+
 		return propertyBean;
 	}
 
@@ -342,7 +345,8 @@
 	 * 
 	 * @param properties
 	 */
-	private static void loadExponentialBackoff(String expoBackoffStr, SandeshaPropertyBean propertyBean) throws SandeshaException {
+	private static void loadExponentialBackoff(String expoBackoffStr, SandeshaPropertyBean propertyBean)
+			throws SandeshaException {
 
 		if (expoBackoffStr != null) {
 			expoBackoffStr = expoBackoffStr.trim();
@@ -359,19 +363,19 @@
 	 * 
 	 * @param properties
 	 */
-	private static void loadRetransmissionInterval(String retransmissionIntStr, SandeshaPropertyBean propertyBean) throws SandeshaException  {
+	private static void loadRetransmissionInterval(String retransmissionIntStr, SandeshaPropertyBean propertyBean)
+			throws SandeshaException {
 
 		if (retransmissionIntStr != null) {
 			try {
 				retransmissionIntStr = retransmissionIntStr.trim();
-				int retransmissionInterval = Integer
-						.parseInt(retransmissionIntStr);
+				int retransmissionInterval = Integer.parseInt(retransmissionIntStr);
 				if (retransmissionInterval > 0) {
 					propertyBean.setRetransmissionInterval(retransmissionInterval);
 				}
 			} catch (NumberFormatException e) {
-				String message = "Cannot derive the Acknowledgement Interval from the passed string";
-				throw new SandeshaException (message,e);
+				String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDerriveRetransInterval);
+				throw new SandeshaException(message, e);
 			}
 		}
 	}
@@ -381,19 +385,19 @@
 	 * 
 	 * @param properties
 	 */
-	private static void loadAcknowledgementInterval(String acknowledgementIntStr, SandeshaPropertyBean propertyBean) throws SandeshaException  {
+	private static void loadAcknowledgementInterval(String acknowledgementIntStr, SandeshaPropertyBean propertyBean)
+			throws SandeshaException {
 
 		if (acknowledgementIntStr != null) {
 			try {
 				acknowledgementIntStr = acknowledgementIntStr.trim();
-				int acknowledgementInt = Integer
-						.parseInt(acknowledgementIntStr);
+				int acknowledgementInt = Integer.parseInt(acknowledgementIntStr);
 				if (acknowledgementInt > 0) {
 					propertyBean.setAcknowledgementInterval(acknowledgementInt);
 				}
 			} catch (NumberFormatException e) {
-				String message = "Cannot derive the Acknowledgement Interval from the passed string";
-				throw new SandeshaException(message,e);
+				String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDerriveAckInterval);
+				throw new SandeshaException(message, e);
 			}
 		}
 	}
@@ -403,64 +407,66 @@
 	 * 
 	 * @param properties
 	 */
-	private static void loadInactivityTimeout(String inactivityTimeoutStr,
-			String inactivityTimeoutMeasure, SandeshaPropertyBean propertyBean) throws SandeshaException  {
+	private static void loadInactivityTimeout(String inactivityTimeoutStr, String inactivityTimeoutMeasure,
+			SandeshaPropertyBean propertyBean) throws SandeshaException {
 
 		if (inactivityTimeoutStr != null && inactivityTimeoutMeasure != null) {
 			try {
 				inactivityTimeoutStr = inactivityTimeoutStr.trim();
 				inactivityTimeoutMeasure = inactivityTimeoutMeasure.trim();
 
-				int inactivityTimeoutVal = Integer
-						.parseInt(inactivityTimeoutStr);
+				int inactivityTimeoutVal = Integer.parseInt(inactivityTimeoutStr);
 				if (inactivityTimeoutVal > 0) {
-					propertyBean.setInactiveTimeoutInterval(
-							inactivityTimeoutVal, inactivityTimeoutMeasure);
+					propertyBean.setInactiveTimeoutInterval(inactivityTimeoutVal, inactivityTimeoutMeasure);
 				}
 			} catch (NumberFormatException e) {
-				String message = "Cannot derive the Inactivity Timeout from the passed string";
-				throw new SandeshaException(message,e);
+				String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDerriveInactivityTimeout);
+				throw new SandeshaException(message, e);
 			}
 		}
 	}
 
-//	/**
-//	 * Loads the StorageManager class name.
-//	 * 
-//	 * @param properties
-//	 */
-//	private static void loadStoragemanagerClass(String storageMgrClassStr, SandeshaPropertyBean propertyBean) throws SandeshaException  {
-//		if (storageMgrClassStr != null) {
-//			storageMgrClassStr = storageMgrClassStr.trim();
-//			propertyBean.setStorageManagerClass(storageMgrClassStr);
-//		}
-//	}
-	
+	// /**
+	// * Loads the StorageManager class name.
+	// *
+	// * @param properties
+	// */
+	// private static void loadStoragemanagerClass(String storageMgrClassStr,
+	// SandeshaPropertyBean propertyBean) throws SandeshaException {
+	// if (storageMgrClassStr != null) {
+	// storageMgrClassStr = storageMgrClassStr.trim();
+	// propertyBean.setStorageManagerClass(storageMgrClassStr);
+	// }
+	// }
+
 	/**
 	 * Loads the InMemoryStorageManager class name.
 	 * 
 	 * @param properties
 	 */
-	private static void loadInMemoryStoragemanagerClass(String inMemoryStorageMgrClassStr, SandeshaPropertyBean propertyBean) throws SandeshaException  {
+	private static void loadInMemoryStoragemanagerClass(String inMemoryStorageMgrClassStr,
+			SandeshaPropertyBean propertyBean) throws SandeshaException {
 		if (inMemoryStorageMgrClassStr != null) {
 			inMemoryStorageMgrClassStr = inMemoryStorageMgrClassStr.trim();
 			propertyBean.setInMemoryStorageManagerClass(inMemoryStorageMgrClassStr);
 		}
 	}
-	
+
 	/**
 	 * Loads the PermanentStorageManager class name.
 	 * 
 	 * @param properties
 	 */
-	private static void loadPermanentStoragemanagerClass(String permanentStorageMgrClassStr, SandeshaPropertyBean propertyBean) throws SandeshaException  {
+	private static void loadPermanentStoragemanagerClass(String permanentStorageMgrClassStr,
+			SandeshaPropertyBean propertyBean) throws SandeshaException {
 		if (permanentStorageMgrClassStr != null) {
 			permanentStorageMgrClassStr = permanentStorageMgrClassStr.trim();
 			propertyBean.setPermanentStorageManagerClass(permanentStorageMgrClassStr);
 		}
 	}
 
-	private static void loadInOrderInvocation(String inOrderInvocation, SandeshaPropertyBean propertyBean) throws SandeshaException  {
+	private static void loadInOrderInvocation(String inOrderInvocation, SandeshaPropertyBean propertyBean)
+			throws SandeshaException {
 
 		if (inOrderInvocation != null) {
 			inOrderInvocation = inOrderInvocation.trim();
@@ -472,16 +478,14 @@
 		}
 	}
 
-	private static void loadMessageTypesToDrop(String messageTypesToDrop, SandeshaPropertyBean propertyBean) throws SandeshaException  {
+	private static void loadMessageTypesToDrop(String messageTypesToDrop, SandeshaPropertyBean propertyBean)
+			throws SandeshaException {
 
 		try {
-			if (messageTypesToDrop != null
-					&& !Sandesha2Constants.VALUE_NONE
-							.equals(messageTypesToDrop)) {
+			if (messageTypesToDrop != null && !Sandesha2Constants.VALUE_NONE.equals(messageTypesToDrop)) {
 				messageTypesToDrop = messageTypesToDrop.trim();
 				messageTypesToDrop = "[" + messageTypesToDrop + "]";
-				ArrayList messageTypesLst = SandeshaUtil
-						.getArrayListFromString(messageTypesToDrop);
+				ArrayList messageTypesLst = SandeshaUtil.getArrayListFromString(messageTypesToDrop);
 
 				Iterator itr = messageTypesLst.iterator();
 				while (itr.hasNext()) {
@@ -491,10 +495,9 @@
 				}
 			}
 		} catch (NumberFormatException e) {
-			String message = "Property '"
-					+ Sandesha2Constants.Properties.MessageTypesToDrop
-					+ "' contains an invalid value.";
-			throw new SandeshaException (message,e);
+			String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.propertyInvalidValue,
+					Sandesha2Constants.Properties.MessageTypesToDrop);
+			throw new SandeshaException(message, e);
 		}
 	}
 

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/RMMsgCreator.java Tue Jul 18 19:58:31 2006
@@ -42,6 +42,8 @@
 import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.SandeshaException;
 import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.storage.beans.SequencePropertyBean;
@@ -69,34 +71,36 @@
 
 	private static Log log = LogFactory.getLog(RMMsgCreator.class);
 
-	private static void initializeCreation(MessageContext relatedMessage,
-			MessageContext newMessage) throws SandeshaException {
-		
-		if (relatedMessage.getAxisService()!=null &&  newMessage.getAxisService()!=null && 
-				newMessage.getAxisService()!=relatedMessage.getAxisService()) {
-			
-			Parameter referencePolicyParam = relatedMessage.getAxisService().getParameter(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
-			if (referencePolicyParam!=null) {
-				Parameter newPolicyParam = new Parameter ();
+	private static void initializeCreation(MessageContext relatedMessage, MessageContext newMessage)
+			throws SandeshaException {
+
+		if (relatedMessage.getAxisService() != null && newMessage.getAxisService() != null
+				&& newMessage.getAxisService() != relatedMessage.getAxisService()) {
+
+			Parameter referencePolicyParam = relatedMessage.getAxisService().getParameter(
+					Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
+			if (referencePolicyParam != null) {
+				Parameter newPolicyParam = new Parameter();
 				newPolicyParam.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
 				newPolicyParam.setValue(newPolicyParam.getValue());
 			}
 		}
-		
-		if (relatedMessage.getAxisOperation()!=null &&  newMessage.getAxisOperation()!=null && 
-				newMessage.getAxisOperation()!=relatedMessage.getAxisOperation()) {
-			
-			Parameter referencePolicyParam = relatedMessage.getAxisOperation().getParameter(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
-			if (referencePolicyParam!=null) {
-				Parameter newPolicyParam = new Parameter ();
+
+		if (relatedMessage.getAxisOperation() != null && newMessage.getAxisOperation() != null
+				&& newMessage.getAxisOperation() != relatedMessage.getAxisOperation()) {
+
+			Parameter referencePolicyParam = relatedMessage.getAxisOperation().getParameter(
+					Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
+			if (referencePolicyParam != null) {
+				Parameter newPolicyParam = new Parameter();
 				newPolicyParam.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
 				newPolicyParam.setValue(newPolicyParam.getValue());
 			}
 		}
 	}
 
-	private static void finalizeCreation(MessageContext relatedMessage,
-			MessageContext newMessage) throws SandeshaException {
+	private static void finalizeCreation(MessageContext relatedMessage, MessageContext newMessage)
+			throws SandeshaException {
 
 		newMessage.setServerSide(relatedMessage.isServerSide());
 
@@ -107,8 +111,7 @@
 			if (oldAxisOperation != null) {
 				ArrayList axisOpParams = oldAxisOperation.getParameters();
 				if (axisOpParams != null) {
-					AxisOperation newAxisOperation = newMessage
-							.getAxisOperation();
+					AxisOperation newAxisOperation = newMessage.getAxisOperation();
 					Iterator iter = axisOpParams.iterator();
 					while (iter.hasNext()) {
 						Parameter nextParam = (Parameter) iter.next();
@@ -123,10 +126,11 @@
 			}
 
 		} catch (AxisFault e) {
-			log.error("Could not copy parameters when creating the new RM Message");
-			throw new SandeshaException(e.getMessage());
-		}		
-		
+			String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotCopyParameters);
+			log.error(message);
+			throw new SandeshaException(message, e);
+		}
+
 		// TODO optimize by cloning the Map rather than copying one by one.
 
 		// operationContext properties
@@ -134,13 +138,11 @@
 		if (oldOpContext != null) {
 			Map oldOpContextProperties = oldOpContext.getProperties();
 			if (oldOpContextProperties != null) {
-				OperationContext newOpContext = newMessage
-						.getOperationContext();
+				OperationContext newOpContext = newMessage.getOperationContext();
 				Iterator keyIter = oldOpContextProperties.keySet().iterator();
 				while (keyIter.hasNext()) {
 					String key = (String) keyIter.next();
-					newOpContext.setProperty(key, oldOpContextProperties
-							.get(key));
+					newOpContext.setProperty(key, oldOpContextProperties.get(key));
 				}
 			}
 		}
@@ -152,12 +154,11 @@
 				Iterator keyIter = oldMsgContextProperties.keySet().iterator();
 				while (keyIter.hasNext()) {
 					String key = (String) keyIter.next();
-					newMessage.setProperty(key, oldMsgContextProperties
-							.get(key));
+					newMessage.setProperty(key, oldMsgContextProperties.get(key));
 				}
 			}
 		}
-		
+
 		// setting an options with properties copied from the old one.
 		Options relatesMessageOptions = relatedMessage.getOptions();
 		if (relatesMessageOptions != null) {
@@ -166,26 +167,21 @@
 				newMessageOptions = new Options();
 				newMessage.setOptions(newMessageOptions);
 			}
-			
 
-			Map relatedMessageProperties = relatesMessageOptions
-					.getProperties();
+			Map relatedMessageProperties = relatesMessageOptions.getProperties();
 			Iterator keys = relatedMessageProperties.keySet().iterator();
 			while (keys.hasNext()) {
 				String key = (String) keys.next();
-				newMessageOptions.setProperty(key, relatedMessageProperties
-						.get(key));
+				newMessageOptions.setProperty(key, relatedMessageProperties.get(key));
 			}
 
-			Options relatedMessageParentOptions = relatesMessageOptions
-					.getParent();
+			Options relatedMessageParentOptions = relatesMessageOptions.getParent();
 			if (relatedMessageParentOptions != null) {
 				Map relatedMessageParentProperties = relatedMessageParentOptions.getProperties();
 				keys = relatedMessageParentProperties.keySet().iterator();
 				while (keys.hasNext()) {
 					String key = (String) keys.next();
-					newMessageOptions.setProperty(key,
-							relatedMessageParentProperties.get(key));
+					newMessageOptions.setProperty(key, relatedMessageParentProperties.get(key));
 				}
 			}
 		}
@@ -200,24 +196,20 @@
 	 * @return
 	 * @throws SandeshaException
 	 */
-	public static RMMsgContext createCreateSeqMsg(
-			RMMsgContext applicationRMMsg, String internalSequenceId,
-			String acksTo,StorageManager storageManager) throws SandeshaException {
+	public static RMMsgContext createCreateSeqMsg(RMMsgContext applicationRMMsg, String internalSequenceId,
+			String acksTo, StorageManager storageManager) throws SandeshaException {
 
-		MessageContext applicationMsgContext = applicationRMMsg
-				.getMessageContext();
+		MessageContext applicationMsgContext = applicationRMMsg.getMessageContext();
 		if (applicationMsgContext == null)
-			throw new SandeshaException("Application message is null");
-		ConfigurationContext context = applicationMsgContext
-				.getConfigurationContext();
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.appMsgIsNull));
+		ConfigurationContext context = applicationMsgContext.getConfigurationContext();
 		if (context == null)
-			throw new SandeshaException("Configuration Context is null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.configContextNotSet));
 
-		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
-				.getSOAPVersion(applicationMsgContext.getEnvelope()));
+		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(applicationMsgContext
+				.getEnvelope()));
 
-		SequencePropertyBeanMgr seqPropMgr = storageManager
-				.getSequencePropertyBeanMgr();
+		SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
 		MessageContext createSeqmsgContext;
 		try {
 			// creating by copying common contents. (this will not set contexts
@@ -225,13 +217,12 @@
 			AxisOperation createSequenceOperation = AxisOperationFactory
 					.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_IN);
 
-			createSeqmsgContext = SandeshaUtil.createNewRelatedMessageContext(
-					applicationRMMsg, createSequenceOperation);
+			createSeqmsgContext = SandeshaUtil
+					.createNewRelatedMessageContext(applicationRMMsg, createSequenceOperation);
 
 			initializeCreation(applicationMsgContext, createSeqmsgContext);
 
-			OperationContext createSeqOpCtx = createSeqmsgContext
-					.getOperationContext();
+			OperationContext createSeqOpCtx = createSeqmsgContext.getOperationContext();
 			String createSeqMsgId = SandeshaUtil.getUUID();
 			createSeqmsgContext.setMessageID(createSeqMsgId);
 			context.registerOperationContext(createSeqMsgId, createSeqOpCtx);
@@ -240,22 +231,16 @@
 			throw new SandeshaException(e.getMessage());
 		}
 
-		AxisOperation appMsgOperationDesc = applicationMsgContext
-				.getAxisOperation();
+		AxisOperation appMsgOperationDesc = applicationMsgContext.getAxisOperation();
+
+		AxisOperation createSeqOperation = createSeqmsgContext.getAxisOperation();
 
-		AxisOperation createSeqOperation = createSeqmsgContext
-				.getAxisOperation();
-		
 		createSeqOperation.setName(new QName("CreateSequenceOperation"));
 		if (appMsgOperationDesc != null) {
-			createSeqOperation.setPhasesOutFlow(appMsgOperationDesc
-					.getPhasesOutFlow());
-			createSeqOperation.setPhasesOutFaultFlow(appMsgOperationDesc
-					.getPhasesOutFaultFlow());
-			createSeqOperation.setPhasesInFaultFlow(appMsgOperationDesc
-					.getPhasesInFaultFlow());
-			createSeqOperation.setRemainingPhasesInFlow(appMsgOperationDesc
-					.getRemainingPhasesInFlow());
+			createSeqOperation.setPhasesOutFlow(appMsgOperationDesc.getPhasesOutFlow());
+			createSeqOperation.setPhasesOutFaultFlow(appMsgOperationDesc.getPhasesOutFaultFlow());
+			createSeqOperation.setPhasesInFaultFlow(appMsgOperationDesc.getPhasesInFaultFlow());
+			createSeqOperation.setRemainingPhasesInFlow(appMsgOperationDesc.getRemainingPhasesInFlow());
 		}
 
 		createSeqmsgContext.setAxisOperation(createSeqOperation);
@@ -265,46 +250,45 @@
 
 		RMMsgContext createSeqRMMsg = new RMMsgContext(createSeqmsgContext);
 
-		String rmVersion = SandeshaUtil.getRMVersion(internalSequenceId,storageManager);
-		if (rmVersion==null)
-			throw new SandeshaException ("Cant find the rmVersion of the given message");
-		
+		String rmVersion = SandeshaUtil.getRMVersion(internalSequenceId, storageManager);
+		if (rmVersion == null)
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
+
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
-		
-		String addressingNamespaceValue = SandeshaUtil.getSequenceProperty(internalSequenceId,Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE,storageManager);
-		
-		CreateSequence createSequencePart = new CreateSequence(factory,rmNamespaceValue,addressingNamespaceValue);
+
+		String addressingNamespaceValue = SandeshaUtil.getSequenceProperty(internalSequenceId,
+				Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE, storageManager);
+
+		CreateSequence createSequencePart = new CreateSequence(factory, rmNamespaceValue, addressingNamespaceValue);
 
 		// Adding sequence offer - if present
-		OperationContext operationcontext = applicationMsgContext
-				.getOperationContext();
+		OperationContext operationcontext = applicationMsgContext.getOperationContext();
 		if (operationcontext != null) {
 			String offeredSequence = (String) applicationMsgContext
 					.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
 			if (offeredSequence != null && !"".equals(offeredSequence)) {
-				SequenceOffer offerPart = new SequenceOffer(factory,rmNamespaceValue);
-				Identifier identifier = new Identifier(factory,rmNamespaceValue);
+				SequenceOffer offerPart = new SequenceOffer(factory, rmNamespaceValue);
+				Identifier identifier = new Identifier(factory, rmNamespaceValue);
 				identifier.setIndentifer(offeredSequence);
 				offerPart.setIdentifier(identifier);
 				createSequencePart.setSequenceOffer(offerPart);
 			}
 		}
 
-		SequencePropertyBean replyToBean = seqPropMgr.retrieve(
-				internalSequenceId,
+		SequencePropertyBean replyToBean = seqPropMgr.retrieve(internalSequenceId,
 				Sandesha2Constants.SequenceProperties.REPLY_TO_EPR);
 		SequencePropertyBean toBean = seqPropMgr.retrieve(internalSequenceId,
 				Sandesha2Constants.SequenceProperties.TO_EPR);
 
 		if (toBean == null || toBean.getValue() == null)
-			throw new SandeshaException("To EPR is not set.");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.toEPRNotValid, null));
 
 		EndpointReference toEPR = new EndpointReference(toBean.getValue());
 		EndpointReference replyToEPR = null;
 		EndpointReference acksToEPR = null;
 
 		String anonymousURI = SpecSpecificConstants.getAddressingAnonymousURI(addressingNamespaceValue);
-		
+
 		if (acksTo == null || "".equals(acksTo))
 			acksTo = anonymousURI;
 
@@ -313,31 +297,31 @@
 		if (replyToBean != null && replyToBean.getValue() != null)
 			replyToEPR = new EndpointReference(replyToBean.getValue());
 
-		if(createSeqRMMsg.getTo()==null)
+		if (createSeqRMMsg.getTo() == null)
 			createSeqRMMsg.setTo(toEPR);
 
 		// ReplyTo will be set only if not null.
 		if (replyToEPR != null)
 			createSeqRMMsg.setReplyTo(replyToEPR);
 
-		createSequencePart.setAcksTo(new AcksTo(
-				new Address(acksToEPR, factory, addressingNamespaceValue), factory,rmNamespaceValue,addressingNamespaceValue));
+		createSequencePart.setAcksTo(new AcksTo(new Address(acksToEPR, factory, addressingNamespaceValue), factory,
+				rmNamespaceValue, addressingNamespaceValue));
 
-		createSeqRMMsg.setMessagePart(
-				Sandesha2Constants.MessageParts.CREATE_SEQ, createSequencePart);
+		createSeqRMMsg.setMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ, createSequencePart);
 
 		try {
 			createSeqRMMsg.addSOAPEnvelope();
 		} catch (AxisFault e1) {
 			throw new SandeshaException(e1.getMessage());
 		}
-		
 
-		createSeqRMMsg.setAction(SpecSpecificConstants.getCreateSequenceAction(SandeshaUtil.getRMVersion(internalSequenceId,storageManager)));
-		createSeqRMMsg.setSOAPAction(SpecSpecificConstants.getCreateSequenceSOAPAction(SandeshaUtil.getRMVersion(internalSequenceId,storageManager)));
+		createSeqRMMsg.setAction(SpecSpecificConstants.getCreateSequenceAction(SandeshaUtil.getRMVersion(
+				internalSequenceId, storageManager)));
+		createSeqRMMsg.setSOAPAction(SpecSpecificConstants.getCreateSequenceSOAPAction(SandeshaUtil.getRMVersion(
+				internalSequenceId, storageManager)));
 
 		finalizeCreation(applicationMsgContext, createSeqmsgContext);
-		
+
 		return createSeqRMMsg;
 	}
 
@@ -349,78 +333,73 @@
 	 * @return
 	 * @throws SandeshaException
 	 */
-	public static RMMsgContext createTerminateSequenceMessage(
-			RMMsgContext referenceRMMessage, String sequenceId, String internalSequenceID,StorageManager storageManager)
-			throws SandeshaException {
-		MessageContext referenceMessage = referenceRMMessage
-				.getMessageContext();
+	public static RMMsgContext createTerminateSequenceMessage(RMMsgContext referenceRMMessage, String sequenceId,
+			String internalSequenceID, StorageManager storageManager) throws SandeshaException {
+		MessageContext referenceMessage = referenceRMMessage.getMessageContext();
 		if (referenceMessage == null)
-			throw new SandeshaException("MessageContext is null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.msgContextNotSet));
 
 		AxisOperation terminateOperation = null;
 
 		try {
-			terminateOperation = AxisOperationFactory
-					.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY);
+			terminateOperation = AxisOperationFactory.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY);
 		} catch (AxisFault e1) {
 			throw new SandeshaException(e1.getMessage());
 		}
 
 		if (terminateOperation == null)
-			throw new SandeshaException("Terminate Operation was null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.terminateOpperationIsNull));
 
-		ConfigurationContext configCtx = referenceMessage
-		.getConfigurationContext();
+		ConfigurationContext configCtx = referenceMessage.getConfigurationContext();
 		if (configCtx == null)
-			throw new SandeshaException("Configuration Context is null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.configContextNotSet));
 
-		MessageContext terminateMessage = SandeshaUtil
-				.createNewRelatedMessageContext(referenceRMMessage,
-						terminateOperation);
+		MessageContext terminateMessage = SandeshaUtil.createNewRelatedMessageContext(referenceRMMessage,
+				terminateOperation);
 
 		OperationContext operationContext = terminateMessage.getOperationContext();
-		configCtx.registerOperationContext(terminateMessage.getMessageID(), operationContext);   //to receive terminate sequence response messages correctly.
-		
+		configCtx.registerOperationContext(terminateMessage.getMessageID(), operationContext); // to
+																								// receive
+																								// terminate
+																								// sequence
+																								// response
+																								// messages
+																								// correctly.
+
 		AxisOperation teferenceMsgOperation = referenceMessage.getAxisOperation();
 		AxisOperation terminateMsgOperation = terminateMessage.getAxisOperation();
 		if (teferenceMsgOperation != null) {
-			terminateMsgOperation.setPhasesOutFlow(teferenceMsgOperation
-					.getPhasesOutFlow());
-			terminateMsgOperation.setPhasesOutFaultFlow(teferenceMsgOperation
-					.getPhasesOutFaultFlow());
-			terminateMsgOperation.setPhasesInFaultFlow(teferenceMsgOperation
-					.getPhasesInFaultFlow());
-			terminateMsgOperation.setRemainingPhasesInFlow(teferenceMsgOperation
-					.getRemainingPhasesInFlow());
-		}
-		
-		String rmVersion = SandeshaUtil.getRMVersion(internalSequenceID,storageManager);
-		if (rmVersion==null)
-			throw new SandeshaException ("Cant find the rmVersion of the given message");
-		
+			terminateMsgOperation.setPhasesOutFlow(teferenceMsgOperation.getPhasesOutFlow());
+			terminateMsgOperation.setPhasesOutFaultFlow(teferenceMsgOperation.getPhasesOutFaultFlow());
+			terminateMsgOperation.setPhasesInFaultFlow(teferenceMsgOperation.getPhasesInFaultFlow());
+			terminateMsgOperation.setRemainingPhasesInFlow(teferenceMsgOperation.getRemainingPhasesInFlow());
+		}
+
+		String rmVersion = SandeshaUtil.getRMVersion(internalSequenceID, storageManager);
+		if (rmVersion == null)
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
+
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
-		
+
 		initializeCreation(referenceMessage, terminateMessage);
 
 		if (!SpecSpecificConstants.isTerminateSequenceResponseRequired(rmVersion)) {
-			terminateMessage.setProperty(MessageContext.TRANSPORT_IN,null);
+			terminateMessage.setProperty(MessageContext.TRANSPORT_IN, null);
 		}
-		
-		RMMsgContext terminateRMMessage = MsgInitializer
-				.initializeMessage(terminateMessage);
+
+		RMMsgContext terminateRMMessage = MsgInitializer.initializeMessage(terminateMessage);
 
 		if (terminateMessage == null)
-			throw new SandeshaException("MessageContext is null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.msgContextNotSet));
 
 		// setUpMessage(referenceMessage, terminateMessage);
-		
-		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
-				.getSOAPVersion(referenceMessage.getEnvelope()));
+
+		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(referenceMessage
+				.getEnvelope()));
 
 		terminateMessage.setMessageID(SandeshaUtil.getUUID());
 
-		AxisOperation referenceMsgOperation = referenceMessage
-				.getAxisOperation();
+		AxisOperation referenceMsgOperation = referenceMessage.getAxisOperation();
 		if (referenceMsgOperation != null) {
 			ArrayList outPhases = referenceMsgOperation.getPhasesOutFlow();
 			if (outPhases != null) {
@@ -428,23 +407,29 @@
 				terminateOperation.setPhasesOutFaultFlow(outPhases);
 			}
 		}
-		
+
 		SOAPEnvelope envelope = factory.getDefaultEnvelope();
 		terminateRMMessage.setSOAPEnvelop(envelope);
-		
-		TerminateSequence terminateSequencePart = new TerminateSequence(factory,rmNamespaceValue);
-		Identifier identifier = new Identifier(factory,rmNamespaceValue);
+
+		TerminateSequence terminateSequencePart = new TerminateSequence(factory, rmNamespaceValue);
+		Identifier identifier = new Identifier(factory, rmNamespaceValue);
 		identifier.setIndentifer(sequenceId);
 		terminateSequencePart.setIdentifier(identifier);
-		terminateRMMessage.setMessagePart(
-				Sandesha2Constants.MessageParts.TERMINATE_SEQ,
-				terminateSequencePart);
+		terminateRMMessage.setMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ, terminateSequencePart);
 
 		finalizeCreation(referenceMessage, terminateMessage);
-		
-		terminateMessage.setProperty(MessageContext.TRANSPORT_IN,null);   //no need for an incoming transport for an terminate
-																		  //message. If this is put, sender will look for an response.
-		
+
+		terminateMessage.setProperty(MessageContext.TRANSPORT_IN, null); // no
+																			// need
+																			// for
+																			// an
+																			// incoming
+																			// transport
+																			// for
+																			// an
+																			// terminate
+		// message. If this is put, sender will look for an response.
+
 		return terminateRMMessage;
 	}
 
@@ -457,29 +442,29 @@
 	 * @return
 	 * @throws AxisFault
 	 */
-	public static RMMsgContext createCreateSeqResponseMsg(
-			RMMsgContext createSeqMessage, MessageContext outMessage,
-			String newSequenceID,StorageManager storageManager) throws AxisFault {
+	public static RMMsgContext createCreateSeqResponseMsg(RMMsgContext createSeqMessage, MessageContext outMessage,
+			String newSequenceID, StorageManager storageManager) throws AxisFault {
 
-		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
-				.getSOAPVersion(createSeqMessage.getSOAPEnvelope()));
+		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(createSeqMessage
+				.getSOAPEnvelope()));
 
 		ConfigurationContext configurationContext = createSeqMessage.getMessageContext().getConfigurationContext();
-		
-		IOMRMElement messagePart = createSeqMessage
-				.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
+
+		IOMRMElement messagePart = createSeqMessage.getMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ);
 		CreateSequence cs = (CreateSequence) messagePart;
 
-		String rmVersion = SandeshaUtil.getRMVersion(newSequenceID,storageManager);
-		if (rmVersion==null)
-			throw new SandeshaException ("Cant find the rmVersion of the given message");
-		
-		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);		
-		String addressingNamespaceValue = SandeshaUtil.getSequenceProperty(newSequenceID,Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE,storageManager);
-		
-		CreateSequenceResponse response = new CreateSequenceResponse(factory,rmNamespaceValue,addressingNamespaceValue);
+		String rmVersion = SandeshaUtil.getRMVersion(newSequenceID, storageManager);
+		if (rmVersion == null)
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
+
+		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
+		String addressingNamespaceValue = SandeshaUtil.getSequenceProperty(newSequenceID,
+				Sandesha2Constants.SequenceProperties.ADDRESSING_NAMESPACE_VALUE, storageManager);
+
+		CreateSequenceResponse response = new CreateSequenceResponse(factory, rmNamespaceValue,
+				addressingNamespaceValue);
 
-		Identifier identifier = new Identifier(factory,rmNamespaceValue);
+		Identifier identifier = new Identifier(factory, rmNamespaceValue);
 		identifier.setIndentifer(newSequenceID);
 
 		response.setIdentifier(identifier);
@@ -490,10 +475,10 @@
 
 			if (outSequenceId != null && !"".equals(outSequenceId)) {
 
-				Accept accept = new Accept(factory,rmNamespaceValue,addressingNamespaceValue);
+				Accept accept = new Accept(factory, rmNamespaceValue, addressingNamespaceValue);
 				EndpointReference acksToEPR = createSeqMessage.getTo();
-				AcksTo acksTo = new AcksTo(factory,rmNamespaceValue,addressingNamespaceValue);
-				Address address = new Address(factory,addressingNamespaceValue);
+				AcksTo acksTo = new AcksTo(factory, rmNamespaceValue, addressingNamespaceValue);
+				Address address = new Address(factory, addressingNamespaceValue);
 				address.setEpr(acksToEPR);
 				acksTo.setAddress(address);
 				accept.setAcksTo(acksTo);
@@ -504,10 +489,12 @@
 
 		SOAPEnvelope envelope = factory.getDefaultEnvelope();
 		response.toOMElement(envelope.getBody());
-		outMessage.setWSAAction(SpecSpecificConstants.getCreateSequenceResponseAction(SandeshaUtil.getRMVersion(newSequenceID,storageManager)));
-		outMessage.setSoapAction(SpecSpecificConstants.getCreateSequenceResponseSOAPAction(SandeshaUtil.getRMVersion(newSequenceID,storageManager)));
-		outMessage.setProperty(AddressingConstants.WS_ADDRESSING_VERSION,addressingNamespaceValue);
-		
+		outMessage.setWSAAction(SpecSpecificConstants.getCreateSequenceResponseAction(SandeshaUtil.getRMVersion(
+				newSequenceID, storageManager)));
+		outMessage.setSoapAction(SpecSpecificConstants.getCreateSequenceResponseSOAPAction(SandeshaUtil.getRMVersion(
+				newSequenceID, storageManager)));
+		outMessage.setProperty(AddressingConstants.WS_ADDRESSING_VERSION, addressingNamespaceValue);
+
 		String newMessageId = SandeshaUtil.getUUID();
 		outMessage.setMessageID(newMessageId);
 
@@ -519,92 +506,97 @@
 		try {
 			createSeqResponse = MsgInitializer.initializeMessage(outMessage);
 		} catch (SandeshaException ex) {
-			throw new AxisFault("Cant initialize the message",ex);
+			throw new AxisFault(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotInnitMessage), ex);
 		}
-		
-		createSeqResponse.setMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ_RESPONSE,response);
+
+		createSeqResponse.setMessagePart(Sandesha2Constants.MessageParts.CREATE_SEQ_RESPONSE, response);
 
 		finalizeCreation(createSeqMessage.getMessageContext(), outMessage);
 
 		createSeqMessage.getMessageContext().setServerSide(true);
 		return createSeqResponse;
 	}
-	
-	
-	public static RMMsgContext createTerminateSeqResponseMsg (RMMsgContext terminateSeqRMMsg, MessageContext outMessage,StorageManager storageManager) throws SandeshaException {
-		
-		RMMsgContext terminateSeqResponseRMMsg = new RMMsgContext (outMessage);
+
+	public static RMMsgContext createTerminateSeqResponseMsg(RMMsgContext terminateSeqRMMsg, MessageContext outMessage,
+			StorageManager storageManager) throws SandeshaException {
+
+		RMMsgContext terminateSeqResponseRMMsg = new RMMsgContext(outMessage);
 		ConfigurationContext configurationContext = terminateSeqRMMsg.getMessageContext().getConfigurationContext();
-		
-		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
-				.getSOAPVersion(terminateSeqRMMsg.getSOAPEnvelope()));
-		
-		TerminateSequence terminateSequence = (TerminateSequence) terminateSeqRMMsg.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ);
+
+		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(terminateSeqRMMsg
+				.getSOAPEnvelope()));
+
+		TerminateSequence terminateSequence = (TerminateSequence) terminateSeqRMMsg
+				.getMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ);
 		String sequenceID = terminateSequence.getIdentifier().getIdentifier();
-		
+
 		String namespace = terminateSeqRMMsg.getRMNamespaceValue();
 		terminateSeqResponseRMMsg.setRMNamespaceValue(namespace);
-		
-		TerminateSequenceResponse terminateSequenceResponse = new TerminateSequenceResponse (factory,namespace);
-		Identifier identifier = new Identifier (factory,namespace);
+
+		TerminateSequenceResponse terminateSequenceResponse = new TerminateSequenceResponse(factory, namespace);
+		Identifier identifier = new Identifier(factory, namespace);
 		identifier.setIndentifer(sequenceID);
 		terminateSequenceResponse.setIdentifier(identifier);
-		
+
 		SOAPEnvelope envelope = factory.getDefaultEnvelope();
 		terminateSeqResponseRMMsg.setSOAPEnvelop(envelope);
-		terminateSeqResponseRMMsg.setMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ_RESPONSE,terminateSequenceResponse);
-		
-		outMessage.setWSAAction(SpecSpecificConstants.getTerminateSequenceResponseAction(SandeshaUtil.getRMVersion(sequenceID,storageManager)));
-		outMessage.setSoapAction(SpecSpecificConstants.getTerminateSequenceResponseAction(SandeshaUtil.getRMVersion(sequenceID,storageManager)));
+		terminateSeqResponseRMMsg.setMessagePart(Sandesha2Constants.MessageParts.TERMINATE_SEQ_RESPONSE,
+				terminateSequenceResponse);
+
+		outMessage.setWSAAction(SpecSpecificConstants.getTerminateSequenceResponseAction(SandeshaUtil.getRMVersion(
+				sequenceID, storageManager)));
+		outMessage.setSoapAction(SpecSpecificConstants.getTerminateSequenceResponseAction(SandeshaUtil.getRMVersion(
+				sequenceID, storageManager)));
+
+		initializeCreation(terminateSeqRMMsg.getMessageContext(), outMessage);
 
-		initializeCreation(terminateSeqRMMsg.getMessageContext(),outMessage);
-		
 		terminateSeqResponseRMMsg.addSOAPEnvelope();
-		
-		
+
 		finalizeCreation(terminateSeqRMMsg.getMessageContext(), outMessage);
-		
+
 		terminateSeqResponseRMMsg.getMessageContext().setServerSide(true);
 		return terminateSeqResponseRMMsg;
 	}
-	
-	
-	public static RMMsgContext createCloseSeqResponseMsg (RMMsgContext closeSeqRMMsg, MessageContext outMessage,StorageManager storageManager) throws SandeshaException {
-		
-		RMMsgContext closeSeqResponseRMMsg = new RMMsgContext (outMessage);
+
+	public static RMMsgContext createCloseSeqResponseMsg(RMMsgContext closeSeqRMMsg, MessageContext outMessage,
+			StorageManager storageManager) throws SandeshaException {
+
+		RMMsgContext closeSeqResponseRMMsg = new RMMsgContext(outMessage);
 		ConfigurationContext configurationContext = closeSeqRMMsg.getMessageContext().getConfigurationContext();
-		
-		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
-				.getSOAPVersion(closeSeqRMMsg.getSOAPEnvelope()));
-		
-		CloseSequence closeSequence = (CloseSequence) closeSeqRMMsg.getMessagePart(Sandesha2Constants.MessageParts.CLOSE_SEQUENCE);
+
+		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(closeSeqRMMsg
+				.getSOAPEnvelope()));
+
+		CloseSequence closeSequence = (CloseSequence) closeSeqRMMsg
+				.getMessagePart(Sandesha2Constants.MessageParts.CLOSE_SEQUENCE);
 		String sequenceID = closeSequence.getIdentifier().getIdentifier();
-		
+
 		String namespace = closeSeqRMMsg.getRMNamespaceValue();
 		closeSeqResponseRMMsg.setRMNamespaceValue(namespace);
-		
-		CloseSequenceResponse closeSequenceResponse = new CloseSequenceResponse (factory,namespace);
-		Identifier identifier = new Identifier (factory,namespace);
+
+		CloseSequenceResponse closeSequenceResponse = new CloseSequenceResponse(factory, namespace);
+		Identifier identifier = new Identifier(factory, namespace);
 		identifier.setIndentifer(sequenceID);
 		closeSequenceResponse.setIdentifier(identifier);
-		
+
 		SOAPEnvelope envelope = factory.getDefaultEnvelope();
 		closeSeqResponseRMMsg.setSOAPEnvelop(envelope);
-		closeSeqResponseRMMsg.setMessagePart(Sandesha2Constants.MessageParts.CLOSE_SEQUENCE_RESPONSE,closeSequenceResponse);
-		
-		outMessage.setWSAAction(SpecSpecificConstants.getCloseSequenceResponseAction(SandeshaUtil.getRMVersion(sequenceID,storageManager)));
-		outMessage.setSoapAction(SpecSpecificConstants.getCloseSequenceResponseAction(SandeshaUtil.getRMVersion(sequenceID,storageManager)));
+		closeSeqResponseRMMsg.setMessagePart(Sandesha2Constants.MessageParts.CLOSE_SEQUENCE_RESPONSE,
+				closeSequenceResponse);
+
+		outMessage.setWSAAction(SpecSpecificConstants.getCloseSequenceResponseAction(SandeshaUtil.getRMVersion(
+				sequenceID, storageManager)));
+		outMessage.setSoapAction(SpecSpecificConstants.getCloseSequenceResponseAction(SandeshaUtil.getRMVersion(
+				sequenceID, storageManager)));
+
+		initializeCreation(closeSeqRMMsg.getMessageContext(), outMessage);
 
-		initializeCreation(closeSeqRMMsg.getMessageContext(),outMessage);
-		
 		closeSeqResponseRMMsg.addSOAPEnvelope();
-		
-		
+
 		finalizeCreation(closeSeqRMMsg.getMessageContext(), outMessage);
 		closeSeqResponseRMMsg.getMessageContext().setServerSide(true);
 		return closeSeqResponseRMMsg;
 	}
-	
 
 	/**
 	 * Adds an ack message to the given application message.
@@ -613,11 +605,11 @@
 	 * @param sequenceId
 	 * @throws SandeshaException
 	 */
-	public static void addAckMessage(RMMsgContext applicationMsg,
-			String sequenceId,StorageManager storageManager) throws SandeshaException {
+	public static void addAckMessage(RMMsgContext applicationMsg, String sequenceId, StorageManager storageManager)
+			throws SandeshaException {
 
-		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
-				.getSOAPVersion(applicationMsg.getSOAPEnvelope()));
+		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion(applicationMsg
+				.getSOAPEnvelope()));
 
 		SOAPEnvelope envelope = applicationMsg.getSOAPEnvelope();
 		if (envelope == null) {
@@ -625,56 +617,51 @@
 			applicationMsg.setSOAPEnvelop(newEnvelope);
 		}
 		envelope = applicationMsg.getSOAPEnvelope();
-		
-		ConfigurationContext ctx = applicationMsg.getMessageContext()
-		.getConfigurationContext();
-		
-		String rmVersion = SandeshaUtil.getRMVersion(sequenceId,storageManager);
-		if (rmVersion==null)
-			throw new SandeshaException ("Cant find the rmVersion of the given message");
-		
+
+		ConfigurationContext ctx = applicationMsg.getMessageContext().getConfigurationContext();
+
+		String rmVersion = SandeshaUtil.getRMVersion(sequenceId, storageManager);
+		if (rmVersion == null)
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.cannotDecideRMVersion));
+
 		String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
-		
-		SequenceAcknowledgement sequenceAck = new SequenceAcknowledgement(
-				factory,rmNamespaceValue);
-		Identifier id = new Identifier(factory,rmNamespaceValue);
+
+		SequenceAcknowledgement sequenceAck = new SequenceAcknowledgement(factory, rmNamespaceValue);
+		Identifier id = new Identifier(factory, rmNamespaceValue);
 		id.setIndentifer(sequenceId);
 		sequenceAck.setIdentifier(id);
 
-		SequencePropertyBeanMgr seqPropMgr = storageManager
-				.getSequencePropertyBeanMgr();
+		SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
 
 		SequencePropertyBean seqBean = seqPropMgr.retrieve(sequenceId,
 				Sandesha2Constants.SequenceProperties.SERVER_COMPLETED_MESSAGES);
 		String msgNoList = (String) seqBean.getValue();
 
-		ArrayList ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(
-				msgNoList, factory,rmNamespaceValue);
+		ArrayList ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(msgNoList, factory, rmNamespaceValue);
 		Iterator iterator = ackRangeArrayList.iterator();
 		while (iterator.hasNext()) {
-			AcknowledgementRange ackRange = (AcknowledgementRange) iterator
-					.next();
+			AcknowledgementRange ackRange = (AcknowledgementRange) iterator.next();
 			sequenceAck.addAcknowledgementRanges(ackRange);
 		}
-		
-		
-		SequencePropertyBean sequenceClosedBean = seqPropMgr.retrieve(sequenceId,Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED );
-		
-		if (sequenceClosedBean!=null && Sandesha2Constants.VALUE_TRUE.equals(sequenceClosedBean.getValue())) {
-			//sequence is closed. so add the 'Final' part.
+
+		SequencePropertyBean sequenceClosedBean = seqPropMgr.retrieve(sequenceId,
+				Sandesha2Constants.SequenceProperties.SEQUENCE_CLOSED);
+
+		if (sequenceClosedBean != null && Sandesha2Constants.VALUE_TRUE.equals(sequenceClosedBean.getValue())) {
+			// sequence is closed. so add the 'Final' part.
 			if (SpecSpecificConstants.isAckFinalAllowed(rmVersion)) {
-				AckFinal ackFinal = new AckFinal (factory,rmNamespaceValue);
+				AckFinal ackFinal = new AckFinal(factory, rmNamespaceValue);
 				sequenceAck.setAckFinal(ackFinal);
 			}
 		}
 
-		applicationMsg.setMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT,sequenceAck);
-		
+		applicationMsg.setMessagePart(Sandesha2Constants.MessageParts.SEQ_ACKNOWLEDGEMENT, sequenceAck);
+
 		sequenceAck.toOMElement(envelope.getHeader());
-		applicationMsg
-				.setAction(SpecSpecificConstants.getSequenceAcknowledgementAction(SandeshaUtil.getRMVersion(sequenceId,storageManager)));
-		applicationMsg
-				.setSOAPAction(SpecSpecificConstants.getSequenceAcknowledgementSOAPAction(SandeshaUtil.getRMVersion(sequenceId,storageManager)));
+		applicationMsg.setAction(SpecSpecificConstants.getSequenceAcknowledgementAction(SandeshaUtil.getRMVersion(
+				sequenceId, storageManager)));
+		applicationMsg.setSOAPAction(SpecSpecificConstants.getSequenceAcknowledgementSOAPAction(SandeshaUtil
+				.getRMVersion(sequenceId, storageManager)));
 		applicationMsg.setMessageId(SandeshaUtil.getUUID());
 	}
 
@@ -685,29 +672,25 @@
 	 * @return
 	 * @throws SandeshaException
 	 */
-	public static RMMsgContext createAckMessage(RMMsgContext relatedRMMessage, String sequenceID, String rmNamespaceValue,StorageManager storageManager)
-			throws SandeshaException {
-		
+	public static RMMsgContext createAckMessage(RMMsgContext relatedRMMessage, String sequenceID,
+			String rmNamespaceValue, StorageManager storageManager) throws SandeshaException {
+
 		try {
-			MessageContext applicationMsgCtx = relatedRMMessage
-					.getMessageContext();
+			MessageContext applicationMsgCtx = relatedRMMessage.getMessageContext();
 
 			AxisOperation ackOperation = AxisOperationFactory
 					.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY);
-			
-			MessageContext ackMsgCtx = SandeshaUtil
-					.createNewRelatedMessageContext(relatedRMMessage,
-							ackOperation);
-			
-			RMMsgContext ackRMMsgCtx = MsgInitializer
-					.initializeMessage(ackMsgCtx);
+
+			MessageContext ackMsgCtx = SandeshaUtil.createNewRelatedMessageContext(relatedRMMessage, ackOperation);
+
+			RMMsgContext ackRMMsgCtx = MsgInitializer.initializeMessage(ackMsgCtx);
 
 			initializeCreation(applicationMsgCtx, ackMsgCtx);
 
-			addAckMessage(ackRMMsgCtx, sequenceID,storageManager);
+			addAckMessage(ackRMMsgCtx, sequenceID, storageManager);
+
+			ackMsgCtx.setProperty(MessageContext.TRANSPORT_IN, null);
 
-			ackMsgCtx.setProperty(MessageContext.TRANSPORT_IN,null);
-			
 			finalizeCreation(applicationMsgCtx, ackMsgCtx);
 
 			ackRMMsgCtx.getMessageContext().setServerSide(true);

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SOAPFaultEnvelopeCreator.java Tue Jul 18 19:58:31 2006
@@ -35,6 +35,8 @@
 import org.apache.sandesha2.FaultData;
 import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
 import org.apache.sandesha2.wsrm.FaultCode;
 import org.apache.sandesha2.wsrm.SequenceFault;
 
@@ -128,7 +130,8 @@
 
 		SOAPEnvelope faultMsgEnvelope = faultMsgContext.getEnvelope();
 		if (faultMsgEnvelope == null)
-			throw new SandeshaException("SOAP Envelope is null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.soapEnvNotSet));
 
 		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
 				.getSOAPVersion(faultMsgEnvelope));
@@ -180,14 +183,17 @@
 
 		SOAPEnvelope faultEnvelope = faultMsgContext.getEnvelope();
 		if (faultEnvelope == null)
-			throw new SandeshaException("SOAP Envelope is null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.soapEnvNotSet));
 
 		SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
 				.getSOAPVersion(faultEnvelope));
 
 		SOAPFault fault = faultEnvelope.getBody().getFault();
 		if (fault == null)
-			throw new SandeshaException("Fault part is null");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.noFaultCode,
+					faultEnvelope.toString()));
 
 		SOAPFaultCode faultCode = fault.getCode();
 		SOAPFaultValue codeValue = faultCode.getValue();

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaPropertyBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaPropertyBean.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaPropertyBean.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaPropertyBean.java Tue Jul 18 19:58:31 2006
@@ -22,103 +22,107 @@
 import org.apache.sandesha2.policy.RMPolicyBean;
 
 /**
- * Used to hold peoperties loaded from sandesha2.properties file or Sandesha2Constants.
+ * Used to hold peoperties loaded from sandesha2.properties file or
+ * Sandesha2Constants.
  */
 
 public class SandeshaPropertyBean {
 
-	RMPolicyBean policyBean = new RMPolicyBean ();
-//	String storageManagerClass = null;
+	RMPolicyBean policyBean = new RMPolicyBean();
+
+	// String storageManagerClass = null;
 	boolean inOrder = true;
+
 	ArrayList msgTypesToDrop = null;
+
 	private String inMemoryStorageManagerClass = null;
+
 	private String permanentStorageManagerClass = null;
-	
-    public long getInactiveTimeoutInterval() {
-        return policyBean.getInactiveTimeoutInterval();
-    }
-    
-    public long getAcknowledgementInaterval() {
-        return policyBean.getAcknowledgementInaterval();
-    }
-    
-    public long getRetransmissionInterval() {
-        return policyBean.getRetransmissionInterval();
-    }
-    
-    public boolean isExponentialBackoff() {
-        return policyBean.isExponentialBackoff();
-    }
-    
-    public void setExponentialBackoff(boolean exponentialBackoff) {
-        policyBean.setExponentialBackoff(exponentialBackoff);    
-    }
-    
-    public void setRetransmissionInterval(long retransmissionInterval) {
-        policyBean.setRetransmissionInterval(retransmissionInterval);
-    }
-    
-    public void setInactiveTimeoutInterval(long value, String measure) {
-    	long timeOut = -1;
-    	
-        if (measure==null) {
-        	policyBean.setInactiveTimeoutInterval(timeOut);
-        	return;
-        } else if ("seconds".equals(measure)){
-        	timeOut = value*1000;
-        } else if ("minutes".equals(measure)){
-        	timeOut = value*60*1000;
-        } else if ("hours".equals(measure)){
-        	timeOut = value*60*60*1000;
-        } else if ("days".equals(measure)){
-        	timeOut = value*24*60*60*1000;
-        }
-        
-        policyBean.setInactiveTimeoutInterval(timeOut);
-        
-    }
-    
-    public void setInactiveTimeoutInterval(long inactivityTimeoutInterval) {
-    	policyBean.setInactiveTimeoutInterval(inactivityTimeoutInterval);
-    }
-    
-    public void setAcknowledgementInterval(long acknowledgementInterval) {
-        policyBean.setAcknowledgementInterval(acknowledgementInterval);
-    }
-	
-//	public String getStorageManagerClass() {
-//		return storageManagerClass;
-//	}
-//	
-//	public void setStorageManagerClass(String storageManagerClass) {
-//		this.storageManagerClass = storageManagerClass;
-//	}
-	
+
+	public long getInactiveTimeoutInterval() {
+		return policyBean.getInactiveTimeoutInterval();
+	}
+
+	public long getAcknowledgementInaterval() {
+		return policyBean.getAcknowledgementInaterval();
+	}
+
+	public long getRetransmissionInterval() {
+		return policyBean.getRetransmissionInterval();
+	}
+
+	public boolean isExponentialBackoff() {
+		return policyBean.isExponentialBackoff();
+	}
+
+	public void setExponentialBackoff(boolean exponentialBackoff) {
+		policyBean.setExponentialBackoff(exponentialBackoff);
+	}
+
+	public void setRetransmissionInterval(long retransmissionInterval) {
+		policyBean.setRetransmissionInterval(retransmissionInterval);
+	}
+
+	public void setInactiveTimeoutInterval(long value, String measure) {
+		long timeOut = -1;
+
+		if (measure == null) {
+			policyBean.setInactiveTimeoutInterval(timeOut);
+			return;
+		} else if ("seconds".equals(measure)) {
+			timeOut = value * 1000;
+		} else if ("minutes".equals(measure)) {
+			timeOut = value * 60 * 1000;
+		} else if ("hours".equals(measure)) {
+			timeOut = value * 60 * 60 * 1000;
+		} else if ("days".equals(measure)) {
+			timeOut = value * 24 * 60 * 60 * 1000;
+		}
+
+		policyBean.setInactiveTimeoutInterval(timeOut);
+
+	}
+
+	public void setInactiveTimeoutInterval(long inactivityTimeoutInterval) {
+		policyBean.setInactiveTimeoutInterval(inactivityTimeoutInterval);
+	}
+
+	public void setAcknowledgementInterval(long acknowledgementInterval) {
+		policyBean.setAcknowledgementInterval(acknowledgementInterval);
+	}
+
+	// public String getStorageManagerClass() {
+	// return storageManagerClass;
+	// }
+	//	
+	// public void setStorageManagerClass(String storageManagerClass) {
+	// this.storageManagerClass = storageManagerClass;
+	// }
+
 	public String getInMemoryStorageManagerClass() {
 		return inMemoryStorageManagerClass;
 	}
-	
+
 	public void setInMemoryStorageManagerClass(String inMemoryStorageManagerClass) {
 		this.inMemoryStorageManagerClass = inMemoryStorageManagerClass;
 	}
-	
+
 	public String getPermanentStorageManagerClass() {
 		return permanentStorageManagerClass;
 	}
-	
+
 	public void setPermanentStorageManagerClass(String permanentStorageManagerClass) {
 		this.permanentStorageManagerClass = permanentStorageManagerClass;
 	}
-	
-	public RMPolicyBean getPolicyBean () {
+
+	public RMPolicyBean getPolicyBean() {
 		return policyBean;
 	}
-	
-	
+
 	public boolean isInOrder() {
 		return inOrder;
 	}
-	
+
 	public void setInOrder(boolean inOrder) {
 		this.inOrder = inOrder;
 	}
@@ -130,17 +134,17 @@
 	public void setMsgTypesToDrop(ArrayList msgTypesToDrop) {
 		this.msgTypesToDrop = msgTypesToDrop;
 	}
-	
-	public void addMsgTypeToDrop (Integer typeNo) {
-		
-		if (typeNo!=null) {
-			if (msgTypesToDrop==null) 
-				msgTypesToDrop = new ArrayList ();
-			
+
+	public void addMsgTypeToDrop(Integer typeNo) {
+
+		if (typeNo != null) {
+			if (msgTypesToDrop == null)
+				msgTypesToDrop = new ArrayList();
+
 			msgTypesToDrop.add(typeNo);
 		}
 	}
-	
+
 	public int getMaximumRetransmissionCount() {
 		return policyBean.getMaximumRetransmissionCount();
 	}
@@ -148,6 +152,5 @@
 	public void setMaximumRetransmissionCount(int maximumRetransmissionCount) {
 		policyBean.setMaximumRetransmissionCount(maximumRetransmissionCount);
 	}
-	
-	
+
 }

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=423350&r1=423349&r2=423350&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Tue Jul 18 19:58:31 2006
@@ -59,6 +59,8 @@
 import org.apache.sandesha2.RMMsgContext;
 import org.apache.sandesha2.Sandesha2Constants;
 import org.apache.sandesha2.SandeshaException;
+import org.apache.sandesha2.i18n.SandeshaMessageHelper;
+import org.apache.sandesha2.i18n.SandeshaMessageKeys;
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.storage.beans.SequencePropertyBean;
@@ -160,7 +162,8 @@
 				long msgNo = Long.parseLong(temp);
 				msgNubers.add(new Long(msgNo));
 			} catch (Exception ex) {
-				String message = "Invalid msg number list";
+				String message = SandeshaMessageHelper.getMessage(
+						SandeshaMessageKeys.invalidMsgNumberList);
 				log.debug(message);
 				throw new SandeshaException(message);
 			}
@@ -311,7 +314,9 @@
 
 		String startStr = Sandesha2Constants.INTERNAL_SEQUENCE_PREFIX + ":";
 		if (!internalSequenceId.startsWith(startStr)) {
-			throw new SandeshaException("Invalid internal sequence ID");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.invalidInternalSequenceID,
+					internalSequenceId));
 		}
 
 		String incomingSequenceId = internalSequenceId.substring(startStr.length());
@@ -339,7 +344,8 @@
 		else if (Sandesha2Constants.PERMANENT_STORAGE_MANAGER.equals(value))
 			return getPermanentStorageManager(context);
 		else
-			throw new SandeshaException ("Unknown StorageManager type. Please check your parameter value.");
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.cannotGetStorageManager));
 	}
 	
 	public static StorageManager getInMemoryStorageManager(ConfigurationContext context) throws SandeshaException {
@@ -379,7 +385,8 @@
 		    ClassLoader classLoader = (ClassLoader)	context.getProperty(Sandesha2Constants.MODULE_CLASS_LOADER);
 
 		    if (classLoader==null)
-		    	throw new SandeshaException ("Module class loader not found");
+		    	throw new SandeshaException (SandeshaMessageHelper.getMessage(
+							SandeshaMessageKeys.classLoaderNotFound));
 		    
 		    Class c = classLoader.loadClass(className);
 			Class configContextClass = context.getClass();
@@ -388,14 +395,16 @@
 			Object obj = constructor.newInstance(new Object[] {context});
 
 			if (obj == null || !(obj instanceof StorageManager))
-				throw new SandeshaException("StorageManager must implement org.apache.sandesha2.storage.StorageManager");
+				throw new SandeshaException(SandeshaMessageHelper.getMessage(
+						SandeshaMessageKeys.storageManagerMustImplement));
 
 			StorageManager mgr = (StorageManager) obj;
 			storageManager = mgr;
 			return storageManager;
 			
 		} catch (Exception e) {
-			String message = "Cannot load the given storage manager";
+			String message = SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.cannotGetStorageManager);
 			log.error(message);
 			throw new SandeshaException(message,e);
 		}
@@ -408,7 +417,9 @@
 		else if (namespaceName.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI))
 			return Sandesha2Constants.SOAPVersion.v1_2;
 		else
-			throw new SandeshaException("Unknown SOAP version");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.unknownSoapVersion,
+					namespaceName));
 	}
 
 	public static boolean isRMGlobalMessage(MessageContext msgCtx) {
@@ -420,7 +431,8 @@
 		if (env != null)
 			header = env.getHeader();
 		else {
-			log.error("SOAP envelope is null");
+			log.error(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.soapEnvNotSet));
 			return false;
 		}
 
@@ -590,7 +602,8 @@
 	public static SandeshaPropertyBean getDefaultPropertyBean (AxisConfiguration axisConfiguration) throws SandeshaException {
 		Parameter parameter = axisConfiguration.getParameter(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
 		if (parameter==null)
-			throw new SandeshaException ("Default Sandesha Property Bean is not available");
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.defaultPropertyBeanNotSet));
 		
 		SandeshaPropertyBean sandeshaPropertyBean = (SandeshaPropertyBean) parameter.getValue();
 		return sandeshaPropertyBean;
@@ -624,7 +637,9 @@
 			return new ArrayList();
 
 		if (str.length() < 2) {
-			String message = "Invalid String array : " + str;
+			String message = SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.invalidStringArray,
+					str);
 			log.debug(message);
 			throw new SandeshaException(message);
 		}
@@ -632,7 +647,8 @@
 		int length = str.length();
 
 		if (str.charAt(0) != '[' || str.charAt(length - 1) != ']') {
-			String message = "Invalid String array" + str;
+			String message = SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.invalidStringArray, str);
 			log.debug(message);
 			throw new SandeshaException(message);
 		}
@@ -704,7 +720,8 @@
 	public static QName getQNameFromString(String qnameStr) throws SandeshaException {
 		String[] parts = qnameStr.split(Sandesha2Constants.QNAME_SEPERATOR);
 		if (!(parts.length == 3))
-			throw new SandeshaException("Invalid QName String");
+			throw new SandeshaException(SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.invalidQName));
 
 		if (parts[0].equals(Sandesha2Constants.VALUE_NONE))
 			parts[0] = null;
@@ -857,7 +874,8 @@
 	public static SandeshaPropertyBean getPropertyBean (AxisDescription axisDescription) throws SandeshaException {
 		Parameter parameter = axisDescription.getParameter(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
 		if (parameter==null)
-			throw new SandeshaException ("Property bean is not set. Cant find Sandesha2 configuration data");
+			throw new SandeshaException (SandeshaMessageHelper.getMessage(
+					SandeshaMessageKeys.defaultPropertyBeanNotSet));
 		
 		SandeshaPropertyBean propertyBean = (SandeshaPropertyBean) parameter.getValue();
 		return propertyBean;



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org