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/08/07 21:53:02 UTC
svn commit: r1154756 - in
/incubator/airavata/trunk/modules/commons/workflow-tracking: ./ schemas/
src/main/java/org/apache/airavata/commons/
src/main/java/org/apache/airavata/workflow/tracking/
src/main/java/org/apache/airavata/workflow/tracking/calde...
Author: smarru
Date: Sun Aug 7 19:53:01 2011
New Revision: 1154756
URL: http://svn.apache.org/viewvc?rev=1154756&view=rev
Log:
updated notification types schema to address AIRAVATA-61 and deprecated query tracking for calder as discussed in AIRAVATA-63
Added:
incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/
incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsd
incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsdconfig (with props)
Removed:
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/calder/
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/xsd/
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/xsdconfig/
Modified:
incubator/airavata/trunk/modules/commons/workflow-tracking/ (props changed)
incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/Notifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/NotifierImpl.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/impl/publish/TestWSMPublisher.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java
incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java
Propchange: incubator/airavata/trunk/modules/commons/workflow-tracking/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Aug 7 19:53:01 2011
@@ -1 +1,4 @@
target
+.settings
+.classpath
+.project
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml Sun Aug 7 19:53:01 2011
@@ -1,15 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <artifactId>airavata-ws-messenger</artifactId>
- <groupId>airavata</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>airavata</groupId>
<artifactId>airavata-workflowtracking</artifactId>
<packaging>jar</packaging>
+ <version>0.0.1-SNAPSHOT</version>
<name>Airavata Workflow Tracking</name>
<url>http://incubator.apache.org/airavata/</url>
@@ -31,7 +27,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.5</version>
<executions>
<execution>
<id>add-source</id>
@@ -62,12 +58,10 @@
</executions>
<inherited>true</inherited>
<configuration>
+ <schemaDirectory>schemas</schemaDirectory>
<outputJar>target/airavata-workflowtrackingtypes-${pom.version}.jar</outputJar>
<xmlConfigs>
- <xmlConfig implementation="java.io.File">src/main/xsdconfig/notification_types_ng.xsdconfig
- </xmlConfig>
- <xmlConfig implementation="java.io.File">src/main/xsdconfig/calder_notification_types.xsdconfig
- </xmlConfig>
+ <xmlConfig implementation="java.io.File">schemas/workflow_tracking_types.xsdconfig</xmlConfig>
</xmlConfigs>
</configuration>
</plugin>
@@ -77,6 +71,8 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
+ <version>${axis2.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>airavata</groupId>
@@ -97,14 +93,38 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <airavata.version>0.0.1-SNAPSHOT</airavata.version>
+ <axis2.version>1.5.1</axis2.version>
</properties>
</project>
Added: incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsd
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsd?rev=1154756&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsd (added)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsd Sun Aug 7 19:53:01 2011
@@ -0,0 +1,574 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<schema
+ targetNamespace="http://airavata.apache.org/schemas/workflow_tracking_types"
+ xmlns:wft="http://airavata.apache.org/schemas/workflow_tracking_types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ attributeFormDefault="qualified"
+ elementFormDefault="qualified">
+
+ <annotation>
+ <documentation>
+ *) Workflows and services can be abstract (template) or concrete (instance).
+ Unless otherwise noted, we always refer to the concrete instance of the workflow/service below
+ *) All workflows are also services.
+ *) Services may be part of zero or more workflows
+ *) When Services execute in the context of a workflow,
+ an invocation of the service is associated with the workflowID of the workflow whose context
+ in which it is being invoked (also called parent workflow),
+ the timestep of this invocation in the parent workflow,
+ and the node ID that uniquely identifies this service within the parent workflow instance.
+ *) Workflows can also be invoked in the context of another parent workflow.
+ *) Workflow ID always refers to the "parent workflow ID". When refering to the invocation of a workflow,
+ its instance ID is called the Service ID.
+ *) Workflows that are not invoked from another workflow do not have a context of execution
+ (parent workflow is not present => Workflow ID is NULL)
+ *) Schema design notes
+ - This schema uses the "Venetian Blind" schema design pattern
+ - It uses Upper Camel Case for schema types and lower camel case for
+ element and attribute names
+ </documentation>
+ </annotation>
+
+ <simpleType name="ServiceIDType">
+ <annotation>
+ <documentation>
+ ID to uniquely identify the service instance.
+ This is usually formed from the targetnamespace and porttype name of the service's WSDL.
+ This ID may refer to the instance ID for a service or for a workflow.
+ </documentation>
+ </annotation>
+ <restriction base="anyURI"/>
+ </simpleType>
+
+ <simpleType name="WorkflowNodeIDType">
+ <annotation>
+ <documentation>
+ String that identifies uniquely a node in workflow graph.
+ The node ID is unique in the scope of a workflow ID.
+ </documentation>
+ </annotation>
+ <restriction base="string"/>
+ </simpleType>
+
+ <simpleType name="WorkflowTimestepType">
+ <annotation>
+ <documentation>
+ The timestep within workflow execution at which this invocation is made.
+ This is a logical time that monotonically increments for each invocation in a workflow.
+ </documentation>
+ </annotation>
+ <restriction base="int"/>
+ </simpleType>
+
+ <simpleType name="DataProductIDType">
+ <annotation>
+ <documentation>
+ Unique logical ID for a data product in the form of a UUID.
+ Physical URL for the data products can be resolved using this ID.
+ </documentation>
+ </annotation>
+ <restriction base="anyURI"/>
+ </simpleType>
+
+ <!-- ========================================================================================== -->
+
+ <complexType name="BaseIDType">
+ <attribute name="workflowID" type="wft:ServiceIDType" use="optional">
+ <annotation>
+ <documentation>
+ The workflow context within which this service is executing.
+ If this service is itself a workflow and not executing as part of another workflow
+ (i.e. this is the root of the invocation trace) then the workflow ID is absent.
+ Otherwise, this is the service ID of the workflow instance.
+ </documentation>
+ </annotation>
+ </attribute>
+
+ <attribute name="serviceID" type="wft:ServiceIDType" use="required">
+ <annotation>
+ <documentation>
+ ID to uniquely identify a service instance. The service instance can
+ be part of zero or more workflow.
+ This is formed from the targetnamespace of the service's CWSDL.
+ </documentation>
+ </annotation>
+ </attribute>
+
+ <attribute name="workflowNodeID" type="wft:WorkflowNodeIDType" use="optional">
+ <annotation>
+ <documentation>
+ Distinct ID of a node within a Workflow graph. unique within the workflowID,
+ not necessarily the order of execution.
+ </documentation>
+ </annotation>
+ </attribute>
+
+ <attribute name="workflowTimestep" type="wft:WorkflowTimestepType" use="optional">
+ <annotation>
+ <documentation>
+ The timestep within workflow execution at which this invocation is made.
+ 32bit integer. Timestep is a numerically ordered monotonically increasing sequence
+ within wf execution that allows relative ordering of invocations.
+ It is unique within the workflowID for each invocation in the workflow.
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+
+ <!-- base type for all notifications -->
+ <complexType name="BaseNotificationType">
+ <annotation>
+ <documentation>This is the base type for all notification activities that are produced</documentation>
+ </annotation>
+ <sequence>
+
+ <element name="notificationSource" type="wft:BaseIDType">
+ <annotation>
+ <documentation>
+ This identifies the entity/invocation context from which this notifcation is being sent.
+ </documentation>
+ </annotation>
+ </element>
+
+ <element name="timestamp" type="dateTime" />
+
+ <element name="description" type="string" minOccurs="0">
+ <annotation>
+ <documentation>Optional human friendly description of this notification.</documentation>
+ </annotation>
+ </element>
+
+ <element name="annotation" type="anyType" minOccurs="0">
+ <annotation>
+ <documentation>Optional additional metadata for this notification. See common.AnnotationConsts file.</documentation>
+ </annotation>
+ </element>
+
+ </sequence>
+
+ <attribute name="infoModelVersion"
+ form="unqualified"
+ type="NMTOKEN"
+ use="required">
+ <!-- we set form as unqualified to allow WS-Messenger YFilter to match it -->
+ <!-- NMToken := (Letter | Digit | '.' | '-' | '_' | ':')+ -->
+ <annotation>
+ <documentation>
+ String identifying notification schema version (used for verifying compatible schema and filtering).
+ </documentation>
+ </annotation>
+ </attribute>
+
+ </complexType>
+
+
+ <complexType name="MessageType">
+ <sequence>
+ <element name="header" type="anyType" minOccurs="0" /> <!-- e.g. soap:header -->
+ <element name="body" type="anyType" minOccurs="0" /> <!-- e.g. soap:body --> <!-- fixme: change to message -->
+ </sequence>
+ </complexType>
+
+ <complexType name="FaultMessageType">
+ <complexContent>
+ <extension base="wft:MessageType" />
+ </complexContent>
+ </complexType>
+
+ <complexType name="InvocationMessageType">
+ <complexContent>
+ <extension base="wft:MessageType" />
+ </complexContent>
+ </complexType>
+
+
+ <complexType name="FailureMessageType">
+ <sequence>
+ <element name="trace" type="anyType" minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ </complexType>
+
+
+ <!-- ========================================================================================== -->
+ <!-- workflow provenance types -->
+ <!-- ========================================================================================== -->
+
+ <!-- sent when the service is first created and is ready to accept invocations -->
+ <element name="serviceInitialized" type="wft:BaseNotificationType" />
+
+ <!-- sent when the service is terminated and will not accept any further invocations -->
+ <element name="serviceTerminated" type="wft:BaseNotificationType" />
+
+ <!-- sent when the workflow is first created and is ready to accept invocations -->
+ <!--element name="workflowInitialized" type="wft:BaseNotificationType"-->
+ <element name="workflowInitialized">
+ <complexType>
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="initialPriority" type="string" minOccurs="0" />
+ <element name="workflowTemplateId" type="wft:ServiceIDType" minOccurs="0" />
+ <element name="workflowCreatorDn" type="string" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+
+ <!-- sent when the workflow is terminated and will not accept any further invocations -->
+ <element name="workflowTerminated" type="wft:BaseNotificationType" />
+
+ <!-- sent when the workflow execution is paused: invocations will be accepted but no new messages will be sent by the workflow -->
+ <element name="workflowPaused" type="wft:BaseNotificationType" />
+
+ <!-- sent when the workflow execution is resumed -->
+ <element name="workflowResumed" type="wft:BaseNotificationType" />
+
+ <!-- workflow priority tracking -->
+ <element name="workflowPriorityChanged">
+ <complexType>
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="newPriority" type="string" />
+ <element name="oldPriority" type="string" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+
+ <!-- ========================================================================================== -->
+
+ <complexType name="InvocationRequestType" abstract="true">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="request" type="wft:InvocationMessageType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="RequestInitiatorType">
+ <complexContent>
+ <extension base="wft:InvocationRequestType">
+ <sequence>
+ <!-- used by wf (client) to set service info, when invoking service -->
+ <element name="receiver" type="wft:BaseIDType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="RequestReceiverType">
+ <complexContent>
+ <extension base="wft:InvocationRequestType">
+ <sequence>
+ <!-- used by service to set workflow(client) info, when invoked by workflow (client) -->
+ <element name="initiator" type="wft:BaseIDType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+
+ <!-- ========================================================================================== -->
+
+ <complexType name="AcknowledgementType" abstract="true">
+ <complexContent>
+ <extension base="wft:BaseNotificationType" >
+ <sequence>
+ <element name="receiver" type="wft:BaseIDType" minOccurs="0" /> <!-- target of the action that succeeded -->
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="AcknowledgeSuccessType">
+ <complexContent>
+ <extension base="wft:AcknowledgementType" />
+ </complexContent>
+ </complexType>
+
+ <complexType name="AcknowledgeFailureType">
+ <complexContent>
+ <extension base="wft:AcknowledgementType">
+ <sequence>
+ <element name="failure" type="wft:FailureMessageType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <!-- ========================================================================================== -->
+
+ <!-- sent by workflow when a service is invoked by it. -->
+ <element name="invokingService" type="wft:RequestInitiatorType" />
+
+
+ <!-- sent by workflow when it is invoked. -->
+ <element name="workflowInvoked" type="wft:RequestReceiverType" />
+
+ <!-- sent by service when it is invoked. -->
+ <element name="serviceInvoked" type="wft:RequestReceiverType" />
+
+
+ <!-- sent by workflow when it invoked a service successfully. -->
+ <element name="invokingServiceSucceeded" type="wft:AcknowledgeSuccessType" />
+
+ <!-- sent by workflow when it failed to invoke a service successfully. -->
+ <element name="invokingServiceFailed" type="wft:AcknowledgeFailureType" />
+
+
+ <!-- ========================================================================================== -->
+
+ <complexType name="InvocationResultType" abstract="true">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="result" type="wft:InvocationMessageType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="InvocationFaultType" abstract="true">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="fault" type="wft:FaultMessageType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="ResultReceiverType">
+ <complexContent>
+ <extension base="wft:InvocationResultType">
+ <sequence>
+ <!-- used by wf (client) to set service info, when receiving result from service -->
+ <element name="responder" type="wft:BaseIDType" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="FaultReceiverType">
+ <complexContent>
+ <extension base="wft:InvocationFaultType">
+ <sequence>
+ <!-- used by wf (client) to set service info, when receiving result from service -->
+ <element name="responder" type="wft:BaseIDType" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="ResultResponderType">
+ <complexContent>
+ <extension base="wft:InvocationResultType">
+ <sequence>
+ <!-- used by service to set workflow(client) info, when returning result to workflow (client) -->
+ <element name="receiver" type="wft:BaseIDType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="FaultResponderType">
+ <complexContent>
+ <extension base="wft:InvocationFaultType">
+ <sequence>
+ <!-- used by service to set workflow(client) info, when returning result to workflow (client) -->
+ <element name="receiver" type="wft:BaseIDType" minOccurs="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <!-- ========================================================================================== -->
+
+ <!-- sent by service when it returns the result for an invocation. -->
+ <element name="sendingResult" type="wft:ResultResponderType" /> <!-- add workflowSendingResult -->
+
+ <!-- sent by service when it returns a fault for an invocation. -->
+ <element name="sendingFault" type="wft:FaultResponderType" /> <!-- add workflowSendingFault -->
+
+
+ <!-- sent by workflow when it receives the result for an invocation. -->
+ <element name="receivedResult" type="wft:ResultReceiverType" /> <!-- add workflowReceivedResult -->
+
+ <!-- sent by workflow when it receives a fault for an invocation. -->
+ <element name="receivedFault" type="wft:FaultReceiverType" /> <!-- add workflowFaultResult -->
+
+
+ <!-- sent by service when it has successfully sent the result for an invocation. -->
+ <element name="sendingResponseSucceeded" type="wft:AcknowledgeSuccessType" />
+
+ <!-- sent by service when it has successfully sent a fault for an invocation. -->
+ <element name="sendingResponseFailed" type="wft:AcknowledgeFailureType" />
+
+ <!-- ========================================================================================== -->
+
+
+ <!-- ========================================================================================== -->
+ <!-- data provenance types -->
+ <!-- ========================================================================================== -->
+
+ <!-- general complex data types -->
+ <complexType name="DataProductType">
+ <sequence>
+ <element name="id" type="wft:DataProductIDType" />
+ <element name="location" type="anyURI" minOccurs="0" maxOccurs="unbounded" />
+ <element name="sizeInBytes" type="long" minOccurs="0" />
+ <element name="timestamp" type="dateTime" minOccurs="0" /> <!-- context sensitive. time at which data product was produced or consumed. -->
+ <element name="description" type="string" minOccurs="0">
+ <annotation>
+ <documentation>Optional human friendly description of this data product.</documentation>
+ </annotation>
+ </element>
+ <element name="annotation" type="anyType" minOccurs="0">
+ <annotation>
+ <documentation>Optional additional metadata for this data product.</documentation>
+ </annotation>
+ </element>
+ </sequence>
+ </complexType>
+
+ <complexType name="DataProductNotificationType">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="dataProduct" type="wft:DataProductType" minOccurs="0" maxOccurs="unbounded" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <!-- sent when a file is used by the jython app. -->
+ <element name="dataConsumed" type="wft:DataProductNotificationType" />
+
+ <!-- sent when a file is generated by the jython app. -->
+ <element name="dataProduced" type="wft:DataProductNotificationType" />
+
+
+ <!-- ========================================================================================== -->
+ <!-- performance audit types -->
+ <!-- ========================================================================================== -->
+
+
+ <!-- sent when the application launches a GRAM job, to facilitate -->
+ <!-- auditing and accounting of TeraGrid jobs -->
+ <!-- SJ The type name needed Type added at the end -->
+ <complexType name="ApplicationAuditType">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="name" type="string" />
+ <element name="jobHandle" type="anyURI"/>
+ <element name="host" type="string" />
+ <element name="queueName" type="string" minOccurs="0"/>
+ <element name="jobId" type="string" minOccurs="0"/>
+ <element name="distinguishedName" type="string" />
+ <element name="projectId" type="string" minOccurs="0"/>
+ <element name="rsl" type="string"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="applicationAudit" type="wft:ApplicationAuditType" />
+
+
+ <!-- sent at the end of a computational block in the jython app -->
+ <!-- with the time in milliseconds taken for that computational block -->
+ <element name="computationDuration">
+ <complexType>
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="durationInMillis" type="long" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+
+ <!-- sent at the end of sending a file to remote location (thro' gridftp?) by the jython app -->
+ <!-- with the time in milliseconds taken to send that file -->
+ <!-- TODO: later add support for time for multiple files in a single notification? -->
+ <complexType name="DataTransferDurationType">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="id" type="wft:DataProductIDType" />
+ <element name="source" type="anyURI" />
+ <element name="target" type="anyURI" />
+ <element name="sizeInBytes" type="long" minOccurs="0" default="-1" />
+ <element name="durationInMillis" type="long" default="-1" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="dataSendDuration" type="wft:DataTransferDurationType" />
+ <element name="dataReceiveDuration" type="wft:DataTransferDurationType" />
+
+ <!-- ========================================================================================== -->
+ <!-- generic log message types -->
+ <!-- ========================================================================================== -->
+
+
+ <!-- sent when an interesting file is created by the jython app that can be viewed thro' a URL -->
+ <!-- used to display as a link on the portal -->
+ <element name="publishURL">
+ <complexType>
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="title" type="string" minOccurs="0" />
+ <element name="location" type="anyURI" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+
+ <!-- generic log message at different levels of importance that can be produced by the jython app -->
+ <element name="logInfo" type="wft:BaseNotificationType" />
+ <element name="logException" type="wft:BaseNotificationType" />
+ <element name="logWarning" type="wft:BaseNotificationType" />
+ <element name="logDebug" type="wft:BaseNotificationType" />
+
+
+ <!-- ========================================================================================== -->
+ <!-- resource broker message types -->
+ <!-- ========================================================================================== -->
+
+ <complexType name="ResourceMappingType">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="mappedResource" type="string" />
+ <element name="retryStatusCount" type="int" default="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="JobStatusType">
+ <complexContent>
+ <extension base="wft:BaseNotificationType">
+ <sequence>
+ <element name="jobStatus" type="string" />
+ <element name="retryCount" type="int" default="0" />
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="resourceMapping" type="wft:ResourceMappingType" />
+ <element name="jobStatus" type="wft:JobStatusType" />
+
+</schema>
Added: incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsdconfig
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsdconfig?rev=1154756&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsdconfig (added)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsdconfig Sun Aug 7 19:53:01 2011
@@ -0,0 +1,13 @@
+<!-- An xsdconfig file must begin with a "config" element in the
+ http://www.bea.com/2002/09/xbean/config namespace. Also, be sure
+ to declare any namespaces used to qualify types in your schema (here,
+ the namespace corresponding to the pol prefix. -->
+<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
+
+ <!-- Use the "namespace" element to map a namespace to the Java package
+ name that should be generated. -->
+ <xb:namespace uri="http://airavata.apache.org/schemas/workflow_tracking_types">
+ <xb:package>org.apache.airavata.workflow.tracking.types</xb:package>
+ </xb:namespace>
+
+</xb:config>
Propchange: incubator/airavata/trunk/modules/commons/workflow-tracking/schemas/workflow_tracking_types.xsdconfig
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/commons/LeadContextHeader.java Sun Aug 7 19:53:01 2011
@@ -183,9 +183,10 @@ public class LeadContextHeader {
setUriValue(NS, "gfac-url", url);
}
- public void setEventSinkEpr(EndpointReference epr){
- setUriValue(NS,"event-sink-epr",URI.create(epr.getAddress()));
+ public void setEventSinkEpr(EndpointReference epr) {
+ setUriValue(NS, "event-sink-epr", URI.create(epr.getAddress()));
}
+
public URI getGfacUrl() {
return lookupUriValue(NS, "gfac-url");
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/AbstractNotifier.java Sun Aug 7 19:53:01 2011
@@ -58,13 +58,11 @@ public abstract class AbstractNotifier {
WorkflowTrackingContext workflowTrackingContext = new WorkflowTrackingContext();
workflowTrackingContext.setGlobalAnnotations(golbalProperties);
workflowTrackingContext.setBrokerEpr(epr);
- workflowTrackingContext.setMyself(createEntity(workflowID, serviceID, workflowNodeID,
- workflowTimestep));
+ workflowTrackingContext.setMyself(createEntity(workflowID, serviceID, workflowNodeID, workflowTimestep));
return workflowTrackingContext;
}
- public InvocationEntity createEntity(URI workflowID, URI serviceID,
- String workflowNodeID, Integer workflowTimestep) {
+ public InvocationEntity createEntity(URI workflowID, URI serviceID, String workflowNodeID, Integer workflowTimestep) {
InvocationEntityImpl invocationEntityImpl = new InvocationEntityImpl(workflowID, serviceID, workflowNodeID,
workflowTimestep);
return invocationEntityImpl;
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/GenericNotifier.java Sun Aug 7 19:53:01 2011
@@ -94,7 +94,7 @@ public interface GenericNotifier {
* responder to an invocation. This object is created for the entity that is invoked and its remote invokee, and/or
* for the entity and the remote entity it invokes.
*
- *
+ *
* @param workflowID
* an URI
* @param serviceID
@@ -103,12 +103,11 @@ public interface GenericNotifier {
* a String
* @param workflowTimestep
* an int
- *
+ *
* @return an InvocationEntity
*
*/
- public InvocationEntity createEntity(URI workflowID, URI serviceID,
- String workflowNodeID, Integer workflowTimestep);
+ public InvocationEntity createEntity(URI workflowID, URI serviceID, String workflowNodeID, Integer workflowTimestep);
/**
* Send a Log message with level INFO
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/Notifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/Notifier.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/Notifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/Notifier.java Sun Aug 7 19:53:01 2011
@@ -21,8 +21,6 @@
package org.apache.airavata.workflow.tracking;
-import org.apache.airavata.workflow.tracking.calder.CalderNotifier;
-
/**
* Convenience interface that groups all methods used to send Lead notification messages. This extends the application
* and workflow notifier interfaces.
@@ -65,8 +63,7 @@ import org.apache.airavata.workflow.trac
* @version $Revision: 1.6 $
* @author
*/
-public interface Notifier extends ProvenanceNotifier, PerformanceNotifier, AuditNotifier, ResourceNotifier,
- CalderNotifier {
+public interface Notifier extends ProvenanceNotifier, PerformanceNotifier, AuditNotifier, ResourceNotifier{
// public static final String WORKFLOW_ID = "workflow_tracking.workflow_id";
// public static final String NODE_ID = "workflow_tracking.node_id";
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/NotifierFactory.java Sun Aug 7 19:53:01 2011
@@ -21,7 +21,6 @@
package org.apache.airavata.workflow.tracking;
-import org.apache.airavata.workflow.tracking.calder.CalderNotifier;
import org.apache.airavata.workflow.tracking.impl.GenericNotifierImpl;
import org.apache.airavata.workflow.tracking.impl.NotifierImpl;
import org.apache.airavata.workflow.tracking.impl.ProvenanceNotifierImpl;
@@ -63,8 +62,4 @@ public class NotifierFactory {
return new NotifierImpl();
}
- public static CalderNotifier createCalderNotifier() {
- return new NotifierImpl();
- }
-
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/WorkflowNotifier.java Sun Aug 7 19:53:01 2011
@@ -110,8 +110,7 @@ public interface WorkflowNotifier extend
* @param receiver
* identity of this workflow invocation
* @param initiator
- * identity of entity
- * that invoked this workflow
+ * identity of entity that invoked this workflow
* @param descriptionAndAnnotation
* optional vararg. The first element is used as the human readable description for this notification.
* The subsequent strings need to be serialized XML fragments that are added as annotation to the
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=1154756&r1=1154755&r2=1154756&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 Sun Aug 7 19:53:01 2011
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import edu.indiana.extreme.lead.calder.types.*;
import org.apache.airavata.commons.LeadCrosscutParametersUtil;
import org.apache.airavata.workflow.tracking.Notifier;
import org.apache.airavata.workflow.tracking.common.DataDurationObj;
@@ -333,165 +332,4 @@ public class NotifierImpl extends Proven
return dataReceiveFinished(context, dataDurationObj, descriptionAndAnnotation);
}
- public void queryStarted(WorkflowTrackingContext context, String radarName, String... descriptionAndAnnotation) {
-
- QueryStartedDocument queryStartedDoc = QueryStartedDocument.Factory.newInstance();
- CalderNotificationType calderNotificationType = queryStartedDoc.addNewQueryStarted();
- calderNotificationType.setRadarName(radarName);
-
- sendNotification(context, queryStartedDoc, descriptionAndAnnotation, "[Query started for " + radarName + "]");
- }
-
- public void queryFailedToStart(WorkflowTrackingContext context, String radarName,
- String... descriptionAndAnnotation) {
- QueryFailedToStartDocument queryFailedToStartDoc = QueryFailedToStartDocument.Factory.newInstance();
- CalderNotificationType calderNotificationType = queryFailedToStartDoc.addNewQueryFailedToStart();
- calderNotificationType.setRadarName(radarName);
-
- sendNotification(context, queryFailedToStartDoc, descriptionAndAnnotation, "[Query failed to start for "
- + radarName + "]");
-
- }
-
- public void queryActive(WorkflowTrackingContext context, String radarName, String... descriptionAndAnnotation) {
- QueryActiveDocument queryActiveDoc = QueryActiveDocument.Factory.newInstance();
- CalderNotificationType calderNotificationType = queryActiveDoc.addNewQueryActive();
- calderNotificationType.setRadarName(radarName);
-
- sendNotification(context, queryActiveDoc, descriptionAndAnnotation, "[Query active for " + radarName + "]");
-
- }
-
- public void queryExpired(WorkflowTrackingContext context, String radarName, String... descriptionAndAnnotation) {
- QueryExpiredDocument queryExpiredDoc = QueryExpiredDocument.Factory.newInstance();
- CalderNotificationType calderNotificationType = queryExpiredDoc.addNewQueryExpired();
- calderNotificationType.setRadarName(radarName);
-
- sendNotification(context, queryExpiredDoc, descriptionAndAnnotation, "[Query Expired for " + radarName + "]");
-
- }
-
- public void triggerFound(WorkflowTrackingContext context, String radarName, String... descriptionAndAnnotation) {
- TriggerFoundDocument triggerFoundDoc = TriggerFoundDocument.Factory.newInstance();
- CalderNotificationType calderNotificationType = triggerFoundDoc.addNewTriggerFound();
- calderNotificationType.setRadarName(radarName);
-
- sendNotification(context, triggerFoundDoc, descriptionAndAnnotation, "[Trigger found for " + radarName + "]");
-
- }
-
- public void queryPublishResult(WorkflowTrackingContext context,
- LeadCrosscutParametersUtil leadCrosscutParametersUtil) {
- QueryPublishResultDocument queryPublishResultDoc = QueryPublishResultDocument.Factory.newInstance();
- CalderClusterNotificationType calderClusterNotificationType = queryPublishResultDoc.addNewQueryPublishResult();
- calderClusterNotificationType.setCtrlat(leadCrosscutParametersUtil.getCenterLatitude());
- calderClusterNotificationType.setCtrlon(leadCrosscutParametersUtil.getCenterLongitude());
- calderClusterNotificationType.setNorthbc(leadCrosscutParametersUtil.getNorthBc());
- calderClusterNotificationType.setSouthbc(leadCrosscutParametersUtil.getSouthBc());
- calderClusterNotificationType.setEastbc(leadCrosscutParametersUtil.getEastBc());
- calderClusterNotificationType.setWestbc(leadCrosscutParametersUtil.getWestBc());
-
- sendNotification(context, queryPublishResultDoc, null,
- "[Clustering result for query found at " + leadCrosscutParametersUtil.getCenterLatitude() + " "
- + leadCrosscutParametersUtil.getCenterLongitude() + "]");
-
- }
-
- public void queryNoDetection(WorkflowTrackingContext context, String... descriptionAndAnnotation) {
- QueryNoDetectionDocument queryNoDetectionDoc = QueryNoDetectionDocument.Factory.newInstance();
- CalderNotificationType calderNotificationType = queryNoDetectionDoc.addNewQueryNoDetection();
- calderNotificationType.setRadarName("");
- sendNotification(context, queryNoDetectionDoc, descriptionAndAnnotation,
- "[No mining results detected for query]");
- }
-
- // /**
- // * Create a notifier object with the default values set. Creating this is
- // convinient
- // * if the same service/application needs to generate multiple messages,
- // since the various
- // * IDs passed in the constructor will be filled into the message
- // automatically. If you're
- // * sending just a single message from a service/app, you can use the
- // static methods that are
- // * available.
- // *
- // * @param brokerLoc_ the location of the broker service in the form
- // "host:port"
- // * @param topic_ the topic to which messages should be sent
- // * @param workflowID_ the workflow instance ID to which this
- // service/application belongs
- // * @param nodeID_ the node ID within the workflow which this
- // service/application represents
- // * @param wfTimeStep_ the unique timestep within the workflow instance at
- // which this
- // * service/application invocation is taking place
- // * @param serviceID_
- // * @param serviceWsdl_ the concrete WSDL of the service (or service
- // wrapper of an
- // * application) which is sending the notification. This is used
- // * to retrieve the unique service QName that can identify this
- // * service instance, and to get the schema for the response message
- // * @param incomingMessageXml_ the icoming message that started this
- // service that should contain
- // * end point reference (ReplyTo EPR is minimum) where the results of
- // * this service/application should be sent to.
- // * @param nameResolverWsdl_ WSDL location of name resolver
- // * @param fileProtocol_ the protocol used to access local files created by
- // this application. e.g. gridftp://, http://, ftp://, etc. Defaults to
- // file://.
- // * @param enableNameResolver whether name resolution is enabled
- // * @param batchProvMessages whether provenance messages should be batched
- // and sent as one message
- // */
- // private void init(String brokerLoc_, String topic_,
- // String workflowID_, String nodeID_, String wfTimeStep_,
- // String serviceID_, String serviceWsdl_,
- // String incomingMessageXml_,
- // String nameResolverWsdl_,
- // String fileProtocol_,
- // boolean enableNameResolver,
- // boolean enableBatchProvenance) {
- //
-
- /**
- * Method main. Simple self test by generating some notifications
- *
- * @param args
- * a String[]
- *
- */
- // public static void main(String args[]) throws Exception {
- //
- // System.err.println("Started " + NotifierImpl.class);
- //
- // for (int i=0; i < 10; i++) {
- // ProvenanceNotifier n =
- // new NotifierImpl(Props.newProps(BROKER_URL,
- // "rainier.extreme.indiana.edu:12346"). // brokerLoc
- // set(TOPIC, "lead_wft_test_topic"). // topic
- // set(WORKFLOW_ID, "wfId93643").
- // set(NODE_ID, "nodeId26").
- // set(TIMESTEP, "12"). // id'ss
- // set(SERVICE_ID, "http://service.qname/").
- // set(NAME_RESOLVER_URL,
- // "http://rainier.extreme.indiana.edu:33330/name_resolver?wsdl").
- // set(ENABLE_NAME_RESOLVER, "true")
- // );
- //
- // n.serviceInvoked("SampleApplication");
- // //n.debug("debug message from the applcation..");
- // //n.publishURL("LEAD home", "http://lead.ou.edu");
- // n.dataConsumed("urn:lead-ou-edu:iub:f81d4fae-7dec-11d0-a765-00a0c91e6bf6",
- // "/foo/bar/input.data");
- // n.fileProduced("/foo/bar/output.data");
- // n.dataConsumed("urn:lead-ou-edu:iub:f81d4fae-7dec-11d0-a765-00a0c91e6bf7",
- // "/acme/input.2");
- // n.fileProduced("/acme/output.2");
- // n.sendingResult(null, null);
- // }
- // //n.workflowFinishedSuccess("rainier.extreme.indiana.edu:12346",
- // "lead_wft_test_topic", "wfId93643");
- // System.err.println("finsished " + NotifierImpl.class);
- // }
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/impl/publish/TestWSMPublisher.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/impl/publish/TestWSMPublisher.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/impl/publish/TestWSMPublisher.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/impl/publish/TestWSMPublisher.java Sun Aug 7 19:53:01 2011
@@ -52,7 +52,7 @@ public class TestWSMPublisher {
WSMPublisher publisher = new WSMPublisher(10, false, "http://invalid/broker/address", "TestTopic1");
} catch (IOException e) {
-// fail("Test failed");
+ // fail("Test failed");
}
}
@@ -67,7 +67,7 @@ public class TestWSMPublisher {
} catch (Exception e) {
e.printStackTrace();
-// fail();
+ // fail();
}
}
@@ -86,7 +86,7 @@ public class TestWSMPublisher {
} catch (Exception e) {
e.printStackTrace();
-// fail();
+ // fail();
}
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/MessagePullerTest.java Sun Aug 7 19:53:01 2011
@@ -89,7 +89,7 @@ public class MessagePullerTest extends T
Callback testCallback1 = new Callback() {
public void deliverMessage(String topic, NotificationType type, XmlObject messageObj) {
System.out.println("Notification Received, notification of type:" + type);
-// assertEquals(type, NotificationType.WorkflowInitialized);
+ // assertEquals(type, NotificationType.WorkflowInitialized);
wait = false;
}
};
@@ -116,7 +116,7 @@ public class MessagePullerTest extends T
System.out.println("Notification Received, notification of type:" + type);
// This assertion is wrong because type and NotificationType.WorkflowInitialized are two different types
-// assertEquals(type, NotificationType.WorkflowInitialized);
+ // assertEquals(type, NotificationType.WorkflowInitialized);
wait = false;
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/messagebox/restart/MessageBoxClientRestartTest.java Sun Aug 7 19:53:01 2011
@@ -110,7 +110,7 @@ public class MessageBoxClientRestartTest
System.out.println("Notification Received, notification of type:" + type);
System.out.println("Topic[" + topic + "]");
-// assertEquals(type, NotificationType.WorkflowInitialized);
+ // assertEquals(type, NotificationType.WorkflowInitialized);
wait = false;
}
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java?rev=1154756&r1=1154755&r2=1154756&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/src/test/java/org/apache/airavata/workflow/tracking/tests/samples/workflow/SimpleWorkflowExecution.java Sun Aug 7 19:53:01 2011
@@ -33,7 +33,6 @@ import org.apache.airavata.workflow.trac
import org.apache.airavata.workflow.tracking.NotifierFactory;
import org.apache.airavata.workflow.tracking.ProvenanceNotifier;
import org.apache.airavata.workflow.tracking.WorkflowNotifier;
-import org.apache.airavata.workflow.tracking.calder.CalderNotifier;
import org.apache.airavata.workflow.tracking.client.Subscription;
import org.apache.airavata.workflow.tracking.common.AnnotationConsts;
import org.apache.airavata.workflow.tracking.common.AnnotationProps;
@@ -337,13 +336,6 @@ public class SimpleWorkflowExecution ext
notifier.dataProduced(context, DATA_URI_5, DATA_URLS_5);
notifier.dataProduced(context, DATA_URI_6, DATA_URLS_6);
- CalderNotifier calderNotifier = NotifierFactory.createCalderNotifier();
- calderNotifier.queryStarted(context, "KIND");
- calderNotifier.queryFailedToStart(context, "KIND");
- calderNotifier.queryExpired(context, "KIND");
- calderNotifier.queryActive(context, "KIND");
- calderNotifier.triggerFound(context, "KIND");
-
boolean successResult = true;
// produce response...either success or failure