[Swift-commit] r2507 - in provider-deef: . src/org/globus/cog/abstraction/impl/execution/deef

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2009-02-06 20:13:49 -0600 (Fri, 06 Feb 2009)
New Revision: 2507

Modified:
   provider-deef/project.properties
   provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/JobSubmissionTaskHandler.java
Log:
cancel message; removed dependency on karajan; updated version

Modified: provider-deef/project.properties
===================================================================
--- provider-deef/project.properties	2009-02-06 22:22:00 UTC (rev 2506)
+++ provider-deef/project.properties	2009-02-07 02:13:49 UTC (rev 2507)
@@ -1,6 +1,6 @@
 module.name 	= provider-deef
 long.name 		= DeeF provider for abstractions
-version			= 1.0
+version			= 1.1
 project			= Java CoG Kit
 lib.deps		= FalkonStubs.jar, concurrent.jar
 debug			= true

Modified: provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/JobSubmissionTaskHandler.java
===================================================================
--- provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/JobSubmissionTaskHandler.java	2009-02-06 22:22:00 UTC (rev 2506)
+++ provider-deef/src/org/globus/cog/abstraction/impl/execution/deef/JobSubmissionTaskHandler.java	2009-02-07 02:13:49 UTC (rev 2507)
@@ -6,18 +6,17 @@
 
 package org.globus.cog.abstraction.impl.execution.deef;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Vector;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Vector;
 
-import org.apache.axis.components.uuid.UUIDGenFactory;
-import org.apache.axis.message.addressing.Address;
 import org.apache.axis.message.addressing.EndpointReferenceType;
-import org.apache.axis.types.NonNegativeInteger;
-import org.apache.axis.types.PositiveInteger;
 import org.apache.log4j.Logger;
+import org.globus.GenericPortal.stubs.GPService_instance.DataFiles;
+import org.globus.GenericPortal.stubs.GPService_instance.DeInit;
+import org.globus.GenericPortal.stubs.GPService_instance.DeInitResponse;
+import org.globus.GenericPortal.stubs.GPService_instance.Executable;
+import org.globus.GenericPortal.stubs.GPService_instance.GPPortType;
 import org.globus.cog.abstraction.impl.common.StatusImpl;
 import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
 import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
@@ -28,30 +27,10 @@
 import org.globus.cog.abstraction.interfaces.ServiceContact;
 import org.globus.cog.abstraction.interfaces.Status;
 import org.globus.cog.abstraction.interfaces.Task;
-
-import org.xml.sax.InputSource;
-import org.oasis.wsrf.lifetime.WSResourceLifetimeServiceAddressingLocator;
 import org.oasis.wsrf.lifetime.ImmediateResourceTermination;
-import org.oasis.wsrf.properties.GetResourcePropertyResponse;
-import org.globus.wsrf.NotificationConsumerManager;
-import org.globus.wsrf.utils.AddressingUtils;
-import org.globus.wsrf.ResourceKey;
-import org.globus.wsrf.encoding.ObjectDeserializer;
+import org.oasis.wsrf.lifetime.WSResourceLifetimeServiceAddressingLocator;
 
-import org.globus.GenericPortal.stubs.GPService_instance.*;
-import org.globus.GenericPortal.stubs.GPService_instance.GPPortType;
-import org.globus.GenericPortal.stubs.GPService_instance.service.GPServiceAddressingLocator;
 
-import org.globus.GenericPortal.stubs.Factory.CreateResource;
-import org.globus.GenericPortal.stubs.Factory.CreateResourceResponse;
-import org.globus.GenericPortal.stubs.Factory.FactoryPortType;
-import org.globus.GenericPortal.stubs.Factory.service.FactoryServiceAddressingLocator;
-
-import org.globus.GenericPortal.common.Notification;
-
-import org.globus.cog.karajan.util.TypeUtil;
-
-
 //import org.globus.GenericPortal.clients.GPService_instance.*;
 
 public class JobSubmissionTaskHandler implements DelegatedTaskHandler
@@ -206,12 +185,17 @@
     TaskSubmissionException {
         // not implemented yet
     }
-
+    
     public void cancel() throws InvalidSecurityContextException,
     TaskSubmissionException {
+        cancel(null);
+    }
+
+    public void cancel(String message) throws InvalidSecurityContextException,
+    TaskSubmissionException {
         try
         {
-            this.task.setStatus(Status.CANCELED);
+            this.task.setStatus(new StatusImpl(Status.CANCELED, message, null));
             //cleanup();
         } catch (Exception e)
         {
@@ -226,7 +210,7 @@
         String s = (String)spec.getAttribute("maxwalltime");
         if (s != null)
         {
-            return timeToSeconds(TypeUtil.toString(s));
+            return timeToSeconds(s);
         }
         else
             return 0;