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 2013/12/10 21:56:35 UTC
svn commit: r1549968 - in /airavata/trunk/modules/gfac: gfac-core/src/main/java/org/apache/airavata/gfac/notification/events/ gfac-core/src/main/java/org/apache/airavata/gfac/notification/listeners/ gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/ ...

Author: lahiru
Date: Tue Dec 10 20:56:35 2013
New Revision: 1549968

URL: http://svn.apache.org/r1549968
Log:
more fixes.

Added:
    airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2ProviderEvent.java
      - copied, changed from r1549966, airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/events/EC2ProviderEvent.java
Removed:
    airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/events/EC2ProviderEvent.java
Modified:
    airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/listeners/LoggingListener.java
    airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2Provider.java
    airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/util/AmazonEC2Util.java

Modified: airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/listeners/LoggingListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/listeners/LoggingListener.java?rev=1549968&r1=1549967&r2=1549968&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/listeners/LoggingListener.java (original)
+++ airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/listeners/LoggingListener.java Tue Dec 10 20:56:35 2013
@@ -54,9 +54,4 @@ public class LoggingListener {
         log.info("Job status has changed ...");
         log.info(event.getStatusMessage());
     }
-
-    @Subscribe
-    public void logStatusChangeEvent(EC2ProviderEvent event){
-        log.info(event.getStatusMessage());
-    }
 }

Modified: airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2Provider.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2Provider.java?rev=1549968&r1=1549967&r2=1549968&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2Provider.java (original)
+++ airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2Provider.java Tue Dec 10 20:56:35 2013
@@ -46,7 +46,6 @@ import org.apache.airavata.gfac.GFacExce
 import org.apache.airavata.gfac.context.JobExecutionContext;
 import org.apache.airavata.gfac.ec2.util.AmazonEC2Util;
 import org.apache.airavata.gfac.ec2.util.EC2ProviderUtil;
-import org.apache.airavata.gfac.notification.events.EC2ProviderEvent;
 import org.apache.airavata.gfac.provider.GFacProvider;
 import org.apache.airavata.gfac.provider.GFacProviderException;
 import org.apache.airavata.gfac.provider.utils.ProviderUtils;

Copied: airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2ProviderEvent.java (from r1549966, airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/events/EC2ProviderEvent.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2ProviderEvent.java?p2=airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2ProviderEvent.java&p1=airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/events/EC2ProviderEvent.java&r1=1549966&r2=1549968&rev=1549968&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/notification/events/EC2ProviderEvent.java (original)
+++ airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/EC2ProviderEvent.java Tue Dec 10 20:56:35 2013
@@ -19,7 +19,9 @@
  *
  */
 
-package org.apache.airavata.gfac.notification.events;
+package org.apache.airavata.gfac.ec2;
+
+import org.apache.airavata.gfac.notification.events.GFacEvent;
 
 public class EC2ProviderEvent extends GFacEvent {
     String statusMessage;

Modified: airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/util/AmazonEC2Util.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/util/AmazonEC2Util.java?rev=1549968&r1=1549967&r2=1549968&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/util/AmazonEC2Util.java (original)
+++ airavata/trunk/modules/gfac/gfac-ec2/src/main/java/org/apache/airavata/gfac/ec2/util/AmazonEC2Util.java Tue Dec 10 20:56:35 2013
@@ -26,7 +26,7 @@ import com.amazonaws.AmazonServiceExcept
 import com.amazonaws.services.ec2.AmazonEC2Client;
 import com.amazonaws.services.ec2.model.*;
 import org.apache.airavata.gfac.context.JobExecutionContext;
-import org.apache.airavata.gfac.notification.events.EC2ProviderEvent;
+import org.apache.airavata.gfac.ec2.EC2ProviderEvent;
 
 import java.util.ArrayList;
 import java.util.List;