You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2011/10/31 07:48:31 UTC
svn commit: r1195355 [3/14] - in /incubator/airavata/trunk/modules:
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/
commons/registry-api/src/main/java/org...
Modified: incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/XMLUtil.java Mon Oct 31 06:48:11 2011
@@ -495,85 +495,77 @@ public class XMLUtil {
public static boolean isEqual(XmlElement elem1, XmlElement elem2) throws Exception {
- if (elem1 == null && elem2 == null) {
- return true;
- } else if (elem1 == null) {
- return false;
- } else if (elem2 == null) {
- return false;
- }
+ if (elem1 == null && elem2 == null) {
+ return true;
+ } else if (elem1 == null) {
+ return false;
+ } else if (elem2 == null) {
+ return false;
+ }
- if (!elem1.getName().equals(elem2.getName())) {
- return false;
- } else {
- // now check if children are the same
- Iterator children1 = elem1.children().iterator();
- Iterator children2 = elem2.children().iterator();
-
- //check first ones for string
- Object child1 = null;
- Object child2 = null;
- if (children1.hasNext() && children2.hasNext()) {
- child1 = children1.next();
- child2 = children2.next();
-
- if (!children1.hasNext() && !children2.hasNext()) {
- //only one node could be string could be xmlelement
- return compareObjs(child1, child2);
- } else {
- //get new iterators
+ if (!elem1.getName().equals(elem2.getName())) {
+ return false;
+ } else {
+ // now check if children are the same
+ Iterator children1 = elem1.children().iterator();
+ Iterator children2 = elem2.children().iterator();
+
+ // check first ones for string
+ Object child1 = null;
+ Object child2 = null;
+ if (children1.hasNext() && children2.hasNext()) {
+ child1 = children1.next();
+ child2 = children2.next();
+
+ if (!children1.hasNext() && !children2.hasNext()) {
+ // only one node could be string could be xmlelement
+ return compareObjs(child1, child2);
+ } else {
+ // get new iterators
- List<XmlElement> elemSet1 = getXmlElementsOnly(elem1.children().iterator());
- List<XmlElement> elemSet2 = getXmlElementsOnly(elem2.children().iterator());
+ List<XmlElement> elemSet1 = getXmlElementsOnly(elem1.children().iterator());
+ List<XmlElement> elemSet2 = getXmlElementsOnly(elem2.children().iterator());
- if(elemSet1.size() != elemSet2.size()){
+ if (elemSet1.size() != elemSet2.size()) {
+ return false;
+ }
+ for (int i = 0; i < elemSet1.size(); ++i) {
+ if (!isEqual(elemSet1.get(i), elemSet2.get(i))) {
return false;
}
- for(int i =0; i< elemSet1.size(); ++i){
- if(!isEqual(elemSet1.get(i), elemSet2.get(i))){
- return false;
- }
- }
- return true;
}
-
-
- }else {
- //no internal element
-
return true;
}
- }
-
-
- }
-
+ } else {
+ // no internal element
- private static List<XmlElement> getXmlElementsOnly(Iterator itr){
- LinkedList<XmlElement> list = new LinkedList<XmlElement>();
- while(itr.hasNext()){
- Object obj = itr.next();
- if(obj instanceof XmlElement){
- list.add((XmlElement) obj);
- }
+ return true;
}
- return list;
}
+ }
-
- private static boolean compareObjs(Object child1, Object child2) throws Exception {
- if (child1 instanceof String && child2 instanceof String) {
- return child1.equals(child2);
-
-
- } else if (child1 instanceof XmlElement && child2 instanceof XmlElement) {
- return isEqual((XmlElement) child1, (XmlElement) child2);
- } else {
- return false;
+ private static List<XmlElement> getXmlElementsOnly(Iterator itr) {
+ LinkedList<XmlElement> list = new LinkedList<XmlElement>();
+ while (itr.hasNext()) {
+ Object obj = itr.next();
+ if (obj instanceof XmlElement) {
+ list.add((XmlElement) obj);
}
}
+ return list;
+ }
+ private static boolean compareObjs(Object child1, Object child2) throws Exception {
+ if (child1 instanceof String && child2 instanceof String) {
+ return child1.equals(child2);
+
+ } else if (child1 instanceof XmlElement && child2 instanceof XmlElement) {
+ return isEqual((XmlElement) child1, (XmlElement) child2);
+ } else {
+ return false;
+ }
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/XMLUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/XMLUtilTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/XMLUtilTest.java (original)
+++ incubator/airavata/trunk/modules/commons/utils/src/test/java/org/apache/airavata/common/utils/XMLUtilTest.java Mon Oct 31 06:48:11 2011
@@ -20,7 +20,6 @@
*/
package org.apache.airavata.common.utils;
-import org.apache.airavata.common.utils.XMLUtil;
import org.junit.Test;
Modified: incubator/airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java Mon Oct 31 06:48:11 2011
@@ -21,7 +21,14 @@
package org.apache.airavata.common.workflow.execution.context;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.schemas.wec.*;
+import org.apache.airavata.schemas.wec.ApplicationOutputDataHandlingDocument;
+import org.apache.airavata.schemas.wec.ApplicationSchedulingContextDocument;
+import org.apache.airavata.schemas.wec.ContextHeaderDocument;
+import org.apache.airavata.schemas.wec.SecurityContextDocument;
+import org.apache.airavata.schemas.wec.SoaServiceEprsDocument;
+import org.apache.airavata.schemas.wec.WorkflowMonitoringContextDocument;
+import org.apache.airavata.schemas.wec.WorkflowOutputDataHandlingDocument;
+import org.apache.airavata.schemas.wec.WorkflowSchedulingContextDocument;
import org.xmlpull.v1.builder.XmlElement;
public class WorkflowContextHeaderBuilder {
Modified: incubator/airavata/trunk/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-execution-context/src/test/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilderTest.java Mon Oct 31 06:48:11 2011
@@ -20,12 +20,11 @@
*/
package org.apache.airavata.common.workflow.execution.context;
+import java.io.File;
+
import org.apache.airavata.common.utils.XMLUtil;
-import org.junit.Assert;
import org.junit.Test;
-import java.io.File;
-
public class WorkflowContextHeaderBuilderTest {
@Test
public void testExecute() {
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/common/InvocationEntity.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/common/InvocationEntity.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/common/InvocationEntity.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/common/InvocationEntity.java Mon Oct 31 06:48:11 2011
@@ -21,10 +21,10 @@
package org.apache.airavata.workflow.tracking.common;
-import org.apache.airavata.workflow.tracking.types.BaseIDType;
-
import java.net.URI;
+import org.apache.airavata.workflow.tracking.types.BaseIDType;
+
public interface InvocationEntity {
public String getWorkflowNodeID();
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/NotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/NotifierImpl.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/NotifierImpl.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/NotifierImpl.java Mon Oct 31 06:48:11 2011
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.apache.airavata.commons.LeadCrosscutParametersUtil;
import org.apache.airavata.workflow.tracking.Notifier;
import org.apache.airavata.workflow.tracking.common.DataDurationObj;
import org.apache.airavata.workflow.tracking.common.DataObj;
@@ -35,7 +34,16 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.impl.state.DataDurationImpl;
import org.apache.airavata.workflow.tracking.impl.state.DataObjImpl;
import org.apache.airavata.workflow.tracking.impl.state.DurationImpl;
-import org.apache.airavata.workflow.tracking.types.*;
+import org.apache.airavata.workflow.tracking.types.ApplicationAuditDocument;
+import org.apache.airavata.workflow.tracking.types.ApplicationAuditType;
+import org.apache.airavata.workflow.tracking.types.ComputationDurationDocument;
+import org.apache.airavata.workflow.tracking.types.DataReceiveDurationDocument;
+import org.apache.airavata.workflow.tracking.types.DataSendDurationDocument;
+import org.apache.airavata.workflow.tracking.types.DataTransferDurationType;
+import org.apache.airavata.workflow.tracking.types.JobStatusDocument;
+import org.apache.airavata.workflow.tracking.types.JobStatusType;
+import org.apache.airavata.workflow.tracking.types.ResourceMappingDocument;
+import org.apache.airavata.workflow.tracking.types.ResourceMappingType;
/**
* DOES NOT SUPPORT MULTI_THREADING -- PUBLISHER QUEUE, DATA CONSUMED/PRODUCED BATCHING * Utility to create and send
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/publish/WSMPublisher.java Mon Oct 31 06:48:11 2011
@@ -57,7 +57,7 @@ public class WSMPublisher extends Abstra
public WSMPublisher(int capacity, boolean defaultAsync, String brokerLoc, String topic) throws IOException {
super(capacity, defaultAsync);
broker = new WseMsgBrokerClient();
- brokerEpr = broker.createEndpointReference(brokerLoc, topic);
+ brokerEpr = WseMsgBrokerClient.createEndpointReference(brokerLoc, topic);
broker.init(brokerEpr.getAddress());
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/state/InvocationEntityImpl.java Mon Oct 31 06:48:11 2011
@@ -24,7 +24,6 @@ package org.apache.airavata.workflow.tra
import java.net.URI;
import org.apache.airavata.workflow.tracking.common.InvocationEntity;
-import org.apache.airavata.workflow.tracking.common.WorkflowTrackingContext;
import org.apache.airavata.workflow.tracking.types.BaseIDType;
public class InvocationEntityImpl implements InvocationEntity {
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/samples/listener/Listener.java Mon Oct 31 06:48:11 2011
@@ -82,7 +82,7 @@ public class Listener {
}
WseMsgBrokerClient publisher = new WseMsgBrokerClient();
- EndpointReference endpointRef = publisher.createEndpointReference(brokerLocation, topic);
+ EndpointReference endpointRef = WseMsgBrokerClient.createEndpointReference(brokerLocation, topic);
publisher.init(endpointRef.getAddress());
try {
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/MessageUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/MessageUtil.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/MessageUtil.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/util/MessageUtil.java Mon Oct 31 06:48:11 2011
@@ -70,7 +70,36 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.common.AnnotationProps;
import org.apache.airavata.workflow.tracking.common.ConstructorConsts;
import org.apache.airavata.workflow.tracking.common.ConstructorProps;
-import org.apache.airavata.workflow.tracking.types.*;
+import org.apache.airavata.workflow.tracking.types.ApplicationAuditDocument;
+import org.apache.airavata.workflow.tracking.types.ComputationDurationDocument;
+import org.apache.airavata.workflow.tracking.types.DataConsumedDocument;
+import org.apache.airavata.workflow.tracking.types.DataProducedDocument;
+import org.apache.airavata.workflow.tracking.types.DataReceiveDurationDocument;
+import org.apache.airavata.workflow.tracking.types.DataSendDurationDocument;
+import org.apache.airavata.workflow.tracking.types.InvokingServiceDocument;
+import org.apache.airavata.workflow.tracking.types.InvokingServiceFailedDocument;
+import org.apache.airavata.workflow.tracking.types.InvokingServiceSucceededDocument;
+import org.apache.airavata.workflow.tracking.types.JobStatusDocument;
+import org.apache.airavata.workflow.tracking.types.LogDebugDocument;
+import org.apache.airavata.workflow.tracking.types.LogExceptionDocument;
+import org.apache.airavata.workflow.tracking.types.LogInfoDocument;
+import org.apache.airavata.workflow.tracking.types.LogWarningDocument;
+import org.apache.airavata.workflow.tracking.types.PublishURLDocument;
+import org.apache.airavata.workflow.tracking.types.ReceivedFaultDocument;
+import org.apache.airavata.workflow.tracking.types.ReceivedResultDocument;
+import org.apache.airavata.workflow.tracking.types.ResourceMappingDocument;
+import org.apache.airavata.workflow.tracking.types.SendingFaultDocument;
+import org.apache.airavata.workflow.tracking.types.SendingResponseFailedDocument;
+import org.apache.airavata.workflow.tracking.types.SendingResponseSucceededDocument;
+import org.apache.airavata.workflow.tracking.types.SendingResultDocument;
+import org.apache.airavata.workflow.tracking.types.ServiceInitializedDocument;
+import org.apache.airavata.workflow.tracking.types.ServiceInvokedDocument;
+import org.apache.airavata.workflow.tracking.types.ServiceTerminatedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowInitializedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowInvokedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowPausedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowResumedDocument;
+import org.apache.airavata.workflow.tracking.types.WorkflowTerminatedDocument;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.xmlbeans.XmlAnySimpleType;
import org.apache.xmlbeans.XmlCalendar;
@@ -466,6 +495,7 @@ public class MessageUtil {
paramValue = paramValue_;
}
+ @Override
public String toString() {
return paramName + "<" + paramType + ">=[" + paramValue + "]";
}
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Mon Oct 31 06:48:11 2011
@@ -85,7 +85,7 @@ public class GFacService implements Serv
* Add dispatcher and security handler to inFlowPhases
*/
for (Iterator<Phase> iterator = phases.iterator(); iterator.hasNext();) {
- Phase phase = (Phase) iterator.next();
+ Phase phase = iterator.next();
if ("Security".equals(phase.getPhaseName())) {
phase.addHandler(new MyProxySecurityHandler());
phase.addHandler(new AmazonSecurityHandler());
@@ -155,6 +155,7 @@ public class GFacService implements Serv
this.context = context;
}
+ @Override
public void run() {
try {
while (true) {
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/dispatchers/GFacURIBasedDispatcher.java Mon Oct 31 06:48:11 2011
@@ -47,6 +47,7 @@ public class GFacURIBasedDispatcher exte
*
* @see org.apache.axis2.engine.AbstractDispatcher#findService(org.apache.axis2.context.MessageContext)
*/
+ @Override
public AxisService findService(MessageContext messageContext) throws AxisFault {
EndpointReference toEPR = messageContext.getTo();
if (toEPR != null) {
@@ -88,6 +89,7 @@ public class GFacURIBasedDispatcher exte
return null;
}
+ @Override
public void initDispatcher() {
init(new HandlerDescription(NAME));
}
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Mon Oct 31 06:48:11 2011
@@ -206,7 +206,8 @@ public class GFacMessageReciever impleme
// List<Parameter> outputs = serviceDescription.getOutputParameters();
for (OutputParameterType parameter : newOutputs) {
- outputParam.add(parameter.getParameterName(), new ActualParameter(parameter.getParameterType().schemaType()));
+ outputParam.add(parameter.getParameterName(), new ActualParameter(parameter.getParameterType()
+ .schemaType()));
}
invocationContext.setInput(inputParam);
@@ -308,12 +309,12 @@ public class GFacMessageReciever impleme
*/
private OMElement getWSDL(ConfigurationContext context, String serviceName) throws XMLStreamException {
String WSDL = null;
- try {
- WSDL = getRegistry(context).getWSDL(serviceName);
- } catch (RegistryException e) {
- //TODO this scenario occur if the service is not present in the registry.
- //someone should handle this
- }
+ try {
+ WSDL = getRegistry(context).getWSDL(serviceName);
+ } catch (RegistryException e) {
+ // TODO this scenario occur if the service is not present in the registry.
+ // someone should handle this
+ }
XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(WSDL));
StAXOMBuilder builder = new StAXOMBuilder(reader);
OMElement wsdlElement = builder.getDocumentElement();
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/util/GFacServiceOperations.java Mon Oct 31 06:48:11 2011
@@ -30,6 +30,7 @@ public enum GFacServiceOperations {
name = n;
}
+ @Override
public String toString() {
return name;
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/invocation/impl/DefaultExecutionContext.java Mon Oct 31 06:48:11 2011
@@ -21,11 +21,11 @@
package org.apache.airavata.core.gfac.context.invocation.impl;
-import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.core.gfac.context.invocation.ExecutionContext;
import org.apache.airavata.core.gfac.notification.GFacNotifiable;
import org.apache.airavata.core.gfac.notification.GFacNotifier;
import org.apache.airavata.core.gfac.notification.impl.DefaultNotifier;
+import org.apache.airavata.registry.api.Registry;
/**
* DefaultExecutionContext is a simple implementation of ExecutionContext. It uses DefaultNotifier as its base notifier.
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java Mon Oct 31 06:48:11 2011
@@ -25,7 +25,6 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Iterator;
import java.util.Map;
import org.apache.airavata.commons.gfac.type.ActualParameter;
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Mon Oct 31 06:48:11 2011
@@ -27,7 +27,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
@@ -40,6 +39,7 @@ import org.apache.airavata.core.gfac.ext
import org.apache.airavata.core.gfac.extension.PreExecuteChain;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
import org.apache.airavata.core.gfac.utils.LogUtils;
+import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.impl.JCRRegistry;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java Mon Oct 31 06:48:11 2011
@@ -17,9 +17,16 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
package org.apache.airavata.test.suite.gfac;
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -31,19 +38,18 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
import org.apache.airavata.registry.api.impl.JCRRegistry;
-import org.apache.airavata.schemas.gfac.*;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.InputParameterType;
+import org.apache.airavata.schemas.gfac.OutputParameterType;
+import org.apache.airavata.schemas.gfac.ParameterType;
+import org.apache.airavata.schemas.gfac.ProjectAccountType;
+import org.apache.airavata.schemas.gfac.StringParameterType;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import static org.junit.Assert.fail;
-
public class GramProviderTest {
public static final String MYPROXY = "myproxy";
@@ -52,15 +58,14 @@ public class GramProviderTest {
@Before
public void setUp() throws Exception {
/*
- * Create database
- */
- JCRRegistry jcrRegistry = new JCRRegistry(null,
- "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
+ * Create database
+ */
+ JCRRegistry jcrRegistry = new JCRRegistry(null, "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
"admin", null);
/*
- * Host
- */
+ * Host
+ */
URL url = this.getClass().getClassLoader().getResource(GRAM_PROPERTIES);
Properties properties = new Properties();
@@ -69,14 +74,16 @@ public class GramProviderTest {
host.getType().changeType(GlobusHostType.type);
host.getType().setHostName(properties.getProperty("gram.name"));
host.getType().setHostAddress(properties.getProperty("gram.host"));
- ((GlobusHostType) host.getType()).setGridFTPEndPointArray(new String[]{properties.getProperty("gridftp.endpoint")});
- ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[]{properties.getProperty("globus.endpoints")});
-
+ ((GlobusHostType) host.getType()).setGridFTPEndPointArray(new String[] { properties
+ .getProperty("gridftp.endpoint") });
+ ((GlobusHostType) host.getType()).setGlobusGateKeeperEndPointArray(new String[] { properties
+ .getProperty("globus.endpoints") });
/*
- * App
- */
- ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(GramApplicationDeploymentType.type);
+ * App
+ */
+ ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(
+ GramApplicationDeploymentType.type);
GramApplicationDeploymentType app = (GramApplicationDeploymentType) appDesc.getType();
app.setCpuCount(1);
app.setNodeCount(1);
@@ -84,12 +91,13 @@ public class GramProviderTest {
name.setStringValue("EchoLocal");
app.setExecutableLocation("/bin/echo");
app.setCpuCount(1);
- ProjectAccountType projectAccountType = ((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
+ ProjectAccountType projectAccountType = ((GramApplicationDeploymentType) appDesc.getType())
+ .addNewProjectAccount();
projectAccountType.setProjectAccountNumber(properties.getProperty("project.name"));
/*
- * Service
- */
+ * Service
+ */
ServiceDescription serv = new ServiceDescription();
serv.getType().setName("SimpleEcho");
@@ -98,22 +106,20 @@ public class GramProviderTest {
parameterType.setName("echo_input");
List<InputParameterType> inputList = new ArrayList<InputParameterType>();
inputList.add(input);
- InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList
- .size()]);
+ InputParameterType[] inputParamList = inputList.toArray(new InputParameterType[inputList.size()]);
OutputParameterType output = OutputParameterType.Factory.newInstance();
ParameterType parameterType1 = output.addNewParameterType();
parameterType1.setName("echo_output");
List<OutputParameterType> outputList = new ArrayList<OutputParameterType>();
outputList.add(output);
- OutputParameterType[] outputParamList = outputList
- .toArray(new OutputParameterType[outputList.size()]);
+ OutputParameterType[] outputParamList = outputList.toArray(new OutputParameterType[outputList.size()]);
serv.getType().setInputParametersArray(inputParamList);
serv.getType().setOutputParametersArray(outputParamList);
/*
- * Save to registry
- */
+ * Save to registry
+ */
jcrRegistry.saveHostDescription(host);
jcrRegistry.saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
jcrRegistry.saveServiceDescription(serv);
@@ -132,7 +138,6 @@ public class GramProviderTest {
ec.addNotifiable(new LoggingNotification());
ct.setExecutionContext(ec);
-
GSISecurityContext gsiSecurityContext = new GSISecurityContext();
gsiSecurityContext.setMyproxyServer(properties.getProperty("myproxy.server"));
gsiSecurityContext.setMyproxyUserName(properties.getProperty("myproxy.username"));
@@ -145,16 +150,16 @@ public class GramProviderTest {
ct.setServiceName("SimpleEcho");
/*
- * Input
- */
+ * Input
+ */
ParameterContextImpl input = new ParameterContextImpl();
ActualParameter echo_input = new ActualParameter();
((StringParameterType) echo_input.getType()).setValue("echo_output=hello");
input.add("echo_input", echo_input);
/*
- * Output
- */
+ * Output
+ */
ParameterContextImpl output = new ParameterContextImpl();
ActualParameter echo_output = new ActualParameter();
output.add("echo_output", echo_output);
@@ -169,8 +174,9 @@ public class GramProviderTest {
Assert.assertNotNull(ct.getOutput());
Assert.assertNotNull(ct.getOutput().getValue("echo_output"));
- Assert.assertEquals("hello", ((StringParameterType) ((ActualParameter) ct.getOutput().getValue("echo_output")).getType()).getValue());
-
+ Assert.assertEquals("hello",
+ ((StringParameterType) ((ActualParameter) ct.getOutput().getValue("echo_output")).getType())
+ .getValue());
} catch (Exception e) {
e.printStackTrace();
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadCallbackHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadCallbackHandlerTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadCallbackHandlerTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadCallbackHandlerTest.java Mon Oct 31 06:48:11 2011
@@ -28,17 +28,21 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.airavata.commons.WorkFlowUtils;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.CommonUtils;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.CommonUtils;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMElement;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.tool.XSTCTester.TestCase;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class LeadCallbackHandlerTest extends TestCase {
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadNotificationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadNotificationManagerTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadNotificationManagerTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/LeadNotificationManagerTest.java Mon Oct 31 06:48:11 2011
@@ -40,9 +40,12 @@ public class LeadNotificationManagerTest
@Test
public final void testGetBrokerPublishEPR() {
- String endpointRefAsStr = LeadNotificationManager.getBrokerPublishEPR("http://localhost:8080/axis2/services/EventingService", "testtopic");
+ String endpointRefAsStr = LeadNotificationManager.getBrokerPublishEPR(
+ "http://localhost:8080/axis2/services/EventingService", "testtopic");
- Assert.assertEquals("<EndpointReference><wsa:Address xmlns:wsa=\"http://www.w3.org/2005/08/addressing\">http://localhost:8080/axis2/services/EventingService/topic/testtopic</wsa:Address></EndpointReference>",endpointRefAsStr);
+ Assert.assertEquals(
+ "<EndpointReference><wsa:Address xmlns:wsa=\"http://www.w3.org/2005/08/addressing\">http://localhost:8080/axis2/services/EventingService/topic/testtopic</wsa:Address></EndpointReference>",
+ endpointRefAsStr);
}
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/RenewSubscriptionTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/RenewSubscriptionTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/RenewSubscriptionTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/RenewSubscriptionTest.java Mon Oct 31 06:48:11 2011
@@ -25,11 +25,11 @@ import java.net.URL;
import java.rmi.RemoteException;
import java.util.Properties;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMAbstractFactory;
@@ -37,7 +37,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.tool.XSTCTester.TestCase;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class RenewSubscriptionTest extends TestCase implements Callback {
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/impl/publish/TestWSMPublisher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/impl/publish/TestWSMPublisher.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/impl/publish/TestWSMPublisher.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/impl/publish/TestWSMPublisher.java Mon Oct 31 06:48:11 2011
@@ -25,7 +25,8 @@ import java.io.IOException;
import org.apache.airavata.workflow.tracking.impl.publish.WSMPublisher;
import org.apache.axis2.addressing.EndpointReference;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
public class TestWSMPublisher {
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/MessagePullerTest.java Mon Oct 31 06:48:11 2011
@@ -27,12 +27,12 @@ import java.util.Properties;
import java.util.UUID;
import org.apache.airavata.commons.WorkFlowUtils;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.CommonUtils;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.CommonUtils;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/RenewSubscriptionTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/RenewSubscriptionTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/RenewSubscriptionTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/RenewSubscriptionTest.java Mon Oct 31 06:48:11 2011
@@ -24,17 +24,21 @@ package org.apache.airavata.test.suite.w
import java.net.URL;
import java.util.Properties;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.tool.XSTCTester.TestCase;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class RenewSubscriptionTest extends TestCase implements Callback {
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/SubscriberThread.java Mon Oct 31 06:48:11 2011
@@ -23,11 +23,11 @@ package org.apache.airavata.test.suite.w
import java.rmi.RemoteException;
+import org.apache.airavata.test.suite.workflowtracking.tests.ThreadMessagePassingCallback;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.ThreadMessagePassingCallback;
import org.apache.xmlbeans.XmlObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/messagebox/restart/MessageBoxClientRestartTest.java Mon Oct 31 06:48:11 2011
@@ -26,12 +26,12 @@ import java.net.URL;
import java.util.Properties;
import org.apache.airavata.commons.WorkFlowUtils;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.CommonUtils;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.CommonUtils;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.wsmg.client.WseMsgBrokerClient;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.addressing.EndpointReference;
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/SimpleWorkflowExecution.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/SimpleWorkflowExecution.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/SimpleWorkflowExecution.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/SimpleWorkflowExecution.java Mon Oct 31 06:48:11 2011
@@ -49,7 +49,11 @@ import org.apache.axis2.util.XMLPrettyPr
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.tool.XSTCTester.TestCase;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class SimpleWorkflowExecution extends TestCase {
@@ -455,7 +459,7 @@ public class SimpleWorkflowExecution ext
"experiment-id-" + System.currentTimeMillis()).set(AnnotationConsts.UserDN,
"/O=IU/OU=Extreme Lab/CN=drlead"));
if (BROKER_URL != null) {
- EndpointReference brokerEpr = api.createEndpointReference(BROKER_URL, topic);
+ EndpointReference brokerEpr = WseMsgBrokerClient.createEndpointReference(BROKER_URL, topic);
props.set(ConstructorConsts.BROKER_EPR, brokerEpr.getAddress());
} else {
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/WorkflowNotificationListener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/WorkflowNotificationListener.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/WorkflowNotificationListener.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/samples/workflow/WorkflowNotificationListener.java Mon Oct 31 06:48:11 2011
@@ -25,15 +25,19 @@ import java.net.URL;
import java.rmi.RemoteException;
import java.util.Properties;
+import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.util.TestConfigKeys;
import org.apache.airavata.workflow.tracking.types.WorkflowTerminatedDocument;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
-import org.junit.*;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class WorkflowNotificationListener implements Callback {
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/util/SubscriberThread.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/util/SubscriberThread.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/util/SubscriberThread.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/workflowtracking/tests/util/SubscriberThread.java Mon Oct 31 06:48:11 2011
@@ -23,12 +23,12 @@ package org.apache.airavata.test.suite.w
import java.rmi.RemoteException;
+import org.apache.airavata.test.suite.workflowtracking.tests.MultipleSubscriptionTest;
+import org.apache.airavata.test.suite.workflowtracking.tests.ThreadMessagePassingCallback;
import org.apache.airavata.workflow.tracking.client.Callback;
import org.apache.airavata.workflow.tracking.client.LeadNotificationManager;
import org.apache.airavata.workflow.tracking.client.NotificationType;
import org.apache.airavata.workflow.tracking.client.Subscription;
-import org.apache.airavata.test.suite.workflowtracking.tests.MultipleSubscriptionTest;
-import org.apache.airavata.test.suite.workflowtracking.tests.ThreadMessagePassingCallback;
import org.apache.xmlbeans.XmlObject;
public class SubscriberThread extends Thread {
Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/MessageBrokerClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/MessageBrokerClient.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/MessageBrokerClient.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/MessageBrokerClient.java Mon Oct 31 06:48:11 2011
@@ -21,13 +21,13 @@
package org.apache.airavata.wsmg.client;
+import java.rmi.RemoteException;
+
import org.apache.airavata.wsmg.client.msgbox.MessagePuller;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
-import java.rmi.RemoteException;
-
public interface MessageBrokerClient {
/**
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -23,9 +23,8 @@ package org.apache.airavata.wsmg.client;
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.NameSpaceConstants;
+import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -21,8 +21,8 @@
package org.apache.airavata.wsmg.client;
-import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
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;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -21,8 +21,8 @@
package org.apache.airavata.wsmg.client;
-import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
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;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -24,8 +24,8 @@ package org.apache.airavata.wsmg.client;
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.NameSpaceConstants;
+import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -27,8 +27,8 @@ import org.apache.airavata.wsmg.client.c
import org.apache.airavata.wsmg.client.protocol.WSEProtocolClient;
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.NameSpaceConstants;
+import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -23,8 +23,8 @@ package org.apache.airavata.wsmg.client;
import javax.xml.namespace.QName;
-import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
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;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -27,8 +27,8 @@ import org.apache.airavata.wsmg.client.c
import org.apache.airavata.wsmg.client.protocol.WSNTProtocolClient;
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.NameSpaceConstants;
+import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -29,8 +29,8 @@ import java.util.List;
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.NameSpaceConstants;
+import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -21,8 +21,8 @@
package org.apache.airavata.wsmg.client.commons;
-import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
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;
import org.apache.axiom.om.OMFactory;
Modified: incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/client/src/main/java/org/apache/airavata/wsmg/client/msgbox/MsgboxHandler.java Mon Oct 31 06:48:11 2011
@@ -23,8 +23,6 @@ package org.apache.airavata.wsmg.client.
import java.rmi.RemoteException;
-import javax.xml.namespace.QName;
-
import org.apache.airavata.wsmg.client.MsgBrokerClientException;
import org.apache.airavata.wsmg.client.NotificationHandler;
import org.apache.airavata.wsmg.commons.MsgBoxQNameConstants;
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -19,128 +19,128 @@
*
*/
-package org.apache.airavata.wsmg.client.protocol;
-
-import javax.xml.namespace.QName;
-
-import org.apache.airavata.wsmg.commons.WsmgCommonConstants;
-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;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.EndpointReferenceHelper;
-
-public class WSEProtocolClient {
-
- public static EndpointReference createEndpointReference(String brokerURL, String topic) {
- if (brokerURL == null) {
- throw new IllegalArgumentException("Broker URL is null.");
- }
- if (topic == null) {
- throw new IllegalArgumentException("Topic is null.");
- }
-
- String sinkLocation = brokerURL.endsWith("/") ? brokerURL + "topic/" + topic : brokerURL + "/topic/" + topic;
-
- EndpointReference eventSinkReference = new EndpointReference(sinkLocation);
- return eventSinkReference;
- }
-
- private static OMElement createFilter(String topicExpression, String xpathExpression) {
-
- boolean hasTopicExpression = (topicExpression != null && topicExpression.length() != 0);
- boolean hasXPathExpression = (xpathExpression != null && xpathExpression.length() != 0);
-
- OMFactory factory = OMAbstractFactory.getOMFactory();
- OMElement filterEl = null;
-
- if (hasTopicExpression && hasXPathExpression) {
- filterEl = factory.createOMElement("Filter", NameSpaceConstants.WSE_NS);
-
- filterEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_AND_XPATH_DIALECT, null);
- OMElement topicExpressionEl = factory.createOMElement("TopicExpression", NameSpaceConstants.WSNT_NS);
- topicExpressionEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
- topicExpressionEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
- topicExpressionEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
- filterEl.addChild(topicExpressionEl);
- 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", NameSpaceConstants.WSE_NS);
-
- filterEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
- filterEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
- filterEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
- } else if (hasXPathExpression) {
- filterEl = factory.createOMElement("Filter", NameSpaceConstants.WSE_NS);
-
- filterEl.addAttribute("Dialect", WsmgCommonConstants.XPATH_DIALECT, null);
- filterEl.setText(xpathExpression);
- }
-
- return filterEl;
- }
-
- public static OMElement createSubscription(EndpointReference eventSink, String topicExpression,
- String xpathExpression, long expireTime) throws AxisFault {
-
- OMFactory factory = OMAbstractFactory.getOMFactory();
- OMElement subscribeMsg = factory.createOMElement("Subscribe", NameSpaceConstants.WSE_NS);
-
- OMElement delivery = factory.createOMElement("Delivery", NameSpaceConstants.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(NameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"),
- NameSpaceConstants.WSA_NS.getNamespaceURI());
-
- delivery.addChild(notifyTo);
- subscribeMsg.addChild(delivery);
-
- OMElement filterEl = createFilter(topicExpression, xpathExpression);
-
- if (filterEl != null) {
- subscribeMsg.addChild(filterEl);
- }
-
- subscribeMsg.declareNamespace(NameSpaceConstants.WSA_NS);
-
- return subscribeMsg;
- }
-
- public static String decodeSubscribeResponse(OMElement responseSubscriptionsManagerElement) throws AxisFault {
- String subscriptionId = null;
- OMElement referencePropertiesEl = responseSubscriptionsManagerElement.getFirstChildWithName(new QName(
- NameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceProperties"));
-
- if (referencePropertiesEl == null) {
- referencePropertiesEl = responseSubscriptionsManagerElement.getFirstChildWithName(new QName(
- NameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceParameters"));
- }
-
- OMElement identifierEl = referencePropertiesEl.getFirstChildWithName(new QName(NameSpaceConstants.WSE_NS
- .getNamespaceURI(), WsmgCommonConstants.SUBSCRIPTION_ID));
-
- if (identifierEl == null) {
- throw new AxisFault("invalid response message, subscription id was not sent by broker");
- }
-
- subscriptionId = identifierEl.getText();
- return subscriptionId;
- }
-
- public static OMElement createUnsubscribeMsg() {
- OMFactory factory = OMAbstractFactory.getOMFactory();
- OMElement message = factory.createOMElement("Unsubscribe", NameSpaceConstants.WSE_NS);
-
- return message;
- }
-
+package org.apache.airavata.wsmg.client.protocol;
+
+import javax.xml.namespace.QName;
+
+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;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.addressing.EndpointReferenceHelper;
+
+public class WSEProtocolClient {
+
+ public static EndpointReference createEndpointReference(String brokerURL, String topic) {
+ if (brokerURL == null) {
+ throw new IllegalArgumentException("Broker URL is null.");
+ }
+ if (topic == null) {
+ throw new IllegalArgumentException("Topic is null.");
+ }
+
+ String sinkLocation = brokerURL.endsWith("/") ? brokerURL + "topic/" + topic : brokerURL + "/topic/" + topic;
+
+ EndpointReference eventSinkReference = new EndpointReference(sinkLocation);
+ return eventSinkReference;
+ }
+
+ private static OMElement createFilter(String topicExpression, String xpathExpression) {
+
+ boolean hasTopicExpression = (topicExpression != null && topicExpression.length() != 0);
+ boolean hasXPathExpression = (xpathExpression != null && xpathExpression.length() != 0);
+
+ OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMElement filterEl = null;
+
+ if (hasTopicExpression && hasXPathExpression) {
+ filterEl = factory.createOMElement("Filter", NameSpaceConstants.WSE_NS);
+
+ filterEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_AND_XPATH_DIALECT, null);
+ OMElement topicExpressionEl = factory.createOMElement("TopicExpression", NameSpaceConstants.WSNT_NS);
+ topicExpressionEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
+ topicExpressionEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
+ topicExpressionEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
+ filterEl.addChild(topicExpressionEl);
+ 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", NameSpaceConstants.WSE_NS);
+
+ filterEl.addAttribute("Dialect", WsmgCommonConstants.TOPIC_EXPRESSION_SIMPLE_DIALECT, null);
+ filterEl.declareNamespace(NameSpaceConstants.WIDGET_NS);
+ filterEl.setText(NameSpaceConstants.WIDGET_NS.getPrefix() + ":" + topicExpression);
+ } else if (hasXPathExpression) {
+ filterEl = factory.createOMElement("Filter", NameSpaceConstants.WSE_NS);
+
+ filterEl.addAttribute("Dialect", WsmgCommonConstants.XPATH_DIALECT, null);
+ filterEl.setText(xpathExpression);
+ }
+
+ return filterEl;
+ }
+
+ public static OMElement createSubscription(EndpointReference eventSink, String topicExpression,
+ String xpathExpression, long expireTime) throws AxisFault {
+
+ OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMElement subscribeMsg = factory.createOMElement("Subscribe", NameSpaceConstants.WSE_NS);
+
+ OMElement delivery = factory.createOMElement("Delivery", NameSpaceConstants.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(NameSpaceConstants.WSE_NS.getNamespaceURI(), "NotifyTo"),
+ NameSpaceConstants.WSA_NS.getNamespaceURI());
+
+ delivery.addChild(notifyTo);
+ subscribeMsg.addChild(delivery);
+
+ OMElement filterEl = createFilter(topicExpression, xpathExpression);
+
+ if (filterEl != null) {
+ subscribeMsg.addChild(filterEl);
+ }
+
+ subscribeMsg.declareNamespace(NameSpaceConstants.WSA_NS);
+
+ return subscribeMsg;
+ }
+
+ public static String decodeSubscribeResponse(OMElement responseSubscriptionsManagerElement) throws AxisFault {
+ String subscriptionId = null;
+ OMElement referencePropertiesEl = responseSubscriptionsManagerElement.getFirstChildWithName(new QName(
+ NameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceProperties"));
+
+ if (referencePropertiesEl == null) {
+ referencePropertiesEl = responseSubscriptionsManagerElement.getFirstChildWithName(new QName(
+ NameSpaceConstants.WSA_NS.getNamespaceURI(), "ReferenceParameters"));
+ }
+
+ OMElement identifierEl = referencePropertiesEl.getFirstChildWithName(new QName(NameSpaceConstants.WSE_NS
+ .getNamespaceURI(), WsmgCommonConstants.SUBSCRIPTION_ID));
+
+ if (identifierEl == null) {
+ throw new AxisFault("invalid response message, subscription id was not sent by broker");
+ }
+
+ subscriptionId = identifierEl.getText();
+ return subscriptionId;
+ }
+
+ public static OMElement createUnsubscribeMsg() {
+ OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMElement message = factory.createOMElement("Unsubscribe", NameSpaceConstants.WSE_NS);
+
+ return message;
+ }
+
}
\ No newline at end of file