You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/09/22 20:17:29 UTC
svn commit: r1174298 [2/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...
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProcessingContextBuilder.java Thu Sep 22 18:17:28 2011
@@ -29,7 +29,7 @@ import org.apache.airavata.wsmg.broker.c
import org.apache.airavata.wsmg.broker.context.ProcessingContext;
import org.apache.airavata.wsmg.broker.context.ProcessingContextBuilder;
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.util.BrokerUtil;
import org.apache.airavata.wsmg.util.WsEventingOperations;
import org.apache.axiom.om.OMElement;
@@ -86,7 +86,7 @@ public class WSEProcessingContextBuilder
case SUBSCRIBE: {
Iterator<OMElement> iterator = msgContext.getEnvelope().getBody()
- .getChildrenWithName(new QName(WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(), "Subscribe"));
+ .getChildrenWithName(new QName(NameSpaceConstants.WSE_NS.getNamespaceURI(), "Subscribe"));
if (!iterator.hasNext()) {
throw new RuntimeException("invalid subscription message - no subscribe element");
@@ -117,7 +117,7 @@ public class WSEProcessingContextBuilder
processingContext.setContextParameter(ContextParameters.SUBSCRIBE_ELEMENT, subscribeElement);
// -- check optional element - expires
- Iterator iterator = subscribeElement.getChildrenWithName(new QName(WsmgNameSpaceConstants.WSE_NS
+ Iterator iterator = subscribeElement.getChildrenWithName(new QName(NameSpaceConstants.WSE_NS
.getNamespaceURI(), "Expires"));
if (iterator.hasNext()) {
@@ -127,7 +127,7 @@ public class WSEProcessingContextBuilder
}
- iterator = subscribeElement.getChildrenWithName(new QName(WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(),
+ iterator = subscribeElement.getChildrenWithName(new QName(NameSpaceConstants.WSE_NS.getNamespaceURI(),
"Filter"));
if (!iterator.hasNext()) {
@@ -138,7 +138,7 @@ public class WSEProcessingContextBuilder
processingContext.setContextParameter(ContextParameters.FILTER_ELEMENT, iterator.next());
- iterator = subscribeElement.getChildrenWithName(new QName(WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(),
+ iterator = subscribeElement.getChildrenWithName(new QName(NameSpaceConstants.WSE_NS.getNamespaceURI(),
"Delivery"));
if (!iterator.hasNext()) {
@@ -147,7 +147,7 @@ public class WSEProcessingContextBuilder
OMElement delivery = (OMElement) iterator.next();
- iterator = delivery.getChildrenWithName(new QName(WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"));
+ iterator = delivery.getChildrenWithName(new QName(NameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"));
if (!iterator.hasNext()) {
throw new RuntimeException("invalid subscription - unable to find NotifyTo tag");
@@ -170,7 +170,7 @@ public class WSEProcessingContextBuilder
private void extractInfoFromHeader(ProcessingContext context, SOAPHeader header) {
- Iterator ite = header.getChildrenWithName(new QName(WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(),
+ Iterator ite = header.getChildrenWithName(new QName(NameSpaceConstants.WSE_NS.getNamespaceURI(),
WsmgCommonConstants.SUBSCRIPTION_ID));
if (ite.hasNext()) {
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEProtocolSupport.java Thu Sep 22 18:17:28 2011
@@ -31,7 +31,7 @@ import org.apache.airavata.wsmg.broker.c
import org.apache.airavata.wsmg.broker.subscription.SubscriptionState;
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.airavata.wsmg.messenger.OutGoingQueue;
import org.apache.airavata.wsmg.util.BrokerUtil;
import org.apache.axiom.om.OMAbstractFactory;
@@ -117,12 +117,12 @@ public class WSEProtocolSupport {
throw new AxisFault("xpath expression is not given");
}
} else if (filterDialectAttrib.compareTo(WsmgCommonConstants.TOPIC_AND_XPATH_DIALECT) == 0) {
- OMElement topicEl = filterEl.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ OMElement topicEl = filterEl.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), "TopicExpression"));
if (topicEl != null) {
topicLocalString = BrokerUtil.getTopicLocalString(topicEl.getText());
}
- OMElement xpathEl = filterEl.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ OMElement xpathEl = filterEl.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), "MessageContent"));
if (xpathEl != null) {
xpathString = xpathEl.getText();
@@ -155,9 +155,9 @@ public class WSEProtocolSupport {
OMFactory factory = OMAbstractFactory.getOMFactory();
- ctx.addResponseMsgNameSpaces(WsmgNameSpaceConstants.WSE_NS);
+ ctx.addResponseMsgNameSpaces(NameSpaceConstants.WSE_NS);
- OMElement responseMessage = factory.createOMElement("SubscribeResponse", WsmgNameSpaceConstants.WSE_NS);
+ OMElement responseMessage = factory.createOMElement("SubscribeResponse", NameSpaceConstants.WSE_NS);
OMElement identifier = factory.createOMElement(WsmgCommonConstants.SUBSCRIPTION_ID,
responseMessage.getNamespace());
@@ -177,8 +177,8 @@ public class WSEProtocolSupport {
try {
subscriptionManagerEpr = EndpointReferenceHelper.toOM(factory, serviceLocationEndpointReference, new QName(
- WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(), "SubscriptionManager"),
- WsmgNameSpaceConstants.WSA_NS.getNamespaceURI());
+ NameSpaceConstants.WSE_NS.getNamespaceURI(), "SubscriptionManager"),
+ NameSpaceConstants.WSA_NS.getNamespaceURI());
responseMessage.addChild(subscriptionManagerEpr);
subscriptionManagerEpr.setNamespace(responseMessage.getNamespace());
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingPublishMsgReceiver.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingPublishMsgReceiver.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingPublishMsgReceiver.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wseventing/WSEventingPublishMsgReceiver.java Thu Sep 22 18:17:28 2011
@@ -24,7 +24,7 @@ package org.apache.airavata.wsmg.broker.
import org.apache.airavata.wsmg.broker.AbstractBrokerMsgReceiver;
import org.apache.airavata.wsmg.broker.context.ProcessingContext;
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.config.WsmgConfigurationContext;
import org.apache.airavata.wsmg.util.WsEventingOperations;
import org.apache.axiom.om.OMElement;
@@ -45,7 +45,7 @@ public class WSEventingPublishMsgReceive
WsmgConfigurationContext brokerConfigContext = (WsmgConfigurationContext) inMsgContext
.getConfigurationContext().getProperty(WsmgCommonConstants.BROKER_WSMGCONFIG);
- brokerConfigContext.getNotificationProcessor().processMsg(processingContext, WsmgNameSpaceConstants.WSE_NS);
+ brokerConfigContext.getNotificationProcessor().processMsg(processingContext, NameSpaceConstants.WSE_NS);
} catch (Exception e) {
throw new AxisFault("unable to process message", e);
}
@@ -63,7 +63,7 @@ public class WSEventingPublishMsgReceive
outputContext = super.createOutputMessageContext(inMsg, processingContext);
- String responseAction = String.format("%s/%s", WsmgNameSpaceConstants.WSE_NS.getNamespaceURI(),
+ String responseAction = String.format("%s/%s", NameSpaceConstants.WSE_NS.getNamespaceURI(),
responseMessage.getLocalName());
outputContext.setSoapAction(responseAction);
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNTProtocolSupport.java Thu Sep 22 18:17:28 2011
@@ -29,7 +29,7 @@ import org.apache.airavata.wsmg.broker.c
import org.apache.airavata.wsmg.broker.context.ProcessingContext;
import org.apache.airavata.wsmg.broker.subscription.SubscriptionState;
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.messenger.OutGoingQueue;
import org.apache.airavata.wsmg.util.BrokerUtil;
import org.apache.axiom.om.OMAbstractFactory;
@@ -116,8 +116,8 @@ public class WSNTProtocolSupport {
OMFactory factory = OMAbstractFactory.getOMFactory();
- ctx.addResponseMsgNameSpaces(WsmgNameSpaceConstants.WSNT_NS);
- OMElement responseMessage = factory.createOMElement("SubscribeResponse", WsmgNameSpaceConstants.WSNT_NS);
+ ctx.addResponseMsgNameSpaces(NameSpaceConstants.WSNT_NS);
+ OMElement responseMessage = factory.createOMElement("SubscribeResponse", NameSpaceConstants.WSNT_NS);
OMElement identifier = factory.createOMElement(WsmgCommonConstants.SUBSCRIPTION_ID,
responseMessage.getNamespace());
@@ -129,7 +129,7 @@ public class WSNTProtocolSupport {
OMElement subscriptionReference = null;
try {
subscriptionReference = EndpointReferenceHelper.toOM(factory, serviceLocationEndpointReference, new QName(
- "SubscriptionReference"), WsmgNameSpaceConstants.WSA_NS.getNamespaceURI());
+ "SubscriptionReference"), NameSpaceConstants.WSA_NS.getNamespaceURI());
responseMessage.addChild(subscriptionReference);
subscriptionReference.setNamespace(responseMessage.getNamespace());
@@ -148,20 +148,20 @@ public class WSNTProtocolSupport {
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);
}
@@ -170,7 +170,7 @@ public class WSNTProtocolSupport {
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());
@@ -187,7 +187,7 @@ public class WSNTProtocolSupport {
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);
@@ -200,7 +200,7 @@ public class WSNTProtocolSupport {
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;
}
@@ -209,14 +209,14 @@ public class WSNTProtocolSupport {
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);
@@ -225,7 +225,7 @@ public class WSNTProtocolSupport {
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/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationMsgReceiver.java Thu Sep 22 18:17:28 2011
@@ -24,7 +24,7 @@ package org.apache.airavata.wsmg.broker.
import org.apache.airavata.wsmg.broker.AbstractBrokerMsgReceiver;
import org.apache.airavata.wsmg.broker.context.ProcessingContext;
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.config.WsmgConfigurationContext;
import org.apache.airavata.wsmg.util.WsNotificationOperations;
import org.apache.axis2.AxisFault;
@@ -58,7 +58,7 @@ public class WSNotificationMsgReceiver e
.getConfigurationContext().getProperty(WsmgCommonConstants.BROKER_WSMGCONFIG);
brokerConfigContext.getNotificationProcessor().processMsg(processingContext,
- WsmgNameSpaceConstants.WSNT_NS);
+ NameSpaceConstants.WSNT_NS);
} catch (Exception e) {
throw new AxisFault("unable to process message", e);
}
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/wsnotification/WSNotificationProcessingContextBuilder.java Thu Sep 22 18:17:28 2011
@@ -29,7 +29,7 @@ import org.apache.airavata.wsmg.broker.c
import org.apache.airavata.wsmg.broker.context.ProcessingContext;
import org.apache.airavata.wsmg.broker.context.ProcessingContextBuilder;
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.util.BrokerUtil;
import org.apache.airavata.wsmg.util.WsNotificationOperations;
import org.apache.axiom.om.OMElement;
@@ -52,7 +52,7 @@ public class WSNotificationProcessingCon
ProcessingContext processingContext = new ProcessingContext();
if (elem == null
- || (!elem.getNamespace().getNamespaceURI().equals(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI()))) {
+ || (!elem.getNamespace().getNamespaceURI().equals(NameSpaceConstants.WSNT_NS.getNamespaceURI()))) {
logger.warn("invalid message payload recieved: " + elem);
@@ -70,7 +70,7 @@ public class WSNotificationProcessingCon
public void onSubscription(ProcessingContext context, OMElement subscribeElement) {
context.setContextParameter(ContextParameters.SUBSCRIBE_ELEMENT, subscribeElement);
- OMElement consumerReference = subscribeElement.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ OMElement consumerReference = subscribeElement.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), "ConsumerReference"));
if (consumerReference == null) {
logger.warn("unable to find consumer reference" + " in subscribe message: " + subscribeElement);
@@ -87,7 +87,7 @@ public class WSNotificationProcessingCon
return;
}
- OMElement topicExpression = subscribeElement.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ OMElement topicExpression = subscribeElement.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), "TopicExpression"));
if (topicExpression != null) { // topic can be null
@@ -96,21 +96,21 @@ public class WSNotificationProcessingCon
}
- OMElement useNotify = subscribeElement.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ OMElement useNotify = subscribeElement.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), "UseNotify"));
if (useNotify != null) {
context.setContextParameter(ContextParameters.USE_NOTIFY_ELEMENT, useNotify);
}
- OMElement selector = subscribeElement.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ OMElement selector = subscribeElement.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), "Selector"));
if (selector != null) {
context.setContextParameter(ContextParameters.XPATH_ELEMENT, selector);
}
- OMElement subscriptionPolicy = subscribeElement.getFirstChildWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ OMElement subscriptionPolicy = subscribeElement.getFirstChildWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), WsmgCommonConstants.SUBSCRIPTION_POLICY));
if (subscriptionPolicy != null) {
@@ -143,7 +143,7 @@ public class WSNotificationProcessingCon
switch (operation) {
case SUBSCRIBE: {
- Iterator<OMElement> iterator = soapBody.getChildrenWithName(new QName(WsmgNameSpaceConstants.WSNT_NS
+ Iterator<OMElement> iterator = soapBody.getChildrenWithName(new QName(NameSpaceConstants.WSNT_NS
.getNamespaceURI(), "SubscribeRequest"));
if (!iterator.hasNext()) {
throw new RuntimeException("invalid message context - unable to find Subscribe information");
@@ -165,7 +165,7 @@ public class WSNotificationProcessingCon
private void extractInfoFromHeader(ProcessingContext context, SOAPHeader header) {
- Iterator ite = header.getChildrenWithName(new QName(WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI(),
+ Iterator ite = header.getChildrenWithName(new QName(NameSpaceConstants.WSNT_NS.getNamespaceURI(),
WsmgCommonConstants.SUBSCRIPTION_ID));
if (ite.hasNext()) {
OMElement identifier = (OMElement) ite.next();
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java Thu Sep 22 18:17:28 2011
@@ -57,7 +57,13 @@ import org.slf4j.LoggerFactory;
public class WsmgPersistantStorage implements WsmgStorage {
private static final Logger logger = LoggerFactory.getLogger(WsmgPersistantStorage.class);
- private static final String TABLE_NAME_TO_CHECK = "subscription";
+ /*
+ * Table name
+ */
+ public static final String TABLE_NAME_EXPIRABLE_SUBCRIPTIONS = "subscription";
+ public static final String TABLE_NAME_NON_EXPIRABLE_SUBCRIPTIONS = "specialSubscription";
+
+ private static final String TABLE_NAME_TO_CHECK = TABLE_NAME_EXPIRABLE_SUBCRIPTIONS;
private Counter storeToDBCounter = new Counter();
@@ -67,7 +73,7 @@ public class WsmgPersistantStorage imple
public WsmgPersistantStorage(String jdbcUrl, String jdbcDriver) {
- this.dbName = WsmgCommonConstants.TABLE_NAME_EXPIRABLE_SUBCRIPTIONS;
+ this.dbName = TABLE_NAME_EXPIRABLE_SUBCRIPTIONS;
db = new JdbcStorage(jdbcUrl, jdbcDriver);
@@ -86,10 +92,10 @@ public class WsmgPersistantStorage imple
// inject dbname to sql statement.
SubscriptionConstants.ORDINARY_SUBSCRIPTION_INSERT_QUERY = String.format(
- SubscriptionConstants.INSERT_SQL_QUERY, WsmgCommonConstants.TABLE_NAME_EXPIRABLE_SUBCRIPTIONS);
+ SubscriptionConstants.INSERT_SQL_QUERY, TABLE_NAME_EXPIRABLE_SUBCRIPTIONS);
SubscriptionConstants.SPECIAL_SUBSCRIPTION_INSERT_QUERY = String.format(
- SubscriptionConstants.INSERT_SQL_QUERY, WsmgCommonConstants.TABLE_NAME_NON_EXPIRABLE_SUBCRIPTIONS);
+ SubscriptionConstants.INSERT_SQL_QUERY, TABLE_NAME_NON_EXPIRABLE_SUBCRIPTIONS);
if (WSMGParameter.measureMessageRate) {
TimerThread timerThread = new TimerThread(storeToDBCounter, " StoreSubScriptionToDBCounter");
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/SenderUtils.java Thu Sep 22 18:17:28 2011
@@ -30,7 +30,7 @@ import org.apache.airavata.wsmg.broker.A
import org.apache.airavata.wsmg.broker.ConsumerInfo;
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.airavata.wsmg.commons.config.ConfigurationManager;
import org.apache.airavata.wsmg.config.WSMGParameter;
import org.apache.airavata.wsmg.messenger.protocol.Axis2Protocol;
@@ -145,10 +145,10 @@ public class SenderUtils {
public OMElement wrapRawMessageToWsntWrappedFormat(OMElement rawNotif,
AdditionalMessageContent additionalMessageContent) {
- OMElement fullNotif = factory.createOMElement("Notify", WsmgNameSpaceConstants.WSNT_NS);
+ OMElement fullNotif = factory.createOMElement("Notify", NameSpaceConstants.WSNT_NS);
OMElement notificationMessageEl = factory.createOMElement("NotificationMessage",
- WsmgNameSpaceConstants.WSNT_NS, fullNotif);
+ NameSpaceConstants.WSNT_NS, fullNotif);
String topicElString = additionalMessageContent.getTopicElement();
if (topicElString != null) {
@@ -171,7 +171,7 @@ public class SenderUtils {
notificationMessageEl.addChild(producerReferenceEl);
}
- OMElement messageEl = factory.createOMElement("Message", WsmgNameSpaceConstants.WSNT_NS, notificationMessageEl);
+ OMElement messageEl = factory.createOMElement("Message", NameSpaceConstants.WSNT_NS, notificationMessageEl);
messageEl.addChild(rawNotif);
return fullNotif;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/Axis2Protocol.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/Axis2Protocol.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/Axis2Protocol.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/messenger/protocol/Axis2Protocol.java Thu Sep 22 18:17:28 2011
@@ -30,7 +30,7 @@ import javax.xml.stream.XMLStreamExcepti
import org.apache.airavata.wsmg.broker.AdditionalMessageContent;
import org.apache.airavata.wsmg.broker.ConsumerInfo;
import org.apache.airavata.wsmg.commons.CommonRoutines;
-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.util.ElementHelper;
@@ -67,7 +67,7 @@ public class Axis2Protocol implements De
String actionString = null;
List<OMElement> soapHeaders = new LinkedList<OMElement>();
if (consumerInfo.getType().compareTo("wsnt") == 0) {
- actionString = WsmgNameSpaceConstants.WSNT_NS.getNamespaceURI() + "/Notify";
+ actionString = NameSpaceConstants.WSNT_NS.getNamespaceURI() + "/Notify";
} else { // wse
actionString = additionalMessageContent.getAction();
String topicElString = additionalMessageContent.getTopicElement();
@@ -114,12 +114,12 @@ public class Axis2Protocol implements De
ServiceClient client = getServiceClient();
- SOAPHeaderBlock msgIdEl = soapfactory.createSOAPHeaderBlock("MessageID", WsmgNameSpaceConstants.WSA_NS);
+ SOAPHeaderBlock msgIdEl = soapfactory.createSOAPHeaderBlock("MessageID", NameSpaceConstants.WSA_NS);
msgIdEl.setText(msgId);
- SOAPHeaderBlock actionEl = soapfactory.createSOAPHeaderBlock("Action", WsmgNameSpaceConstants.WSA_NS);
+ SOAPHeaderBlock actionEl = soapfactory.createSOAPHeaderBlock("Action", NameSpaceConstants.WSA_NS);
actionEl.setText(action);
- SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", WsmgNameSpaceConstants.WSA_NS);
+ SOAPHeaderBlock to = soapfactory.createSOAPHeaderBlock("To", NameSpaceConstants.WSA_NS);
to.setText(consumerLocation.getAddress());
client.addHeader(actionEl);
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/BrokerUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/BrokerUtilTest.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/BrokerUtilTest.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/test/java/org/apache/airavata/wsmg/util/BrokerUtilTest.java Thu Sep 22 18:17:28 2011
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
import junit.framework.TestCase;
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.util.BrokerUtil;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -121,7 +121,7 @@ public class BrokerUtilTest extends Test
OMNamespace ns = factory.createOMNamespace("unit_test", "jnt");
OMElement xpathEl = factory.createOMElement("TestXpath", ns);
- xpathEl.addAttribute("Dialect", dialect, WsmgNameSpaceConstants.WSE_NS);
+ xpathEl.addAttribute("Dialect", dialect, NameSpaceConstants.WSE_NS);
xpathEl.setText(xpathExpression);
@@ -140,7 +140,7 @@ public class BrokerUtilTest extends Test
OMNamespace ns = factory.createOMNamespace("unit_test", "jnt");
OMElement xpathEl = factory.createOMElement("TestXpath", ns);
- xpathEl.addAttribute("Dialect", dialect, WsmgNameSpaceConstants.WSE_NS);
+ xpathEl.addAttribute("Dialect", dialect, NameSpaceConstants.WSE_NS);
xpathEl.setText(xpathExpression);
assertEquals(xpathExpression, BrokerUtil.getXPathString(xpathEl));
Modified: incubator/airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java?rev=1174298&r1=1174297&r2=1174298&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/samples/messagebox/messagebox-create-store-take-delete/src/org/apache/airavata/wsmg/samples/msgBox/SimpleMsgBoxExec.java Thu Sep 22 18:17:28 2011
@@ -84,8 +84,10 @@ public class SimpleMsgBoxExec {
}
}
+ /*
System.out.println("Delete message box response : "
+ client.deleteMsgBox(msgBoxEpr, 500L));
+ */
}
}