airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From patanac...@apache.org
Subject svn commit: r1174298 [1/2] - in /incubator/airavata/trunk/modules/ws-messenger: client/src/main/java/org/apache/airavata/wsmg/client/ client/src/main/java/org/apache/airavata/wsmg/client/commons/ client/src/main/java/org/apache/airavata/wsmg/client/pro...
Date Thu, 22 Sep 2011 18:17:29 GMT
Author: patanachai
Date: Thu Sep 22 18:17:28 2011
New Revision: 1174298

URL: http://svn.apache.org/viewvc?rev=1174298&view=rev
Log:
AIRAVATA-101 Namespace clean up

Added:
    incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/NameSpaceConstants.java
      - copied, changed from r1174240, incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgNameSpaceConstants.java
Removed:
    incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/MsgBoxNameSpConsts.java
    incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgNameSpaceConstants.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/NotificationHandler.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/transports/
Modified:
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/NotificationProducerStub.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/SubscriptionStub.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WidgetStub.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseCreateSubscription.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntMsgBrokerClient.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/commons/NotificationProducer.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSEProtocolClient.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSNTProtocolClient.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java
    incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java
    incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/CommonRoutines.java
    incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java
    incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/AbstractBrokerMsgReceiver.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingPublishMsgReceiver.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/Axis2Protocol.java
    incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/BrokerUtilTest.java
    incubator/airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/NotificationProducerStub.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/NotificationProducerStub.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/NotificationProducerStub.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/NotificationProducerStub.java Thu Sep 22 18:17:28 2011
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.airavata.wsmg.client.util.ClientUtil;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -61,7 +61,7 @@ public class NotificationProducerStub ex
 
     public OMElement getCurrentMessage(OMElement topicExp) throws AxisFault {
 
-        OMElement message = factory.createOMElement("GetCurrentMessage", WsmgNameSpaceConstants.WSNT_NS);
+        OMElement message = factory.createOMElement("GetCurrentMessage", NameSpaceConstants.WSNT_NS);
         message.addChild(topicExp);
 
         ServiceClient client = createServiceClient(message);
@@ -83,12 +83,12 @@ public class NotificationProducerStub ex
         if (client.getAxisConfiguration().getModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING) != null) {
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(opts.getTo().getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
             client.addHeader(action);
@@ -126,12 +126,12 @@ public class NotificationProducerStub ex
     public SubscriptionStub subscribe(EndpointReference consumerReference, OMElement topicExpression,
             OMElement xpathExpression, boolean useNotfy, boolean wsrm) throws AxisFault {
 
-        OMElement message = factory.createOMElement("SubscribeRequest", WsmgNameSpaceConstants.WSNT_NS);
+        OMElement message = factory.createOMElement("SubscribeRequest", NameSpaceConstants.WSNT_NS);
 
-        message.declareNamespace(WsmgNameSpaceConstants.WSNT_NS);
+        message.declareNamespace(NameSpaceConstants.WSNT_NS);
 
         OMElement eprCrEl = EndpointReferenceHelper.toOM(factory, consumerReference, new QName("ConsumerReference"),
-                WsmgNameSpaceConstants.WSA_NS.getNamespaceURI());
+                NameSpaceConstants.WSA_NS.getNamespaceURI());
 
         message.addChild(eprCrEl);
         eprCrEl.setNamespace(message.getNamespace());
@@ -159,7 +159,7 @@ public class NotificationProducerStub ex
         client.cleanupTransport();
 
         OMElement sr = responseMessage.getFirstChildWithName(new QName(
-                WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(), "SubscriptionReference"));
+                NameSpaceConstants.WSNT_NS.getNamespaceURI(), "SubscriptionReference"));
 
         if (sr == null) {
             throw new AxisFault("unable to subscribe, invalid response returned by broker");

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/SubscriptionStub.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/SubscriptionStub.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/SubscriptionStub.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/SubscriptionStub.java Thu Sep 22 18:17:28 2011
@@ -22,7 +22,7 @@
 package org.apache.airavata.wsmg.client;
 
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -51,7 +51,7 @@ public class SubscriptionStub extends Ws
 
     public void pauseSubscription() throws AxisFault {
 
-        OMElement message = factory.createOMElement("PauseSubscription", WsmgNameSpaceConstants.WSNT_NS);
+        OMElement message = factory.createOMElement("PauseSubscription", NameSpaceConstants.WSNT_NS);
 
         ServiceClient client = createServiceClient(message);
         client.sendReceive(message);
@@ -60,7 +60,7 @@ public class SubscriptionStub extends Ws
 
     public void resumeSubscription() throws AxisFault {
 
-        OMElement message = factory.createOMElement("ResumeSubscription", WsmgNameSpaceConstants.WSNT_NS);
+        OMElement message = factory.createOMElement("ResumeSubscription", NameSpaceConstants.WSNT_NS);
 
         ServiceClient client = createServiceClient(message);
         client.sendReceive(message);
@@ -76,13 +76,13 @@ public class SubscriptionStub extends Ws
         if (client.getAxisConfiguration().getModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING) != null) {
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(opts.getTo().getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
             client.addHeader(action);

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WidgetStub.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WidgetStub.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WidgetStub.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WidgetStub.java Thu Sep 22 18:17:28 2011
@@ -22,7 +22,7 @@
 package org.apache.airavata.wsmg.client;
 
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -47,7 +47,7 @@ public class WidgetStub extends WsrfReso
 
     public void generateNotification() throws AxisFault {
 
-        OMElement message = factory.createOMElement("generateNotification", WsmgNameSpaceConstants.WIDGET_NS);
+        OMElement message = factory.createOMElement("generateNotification", NameSpaceConstants.WIDGET_NS);
 
         ServiceClient client = createServiceClient(message);
         client.sendReceive(message);
@@ -64,13 +64,13 @@ public class WidgetStub extends WsrfReso
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
 
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(opts.getTo().getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
             client.addHeader(action);

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseCreateSubscription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseCreateSubscription.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseCreateSubscription.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseCreateSubscription.java Thu Sep 22 18:17:28 2011
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.airavata.wsmg.client.util.ClientUtil;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -75,7 +75,7 @@ public class WseCreateSubscription {
             throw AxisFault.makeFault(new RuntimeException("no response recieved for subscription message"));
         }
         OMElement responseSubscriptionsManagerElement = responseMessage.getFirstChildWithName(new QName(
-                WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(), "SubscriptionManager"));
+                NameSpaceConstants.WSE_NS.getNamespaceURI(), "SubscriptionManager"));
         return responseSubscriptionsManagerElement;
     }
 
@@ -94,13 +94,13 @@ public class WseCreateSubscription {
 
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(UUIDGenerator.getUUID());
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(opts.getTo().getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
             client.addHeader(action);
@@ -115,16 +115,16 @@ public class WseCreateSubscription {
     private OMElement createMessageEl(EndpointReference eventSinkReferenceEPR, OMElement filterEl, long expireTime)
             throws AxisFault {
 
-        OMElement message = factory.createOMElement("Subscribe", WsmgNameSpaceConstants.WSE_NS);
+        OMElement message = factory.createOMElement("Subscribe", NameSpaceConstants.WSE_NS);
 
-        OMElement delivery = factory.createOMElement("Delivery", WsmgNameSpaceConstants.WSE_NS);
+        OMElement delivery = factory.createOMElement("Delivery", NameSpaceConstants.WSE_NS);
 
-        OMElement expires = factory.createOMElement("Expires", WsmgNameSpaceConstants.WSE_NS);
+        OMElement expires = factory.createOMElement("Expires", NameSpaceConstants.WSE_NS);
         expires.setText(Long.toString(expireTime));
         message.addChild(expires);
 
         OMElement notifyTo = EndpointReferenceHelper.toOM(factory, eventSinkReferenceEPR, new QName(
-                WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"), WsmgNameSpaceConstants.WSA_NS
+                NameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"), NameSpaceConstants.WSA_NS
                 .getNamespaceURI());
 
         delivery.addChild(notifyTo);
@@ -134,7 +134,7 @@ public class WseCreateSubscription {
             message.addChild(filterEl);
         }
 
-        message.declareNamespace(WsmgNameSpaceConstants.WSA_NS);
+        message.declareNamespace(NameSpaceConstants.WSA_NS);
 
         return message;
     }

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WseMsgBrokerClient.java Thu Sep 22 18:17:28 2011
@@ -28,7 +28,7 @@ import org.apache.airavata.wsmg.client.p
 import org.apache.airavata.wsmg.client.util.ClientUtil;
 import org.apache.airavata.wsmg.commons.CommonRoutines;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -43,7 +43,7 @@ public class WseMsgBrokerClient extends 
 
     protected long timeoutInMilliSeconds = WsmgCommonConstants.DEFAULT_CLIENT_SOCKET_TIME_OUT_MILLIES;
 
-    final static String WIDGET_NS_PREFIX = WsmgNameSpaceConstants.WIDGET_NS.getPrefix() + ":";
+    final static String WIDGET_NS_PREFIX = NameSpaceConstants.WIDGET_NS.getPrefix() + ":";
 
     protected NotificationProducer notificationProducer = new NotificationProducer();
     protected ConsumerServerHandler consumerServerHandler = new ConsumerServerHandler();
@@ -64,7 +64,7 @@ public class WseMsgBrokerClient extends 
         OMFactory factory = OMAbstractFactory.getOMFactory();
 
         OMElement wrappedMsg = factory.createOMElement(WsmgCommonConstants.WSMG_PLAIN_TEXT_WRAPPER,
-                WsmgNameSpaceConstants.WSMG_NS);
+                NameSpaceConstants.WSMG_NS);
 
         wrappedMsg.setText(plainText);
         publish(topic, wrappedMsg);
@@ -77,9 +77,9 @@ public class WseMsgBrokerClient extends 
         OMElement topicExpressionEl = null;
 
         if (topic != null) {
-            topicExpressionEl = factory.createOMElement("Topic", WsmgNameSpaceConstants.WSNT_NS);
+            topicExpressionEl = factory.createOMElement("Topic", NameSpaceConstants.WSNT_NS);
             topicExpressionEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
-            topicExpressionEl.declareNamespace(WsmgNameSpaceConstants.WIDGET_NS);
+            topicExpressionEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
             topicExpressionEl.setText(WIDGET_NS_PREFIX + topic);
 
         }
@@ -121,7 +121,7 @@ public class WseMsgBrokerClient extends 
             }
 
             OMElement responseSubscriptionsManagerElement = responseMessage.getFirstChildWithName(new QName(
-                    WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(), "SubscriptionManager"));
+                    NameSpaceConstants.WSE_NS.getNamespaceURI(), "SubscriptionManager"));
 
             subscriptionId = WSEProtocolClient.decodeSubscribeResponse(responseSubscriptionsManagerElement);
 

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntCreatePublishReg.java Thu Sep 22 18:17:28 2011
@@ -24,7 +24,7 @@ package org.apache.airavata.wsmg.client;
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -57,7 +57,7 @@ public class WsntCreatePublishReg extend
     public WsrfResourceStub registerPublisher(EndpointReference omEndpointReference) throws AxisFault {
 
         // invoker.setMessageId(null);
-        OMElement message = factory.createOMElement(new QName(WsmgNameSpaceConstants.WSBR_NS.getNamespaceURI(),
+        OMElement message = factory.createOMElement(new QName(NameSpaceConstants.WSBR_NS.getNamespaceURI(),
                 "RegisterPublisher"));
         // builder.newFragment(WsmgConstants.WSBR_NS,
         // "RegisterPublisher");
@@ -67,7 +67,7 @@ public class WsntCreatePublishReg extend
         OMElement publisherRef = null;
 
         publisherRef = EndpointReferenceHelper.toOM(factory, omEndpointReference, new QName(
-                WsmgNameSpaceConstants.WSBR_NS.getNamespaceURI(), "PublisherReference"), WsmgNameSpaceConstants.WSA_NS
+                NameSpaceConstants.WSBR_NS.getNamespaceURI(), "PublisherReference"), NameSpaceConstants.WSA_NS
                 .getNamespaceURI());
 
         message.addChild(publisherRef);
@@ -78,7 +78,7 @@ public class WsntCreatePublishReg extend
         client.cleanupTransport();
 
         OMElement publisherRegistrationRef = responseMessage.getFirstChildWithName(new QName(
-                WsmgNameSpaceConstants.WSBR_NS.getNamespaceURI(), "PublisherRegistrationReference"));
+                NameSpaceConstants.WSBR_NS.getNamespaceURI(), "PublisherRegistrationReference"));
 
         EndpointReference epr = EndpointReferenceHelper.fromOM(publisherRegistrationRef);
         return new WsrfResourceStub(epr, getTimeoutInMilliSeconds());
@@ -97,13 +97,13 @@ public class WsntCreatePublishReg extend
 
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(opts.getTo().getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
             client.addHeader(action);

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntMsgBrokerClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntMsgBrokerClient.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntMsgBrokerClient.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsntMsgBrokerClient.java Thu Sep 22 18:17:28 2011
@@ -28,7 +28,7 @@ import org.apache.airavata.wsmg.client.p
 import org.apache.airavata.wsmg.client.util.ClientUtil;
 import org.apache.airavata.wsmg.commons.CommonRoutines;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -61,7 +61,7 @@ public class WsntMsgBrokerClient extends
         OMFactory factory = OMAbstractFactory.getOMFactory();
 
         OMElement wrappedMsg = factory.createOMElement(WsmgCommonConstants.WSMG_PLAIN_TEXT_WRAPPER,
-                WsmgNameSpaceConstants.WSMG_NS);
+                NameSpaceConstants.WSMG_NS);
 
         wrappedMsg.setText(plainText);
         publish(topic, wrappedMsg);
@@ -111,7 +111,7 @@ public class WsntMsgBrokerClient extends
             OMElement responseMessage = client.sendReceive(message);
             client.cleanupTransport();
 
-            OMElement sr = responseMessage.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+            OMElement sr = responseMessage.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
                     .getNamespaceURI(), "SubscriptionReference"));
 
             if (sr == null) {

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/WsrfResourceStub.java Thu Sep 22 18:17:28 2011
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
 
 import org.apache.airavata.wsmg.client.util.DcDate;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -89,7 +89,7 @@ public class WsrfResourceStub {
     public void destroy() throws AxisFault {
         String uuid = UUIDGenerator.getUUID();
         opts.setMessageId(uuid);
-        OMElement message = factory.createOMElement("Destroy", WsmgNameSpaceConstants.WSRL_NS);
+        OMElement message = factory.createOMElement("Destroy", NameSpaceConstants.WSRL_NS);
         opts.setAction(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
         opts.setTimeOutInMilliSeconds(getTimeoutInMilliSeconds());
 
@@ -99,13 +99,13 @@ public class WsrfResourceStub {
 
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(this.resourceEndpointReference.getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
             client.addHeader(action);
@@ -120,7 +120,7 @@ public class WsrfResourceStub {
     public void setTerminationTime(Calendar cal) throws AxisFault {
         String uuid = UUIDGenerator.getUUID();
         opts.setMessageId(uuid);
-        OMElement message = factory.createOMElement("SetTerminationTime", WsmgNameSpaceConstants.WSRL_NS);
+        OMElement message = factory.createOMElement("SetTerminationTime", NameSpaceConstants.WSRL_NS);
         opts.setAction(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
         opts.setTimeOutInMilliSeconds(getTimeoutInMilliSeconds());
@@ -142,13 +142,13 @@ public class WsrfResourceStub {
         if (client.getAxisConfiguration().getModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING) != null) {
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(this.resourceEndpointReference.getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(message.getNamespace().getNamespaceURI() + "/" + message.getLocalName());
 
             client.addHeader(action);
@@ -162,7 +162,7 @@ public class WsrfResourceStub {
 
     public List<OMElement> getResourceProperty(QName qn) throws AxisFault { // List<XmlElement>
 
-        OMElement messageEl = factory.createOMElement("GetResourceProperty", WsmgNameSpaceConstants.WSRP_NS);
+        OMElement messageEl = factory.createOMElement("GetResourceProperty", NameSpaceConstants.WSRP_NS);
         String uuid = UUIDGenerator.getUUID();
 
         opts.setTimeOutInMilliSeconds(getTimeoutInMilliSeconds());
@@ -185,13 +185,13 @@ public class WsrfResourceStub {
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
 
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(this.resourceEndpointReference.getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(messageEl.getNamespace().getNamespaceURI() + "/" + messageEl.getLocalName());
 
             client.addHeader(action);
@@ -208,7 +208,7 @@ public class WsrfResourceStub {
 
     public List<OMElement> getMultipleResourceProperties(QName[] qnamez) throws AxisFault { // TODO
 
-        OMElement messageEl = factory.createOMElement("GetMultipleResourceProperties", WsmgNameSpaceConstants.WSRP_NS);
+        OMElement messageEl = factory.createOMElement("GetMultipleResourceProperties", NameSpaceConstants.WSRP_NS);
         String uuid = UUIDGenerator.getUUID();
         opts.setMessageId(uuid);
         opts.setAction(messageEl.getNamespace().getNamespaceURI() + "/" + messageEl.getLocalName());
@@ -223,7 +223,7 @@ public class WsrfResourceStub {
 
             OMNamespace ns = factory.createOMNamespace(qn.getNamespaceURI(), qn.getPrefix());
 
-            OMElement child = factory.createOMElement("ResourceProperty", WsmgNameSpaceConstants.WSRP_NS);
+            OMElement child = factory.createOMElement("ResourceProperty", NameSpaceConstants.WSRP_NS);
 
             QName textQName = new QName(qn.getNamespaceURI(), qn.getLocalPart(), qn.getPrefix());
 
@@ -241,13 +241,13 @@ public class WsrfResourceStub {
 
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(this.resourceEndpointReference.getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(messageEl.getNamespace().getNamespaceURI() + "/" + messageEl.getLocalName());
 
             client.addHeader(action);
@@ -269,11 +269,11 @@ public class WsrfResourceStub {
         String uuid = UUIDGenerator.getUUID();
         opts.setMessageId(uuid);
         opts.setTimeOutInMilliSeconds(getTimeoutInMilliSeconds());
-        OMElement messageEl = factory.createOMElement("QueryResourceProperties", WsmgNameSpaceConstants.WSRP_NS);
+        OMElement messageEl = factory.createOMElement("QueryResourceProperties", NameSpaceConstants.WSRP_NS);
 
         opts.setAction(messageEl.getNamespace().getNamespaceURI() + "/" + messageEl.getLocalName());
 
-        OMElement queryExpressionEl = factory.createOMElement("QueryExpression", WsmgNameSpaceConstants.WSRP_NS);
+        OMElement queryExpressionEl = factory.createOMElement("QueryExpression", NameSpaceConstants.WSRP_NS);
 
         queryExpressionEl.addAttribute("dialect", WsmgCommonConstants.XPATH_DIALECT, null);
 
@@ -285,13 +285,13 @@ public class WsrfResourceStub {
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
 
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(this.resourceEndpointReference.getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(messageEl.getNamespace().getNamespaceURI() + "/" + messageEl.getLocalName());
 
             client.addHeader(action);
@@ -310,7 +310,7 @@ public class WsrfResourceStub {
             throw new IllegalArgumentException("at least one request is required");
         }
 
-        OMElement messageEl = factory.createOMElement("SetResourceProperties", WsmgNameSpaceConstants.WSRP_NS);
+        OMElement messageEl = factory.createOMElement("SetResourceProperties", NameSpaceConstants.WSRP_NS);
 
         String uuid = UUIDGenerator.getUUID();
         opts.setMessageId(uuid);
@@ -332,13 +332,13 @@ public class WsrfResourceStub {
 
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(uuid);
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(this.resourceEndpointReference.getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
             action.setText(messageEl.getNamespace().getNamespaceURI() + "/" + messageEl.getLocalName());
 
             client.addHeader(action);

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/commons/NotificationProducer.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/commons/NotificationProducer.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/commons/NotificationProducer.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/commons/NotificationProducer.java Thu Sep 22 18:17:28 2011
@@ -22,7 +22,7 @@
 package org.apache.airavata.wsmg.client.commons;
 
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -79,14 +79,14 @@ public class NotificationProducer {
             brokerLocationEPR.addReferenceParameter(topicExpressionEl);
             client.engageModule(WsmgCommonConstants.AXIS_MODULE_NAME_ADDRESSING);
         } else {
-            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
             msgId.setText(UUIDGenerator.getUUID());
 
-            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+            SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
             to.setText(brokerLocationEPR.getAddress());
 
-            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
-            action.setText("wsnt".equals(type) ? WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI() + "/Notify"
+            SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
+            action.setText("wsnt".equals(type) ? NameSpaceConstants.WSNT_NS.getNamespaceURI() + "/Notify"
                     : WsmgCommonConstants.WSMG_PUBLISH_SOAP_ACTION);
             if (topicExpressionEl != null) {
                 try {
@@ -104,7 +104,7 @@ public class NotificationProducer {
 
         Options opts = new Options();
 
-        opts.setAction("wsnt".equals(type) ? WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI() + "/Notify"
+        opts.setAction("wsnt".equals(type) ? NameSpaceConstants.WSNT_NS.getNamespaceURI() + "/Notify"
                 : WsmgCommonConstants.WSMG_PUBLISH_SOAP_ACTION);
 
         opts.setTo(brokerLocationEPR);

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSEProtocolClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSEProtocolClient.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSEProtocolClient.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSEProtocolClient.java Thu Sep 22 18:17:28 2011
@@ -3,7 +3,7 @@ package org.apache.airavata.wsmg.client.
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -36,26 +36,26 @@ public class WSEProtocolClient {
         OMElement filterEl = null;
 
         if (hasTopicExpression && hasXPathExpression) {
-            filterEl = factory.createOMElement("Filter", WsmgNameSpaceConstants.WSE_NS);
+            filterEl = factory.createOMElement("Filter", NameSpaceConstants.WSE_NS);
 
             filterEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_AND_XPATH_DIALECT, null);
-            OMElement topicExpressionEl = factory.createOMElement("TopicExpression", WsmgNameSpaceConstants.WSNT_NS);
+            OMElement topicExpressionEl = factory.createOMElement("TopicExpression", NameSpaceConstants.WSNT_NS);
             topicExpressionEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
-            topicExpressionEl.declareNamespace(WsmgNameSpaceConstants.WIDGET_NS);
-            topicExpressionEl.setText(WsmgNameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
+            topicExpressionEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
+            topicExpressionEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
             filterEl.addChild(topicExpressionEl);
-            OMElement xpathEl = factory.createOMElement("MessageContent", WsmgNameSpaceConstants.WSNT_NS);
+            OMElement xpathEl = factory.createOMElement("MessageContent", NameSpaceConstants.WSNT_NS);
             xpathEl.addAttribute("Dialect", WsmgCommonConstants.XPATH_DIALECT, null);
             xpathEl.setText(xpathExpression);
             filterEl.addChild(xpathEl);
         } else if (hasTopicExpression) {
-            filterEl = factory.createOMElement("Filter", WsmgNameSpaceConstants.WSE_NS);
+            filterEl = factory.createOMElement("Filter", NameSpaceConstants.WSE_NS);
 
             filterEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
-            filterEl.declareNamespace(WsmgNameSpaceConstants.WIDGET_NS);
-            filterEl.setText(WsmgNameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
+            filterEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
+            filterEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
         } else if (hasXPathExpression) {
-            filterEl = factory.createOMElement("Filter", WsmgNameSpaceConstants.WSE_NS);
+            filterEl = factory.createOMElement("Filter", NameSpaceConstants.WSE_NS);
 
             filterEl.addAttribute("Dialect", WsmgCommonConstants.XPATH_DIALECT, null);
             filterEl.setText(xpathExpression);
@@ -68,17 +68,17 @@ public class WSEProtocolClient {
             String xpathExpression, long expireTime) throws AxisFault {
 
         OMFactory factory = OMAbstractFactory.getOMFactory();
-        OMElement subscribeMsg = factory.createOMElement("Subscribe", WsmgNameSpaceConstants.WSE_NS);
+        OMElement subscribeMsg = factory.createOMElement("Subscribe", NameSpaceConstants.WSE_NS);
 
-        OMElement delivery = factory.createOMElement("Delivery", WsmgNameSpaceConstants.WSE_NS);
+        OMElement delivery = factory.createOMElement("Delivery", NameSpaceConstants.WSE_NS);
 
-        OMElement expires = factory.createOMElement("Expires", WsmgNameSpaceConstants.WSE_NS);
+        OMElement expires = factory.createOMElement("Expires", NameSpaceConstants.WSE_NS);
         expires.setText(Long.toString(expireTime));
         subscribeMsg.addChild(expires);
 
         OMElement notifyTo = EndpointReferenceHelper.toOM(factory, eventSink,
-                new QName(WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"),
-                WsmgNameSpaceConstants.WSA_NS.getNamespaceURI());
+                new QName(NameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"),
+                NameSpaceConstants.WSA_NS.getNamespaceURI());
 
         delivery.addChild(notifyTo);
         subscribeMsg.addChild(delivery);
@@ -89,7 +89,7 @@ public class WSEProtocolClient {
             subscribeMsg.addChild(filterEl);
         }
 
-        subscribeMsg.declareNamespace(WsmgNameSpaceConstants.WSA_NS);
+        subscribeMsg.declareNamespace(NameSpaceConstants.WSA_NS);
 
         return subscribeMsg;
     }
@@ -97,14 +97,14 @@ public class WSEProtocolClient {
     public static String decodeSubscribeResponse(OMElement responseSubscriptionsManagerElement) throws AxisFault {
         String subscriptionId = null;
         OMElement referencePropertiesEl = responseSubscriptionsManagerElement.getFirstChildWithName(new QName(
-                WsmgNameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceProperties"));
+                NameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceProperties"));
 
         if (referencePropertiesEl == null) {
             referencePropertiesEl = responseSubscriptionsManagerElement.getFirstChildWithName(new QName(
-                    WsmgNameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceParameters"));
+                    NameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceParameters"));
         }
 
-        OMElement identifierEl = referencePropertiesEl.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSE_NS
+        OMElement identifierEl = referencePropertiesEl.getFirstChildWithName(new QName(NameSpaceConstants.WSE_NS
                 .getNamespaceURI(), WsmgCommonConstants.SUBSCRIPTION_ID));
 
         if (identifierEl == null) {
@@ -117,7 +117,7 @@ public class WSEProtocolClient {
 
     public static OMElement createUnsubscribeMsg() {
         OMFactory factory = OMAbstractFactory.getOMFactory();
-        OMElement message = factory.createOMElement("Unsubscribe", WsmgNameSpaceConstants.WSE_NS);
+        OMElement message = factory.createOMElement("Unsubscribe", NameSpaceConstants.WSE_NS);
 
         return message;
     }

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSNTProtocolClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSNTProtocolClient.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSNTProtocolClient.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/protocol/WSNTProtocolClient.java Thu Sep 22 18:17:28 2011
@@ -5,7 +5,7 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -19,20 +19,20 @@ public class WSNTProtocolClient {
                 String xpathExpression) throws AxisFault {
             OMFactory factory = OMAbstractFactory.getOMFactory();
 
-            OMElement message = factory.createOMElement("SubscribeRequest", WsmgNameSpaceConstants.WSNT_NS);
+            OMElement message = factory.createOMElement("SubscribeRequest", NameSpaceConstants.WSNT_NS);
 
             if (topicExpression != null) {
-                OMElement topicExpEl = factory.createOMElement("TopicExpression", WsmgNameSpaceConstants.WSNT_NS,
+                OMElement topicExpEl = factory.createOMElement("TopicExpression", NameSpaceConstants.WSNT_NS,
                         message);
 
                 topicExpEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT,
-                        WsmgNameSpaceConstants.WSNT_NS);
-                topicExpEl.declareNamespace(WsmgNameSpaceConstants.WIDGET_NS);
-                topicExpEl.setText(WsmgNameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
+                        NameSpaceConstants.WSNT_NS);
+                topicExpEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
+                topicExpEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
             }
 
             if (xpathExpression != null) {
-                OMElement xpathExpEl = factory.createOMElement("Selector", WsmgNameSpaceConstants.WSNT_NS, message);
+                OMElement xpathExpEl = factory.createOMElement("Selector", NameSpaceConstants.WSNT_NS, message);
                 xpathExpEl.addAttribute("Dialect", WsmgCommonConstants.XPATH_DIALECT, null);
                 xpathExpEl.setText(xpathExpression);
             }
@@ -41,7 +41,7 @@ public class WSNTProtocolClient {
             useNotifyEl.setText("true");// check wether we still need this
 
             OMElement eprCrEl = EndpointReferenceHelper.toOM(factory, eventSinkLocation,
-                    new QName("ConsumerReference"), WsmgNameSpaceConstants.WSA_NS.getNamespaceURI());
+                    new QName("ConsumerReference"), NameSpaceConstants.WSA_NS.getNamespaceURI());
 
             message.addChild(eprCrEl);
             eprCrEl.setNamespace(message.getNamespace());
@@ -58,7 +58,7 @@ public class WSNTProtocolClient {
             Map<QName, OMElement> referenceParams = subscriptionReferenceEPR.getAllReferenceParameters();
 
             if (referenceParams != null) {
-                QName identifierQName = new QName(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(),
+                QName identifierQName = new QName(NameSpaceConstants.WSNT_NS.getNamespaceURI(),
                         WsmgCommonConstants.SUBSCRIPTION_ID);
 
                 OMElement identifierEl = referenceParams.get(identifierQName);
@@ -71,7 +71,7 @@ public class WSNTProtocolClient {
 
         public static OMElement createUnsubscribeMsg() {
             OMFactory factory = OMAbstractFactory.getOMFactory();
-            OMElement message = factory.createOMElement("UnsubsribeRequest", WsmgNameSpaceConstants.WSNT_NS);
+            OMElement message = factory.createOMElement("UnsubsribeRequest", NameSpaceConstants.WSNT_NS);
 
             return message;
         }
@@ -80,14 +80,14 @@ public class WSNTProtocolClient {
                 throws AxisFault {
             OMFactory factory = OMAbstractFactory.getOMFactory();
 
-            OMElement topicExpEl = factory.createOMElement("Topic", WsmgNameSpaceConstants.WSNT_NS);
+            OMElement topicExpEl = factory.createOMElement("Topic", NameSpaceConstants.WSNT_NS);
             topicExpEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
-            topicExpEl.declareNamespace(WsmgNameSpaceConstants.WIDGET_NS);
-            topicExpEl.setText(WsmgNameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topic);
+            topicExpEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
+            topicExpEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topic);
 
-            OMElement messageToNotify = factory.createOMElement("Notify", WsmgNameSpaceConstants.WSNT_NS);
-            messageToNotify.declareNamespace(WsmgNameSpaceConstants.WSNT_NS);
-            messageToNotify.declareNamespace(WsmgNameSpaceConstants.WSA_NS);
+            OMElement messageToNotify = factory.createOMElement("Notify", NameSpaceConstants.WSNT_NS);
+            messageToNotify.declareNamespace(NameSpaceConstants.WSNT_NS);
+            messageToNotify.declareNamespace(NameSpaceConstants.WSA_NS);
             OMElement notificationMesssageEl = factory.createOMElement("NotificationMessage",
                     messageToNotify.getNamespace(), messageToNotify);
 
@@ -96,7 +96,7 @@ public class WSNTProtocolClient {
             notificationMesssageEl
                     .addChild(EndpointReferenceHelper.toOM(factory, producerReference, new QName(notificationMesssageEl
                             .getNamespace().getNamespaceURI(), "ProducerReference", notificationMesssageEl
-                            .getNamespace().getPrefix()), WsmgNameSpaceConstants.WSA_NS.getNamespaceURI()));
+                            .getNamespace().getPrefix()), NameSpaceConstants.WSA_NS.getNamespaceURI()));
 
             OMElement messageEl = factory.createOMElement("Message", notificationMesssageEl.getNamespace(),
                     notificationMesssageEl);

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/gui/WsntViewerConsumerNotificationHandler.java Thu Sep 22 18:17:28 2011
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.slf4j.Logger;
@@ -59,14 +59,14 @@ public class WsntViewerConsumerNotificat
 
     private void addBriefMsg(SOAPEnvelope env) throws XMLStreamException {
 
-        QName notify = new QName(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(), "Notify",
-                WsmgNameSpaceConstants.WSNT_NS.getPrefix());
+        QName notify = new QName(NameSpaceConstants.WSNT_NS.getNamespaceURI(), "Notify",
+                NameSpaceConstants.WSNT_NS.getPrefix());
 
-        QName notifyMsg = new QName(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(), "NotificationMessage",
-                WsmgNameSpaceConstants.WSNT_NS.getPrefix());
+        QName notifyMsg = new QName(NameSpaceConstants.WSNT_NS.getNamespaceURI(), "NotificationMessage",
+                NameSpaceConstants.WSNT_NS.getPrefix());
 
-        QName msg = new QName(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(), "Message",
-                WsmgNameSpaceConstants.WSNT_NS.getPrefix());
+        QName msg = new QName(NameSpaceConstants.WSNT_NS.getNamespaceURI(), "Message",
+                NameSpaceConstants.WSNT_NS.getPrefix());
 
         if (env.getBody() == null) {
             throw new RuntimeException("invalid soap envelope - no soap body");

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/CreateMsgBox.java Thu Sep 22 18:17:28 2011
@@ -24,7 +24,7 @@ package org.apache.airavata.wsmg.msgbox.
 import javax.xml.namespace.QName;
 
 import org.apache.airavata.wsmg.client.util.ClientUtil;
-import org.apache.airavata.wsmg.commons.MsgBoxNameSpConsts;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
@@ -84,11 +84,11 @@ public class CreateMsgBox {
     }
 
     private OMElement createMessageEl() throws AxisFault {
-        OMElement message = factory.createOMElement("createMsgBox", MsgBoxNameSpConsts.MSG_BOX);
-        OMElement msgBoxId = factory.createOMElement("MsgBoxId", MsgBoxNameSpConsts.MSG_BOX);
+        OMElement message = factory.createOMElement("createMsgBox", NameSpaceConstants.MSG_BOX);
+        OMElement msgBoxId = factory.createOMElement("MsgBoxId", NameSpaceConstants.MSG_BOX);
         msgBoxId.setText("Create message box");
         message.addChild(msgBoxId);
-        message.declareNamespace(MsgBoxNameSpConsts.MSG_BOX);
+        message.declareNamespace(NameSpaceConstants.MSG_BOX);
         return message;
     }
 
@@ -98,7 +98,7 @@ public class CreateMsgBox {
         opts.setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE);
         opts.setTo(new EndpointReference(this.msgBoxEndPointReference));
         opts.setMessageId(uuid);
-        opts.setAction(MsgBoxNameSpConsts.MSG_BOX.getNamespaceURI() + "/" + "createMsgBox");
+        opts.setAction(NameSpaceConstants.MSG_BOX.getNamespaceURI() + "/" + "createMsgBox");
 
         opts.setTimeOutInMilliSeconds(getTimeoutInMilliSeconds());
         ServiceClient client = new ServiceClient();

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/DestroyMsgBox.java Thu Sep 22 18:17:28 2011
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.wsmg.msgbox.client;
 
-import org.apache.airavata.wsmg.commons.MsgBoxNameSpConsts;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
@@ -84,11 +84,11 @@ public class DestroyMsgBox {
     }
 
     private OMElement createMessageEl(String msgboxid) throws AxisFault {
-        OMElement message = factory.createOMElement("destroyMsgBox", MsgBoxNameSpConsts.MSG_BOX);
-        OMElement msgBoxId = factory.createOMElement("MsgBoxId", MsgBoxNameSpConsts.MSG_BOX);
+        OMElement message = factory.createOMElement("destroyMsgBox", NameSpaceConstants.MSG_BOX);
+        OMElement msgBoxId = factory.createOMElement("MsgBoxId", NameSpaceConstants.MSG_BOX);
         msgBoxId.setText(msgboxid);
         message.addChild(msgBoxId);
-        message.declareNamespace(MsgBoxNameSpConsts.MSG_BOX);
+        message.declareNamespace(NameSpaceConstants.MSG_BOX);
         return message;
     }
 

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/StoreMessage.java Thu Sep 22 18:17:28 2011
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.wsmg.msgbox.client;
 
-import org.apache.airavata.wsmg.commons.MsgBoxNameSpConsts;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
@@ -84,14 +84,14 @@ public class StoreMessage {
     }
 
     private OMElement createMessageEl(String msgboxid, OMElement messageIn) throws AxisFault {
-        OMElement message = factory.createOMElement("storeMessages", MsgBoxNameSpConsts.MSG_BOX);
-        OMElement messageElement = factory.createOMElement("message", MsgBoxNameSpConsts.MSG_BOX);
-        OMElement msgBoxId = factory.createOMElement("MsgBoxId", MsgBoxNameSpConsts.MSG_BOX);
+        OMElement message = factory.createOMElement("storeMessages", NameSpaceConstants.MSG_BOX);
+        OMElement messageElement = factory.createOMElement("message", NameSpaceConstants.MSG_BOX);
+        OMElement msgBoxId = factory.createOMElement("MsgBoxId", NameSpaceConstants.MSG_BOX);
         msgBoxId.setText(msgboxid);
         message.addChild(msgBoxId);
         messageElement.addChild(messageIn);
         message.addChild(messageElement);
-        message.declareNamespace(MsgBoxNameSpConsts.MSG_BOX);
+        message.declareNamespace(NameSpaceConstants.MSG_BOX);
         return message;
     }
 
@@ -101,7 +101,7 @@ public class StoreMessage {
         opts.setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE);
         opts.setTo(msgBoxEndPointReference);
         opts.setMessageId(uuid);
-        opts.setAction(MsgBoxNameSpConsts.MSG_BOX.getNamespaceURI() + "/" + "storeMessages");
+        opts.setAction(NameSpaceConstants.MSG_BOX.getNamespaceURI() + "/" + "storeMessages");
 
         opts.setTimeOutInMilliSeconds(getTimeoutInMilliSeconds());
         ServiceClient client = new ServiceClient();

Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/msgbox/client/TakeMessages.java Thu Sep 22 18:17:28 2011
@@ -23,7 +23,7 @@ package org.apache.airavata.wsmg.msgbox.
 
 import java.util.Iterator;
 
-import org.apache.airavata.wsmg.commons.MsgBoxNameSpConsts;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
@@ -91,11 +91,11 @@ public class TakeMessages {
     }
 
     private OMElement createMessageEl(String msgboxid) throws AxisFault {
-        OMElement message = factory.createOMElement("takeMessages", MsgBoxNameSpConsts.MSG_BOX);
-        OMElement msgBoxId = factory.createOMElement("MsgBoxId", MsgBoxNameSpConsts.MSG_BOX);
+        OMElement message = factory.createOMElement("takeMessages", NameSpaceConstants.MSG_BOX);
+        OMElement msgBoxId = factory.createOMElement("MsgBoxId", NameSpaceConstants.MSG_BOX);
         msgBoxId.setText(msgboxid);
         message.addChild(msgBoxId);
-        message.declareNamespace(MsgBoxNameSpConsts.MSG_BOX);
+        message.declareNamespace(NameSpaceConstants.MSG_BOX);
         return message;
     }
 

Modified: incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/CommonRoutines.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/CommonRoutines.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/CommonRoutines.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/CommonRoutines.java Thu Sep 22 18:17:28 2011
@@ -197,13 +197,13 @@ public class CommonRoutines {
 
         SOAPFactory soapfactory = OMAbstractFactory.getSOAP11Factory();
 
-        SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+        SOAPHeaderBlock msgId = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
         msgId.setText(UUIDGenerator.getUUID());
 
-        SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+        SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
         to.setText(destination);
 
-        SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+        SOAPHeaderBlock action = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
         action.setText(soapAction);
 
         client.addHeader(action);

Copied: incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/NameSpaceConstants.java (from r1174240, incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgNameSpaceConstants.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/NameSpaceConstants.java?p2=incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/NameSpaceConstants.java&p1=incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgNameSpaceConstants.java&r1=1174240&r2=1174298&rev=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgNameSpaceConstants.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/NameSpaceConstants.java Thu Sep 22 18:17:28 2011
@@ -25,50 +25,54 @@ import org.apache.axiom.om.OMAbstractFac
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 
-public abstract class WsmgNameSpaceConstants {
+public abstract class NameSpaceConstants {
 
-    public final static String XHTML_NS = null;
-
-    public final static String RESOURCE_ID = "ResourceID";
-
-    public final static OMFactory factory = OMAbstractFactory.getOMFactory();
+    public final static OMFactory factory = OMAbstractFactory.getOMFactory();  
 
     public final static OMNamespace WSMG_NS = factory.createOMNamespace(
-            "http://www.collab-ogce.org/ogce/index.php/Messaging", "org.apache.airavata.wsmg");
+            "http://org.apache.airavata/ws-messenger/wsmg/2011", "wsmg");
+    
+    public final static OMNamespace MSG_BOX = factory.createOMNamespace(
+            "http://org.apache.airavata/ws-messenger/msgbox/2011", "msgbox");
 
     public final static OMNamespace WIDGET_NS = factory.createOMNamespace("http://widgets.com", "widget");
+    
+    /**
+     * WS Addressing
+     */
+    public final static OMNamespace WSA_NS = factory.createOMNamespace("http://www.w3.org/2005/08/addressing", "wsa");
 
-    public final static OMNamespace NS_2004_08 = factory.createOMNamespace(
-            "http://schemas.xmlsoap.org/ws/2004/08/addressing", "wa48");
-
-    public final static OMNamespace WSRL_NS = factory.createOMNamespace(
-            "http://www.ibm.com/xmlns/stdwip/web-services/WS-ResourceLifetime", "wsrl");
-
-    public final static OMNamespace WSRP_NS = factory.createOMNamespace(
-            "http://www.ibm.com/xmlns/stdwip/web-services/WS-ResourceProperties", "wsrp");
-    // "http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd");
-
+    /**
+     * WS Notification
+     * 
+     * https://www.ibm.com/developerworks/library/specification/ws-notification/
+     * 
+     */
     public final static OMNamespace WSNT_NS = factory.createOMNamespace(
             "http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification", "wsnt");
-    // "http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd");
-
+    
     public final static OMNamespace WSBR_NS = factory.createOMNamespace(
-            "http://www.ibm.com/xmlns/stdwip/web-services/WS-BrokeredNotification", "wsbn");
-
-    public final static OMNamespace WSA_NS = factory.createOMNamespace("http://www.w3.org/2005/08/addressing", "wsa");
-    // "http://schemas.xmlsoap.org/ws/2003/03/addressing");
-    // "http://schemas.xmlsoap.org/ws/2004/03/addressing");
+            "http://www.ibm.com/xmlns/stdwip/web-services/WS-BrokeredNotification", "wsbn");    
+    
+    /**
+     * WS Resource specification namespace
+     * 
+     * http://www.ibm.com/developerworks/webservices/library/specification/ws-resource/
+     * 
+     */
+    public final static OMNamespace WSRP_NS = factory.createOMNamespace(
+            "http://www.ibm.com/xmlns/stdwip/web-services/WS-ResourceProperties", "wsrp");
+    
+    public final static OMNamespace WSRL_NS = factory.createOMNamespace(
+            "http://www.ibm.com/xmlns/stdwip/web-services/WS-ResourceLifetime", "wsrl");
+    
 
+    /**
+     * Web Services Eventing (WS-Eventing)
+     * 
+     * http://schemas.xmlsoap.org/ws/2004/08/eventing/
+     */
     public final static OMNamespace WSE_NS = factory.createOMNamespace(
             "http://schemas.xmlsoap.org/ws/2004/08/eventing", "wse");
 
-    public final static OMNamespace SOAP_NS = factory.createOMNamespace("http://schemas.xmlsoap.org/soap/envelope/",
-            "s");
-
-    public final static OMNamespace WSE = factory.createOMNamespace("http://schemas.xmlsoap.org/ws/2004/08/eventing",
-            "wse");
-
-    public final static OMNamespace WSA_2004_NS = factory.createOMNamespace(
-            "http://schemas.xmlsoap.org/ws/2004/08/addressing", "wsa");
-
 }

Modified: incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/WsmgCommonConstants.java Thu Sep 22 18:17:28 2011
@@ -57,19 +57,7 @@ public class WsmgCommonConstants {
 
     public static final String EPR_SOURCE_HELPER_TO_OM_GET_EPR_PROPERTIES = "http://www.w3.org/2005/08/addressing";
 
-    public final static String WSN1_0_ActionPrefix = "http://www.ibm.com/xmlns/stdwip";
-
-    public final static String WSN1_2_ActionPrefix = "http://docs.oasis-open.org/wsn";
-
-    public final static String WSN_ActionPrefix = WSN1_2_ActionPrefix;
-
     public final static String WSMG_PUBLISH_SOAP_ACTION = "http://org.apache.airavata/WseNotification";
-    /**
-     * Constants to switch between different web service Stacks and Transports
-     * 
-     */
-    public static final int BROKER_WEB_SERVICE_STACK_STANDALONE_AXIS2 = 2;
-    public static final int BROKER_WEB_SERVICE_STACK_TOMCAT_AXIS2 = 4;
 
     public static final String STORAGE_TYPE_IN_MEMORY = "memory";
     public static final String STORAGE_TYPE_PERSISTANT = "persistent";
@@ -98,9 +86,6 @@ public class WsmgCommonConstants {
     public static final String CONFIG_SENDING_BATCH_SIZE = "sending.batch.size";
     public static final String CONFIG_SENDING_THREAD_POOL_SIZE = "sending.thread.pool.size";
 
-    public static final String TABLE_NAME_EXPIRABLE_SUBCRIPTIONS = "subscription";
-    public static final String TABLE_NAME_NON_EXPIRABLE_SUBCRIPTIONS = "specialSubscription";
-
     public static final String BROKER_CONFIGURATION_FILE_NAME = "msgBroker.properties";
 
     public static final String DELIVERY_PROTOCOL = "broker.delivery.protocol";

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java Thu Sep 22 18:17:28 2011
@@ -25,7 +25,7 @@ import java.io.StringReader;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.airavata.wsmg.commons.MsgBoxNameSpConsts;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.airavata.wsmg.msgbox.Storage.MsgBoxStorage;
 import org.apache.airavata.wsmg.msgbox.util.MsgBoxCommonConstants;
 import org.apache.airavata.wsmg.msgbox.util.MsgBoxUtils;
@@ -115,7 +115,7 @@ public class MsgBoxServiceSkeleton imple
             //FIXME: Should we throw exception?? or client will read false status
         }
         resp.addChild(status);
-        resp.declareNamespace(MsgBoxNameSpConsts.MSG_BOX);
+        resp.declareNamespace(NameSpaceConstants.MSG_BOX);
         return resp;
     }
 
@@ -134,7 +134,7 @@ public class MsgBoxServiceSkeleton imple
                 logger.debug("  no messages..  ");
             }
             respEl.addChild(messageSet);
-            respEl.declareNamespace(MsgBoxNameSpConsts.MSG_BOX);
+            respEl.declareNamespace(NameSpaceConstants.MSG_BOX);
             return respEl;
         } catch (Exception e) {
             logger.error("Error taking mesages of message box: " + msgBoxAddr, e);

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/AbstractBrokerMsgReceiver.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/AbstractBrokerMsgReceiver.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/AbstractBrokerMsgReceiver.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/AbstractBrokerMsgReceiver.java Thu Sep 22 18:17:28 2011
@@ -24,7 +24,7 @@ package org.apache.airavata.wsmg.broker;
 import java.util.List;
 
 import org.apache.airavata.wsmg.broker.context.ProcessingContext;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
@@ -92,8 +92,8 @@ public abstract class AbstractBrokerMsgR
 
     private void declareResponseMsgNamespace(SOAPEnvelope outputEnvelope, List<OMNamespace> namespaces) {
 
-        if (!namespaces.contains(WsmgNameSpaceConstants.WSA_NS)) {
-            namespaces.add(WsmgNameSpaceConstants.WSA_NS);// declare WSA by default
+        if (!namespaces.contains(NameSpaceConstants.WSA_NS)) {
+            namespaces.add(NameSpaceConstants.WSA_NS);// declare WSA by default
         }
 
         for (OMNamespace ns : namespaces) {

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/NotificationProcessor.java Thu Sep 22 18:17:28 2011
@@ -31,7 +31,7 @@ import javax.xml.stream.XMLStreamExcepti
 import org.apache.airavata.wsmg.broker.context.ContextParameters;
 import org.apache.airavata.wsmg.broker.context.ProcessingContext;
 import org.apache.airavata.wsmg.commons.OutGoingMessage;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.airavata.wsmg.config.WSMGParameter;
 import org.apache.airavata.wsmg.config.WsmgConfigurationContext;
 import org.apache.airavata.wsmg.matching.AbstractMessageMatcher;
@@ -99,7 +99,7 @@ public class NotificationProcessor {
                 .getSoapAction(), ctx.getMessageContext().getMessageID());
         additionalMessageContent.setTrackId(trackId);
 
-        if (WsmgNameSpaceConstants.WSNT_NS.equals(protocolNs)) {
+        if (NameSpaceConstants.WSNT_NS.equals(protocolNs)) {
 
             onWSNTMsg(ctx, additionalMessageContent);
             setResponseMsg(ctx, trackId, protocolNs);
@@ -125,7 +125,7 @@ public class NotificationProcessor {
         String topicElString = null;
         String topicLocalString = null;
 
-        QName qName = new QName(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(), "Topic");
+        QName qName = new QName(NameSpaceConstants.WSNT_NS.getNamespaceURI(), "Topic");
 
         OMElement topicEl = ctx.getMessageContext().getEnvelope().getHeader().getFirstChildWithName(qName);
 
@@ -224,7 +224,7 @@ public class NotificationProcessor {
 
             String topicLocalString = null;
 
-            OMElement topicEl = wrappedMessageEl.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+            OMElement topicEl = wrappedMessageEl.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
                     .getNamespaceURI(), "Topic"));
             if (topicEl != null) {
 
@@ -238,7 +238,7 @@ public class NotificationProcessor {
                 additionalMessageContent.setTopicElement(topicElString);
             }
             OMElement producerReferenceEl = wrappedMessageEl.getFirstChildWithName(new QName(
-                    WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(), "ProducerReference"));
+                    NameSpaceConstants.WSNT_NS.getNamespaceURI(), "ProducerReference"));
 
             if (producerReferenceEl != null) {
                 try {
@@ -251,7 +251,7 @@ public class NotificationProcessor {
             }
 
             OMElement notificationMessageEl = wrappedMessageEl.getFirstChildWithName(
-                    new QName(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(), "Message")).getFirstElement();
+                    new QName(NameSpaceConstants.WSNT_NS.getNamespaceURI(), "Message")).getFirstElement();
 
             String message = null;
             try {

Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/subscription/SubscriptionManager.java Thu Sep 22 18:17:28 2011
@@ -44,7 +44,7 @@ import org.apache.airavata.wsmg.broker.w
 import org.apache.airavata.wsmg.broker.wsnotification.WSNTProtocolSupport;
 import org.apache.airavata.wsmg.broker.wsnotification.WSNotificationProcessingContextBuilder;
 import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-import org.apache.airavata.wsmg.commons.WsmgNameSpaceConstants;
+import org.apache.airavata.wsmg.commons.NameSpaceConstants;
 import org.apache.airavata.wsmg.commons.storage.WsmgStorage;
 import org.apache.airavata.wsmg.config.WSMGParameter;
 import org.apache.airavata.wsmg.config.WsmgConfigurationContext;
@@ -131,7 +131,7 @@ public class SubscriptionManager {
             return;
         }
 
-        if (WsmgNameSpaceConstants.WSE_NS.equals(ctx.getContextParameter(ContextParameters.SUBSCRIBE_ELEMENT)
+        if (NameSpaceConstants.WSE_NS.equals(ctx.getContextParameter(ContextParameters.SUBSCRIBE_ELEMENT)
                 .getNamespace())) {
             wseProtocalSupport.createSubscribeResponse(ctx, subId);
 
@@ -156,7 +156,7 @@ public class SubscriptionManager {
 
         // get the first element element inside the soap body element and check
         // whether namespace is WSE
-        if (WsmgNameSpaceConstants.WSE_NS.equals(ctx.getContextParameter(ContextParameters.SUBSCRIBE_ELEMENT)
+        if (NameSpaceConstants.WSE_NS.equals(ctx.getContextParameter(ContextParameters.SUBSCRIBE_ELEMENT)
                 .getNamespace())) {
             state = wseProtocalSupport.createSubscriptionState(ctx, outGoingQueue);
         } else { // Handle WSNT
@@ -299,7 +299,7 @@ public class SubscriptionManager {
                 subscribeXmlElement = builder.getDocumentElement();
 
                 if (subscribeXmlElement.getNamespace().getNamespaceURI()
-                        .equals(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI())) {
+                        .equals(NameSpaceConstants.WSNT_NS.getNamespaceURI())) {
                     processingCtxBuilder = wsntBuilder;
 
                 } else {



Mime
View raw message