Author: smarru
Date: Mon Dec 3 21:28:11 2012
New Revision: 1416673
URL: http://svn.apache.org/viewvc?rev=1416673&view=rev
Log:
updating schema constants for wec and wft
Modified:
airavata/trunk/modules/commons/workflow-execution-context/src/test/resources/result.xml
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
airavata/trunk/modules/ws-messenger/message-monitor/src/main/java/org/apache/airavata/ws/monitor/MonitorUtil.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java
Modified:
airavata/trunk/modules/commons/workflow-execution-context/src/test/resources/result.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-execution-context/src/test/resources/result.xml?rev=1416673&r1=1416672&r2=1416673&view=diff
==============================================================================
---
airavata/trunk/modules/commons/workflow-execution-context/src/test/resources/result.xml
(original)
+++
airavata/trunk/modules/commons/workflow-execution-context/src/test/resources/result.xml
Mon Dec 3 21:28:11 2012
@@ -7,7 +7,7 @@
the License. -->
<wor:context-header
-
xmlns:wor="http://schemas.airavata.apache.org/workflow-execution-context";>
+ xmlns:wor="http://airavata.apache.org/schemas/wec/2012/05";>
<wor:soa-service-eprs>
<wor:gfac-url>gfacurl</wor:gfac-url>
<wor:registry-url>registryurl</wor:registry-url>
Modified:
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1416673&r1=1416672&r2=1416673&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
(original)
+++
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
Mon Dec 3 21:28:11 2012
@@ -340,7 +340,7 @@ public class GFacMessageReciever impleme
private String getEventBrokerURL(MessageContext context) {
SOAPHeader header = context.getEnvelope().getHeader();
OMElement contextHeader = header.getFirstChildWithName(new QName(
-
"http://schemas.airavata.apache.org/workflow-execution-context";,
"context-header"));
+ "http://airavata.apache.org/schemas/wec/2012/05";,
"context-header"));
String address = null;
try {
ContextHeaderDocument document =
ContextHeaderDocument.Factory.parse(contextHeader.toStringWithConsume());
@@ -370,7 +370,7 @@ public class GFacMessageReciever impleme
private OMElement getHeader(MessageContext context) {
SOAPHeader header = context.getEnvelope().getHeader();
OMElement contextHeader = header.getFirstChildWithName(new QName(
-
"http://schemas.airavata.apache.org/workflow-execution-context";,
"context-header"));
+ "http://airavata.apache.org/schemas/wec/2012/05";,
"context-header"));
return contextHeader;
}
}
Modified:
airavata/trunk/modules/ws-messenger/message-monitor/src/main/java/org/apache/airavata/ws/monitor/MonitorUtil.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/message-monitor/src/main/java/org/apache/airavata/ws/monitor/MonitorUtil.java?rev=1416673&r1=1416672&r2=1416673&view=diff
==============================================================================
---
airavata/trunk/modules/ws-messenger/message-monitor/src/main/java/org/apache/airavata/ws/monitor/MonitorUtil.java
(original)
+++
airavata/trunk/modules/ws-messenger/message-monitor/src/main/java/org/apache/airavata/ws/monitor/MonitorUtil.java
Mon Dec 3 21:28:11 2012
@@ -45,7 +45,7 @@ public class MonitorUtil {
* Workflow tracking namespace
*/
public static final XmlNamespace WOR_NS =
XMLUtil.BUILDER.newNamespace("wor",
- "http://airavata.apache.org/schemas/workflow_tracking_types";);
+ "http://airavata.apache.org/schemas/wft/2011/08";);
/**
* XBaya events namespace
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1416673&r1=1416672&r2=1416673&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
Mon Dec 3 21:28:11 2012
@@ -221,7 +221,7 @@ public class WorkflowInterpretorSkeleton
public java.lang.String launchWorkflow(java.lang.String
workflowAsString, java.lang.String topic, NameValue[] inputs) throws
XMLStreamException {
OMElement workflowContext = getWorkflowContextHeader();
if(workflowContext == null){
- workflowContext = AXIOMUtil.stringToOM("<wor:context-header
xmlns:wor=\"http://schemas.airavata.apache.org/workflow-execution-context\";>\n"
+
+ workflowContext = AXIOMUtil.stringToOM("<wor:context-header
xmlns:wor=\"http://airavata.apache.org/schemas/wec/2012/05\";>\n" +
" <wor:soa-service-eprs>\n" +
" <wor:gfac-url></wor:gfac-url>\n" +
" <wor:registry-url></wor:registry-url>\n" +
@@ -263,7 +263,7 @@ public class WorkflowInterpretorSkeleton
private OMElement getWorkflowContextHeader() {
MessageContext currentMessageContext =
MessageContext.getCurrentMessageContext();
SOAPHeader header = currentMessageContext.getEnvelope().getHeader();
- Iterator childrenWithName = header.getChildrenWithName(new
QName("http://schemas.airavata.apache.org/workflow-execution-context";,
"context-header"));
+ Iterator childrenWithName = header.getChildrenWithName(new
QName("http://airavata.apache.org/schemas/wec/2012/05";, "context-header"));
if (childrenWithName.hasNext()) {
return (OMElement) childrenWithName.next();
} else {
Modified:
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java?rev=1416673&r1=1416672&r2=1416673&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTrackingTest.java
Mon Dec 3 21:28:11 2012
@@ -49,7 +49,7 @@ public class WorkflowTrackingTest implem
public void handleNotification(SOAPEnvelope msgEnvelope) {
logger.info("Received " + msgEnvelope);
- String message = "<?xml version='1.0'
encoding='utf-8'?><soapenv:Envelope
xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\";><soapenv:Header><wsa:Action
xmlns:wsa=\"http://www.w3.org/2005/08/addressing\";>http://org.apache.airavata/WseNotification</wsa:Action><wsa:MessageID
xmlns:wsa=\"http://www.w3.org/2005/08/addressing\"; /><wsa:To
xmlns:wsa=\"http://www.w3.org/2005/08/addressing\";>http://140.182.151.20:61436/axis2/services/ConsumerService/</wsa:To><wsnt:Topic
xmlns:wsnt=\"http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification\";
xmlns:ns2=\"http://tutorial.globus.org/auction\";
Dialect=\"http://www.ibm.com/xmlns/stdwip/web-services/WS-Topics/TopicExpression/simple\";>ns2:abc</wsnt:Topic></soapenv:Header><soapenv:Body><wor:workflowInvoked
xmlns:wor=\"http://airavata.apache.org/schemas/workflow_tracking_types\";
infoModelVersion=\"2.6\"><wor:notificationSource wor:serviceID=\"abc\"
/><wor:timestamp>2011-12-20T14:47:33.736-05:00</wor:timestamp><wor:desc
ription>Workflow Started</wor:description><wor:annotation /><wor:initiator
wor:serviceID=\"abc\"
/></wor:workflowInvoked></soapenv:Body></soapenv:Envelope>";
+ String message = "<?xml version='1.0'
encoding='utf-8'?><soapenv:Envelope
xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\";><soapenv:Header><wsa:Action
xmlns:wsa=\"http://www.w3.org/2005/08/addressing\";>http://org.apache.airavata/WseNotification</wsa:Action><wsa:MessageID
xmlns:wsa=\"http://www.w3.org/2005/08/addressing\"; /><wsa:To
xmlns:wsa=\"http://www.w3.org/2005/08/addressing\";>http://140.182.151.20:61436/axis2/services/ConsumerService/</wsa:To><wsnt:Topic
xmlns:wsnt=\"http://www.ibm.com/xmlns/stdwip/web-services/WS-BaseNotification\";
xmlns:ns2=\"http://tutorial.globus.org/auction\";
Dialect=\"http://www.ibm.com/xmlns/stdwip/web-services/WS-Topics/TopicExpression/simple\";>ns2:abc</wsnt:Topic></soapenv:Header><soapenv:Body><wor:workflowInvoked
xmlns:wor=\"http://airavata.apache.org/schemas/wft/2011/08\";
infoModelVersion=\"2.6\"><wor:notificationSource wor:serviceID=\"abc\"
/><wor:timestamp>2011-12-20T14:47:33.736-05:00</wor:timestamp><wor:description>Work
flow Started</wor:description><wor:annotation /><wor:initiator
wor:serviceID=\"abc\"
/></wor:workflowInvoked></soapenv:Body></soapenv:Envelope>";
Assert.assertEquals(message,msgEnvelope);
}
