Changeset 515 for DCWoRMS/trunk/src

Timestamp:

10/12/12 15:27:52 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• example/localplugin/BaseLocalSchedulingPlugin.java (modified) (2 diffs)
• schedframe/resources/computing/extensions/ExtensionType.java (modified) (1 diff)
• schedframe/scheduling/plugin/SchedulingPlugin.java (modified) (1 diff)
• schedframe/scheduling/plugin/grid/JobRegistry.java (deleted)
• schedframe/scheduling/plugin/grid/ModuleType.java (modified) (1 diff)
• schedframe/scheduling/plugin/local/LocalSchedulingPlugin.java (modified) (2 diffs)

DCWoRMS/trunk/src/example/localplugin/BaseLocalSchedulingPlugin.java

@@ -12 +12 @@
 import schedframe.scheduling.TaskList;
 import schedframe.scheduling.manager.resources.ResourceManager;
-import schedframe.scheduling.manager.tasks.JobRegistryImpl;
+import schedframe.scheduling.manager.tasks.JobRegistry;
 import schedframe.scheduling.plan.impl.Allocation;
 import schedframe.scheduling.plan.impl.ScheduledTask;
@@ -34 +34 @@
         public SchedulingResponseType handleResourceAllocationViolation(SchedulingEvent event,
                         TaskQueueList queues, 
-                        JobRegistryImpl jobRegistry, 
+                        JobRegistry jobRegistry, 
                                         ResourceManager resourceManager, ModuleList modules){
                 SchedulingResponseType responeEvent = null;

DCWoRMS/trunk/src/schedframe/resources/computing/extensions/ExtensionType.java

@@ -2 +2 @@
 
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
-import schedframe.scheduling.plugin.grid.JobRegistry;
 
 public enum ExtensionType {
 
-        JOB_REGISTRY("Job registry", JobRegistry.class),
         ENERGY_EXTENSION("EnergyExtension", EnergyExtension.class);
         

DCWoRMS/trunk/src/schedframe/scheduling/plugin/SchedulingPlugin.java

@@ -4 +4 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.scheduling.TaskList;
-import schedframe.scheduling.TaskListImpl;
 import schedframe.scheduling.manager.resources.ResourceManager;
 import schedframe.scheduling.manager.tasks.JobRegistry;

DCWoRMS/trunk/src/schedframe/scheduling/plugin/grid/ModuleType.java

@@ -12 +12 @@
 
         RESOURCE_DISCOVERY("Resource_discovery", ResourceDiscovery.class),
-        JOB_REGISTRY("Job registry", JobRegistry.class),
         RESOURCE_CALENDAR("Resource Calendar", StaticResourceLoadCalendar.class);
         //DATA_MANAGER("Data Manager", DataManager.class),

DCWoRMS/trunk/src/schedframe/scheduling/plugin/local/LocalSchedulingPlugin.java

@@ -4 +4 @@
 import schedframe.events.scheduling.SchedulingResponseType;
 import schedframe.scheduling.manager.resources.ResourceManager;
-import schedframe.scheduling.manager.tasks.JobRegistryImpl;
+import schedframe.scheduling.manager.tasks.JobRegistry;
 import schedframe.scheduling.plugin.SchedulingPlugin;
 import schedframe.scheduling.plugin.grid.ModuleList;
@@ -14 +14 @@
         public SchedulingResponseType handleResourceAllocationViolation(SchedulingEvent event,
                                         TaskQueueList queues, 
-                                        JobRegistryImpl jobRegistry, 
+                                        JobRegistry jobRegistry, 
                                         ResourceManager resourceManager, ModuleList modules);