You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/09/16 23:13:44 UTC
svn commit: r1171786 - in
/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac:
notification/ notification/impl/ provider/ provider/impl/ provider/utils/
services/impl/
Author: lahiru
Date: Fri Sep 16 21:13:44 2011
New Revision: 1171786
URL: http://svn.apache.org/viewvc?rev=1171786&view=rev
Log:
refactoring notification implementation in gfac.
Modified:
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/Subject.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/Subject.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/Subject.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/Subject.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/Subject.java Fri Sep 16 21:13:44 2011
@@ -33,38 +33,38 @@ public interface Subject {
/*
*
*/
- void startSchedule(Object notifier, InvocationContext context);
+ void startSchedule(InvocationContext context);
- void finishSchedule(Object notifier, InvocationContext context);
+ void finishSchedule(InvocationContext context);
/*
*
*/
- void input(Object notifier, InvocationContext context, String... data);
+ void input(InvocationContext context, String... data);
void output(Object notifier, InvocationContext context, String... data);
/*
*
*/
- void startExecution(Object notifier, InvocationContext context);
+ void startExecution(InvocationContext context);
- void applicationInfo(Object notifier, InvocationContext context, String... data);
+ void applicationInfo(InvocationContext context, String... data);
- void finishExecution(Object notifier, InvocationContext context);
+ void finishExecution(InvocationContext context);
- void statusChanged(Object notifier, InvocationContext context, String... data);
+ void statusChanged(InvocationContext context, String... data);
- void executionFail(Object notifier, InvocationContext context, Exception e, String... data);
+ void executionFail(InvocationContext context, Exception e, String... data);
/*
* Interface for developer to use
*/
- void debug(Object notifier, InvocationContext context, String... data);
+ void debug(InvocationContext context, String... data);
- void info(Object notifier, InvocationContext context, String... data);
+ void info(InvocationContext context, String... data);
- void warning(Object notifier, InvocationContext context, String... data);
+ void warning(InvocationContext context, String... data);
- void exception(Object notifier, InvocationContext context, String... data);
+ void exception(InvocationContext context, String... data);
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/DefaultNotifier.java Fri Sep 16 21:13:44 2011
@@ -49,30 +49,30 @@ public class DefaultNotifier implements
return notifiableObjects.toArray(new GFacNotifiable[]{});
}
- public void startSchedule(Object notifier, InvocationContext context) {
+ public void startSchedule(InvocationContext context) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.startSchedule(notifier, context);
+ notif.startSchedule(context);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
- public void finishSchedule(Object notifier, InvocationContext context) {
+ public void finishSchedule(InvocationContext context) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.finishSchedule(notifier, context);
+ notif.finishSchedule(context);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
- public void input(Object notifier, InvocationContext context, String... data) {
+ public void input(InvocationContext context, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.info(notifier, context, data);
+ notif.info(context, data);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
@@ -89,70 +89,70 @@ public class DefaultNotifier implements
}
}
- public void startExecution(Object notifier, InvocationContext context) {
+ public void startExecution(InvocationContext context) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.startExecution(notifier, context);
+ notif.startExecution(context);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
- public void applicationInfo(Object notifier, InvocationContext context, String... data) {
+ public void applicationInfo(InvocationContext context, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.applicationInfo(notifier, context, data);
+ notif.applicationInfo(context, data);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
- public void finishExecution(Object notifier, InvocationContext context) {
+ public void finishExecution(InvocationContext context) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.finishExecution(notifier, context);
+ notif.finishExecution(context);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
- public void statusChanged(Object notifier, InvocationContext context, String... data) {
+ public void statusChanged(InvocationContext context, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.statusChanged(notifier, context, data);
+ notif.statusChanged(context, data);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
- public void executionFail(Object notifier, InvocationContext context, Exception e, String... data) {
+ public void executionFail(InvocationContext context, Exception e, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.executionFail(notifier, context, e, data);
+ notif.executionFail(context, e, data);
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
}
}
- public void debug(Object notifier, InvocationContext context, String... data) {
+ public void debug(InvocationContext context, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.debug(notifier, context, data);
+ notif.debug(context, data);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
- public void info(Object notifier, InvocationContext context, String... data) {
+ public void info(InvocationContext context, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.info(notifier, context, data);
+ notif.info(context, data);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
@@ -160,10 +160,10 @@ public class DefaultNotifier implements
}
- public void warning(Object notifier, InvocationContext context, String... data) {
+ public void warning(InvocationContext context, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.warning(notifier, context, data);
+ notif.warning(context, data);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
@@ -171,10 +171,10 @@ public class DefaultNotifier implements
}
- public void exception(Object notifier, InvocationContext context, String... data) {
+ public void exception(InvocationContext context, String... data) {
for (GFacNotifiable notif : notifiableObjects) {
try {
- notif.exception(notifier, context, data);
+ notif.exception(context, data);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/LoggingNotification.java Fri Sep 16 21:13:44 2011
@@ -33,59 +33,59 @@ public class LoggingNotification impleme
protected final Logger log = LoggerFactory.getLogger(LoggingNotification.class);
- public void startSchedule(Object notifier, InvocationContext context) {
- printOut(notifier, context, "Start scheduling");
+ public void startSchedule(InvocationContext context) {
+ printOut(context, "Start scheduling");
}
- public void finishSchedule(Object notifier, InvocationContext context) {
- printOut(notifier, context, "Finish scheduling");
+ public void finishSchedule(InvocationContext context) {
+ printOut(context, "Finish scheduling");
}
- public void input(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void input(InvocationContext context, String... data) {
+ printOut(context, data);
}
public void output(Object notifier, InvocationContext context, String... data) {
}
- public void startExecution(Object notifier, InvocationContext context) {
- printOut(notifier, context, "Start execution");
+ public void startExecution(InvocationContext context) {
+ printOut(context, "Start execution");
}
- public void applicationInfo(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void applicationInfo(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void finishExecution(Object notifier, InvocationContext context) {
- printOut(notifier, context, "Finish execution");
+ public void finishExecution(InvocationContext context) {
+ printOut(context, "Finish execution");
}
- public void statusChanged(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void statusChanged(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void executionFail(Object notifier, InvocationContext context, Exception e, String... data) {
- printOut(notifier, context, data);
+ public void executionFail(InvocationContext context, Exception e, String... data) {
+ printOut(context, data);
}
- public void debug(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void debug(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void info(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void info(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void warning(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void warning(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void exception(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void exception(InvocationContext context, String... data) {
+ printOut(context, data);
}
- private void printOut(Object notifier, InvocationContext context, String... data) {
- log.info("Notifier: " + notifier.getClass().toString());
+ private void printOut(InvocationContext context, String... data) {
+ log.info("Notifier: " + this.getClass().toString());
if (data != null) {
log.info("-----DATA-----");
for (int i = 0; i < data.length; i++) {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/StandardOutNotification.java Fri Sep 16 21:13:44 2011
@@ -28,59 +28,59 @@ import org.apache.airavata.core.gfac.not
*/
public class StandardOutNotification implements GFacNotifiable {
- public void startSchedule(Object notifier, InvocationContext context) {
- printOut(notifier, context);
+ public void startSchedule(InvocationContext context) {
+ printOut(context);
}
- public void finishSchedule(Object notifier, InvocationContext context) {
- printOut(notifier, context);
+ public void finishSchedule(InvocationContext context) {
+ printOut(context);
}
- public void input(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void input(InvocationContext context, String... data) {
+ printOut(context, data);
}
public void output(Object notifier, InvocationContext context, String... data) {
}
- public void startExecution(Object notifier, InvocationContext context) {
- printOut(notifier, context);
+ public void startExecution(InvocationContext context) {
+ printOut(context);
}
- public void applicationInfo(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void applicationInfo(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void finishExecution(Object notifier, InvocationContext context) {
- printOut(notifier, context);
+ public void finishExecution(InvocationContext context) {
+ printOut(context);
}
- public void statusChanged(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void statusChanged(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void executionFail(Object notifier, InvocationContext context, Exception e, String... data) {
- printOut(notifier, context, data);
+ public void executionFail(InvocationContext context, Exception e, String... data) {
+ printOut(context, data);
}
- public void debug(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void debug(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void info(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void info(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void warning(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void warning(InvocationContext context, String... data) {
+ printOut(context, data);
}
- public void exception(Object notifier, InvocationContext context, String... data) {
- printOut(notifier, context, data);
+ public void exception(InvocationContext context, String... data) {
+ printOut(context, data);
}
- private void printOut(Object notifier, InvocationContext context, String... data) {
- System.out.println("Notifier: " + notifier.getClass().toString());
+ private void printOut(InvocationContext context, String... data) {
+ System.out.println("Notifier: " + this.getClass().toString());
if (data != null) {
System.out.println("-----DATA-----");
for (int i = 0; i < data.length; i++) {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/notification/impl/WorkflowTrackingNotification.java Fri Sep 16 21:13:44 2011
@@ -81,48 +81,48 @@ public class WorkflowTrackingNotificatio
this.invocationContext = this.notifier.workflowInvoked(this.context, this.initiator);
}
- public void startSchedule(Object notifier, InvocationContext context) {
+ public void startSchedule(InvocationContext context) {
}
- public void finishSchedule(Object notifier, InvocationContext context) {
+ public void finishSchedule(InvocationContext context) {
}
- public void input(Object notifier, InvocationContext context, String... data) {
+ public void input(InvocationContext context, String... data) {
}
public void output(Object notifier, InvocationContext context, String... data) {
}
- public void startExecution(Object notifier, InvocationContext context) {
+ public void startExecution(InvocationContext context) {
this.duration = this.notifier.computationStarted();
}
- public void applicationInfo(Object notifier, InvocationContext context, String... data) {
+ public void applicationInfo(InvocationContext context, String... data) {
}
- public void finishExecution(Object notifier, InvocationContext context) {
+ public void finishExecution(InvocationContext context) {
this.duration = this.notifier.computationFinished(this.context, this.duration);
}
- public void statusChanged(Object notifier, InvocationContext context, String... data) {
+ public void statusChanged(InvocationContext context, String... data) {
this.notifier.info(this.context, data);
}
- public void executionFail(Object notifier, InvocationContext context, Exception e, String... data) {
+ public void executionFail(InvocationContext context, Exception e, String... data) {
this.notifier.sendingFault(this.context, this.invocationContext, data);
}
- public void debug(Object notifier, InvocationContext context, String... data) {
+ public void debug(InvocationContext context, String... data) {
}
- public void info(Object notifier, InvocationContext context, String... data) {
+ public void info(InvocationContext context, String... data) {
this.notifier.info(this.context, data);
}
- public void warning(Object notifier, InvocationContext context, String... data) {
+ public void warning(InvocationContext context, String... data) {
}
- public void exception(Object notifier, InvocationContext context, String... data) {
+ public void exception(InvocationContext context, String... data) {
}
public InvocationEntity getReceiver() {
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java Fri Sep 16 21:13:44 2011
@@ -60,14 +60,14 @@ public abstract class AbstractProvider i
GFacNotifier notifier = invocationContext.getExecutionContext().getNotifier();
- notifier.startExecution(this, invocationContext);
+ notifier.startExecution(invocationContext);
/*
* Execution application
*/
executeApplication(invocationContext);
- notifier.finishExecution(this, invocationContext);
+ notifier.finishExecution(invocationContext);
/*
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=1171786&r1=1171785&r2=1171786&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 Fri Sep 16 21:13:44 2011
@@ -148,7 +148,7 @@ public class GramProvider extends Abstra
.append(app.getTmpDir())
.append(" Globus GateKeeper cantact = ")
.append(gateKeeper);
- invocationContext.getExecutionContext().getNotifier().info(this, invocationContext, buf.toString());
+ invocationContext.getExecutionContext().getNotifier().info(invocationContext, buf.toString());
/*
* The first boolean is to specify the job is a batch job - use true
@@ -158,14 +158,14 @@ public class GramProvider extends Abstra
job.request(gateKeeper, false, false);
String gramJobid = job.getIDAsString();
log.info("JobID = " + gramJobid);
- invocationContext.getExecutionContext().getNotifier().info(this, invocationContext, "JobID=" + gramJobid);
+ invocationContext.getExecutionContext().getNotifier().info(invocationContext, "JobID=" + gramJobid);
log.info(buf.toString());
invocationContext
.getExecutionContext()
.getNotifier()
- .applicationInfo(this, invocationContext, gramJobid, gateKeeper, null, null,
+ .applicationInfo(invocationContext, gramJobid, gateKeeper, null, null,
gssCred.getName().toString(), null, job.getRSL());
/*
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/utils/JobSubmissionListener.java Fri Sep 16 21:13:44 2011
@@ -123,7 +123,7 @@ public class JobSubmissionListener imple
/*
* Notify status change
*/
- this.context.getExecutionContext().getNotifier().statusChanged(this, this.context, jobStatusMessage);
+ this.context.getExecutionContext().getNotifier().statusChanged(this.context, jobStatusMessage);
/*
* Set new status if it is finished, notify all wait object
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java?rev=1171786&r1=1171785&r2=1171786&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/AbstractSimpleService.java Fri Sep 16 21:13:44 2011
@@ -84,9 +84,9 @@ public abstract class AbstractSimpleServ
* Determine provider
*/
Scheduler scheduler = getScheduler(context);
- context.getExecutionContext().getNotifier().startSchedule(this, context);
+ context.getExecutionContext().getNotifier().startSchedule(context);
Provider provider = scheduler.schedule(context);
- context.getExecutionContext().getNotifier().finishSchedule(this, context);
+ context.getExecutionContext().getNotifier().finishSchedule(context);
log.debug("After scheduling, try to run data chain");