Changeset 1396 for DCWoRMS/branches/coolemall/src/example/globalplugin

Timestamp:

06/26/14 14:18:01 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/example/globalplugin

Files:

• BaseGlobalPlugin.java (modified) (1 diff)
• GridFCFSLoadBalancingPlugin.java (modified) (2 diffs)
• GridFCFSRandomPlugin.java (modified) (3 diffs)
• GridFCFSRoundRobinPlugin.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/example/globalplugin/BaseGlobalPlugin.java

@@ -6 +6 @@
 import schedframe.scheduling.TaskList;
 import schedframe.scheduling.manager.resources.ResourceManager;
+import schedframe.scheduling.plugin.ModuleList;
 import schedframe.scheduling.plugin.SchedulingPluginConfiguration;
 import schedframe.scheduling.plugin.grid.GlobalSchedulingPlugin;
-import schedframe.scheduling.plugin.grid.ModuleList;
 import schedframe.scheduling.queue.TaskQueue;
 import schedframe.scheduling.queue.TaskQueueList;

DCWoRMS/branches/coolemall/src/example/globalplugin/GridFCFSLoadBalancingPlugin.java

@@ -3 +3 @@
 
 import java.util.List;
-import java.util.Properties;
 
 import org.apache.commons.logging.Log;
@@ -16 +15 @@
 import schedframe.scheduling.plan.impl.ScheduledTask;
 import schedframe.scheduling.plan.impl.SchedulingPlan;
-import schedframe.scheduling.plugin.grid.Module;
-import schedframe.scheduling.plugin.grid.ModuleList;
+import schedframe.scheduling.plugin.Module;
+import schedframe.scheduling.plugin.ModuleList;
 import schedframe.scheduling.plugin.grid.ResourceDiscovery;
 import schedframe.scheduling.queue.QueueDescription;

DCWoRMS/branches/coolemall/src/example/globalplugin/GridFCFSRandomPlugin.java

@@ -2 +2 @@
 
 import java.util.List;
-import java.util.Properties;
 import java.util.Random;
 
@@ -13 +12 @@
 import schedframe.scheduling.plan.impl.ScheduledTask;
 import schedframe.scheduling.plan.impl.SchedulingPlan;
-import schedframe.scheduling.plugin.grid.Module;
-import schedframe.scheduling.plugin.grid.ModuleList;
+import schedframe.scheduling.plugin.Module;
+import schedframe.scheduling.plugin.ModuleList;
 import schedframe.scheduling.plugin.grid.ResourceDiscovery;
 import schedframe.scheduling.queue.TaskQueue;
@@ -29 +28 @@
         }
         
-        public SchedulingPlanInterface schedule(SchedulingEvent event,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event,
                         TaskQueueList queues, 
                         JobRegistry jobRegistry,

DCWoRMS/branches/coolemall/src/example/globalplugin/GridFCFSRoundRobinPlugin.java

@@ -12 +12 @@
 import schedframe.scheduling.plan.impl.ScheduledTask;
 import schedframe.scheduling.plan.impl.SchedulingPlan;
-import schedframe.scheduling.plugin.grid.Module;
-import schedframe.scheduling.plugin.grid.ModuleList;
+import schedframe.scheduling.plugin.Module;
+import schedframe.scheduling.plugin.ModuleList;
 import schedframe.scheduling.plugin.grid.ResourceDiscovery;
 import schedframe.scheduling.queue.TaskQueue;
@@ -24 +24 @@
         private LinkedList<String> lastUsedResources = new LinkedList<String>();
 
-        public SchedulingPlanInterface schedule(SchedulingEvent event,
+        public SchedulingPlanInterface<?> schedule(SchedulingEvent event,
                         TaskQueueList queues, 
                         JobRegistry jobRegistry,