Menu
▾
▴
cogkit-svn — SVN update notifications are sent to this mailing list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(39) |
May
(165) |
Jun
(164) |
Jul
(127) |
Aug
(81) |
Sep
(146) |
Oct
(375) |
Nov
(241) |
Dec
(77) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(42) |
Feb
(38) |
Mar
(30) |
Apr
(6) |
May
(17) |
Jun
|
Jul
(15) |
Aug
(59) |
Sep
(31) |
Oct
(44) |
Nov
(30) |
Dec
(12) |
| 2008 |
Jan
(9) |
Feb
(63) |
Mar
(18) |
Apr
(43) |
May
(28) |
Jun
(32) |
Jul
(61) |
Aug
(5) |
Sep
(72) |
Oct
(48) |
Nov
(6) |
Dec
|
|
From: <ha...@us...> - 2007-08-22 21:40:29
|
Revision: 1707
http://cogkit.svn.sourceforge.net/cogkit/?rev=1707&view=rev
Author: hategan
Date: 2007-08-22 14:40:26 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
added kernelprofile
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
Modified: trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-08-22 18:52:02 UTC (rev 1706)
+++ trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-08-22 21:40:26 UTC (rev 1707)
@@ -2,6 +2,9 @@
*** The cobalt provider was not passing command line arguments
to the job
+
+*** Added -k <kernel profile> option for cobalt. The spec attribute
+ is "kernelprofile".
(08/20/07)
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-08-22 18:52:02 UTC (rev 1706)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-08-22 21:40:26 UTC (rev 1707)
@@ -158,6 +158,7 @@
addAttr("count", "-n", l, "1");
addAttr("project", "-p", l);
addAttr("queue", "-q", l);
+ addAttr("kernelprofile", "-k", l);
// cqsub seems to require both the node count and time args
addAttr("maxwalltime", "-t", l, "10");
if (spec.getDirectory() != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-22 18:52:04
|
Revision: 1706
http://cogkit.svn.sourceforge.net/cogkit/?rev=1706&view=rev
Author: hategan
Date: 2007-08-22 11:52:02 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
arguments
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
Modified: trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-08-22 16:59:55 UTC (rev 1705)
+++ trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-08-22 18:52:02 UTC (rev 1706)
@@ -1,3 +1,8 @@
+(08/22/07)
+
+*** The cobalt provider was not passing command line arguments
+ to the job
+
(08/20/07)
*** Redirection updates
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-08-22 16:59:55 UTC (rev 1705)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-08-22 18:52:02 UTC (rev 1706)
@@ -169,7 +169,7 @@
l.add("-E");
l.add(stderr);
l.add(spec.getExecutable());
- List args = spec.getArgumentsAsList();
+ l.addAll(spec.getArgumentsAsList());
if (logger.isDebugEnabled()) {
logger.debug("Cqsub cmd line: " + l);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-22 16:59:59
|
Revision: 1705
http://cogkit.svn.sourceforge.net/cogkit/?rev=1705&view=rev
Author: hategan
Date: 2007-08-22 09:59:55 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
changes
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/CHANGES.txt
Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-08-22 16:58:43 UTC (rev 1704)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-08-22 16:59:55 UTC (rev 1705)
@@ -1,3 +1,8 @@
+(08/22/2007)
+
+*** failOnJobError=false would not make task:execute() return
+ anything if the job succeeded. Now it returns a 0.
+
(08/20/2007)
*** Added failOnJobError flag to task:execute(). Should it be set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-22 16:58:45
|
Revision: 1704
http://cogkit.svn.sourceforge.net/cogkit/?rev=1704&view=rev
Author: hategan
Date: 2007-08-22 09:58:43 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
also return exit code if failOnJobError is false and the job does not fail
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-08-21 22:22:02 UTC (rev 1703)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-08-22 16:58:43 UTC (rev 1704)
@@ -306,6 +306,9 @@
protected void taskCompleted(StatusEvent e, VariableStack stack) throws ExecutionException {
Task t = (Task) e.getSource();
returnOutputs(t, stack);
+ if (!TypeUtil.toBoolean(A_FAIL_ON_JOB_ERROR.getValue(stack))) {
+ Arg.VARGS.ret(stack, new Integer(0));
+ }
super.taskCompleted(e, stack);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:39:52
|
Revision: 1698
http://cogkit.svn.sourceforge.net/cogkit/?rev=1698&view=rev
Author: hategan
Date: 2007-08-20 15:39:51 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
added location constants
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/resources/task.xml
Modified: trunk/current/src/cog/modules/karajan/resources/task.xml
===================================================================
--- trunk/current/src/cog/modules/karajan/resources/task.xml 2007-08-20 22:39:25 UTC (rev 1697)
+++ trunk/current/src/cog/modules/karajan/resources/task.xml 2007-08-20 22:39:51 UTC (rev 1698)
@@ -27,6 +27,11 @@
<import file="sys.xml"/>
+
+ <global name="LOCATION:STREAM" value="1"/>
+ <global name="LOCATION:LOCAL" value="2"/>
+ <global name="LOCATION:REMOTE" value="4"/>
+
<import file="java.xml"/>
<export name="SSHSecurityContext">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:39:38
|
Revision: 1696
http://cogkit.svn.sourceforge.net/cogkit/?rev=1696&view=rev
Author: hategan
Date: 2007-08-20 15:39:11 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
added stdoutLocation, stderrLocation, and failOnJobError
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-08-20 22:34:12 UTC (rev 1695)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-08-20 22:39:11 UTC (rev 1696)
@@ -15,9 +15,12 @@
import org.apache.log4j.Logger;
import org.globus.cog.abstraction.impl.common.StatusEvent;
+import org.globus.cog.abstraction.impl.common.execution.JobException;
import org.globus.cog.abstraction.impl.common.task.GenericTaskHandler;
import org.globus.cog.abstraction.impl.common.task.JobSpecificationImpl;
import org.globus.cog.abstraction.impl.common.task.TaskImpl;
+import org.globus.cog.abstraction.interfaces.FileLocation;
+import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Service;
import org.globus.cog.abstraction.interfaces.StatusListener;
import org.globus.cog.abstraction.interfaces.Task;
@@ -43,6 +46,8 @@
public static final Arg A_HOST = new Arg.Optional("host");
public static final Arg A_STDOUT = new Arg.Optional("stdout");
public static final Arg A_STDERR = new Arg.Optional("stderr");
+ public static final Arg A_STDOUTLOCATION = new Arg.Optional("stdoutLocation");
+ public static final Arg A_STDERRLOCATION = new Arg.Optional("stderrLocation");
public static final Arg A_STDIN = new Arg.Optional("stdin");
public static final Arg A_PROVIDER = new Arg.Optional("provider");
public static final Arg A_SECURITY_CONTEXT = new Arg.Optional("securitycontext");
@@ -62,13 +67,14 @@
public static final Arg A_DELEGATION = new Arg.Optional("delegation", Boolean.FALSE);
public static final Arg.Channel C_ENVIRONMENT = new Arg.Channel("environment");
public static final Arg A_ATTRIBUTES = new Arg.Optional("attributes", Collections.EMPTY_MAP);
+ public static final Arg A_FAIL_ON_JOB_ERROR = new Arg.Optional("failonjoberror", Boolean.TRUE);
static {
setArguments(GridExec.class, new Arg[] { A_EXECUTABLE, A_ARGS, A_ARGUMENTS, A_HOST,
- A_STDOUT, A_STDERR, A_STDIN, A_PROVIDER, A_COUNT, A_JOBTYPE, A_MAXTIME,
- A_MAXWALLTIME, A_MAXCPUTIME, A_ENVIRONMENT, A_QUEUE, A_PROJECT, A_MINMEMORY,
- A_MAXMEMORY, A_REDIRECT, A_SECURITY_CONTEXT, A_DIRECTORY, A_NATIVESPEC,
- A_DELEGATION, A_ATTRIBUTES, C_ENVIRONMENT });
+ A_STDOUT, A_STDERR, A_STDOUTLOCATION, A_STDERRLOCATION, A_STDIN, A_PROVIDER,
+ A_COUNT, A_JOBTYPE, A_MAXTIME, A_MAXWALLTIME, A_MAXCPUTIME, A_ENVIRONMENT, A_QUEUE,
+ A_PROJECT, A_MINMEMORY, A_MAXMEMORY, A_REDIRECT, A_SECURITY_CONTEXT, A_DIRECTORY,
+ A_NATIVESPEC, A_DELEGATION, A_ATTRIBUTES, C_ENVIRONMENT, A_FAIL_ON_JOB_ERROR });
}
public void submitTask(VariableStack stack) throws ExecutionException {
@@ -79,9 +85,10 @@
Iterator i = named.getNames();
Object host = null;
String provider = null;
+ boolean redirect = false;
while (i.hasNext()) {
String name = (String) i.next();
-
+
Object value = named.getArgument(name);
if (name.equals(A_EXECUTABLE.getName())) {
js.setExecutable(TypeUtil.toString(value));
@@ -98,7 +105,7 @@
}
}
else if (name.equals(A_REDIRECT.getName())) {
- js.setRedirected(TypeUtil.toBoolean(value));
+ redirect = TypeUtil.toBoolean(value);
}
else if (name.equals(A_STDIN.getName())) {
js.setStdInput(TypeUtil.toString(value));
@@ -106,9 +113,15 @@
else if (name.equals(A_STDOUT.getName())) {
js.setStdOutput(TypeUtil.toString(value));
}
+ else if (name.equals(A_STDOUTLOCATION.getName())) {
+ js.setStdOutputLocation(new FileLocation.Impl(TypeUtil.toInt(value)));
+ }
else if (name.equals(A_STDERR.getName())) {
js.setStdError(TypeUtil.toString(value));
}
+ else if (name.equals(A_STDERRLOCATION.getName())) {
+ js.setStdErrorLocation(new FileLocation.Impl(TypeUtil.toInt(value)));
+ }
else if (name.equals(A_DIRECTORY.getName())) {
js.setDirectory(TypeUtil.toString(value));
}
@@ -165,7 +178,8 @@
js.setAttribute((String) e.getKey(), e.getValue());
}
catch (ClassCastException ex) {
- throw new ExecutionException("Invalid attribute name (" + e.getKey() + ")", ex);
+ throw new ExecutionException("Invalid attribute name (" + e.getKey()
+ + ")", ex);
}
}
}
@@ -173,7 +187,12 @@
js.setAttribute(name, value);
}
}
-
+
+ if (redirect) {
+ js.setStdOutputLocation(FileLocation.MEMORY);
+ js.setStdErrorLocation(FileLocation.MEMORY);
+ }
+
VariableArguments env = C_ENVIRONMENT.get(stack);
Iterator j = env.iterator();
while (j.hasNext()) {
@@ -253,42 +272,50 @@
throw new ExecutionException("Exception caught while submitting job", e);
}
}
-
+
private List stringify(List l) {
- ArrayList sl = new ArrayList(l.size());
- Iterator i = l.iterator();
- while (i.hasNext()) {
- sl.add(TypeUtil.toString(i.next()));
- }
- return sl;
+ ArrayList sl = new ArrayList(l.size());
+ Iterator i = l.iterator();
+ while (i.hasNext()) {
+ sl.add(TypeUtil.toString(i.next()));
+ }
+ return sl;
}
protected void taskFailed(StatusEvent e, VariableStack stack) throws ExecutionException {
Task task = (Task) e.getSource();
- if (task.getStdError() != null) {
- failImmediately(stack, task.getStdError());
+ returnOutputs(task, stack);
+ Exception ex = e.getStatus().getException();
+ if (ex instanceof JobException && !TypeUtil.toBoolean(A_FAIL_ON_JOB_ERROR.getValue(stack))) {
+ Arg.VARGS.ret(stack, new Integer(((JobException) ex).getExitCode()));
+ super.taskCompleted(e, stack);
}
- else if (e.getStatus().getException() != null) {
- failImmediately(stack, e.getStatus().getException());
- }
- else if (e.getStatus().getMessage() != null) {
- failImmediately(stack, e.getStatus().getMessage());
- }
else {
- failImmediately(stack, "Task failed");
+ if (e.getStatus().getException() != null) {
+ failImmediately(stack, e.getStatus().getException());
+ }
+ else if (e.getStatus().getMessage() != null) {
+ failImmediately(stack, e.getStatus().getMessage());
+ }
+ else {
+ failImmediately(stack, "Task failed");
+ }
}
}
protected void taskCompleted(StatusEvent e, VariableStack stack) throws ExecutionException {
- if (TypeUtil.toBoolean(A_REDIRECT.getValue(stack))) {
- Task t = (Task) e.getSource();
- if (t.getStdOutput() != null) {
- STDOUT.ret(stack, t.getStdOutput());
- }
- if (t.getStdError() != null) {
- STDERR.ret(stack, t.getStdError());
- }
- }
+ Task t = (Task) e.getSource();
+ returnOutputs(t, stack);
super.taskCompleted(e, stack);
}
+
+ protected void returnOutputs(Task t, VariableStack stack) throws ExecutionException {
+ JobSpecification spec = (JobSpecification) t.getSpecification();
+ if (t.getStdOutput() != null && FileLocation.MEMORY.overlaps(spec.getStdOutputLocation())) {
+ STDOUT.ret(stack, t.getStdOutput());
+ }
+ if (t.getStdError() != null && FileLocation.MEMORY.overlaps(spec.getStdErrorLocation())) {
+ STDERR.ret(stack, t.getStdError());
+ }
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:39:38
|
Revision: 1697
http://cogkit.svn.sourceforge.net/cogkit/?rev=1697&view=rev
Author: hategan
Date: 2007-08-20 15:39:25 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
changes
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/CHANGES.txt
Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-08-20 22:39:11 UTC (rev 1696)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-08-20 22:39:25 UTC (rev 1697)
@@ -1,3 +1,15 @@
+(08/20/2007)
+
+*** Added failOnJobError flag to task:execute(). Should it be set
+ to false, it would prevent task:execute() from failing when
+ a non-zero exit code is detected from the application, and
+ return the exit code instead.
+
+*** Added stdoutLocation and stderrLocation to task:execute().
+ One can now put these two in either the stdout/stderr channels,
+ local files, remote files, or any possible combination of these
+ (assuming the providers support these).
+
(08/16/2007)
*** task:execute() would redirect the job stderr to stdout. Fixed.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:34:14
|
Revision: 1695
http://cogkit.svn.sourceforge.net/cogkit/?rev=1695&view=rev
Author: hategan
Date: 2007-08-20 15:34:12 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
redirection stuff
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-ssh/CHANGES.txt
trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Exec.java
trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/FileTransferTaskHandler.java
trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/JobSubmissionTaskHandler.java
trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHRunner.java
trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHTaskStatusListener.java
trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Sftp.java
trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Ssh.java
Modified: trunk/current/src/cog/modules/provider-ssh/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/CHANGES.txt 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/CHANGES.txt 2007-08-20 22:34:12 UTC (rev 1695)
@@ -1,3 +1,7 @@
+(08/20/2007)
+
+*** Redirection updates
+
-------------------------------2.2----------------------------------
(10/10/2006)
Modified: trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Exec.java
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Exec.java 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Exec.java 2007-08-20 22:34:12 UTC (rev 1695)
@@ -26,14 +26,19 @@
package org.globus.cog.abstraction.impl.execution.ssh;
import java.io.BufferedReader;
+import java.io.CharArrayWriter;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.Writer;
import org.apache.log4j.Logger;
+import org.globus.cog.abstraction.impl.common.execution.JobException;
import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
import org.globus.cog.abstraction.impl.common.task.TaskSubmissionException;
+import org.globus.cog.abstraction.impl.common.util.WriterMultiplexer;
import com.sshtools.j2ssh.session.SessionChannelClient;
@@ -41,8 +46,9 @@
static Logger logger = Logger.getLogger(Exec.class.getName());
private String cmd;
private String dir;
- private StringBuffer taskOutput = new StringBuffer();
- private StringBuffer taskError = new StringBuffer();
+ private String outFile, errFile;
+ private boolean outMem, errMem;
+ private CharArrayWriter out, err;
public void setCmd(String cmd) {
this.cmd = cmd;
@@ -61,7 +67,9 @@
}
public void execute() throws IllegalSpecException, InvalidSecurityContextException,
- InvalidServiceContactException, TaskSubmissionException {
+ InvalidServiceContactException, TaskSubmissionException, JobException {
+ setOutput(outMem || outFile != null);
+ setError(errMem || errFile != null);
super.execute();
try {
SessionChannelClient session = ssh.openSessionChannel();
@@ -81,7 +89,7 @@
}
}
- public void executeCommand(SessionChannelClient session) throws TaskSubmissionException {
+ public void executeCommand(SessionChannelClient session) throws TaskSubmissionException, JobException {
try {
if (getCmd() == null) {
throw new TaskSubmissionException("No executable specified");
@@ -99,6 +107,24 @@
session.getInputStream()));
BufferedReader stderr = new BufferedReader(new InputStreamReader(
session.getStderrInputStream()));
+
+ Writer owr = null;
+ if (outMem) {
+ out = new CharArrayWriter();
+ owr = out;
+ }
+ if (outFile != null) {
+ owr = WriterMultiplexer.multiplex(owr, new FileWriter(outFile));
+ }
+
+ Writer ewr = null;
+ if (errMem) {
+ err = new CharArrayWriter();
+ ewr = err;
+ }
+ if (errFile != null) {
+ ewr = WriterMultiplexer.multiplex(ewr, new FileWriter(errFile));
+ }
/*
* Read all output sent to stdout (line by line) and print it to our
@@ -119,7 +145,7 @@
charsout = 0;
}
if (charsout > 0) {
- this.taskOutput.append(new String(bufout, 0, charsout));
+ owr.write(bufout, 0, charsout);
}
}
if (error) {
@@ -130,7 +156,7 @@
charserr = 0;
}
if (charserr > 0) {
- this.taskError.append(new String(buferr, 0, charserr));
+ ewr.write(buferr, 0, charsout);
}
}
@@ -142,12 +168,20 @@
}
}
}
+
+ if (owr != null) {
+ owr.close();
+ }
+ if (ewr != null) {
+ ewr.close();
+ }
Integer exitcode = session.getExitCode();
if (exitcode != null) {
if (exitcode.intValue() != 0) {
logger.info("Exit code " + exitcode.toString());
+ throw new JobException(exitcode.intValue());
}
}
}
@@ -162,10 +196,52 @@
}
public String getTaskOutput() {
- return this.taskOutput.toString();
+ if (out != null) {
+ return out.toString();
+ }
+ else {
+ return null;
+ }
}
public String getTaskError() {
- return this.taskError.toString();
+ if (err != null) {
+ return err.toString();
+ }
+ else {
+ return null;
+ }
}
+
+ public String getErrFile() {
+ return errFile;
+ }
+
+ public void setErrFile(String errFile) {
+ this.errFile = errFile;
+ }
+
+ public boolean getErrMem() {
+ return errMem;
+ }
+
+ public void setErrMem(boolean errMem) {
+ this.errMem = errMem;
+ }
+
+ public String getOutFile() {
+ return outFile;
+ }
+
+ public void setOutFile(String outFile) {
+ this.outFile = outFile;
+ }
+
+ public boolean getOutMem() {
+ return outMem;
+ }
+
+ public void setOutMem(boolean outMem) {
+ this.outMem = outMem;
+ }
}
\ No newline at end of file
Modified: trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/FileTransferTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/FileTransferTaskHandler.java 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/FileTransferTaskHandler.java 2007-08-20 22:34:12 UTC (rev 1695)
@@ -128,7 +128,7 @@
// perform cleanup if required
}
- public void SSHTaskStatusChanged(int status, String message) {
+ public void SSHTaskStatusChanged(int status, Exception e) {
if (status == SSHTaskStatusListener.COMPLETED) {
this.task.setStatus(Status.COMPLETED);
}
@@ -137,7 +137,6 @@
Status oldStatus = this.task.getStatus();
newStatus.setPrevStatusCode(oldStatus.getStatusCode());
newStatus.setStatusCode(Status.FAILED);
- Exception e = new Exception(message);
newStatus.setException(e);
this.task.setStatus(newStatus);
}
Modified: trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/JobSubmissionTaskHandler.java 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/JobSubmissionTaskHandler.java 2007-08-20 22:34:12 UTC (rev 1695)
@@ -6,8 +6,6 @@
package org.globus.cog.abstraction.impl.execution.ssh;
-import java.io.FileWriter;
-import java.io.IOException;
import java.net.PasswordAuthentication;
import org.apache.log4j.Logger;
@@ -18,6 +16,7 @@
import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
import org.globus.cog.abstraction.impl.common.task.TaskSubmissionException;
import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
+import org.globus.cog.abstraction.interfaces.FileLocation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.SecurityContext;
import org.globus.cog.abstraction.interfaces.Status;
@@ -36,16 +35,18 @@
if (this.task != null) {
throw new TaskSubmissionException(
"JobSubmissionTaskHandler cannot handle two active jobs simultaneously");
- } else {
+ }
+ else {
this.task = task;
JobSpecification spec;
try {
spec = (JobSpecification) this.task.getSpecification();
- } catch (Exception e) {
+ }
+ catch (Exception e) {
throw new IllegalSpecException(
"Exception while retreiving Job Specification", e);
}
- //prepare command
+ // prepare command
String cmd = prepareSpecification(spec);
exec = new Exec();
exec.setCmd(cmd);
@@ -55,23 +56,27 @@
exec.setVerifyhost(false);
if (task.getService(0).getServiceContact().getPort() != -1) {
exec.setPort(task.getService(0).getServiceContact().getPort());
- } else {
+ }
+ else {
// default port for ssh
exec.setPort(22);
logger.debug("Using default ssh port: 22");
}
- if (spec.getStdOutput() != null) {
- exec.setOutput(false);
+ if (FileLocation.LOCAL.overlaps(spec.getStdOutputLocation()) && notEmpty(spec.getStdOutput())) {
+ exec.setOutFile(spec.getStdOutput());
}
- if (spec.getStdError() != null) {
- exec.setError(false);
+ if (FileLocation.MEMORY.overlaps(spec.getStdOutputLocation())) {
+ exec.setOutMem(true);
}
-
- if (spec.isRedirected()) {
- exec.setError(true);
- exec.setOutput(true);
+
+ if (FileLocation.LOCAL.overlaps(spec.getStdErrorLocation()) && notEmpty(spec.getStdError())) {
+ exec.setErrFile(spec.getStdError());
}
+ if (FileLocation.MEMORY.overlaps(spec.getStdErrorLocation())) {
+ exec.setErrMem(true);
+ }
+
SecurityContext sec = getSecurityContext();
@@ -80,13 +85,15 @@
.getCredentials();
exec.setUsername(auth.getUserName());
exec.setPassword(new String(auth.getPassword()));
- } else if (sec.getCredentials() instanceof PublicKeyAuthentication) {
+ }
+ else if (sec.getCredentials() instanceof PublicKeyAuthentication) {
PublicKeyAuthentication auth = (PublicKeyAuthentication) sec
.getCredentials();
exec.setUsername(auth.getUsername());
exec.setPassphrase(new String(auth.getPassPhrase()));
exec.setKeyfile(auth.getPrivateKeyFile().getAbsolutePath());
- } else {
+ }
+ else {
throw new InvalidSecurityContextException(
"Unsupported credentials: " + sec.getCredentials());
}
@@ -118,30 +125,48 @@
}
private String prepareSpecification(JobSpecification spec)
- throws TaskSubmissionException {
- //this will only work with sh/bash
- StringBuffer cmd = new StringBuffer(spec.getExecutable());
+ throws TaskSubmissionException, IllegalSpecException {
+ StringBuffer cmd = new StringBuffer("/bin/sh -c '");
+ append(cmd, spec.getExecutable());
if (spec.getArgumentsAsString() != null) {
- cmd.append(" ");
- cmd.append(spec.getArgumentsAsString());
+ append(cmd, " ");
+ append(cmd, spec.getArgumentsAsString());
}
- if ((spec.getStdInput() != null) && (!spec.getStdInput().equals(""))) {
- cmd.append(" <");
- cmd.append(spec.getStdInput());
+ if (FileLocation.LOCAL.overlaps(spec.getStdInputLocation())) {
+ throw new IllegalSpecException("The SSH provider does not support local input");
}
- if (!spec.isRedirected()) {
- if ((spec.getStdOutput() != null)
- && (!spec.getStdOutput().equals(""))) {
- cmd.append(" 1>");
- cmd.append(spec.getStdOutput());
+ if (notEmpty(spec.getStdInput())) {
+ append(cmd, " <");
+ append(cmd, spec.getStdInput());
+ }
+ if (FileLocation.REMOTE.overlaps(spec.getStdOutputLocation())
+ && notEmpty(spec.getStdOutput())) {
+ cmd.append(" 1>");
+ cmd.append(spec.getStdOutput());
+ }
+ if (FileLocation.REMOTE.overlaps(spec.getStdErrorLocation())
+ && notEmpty(spec.getStdError())) {
+ cmd.append(" 2>");
+ cmd.append(spec.getStdError());
+ }
+ cmd.append('\'');
+ return cmd.toString();
+ }
+
+ private boolean notEmpty(String str) {
+ return str != null && !str.equals("");
+ }
+
+ private void append(StringBuffer sb, String str) {
+ for (int i = 0; i < str.length(); i++) {
+ char c = str.charAt(i);
+ if (c == '\'') {
+ sb.append("\\'");
}
- if ((spec.getStdError() != null)
- && (!spec.getStdError().equals(""))) {
- cmd.append(" 2>");
- cmd.append(spec.getStdError());
+ else {
+ sb.append(c);
}
}
- return cmd.toString();
}
private void cleanup() {
@@ -157,39 +182,22 @@
public void outputClosed() {
}
- public void SSHTaskStatusChanged(int status, String message) {
+ public void SSHTaskStatusChanged(int status, Exception e) {
JobSpecification spec = (JobSpecification) this.task.getSpecification();
if (status == SSHTaskStatusListener.COMPLETED) {
- if ((spec.isRedirected()) && (spec.getStdOutput() != null)
- && (!spec.getStdOutput().equals(""))) {
- try {
- FileWriter writer = new FileWriter(spec.getStdOutput());
- writer.write(exec.getTaskOutput());
- writer.flush();
- writer.close();
- } catch (IOException ioe) {
- Status newStatus = new StatusImpl();
- Status oldStatus = this.task.getStatus();
- newStatus.setPrevStatusCode(oldStatus.getStatusCode());
- newStatus.setStatusCode(Status.FAILED);
- newStatus.setException(ioe);
- newStatus.setMessage(ioe.getMessage());
- this.task.setStatus(newStatus);
- return;
- }
- } else {
- this.task.setStdOutput(exec.getTaskOutput());
- }
+ this.task.setStdOutput(exec.getTaskOutput());
+ this.task.setStdError(exec.getTaskError());
this.task.setStatus(Status.COMPLETED);
- } else if (status == SSHTaskStatusListener.FAILED) {
+ }
+ else if (status == SSHTaskStatusListener.FAILED) {
Status newStatus = new StatusImpl();
Status oldStatus = this.task.getStatus();
newStatus.setPrevStatusCode(oldStatus.getStatusCode());
newStatus.setStatusCode(Status.FAILED);
- Exception e = new Exception(message);
newStatus.setException(e);
this.task.setStatus(newStatus);
- } else {
+ }
+ else {
logger.warn("Unknown status code: " + status);
return;
}
Modified: trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHRunner.java
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHRunner.java 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHRunner.java 2007-08-20 22:34:12 UTC (rev 1695)
@@ -10,7 +10,7 @@
import java.util.LinkedList;
import java.util.List;
-public class SSHRunner extends Thread{
+public class SSHRunner extends Thread {
private Ssh ssh;
private List listeners;
@@ -24,7 +24,7 @@
notifyListeners(SSHTaskStatusListener.COMPLETED, null);
}
catch (Exception e){
- notifyListeners(SSHTaskStatusListener.FAILED, e.getMessage());
+ notifyListeners(SSHTaskStatusListener.FAILED, e);
}
}
@@ -43,10 +43,10 @@
}
}
- public void notifyListeners(int event, String message){
+ public void notifyListeners(int event, Exception e){
Iterator i = listeners.iterator();
while (i.hasNext()){
- ((SSHTaskStatusListener) i.next()).SSHTaskStatusChanged(event, message);
+ ((SSHTaskStatusListener) i.next()).SSHTaskStatusChanged(event, e);
}
}
}
Modified: trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHTaskStatusListener.java
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHTaskStatusListener.java 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/SSHTaskStatusListener.java 2007-08-20 22:34:12 UTC (rev 1695)
@@ -9,5 +9,5 @@
public interface SSHTaskStatusListener {
public static final int FAILED = 1;
public static final int COMPLETED = 0;
- public void SSHTaskStatusChanged(int status, String message);
+ public void SSHTaskStatusChanged(int status, Exception e);
}
Modified: trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Sftp.java
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Sftp.java 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Sftp.java 2007-08-20 22:34:12 UTC (rev 1695)
@@ -36,6 +36,7 @@
import java.io.IOException;
import org.apache.log4j.Logger;
+import org.globus.cog.abstraction.impl.common.execution.JobException;
import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
@@ -119,7 +120,7 @@
IllegalSpecException,
InvalidSecurityContextException,
InvalidServiceContactException,
- TaskSubmissionException {
+ TaskSubmissionException, JobException {
super.execute();
if ((get != null) && (dest == null)) {
logger.debug("You must supply a destination for the get operation");
Modified: trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Ssh.java
===================================================================
--- trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Ssh.java 2007-08-20 22:33:08 UTC (rev 1694)
+++ trunk/current/src/cog/modules/provider-ssh/src/org/globus/cog/abstraction/impl/execution/ssh/Ssh.java 2007-08-20 22:34:12 UTC (rev 1695)
@@ -31,6 +31,7 @@
import java.io.IOException;
import org.apache.log4j.Logger;
+import org.globus.cog.abstraction.impl.common.execution.JobException;
import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
@@ -104,7 +105,7 @@
}
public void execute() throws IllegalSpecException, InvalidSecurityContextException,
- InvalidServiceContactException, TaskSubmissionException {
+ InvalidServiceContactException, TaskSubmissionException, JobException {
try {
if (host == null) {
throw new InvalidServiceContactException("You must provide a host to connect to.");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:33:16
|
Revision: 1694
http://cogkit.svn.sourceforge.net/cogkit/?rev=1694&view=rev
Author: hategan
Date: 2007-08-20 15:33:08 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
redirection stuff
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltJob.java
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/common/Job.java
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/PBSExecutor.java
trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-08-20 22:29:19 UTC (rev 1693)
+++ trunk/current/src/cog/modules/provider-localscheduler/CHANGES.txt 2007-08-20 22:33:08 UTC (rev 1694)
@@ -1,3 +1,7 @@
+(08/20/07)
+
+*** Redirection updates
+
(02/27/07)
*** I think Process.waitFor() can deadlock if there's too
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-08-20 22:29:19 UTC (rev 1693)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltExecutor.java 2007-08-20 22:33:08 UTC (rev 1694)
@@ -109,8 +109,9 @@
}
getProcessPoller().addJob(
- new CobaltJob(jobid, spec.isRedirected(), stdout, stderr, spec
- .getStdOutput(), spec.getStdError(), this));
+ new CobaltJob(jobid, stdout, stderr, spec.getStdOutput(), spec
+ .getStdOutputLocation(), spec.getStdError(), spec
+ .getStdErrorLocation(), this));
}
private void error(String message) {
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltJob.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltJob.java 2007-08-20 22:29:19 UTC (rev 1693)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/CobaltJob.java 2007-08-20 22:33:08 UTC (rev 1694)
@@ -15,28 +15,33 @@
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.Writer;
import org.apache.log4j.Logger;
+import org.globus.cog.abstraction.impl.common.util.NullWriter;
+import org.globus.cog.abstraction.impl.common.util.WriterMultiplexer;
import org.globus.cog.abstraction.impl.scheduler.common.Job;
import org.globus.cog.abstraction.impl.scheduler.common.ProcessException;
import org.globus.cog.abstraction.impl.scheduler.common.ProcessListener;
+import org.globus.cog.abstraction.interfaces.FileLocation;
public class CobaltJob extends Job {
public static final Logger logger = Logger.getLogger(CobaltJob.class);
private String stdout, stderr, tstdout, tstderr;
- private boolean redirect;
+ private FileLocation outLoc, errLoc;
private int exitcode;
- public CobaltJob(String jobID, boolean redirect, String stdout,
- String stderr, String tstdout, String tstderr,
+ public CobaltJob(String jobID, String stdout,
+ String stderr, String tstdout, FileLocation outLoc, String tstderr, FileLocation errLoc,
ProcessListener listener) {
- super(jobID, null, null, null, listener);
- this.redirect = redirect;
+ super(jobID, null, null, null, null, null, listener);
this.stdout = stdout;
this.stderr = stderr;
this.tstdout = tstdout;
+ this.outLoc = outLoc;
this.tstderr = tstderr;
+ this.errLoc = errLoc;
int exitcode = Integer.MIN_VALUE;
}
@@ -54,37 +59,32 @@
protected boolean processStdout() {
try {
+ Writer wr = null;
CharArrayWriter caw = null;
- if (redirect) {
+ if (FileLocation.MEMORY.overlaps(outLoc)) {
caw = new CharArrayWriter();
+ wr = caw;
}
- BufferedWriter bw = null;
- if (tstdout != null) {
- bw = new BufferedWriter(new FileWriter(tstdout));
+ if (tstdout != null && LOCAL_AND_REMOTE.overlaps(outLoc)) {
+ wr = WriterMultiplexer.multiplex(wr, new BufferedWriter(new FileWriter(tstdout)));
}
+ if (wr == null) {
+ wr = new NullWriter();
+ }
BufferedReader br = new BufferedReader(new FileReader(stdout));
String line;
do {
line = br.readLine();
if (line != null) {
- if (redirect) {
- caw.write(line);
- caw.write('\n');
- }
- else if (tstdout != null) {
- bw.write(line);
- bw.write('\n');
- }
+ wr.write(line);
+ wr.write('\n');
}
} while (line != null);
br.close();
+ wr.close();
if (caw != null) {
- caw.close();
listener.stdoutUpdated(caw.toString());
}
- if (bw != null) {
- bw.close();
- }
return true;
}
catch (Exception e) {
@@ -96,17 +96,23 @@
return false;
}
}
+
+ private static final FileLocation LOCAL_AND_REMOTE = FileLocation.LOCAL.and(FileLocation.REMOTE);
protected boolean processStderr() {
try {
+ Writer wr = null;
CharArrayWriter caw = null;
- if (redirect) {
+ if (FileLocation.MEMORY.overlaps(errLoc)) {
caw = new CharArrayWriter();
+ wr = caw;
}
- BufferedWriter bw = null;
- if (tstdout != null) {
- bw = new BufferedWriter(new FileWriter(tstderr));
+ if (tstdout != null && LOCAL_AND_REMOTE.overlaps(errLoc)) {
+ wr = WriterMultiplexer.multiplex(wr, new BufferedWriter(new FileWriter(tstderr)));
}
+ if (wr == null) {
+ wr = new NullWriter();
+ }
BufferedReader br = new BufferedReader(new FileReader(stderr));
String line;
boolean started = false;
@@ -121,14 +127,8 @@
if (started) {
if (!line.startsWith("<")
|| line.indexOf("(Info)") == -1) {
- if (redirect) {
- caw.write(line);
- caw.write('\n');
- }
- else if (tstdout != null) {
- bw.write(line);
- bw.write('\n');
- }
+ wr.write(line);
+ wr.write('\n');
}
else {
int index = line.indexOf("BG/L job exit status =");
@@ -150,13 +150,10 @@
}
} while (line != null);
br.close();
+ wr.close();
if (caw != null) {
- caw.close();
listener.stderrUpdated(caw.toString());
}
- if (bw != null) {
- bw.close();
- }
return true;
}
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java 2007-08-20 22:29:19 UTC (rev 1693)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/cobalt/execution/JobSubmissionTaskHandler.java 2007-08-20 22:33:08 UTC (rev 1694)
@@ -8,6 +8,7 @@
import org.apache.log4j.Logger;
import org.globus.cog.abstraction.impl.common.StatusImpl;
+import org.globus.cog.abstraction.impl.common.execution.JobException;
import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
@@ -16,6 +17,7 @@
import org.globus.cog.abstraction.impl.scheduler.common.Job;
import org.globus.cog.abstraction.impl.scheduler.common.ProcessListener;
import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
+import org.globus.cog.abstraction.interfaces.FileLocation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Status;
import org.globus.cog.abstraction.interfaces.Task;
@@ -103,7 +105,7 @@
}
else {
Status s = new StatusImpl();
- s.setMessage("Process failed with exit code " + exitCode);
+ s.setException(new JobException(exitCode));
s.setStatusCode(Status.FAILED);
task.setStatus(s);
}
@@ -132,13 +134,13 @@
}
public void stderrUpdated(String stderr) {
- if (spec.isRedirected()) {
+ if (FileLocation.MEMORY.overlaps(spec.getStdErrorLocation())) {
task.setStdError(stderr);
}
}
public void stdoutUpdated(String stdout) {
- if (spec.isRedirected()) {
+ if (FileLocation.MEMORY.overlaps(spec.getStdOutputLocation())) {
task.setStdOutput(stdout);
}
}
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/common/Job.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/common/Job.java 2007-08-20 22:29:19 UTC (rev 1693)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/common/Job.java 2007-08-20 22:33:08 UTC (rev 1694)
@@ -15,6 +15,7 @@
import java.io.IOException;
import org.apache.log4j.Logger;
+import org.globus.cog.abstraction.interfaces.FileLocation;
public class Job {
public static final Logger logger = Logger.getLogger(Job.class);
@@ -28,16 +29,19 @@
private String jobID;
private String exitcodeFileName;
private String stdout, stderr;
+ private FileLocation outLoc, errLoc;
protected ProcessListener listener;
protected int state;
private int ticks;
- public Job(String jobID, String stdout, String stderr,
+ public Job(String jobID, String stdout, FileLocation outLoc, String stderr, FileLocation errLoc,
String exitcodeFileName, ProcessListener listener) {
this.jobID = jobID;
this.listener = listener;
this.stdout = stdout;
this.stderr = stderr;
+ this.outLoc = outLoc;
+ this.errLoc = errLoc;
this.state = STATE_NONE;
this.exitcodeFileName = exitcodeFileName;
this.ticks = 0;
@@ -87,7 +91,7 @@
protected boolean processStdout() {
try {
- if (stdout != null) {
+ if (FileLocation.MEMORY.overlaps(outLoc)) {
String out = readFile(stdout);
if (out != null && !"".equals(out)) {
listener.stdoutUpdated(out);
@@ -107,7 +111,7 @@
protected boolean processStderr() {
try {
- if (stderr != null) {
+ if (FileLocation.MEMORY.overlaps(errLoc)) {
String err = readFile(stderr);
if (err != null && !"".equals(err)) {
listener.stderrUpdated(err);
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/PBSExecutor.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/PBSExecutor.java 2007-08-20 22:29:19 UTC (rev 1693)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/PBSExecutor.java 2007-08-20 22:33:08 UTC (rev 1694)
@@ -113,8 +113,8 @@
String jobid = getOutput(process.getInputStream());
getProcessPoller().addJob(
- new Job(jobid, spec.isRedirected() ? stdout : null, spec
- .isRedirected() ? stderr : null, exitcode, this));
+ new Job(jobid, stdout, spec.getStdOutputLocation(), stderr,
+ spec.getStdErrorLocation(), exitcode, this));
}
private void error(String message) {
@@ -238,34 +238,34 @@
for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
if (c == '\\') {
- if (escaped) {
- sb.append('\\');
- }
- else {
- escaped = true;
- }
+ if (escaped) {
+ sb.append('\\');
+ }
+ else {
+ escaped = true;
+ }
}
else {
if (c == '$' && !escaped) {
- if (i == str.length() - 1) {
- sb.append('$');
- }
- else {
- int e = str.indexOf(' ', i);
- if (e == -1) {
- e = str.length();
- }
- String name = str.substring(i + 1, e);
- Object attr = spec.getAttribute(name);
- if (attr != null) {
- sb.append(attr.toString());
- }
- else {
- sb.append('$');
- sb.append(name);
- }
- i = e;
- }
+ if (i == str.length() - 1) {
+ sb.append('$');
+ }
+ else {
+ int e = str.indexOf(' ', i);
+ if (e == -1) {
+ e = str.length();
+ }
+ String name = str.substring(i + 1, e);
+ Object attr = spec.getAttribute(name);
+ if (attr != null) {
+ sb.append(attr.toString());
+ }
+ else {
+ sb.append('$');
+ sb.append(name);
+ }
+ i = e;
+ }
}
else {
sb.append(c);
Modified: trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java 2007-08-20 22:29:19 UTC (rev 1693)
+++ trunk/current/src/cog/modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/pbs/execution/JobSubmissionTaskHandler.java 2007-08-20 22:33:08 UTC (rev 1694)
@@ -8,6 +8,7 @@
import org.apache.log4j.Logger;
import org.globus.cog.abstraction.impl.common.StatusImpl;
+import org.globus.cog.abstraction.impl.common.execution.JobException;
import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
@@ -16,6 +17,7 @@
import org.globus.cog.abstraction.impl.scheduler.common.ProcessListener;
import org.globus.cog.abstraction.impl.scheduler.pbs.PBSExecutor;
import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
+import org.globus.cog.abstraction.interfaces.FileLocation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Status;
import org.globus.cog.abstraction.interfaces.Task;
@@ -103,7 +105,7 @@
}
else {
Status s = new StatusImpl();
- s.setMessage("Process failed with exit code " + exitCode);
+ s.setException(new JobException(exitCode));
s.setStatusCode(Status.FAILED);
task.setStatus(s);
}
@@ -132,13 +134,13 @@
}
public void stderrUpdated(String stderr) {
- if (spec.isRedirected()) {
+ if (FileLocation.MEMORY.overlaps(spec.getStdErrorLocation())) {
task.setStdError(stderr);
}
}
public void stdoutUpdated(String stdout) {
- if (spec.isRedirected()) {
+ if (FileLocation.MEMORY.overlaps(spec.getStdOutputLocation())) {
task.setStdOutput(stdout);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:29:21
|
Revision: 1693
http://cogkit.svn.sourceforge.net/cogkit/?rev=1693&view=rev
Author: hategan
Date: 2007-08-20 15:29:19 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
updated redirection stuff
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-local/CHANGES.txt
trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-local/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-local/CHANGES.txt 2007-08-20 22:28:02 UTC (rev 1692)
+++ trunk/current/src/cog/modules/provider-local/CHANGES.txt 2007-08-20 22:29:19 UTC (rev 1693)
@@ -1,3 +1,8 @@
+(08/20/2007)
+
+*** Rimplemented redirection to conform to new things in the
+ interfaces
+
(03/11/2007)
*** Improved the implementation of the execution provider:
Modified: trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java 2007-08-20 22:28:02 UTC (rev 1692)
+++ trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java 2007-08-20 22:29:19 UTC (rev 1693)
@@ -19,11 +19,15 @@
import org.apache.log4j.Logger;
import org.globus.cog.abstraction.impl.common.StatusImpl;
+import org.globus.cog.abstraction.impl.common.execution.JobException;
import org.globus.cog.abstraction.impl.common.task.IllegalSpecException;
import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
import org.globus.cog.abstraction.impl.common.task.InvalidServiceContactException;
import org.globus.cog.abstraction.impl.common.task.TaskSubmissionException;
+import org.globus.cog.abstraction.impl.common.util.NullOutputStream;
+import org.globus.cog.abstraction.impl.common.util.OutputStreamMultiplexer;
import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
+import org.globus.cog.abstraction.interfaces.FileLocation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Status;
import org.globus.cog.abstraction.interfaces.Task;
@@ -105,6 +109,9 @@
this.task.setStatus(Status.CANCELED);
}
+ private static final FileLocation REDIRECT_LOCATION = FileLocation.MEMORY
+ .and(FileLocation.LOCAL);
+
public void run() {
try {
// TODO move away from the multi-threaded approach
@@ -129,9 +136,10 @@
*/
processIN(spec.getStdInput(), dir, buf);
- if (spec.getStdOutput() != null || spec.isRedirected()) {
- String out = processOUT(spec.getStdOutput(), dir, buf,
- process.getInputStream());
+ if (!FileLocation.NONE.equals(spec.getStdOutputLocation())) {
+ String out = processOUT(spec.getStdOutput(), spec
+ .getStdOutputLocation(), dir, buf, process
+ .getInputStream());
if (out != null) {
if (logger.isDebugEnabled()) {
logger.debug("STDOUT from job: " + out);
@@ -140,8 +148,9 @@
}
}
- if (spec.getStdError() != null || spec.isRedirected()) {
- String err = processOUT(spec.getStdError(), dir, buf, process
+ if (!FileLocation.NONE.equals(spec.getStdErrorLocation())) {
+ String err = processOUT(spec.getStdError(), spec
+ .getStdErrorLocation(), dir, buf, process
.getErrorStream());
if (err != null) {
if (logger.isDebugEnabled()) {
@@ -165,8 +174,7 @@
if (exitCode == 0) {
this.task.setStatus(Status.COMPLETED);
} else {
- throw new Exception("Job failed with an exit code of "
- + exitCode);
+ throw new JobException(exitCode);
}
} catch (Exception e) {
if (killed) {
@@ -206,23 +214,37 @@
}
}
- protected String processOUT(String out, File dir, byte[] buf,
- InputStream pin) throws IOException {
+ protected String processOUT(String out, FileLocation loc, File dir,
+ byte[] buf, InputStream pin) throws IOException {
- OutputStream os;
- if (out == null) {
- os = new ByteArrayOutputStream();
- } else {
- os = new FileOutputStream(out);
+ OutputStream os = null;
+ ByteArrayOutputStream baos = null;
+ if (FileLocation.MEMORY.overlaps(loc)) {
+ baos = new ByteArrayOutputStream();
+ os = baos;
}
+ if ((FileLocation.LOCAL.overlaps(loc) || FileLocation.REMOTE
+ .equals(loc))
+ && out != null) {
+ if (os != null) {
+ os = new OutputStreamMultiplexer(os, new FileOutputStream(out));
+ }
+ else {
+ os = new FileOutputStream(out);
+ }
+ }
+ if (os == null) {
+ os = new NullOutputStream();
+ }
+
int len = pin.read(buf);
while (len != -1) {
os.write(buf, 0, len);
len = pin.read(buf);
}
os.close();
- if (out == null) {
- return os.toString();
+ if (baos != null) {
+ return baos.toString();
} else {
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:28:10
|
Revision: 1692
http://cogkit.svn.sourceforge.net/cogkit/?rev=1692&view=rev
Author: hategan
Date: 2007-08-20 15:28:02 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
updated redirection stuff
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2007-08-20 22:27:42 UTC (rev 1691)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2007-08-20 22:28:02 UTC (rev 1692)
@@ -1,3 +1,7 @@
+(08/20/2007)
+
+*** Updated to use new redirection stuff
+
(05/20/2007)
*** Corrected instances in which cleanup is done
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-08-20 22:27:42 UTC (rev 1691)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2007-08-20 22:28:02 UTC (rev 1692)
@@ -25,6 +25,7 @@
import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
import org.globus.cog.abstraction.interfaces.Delegation;
import org.globus.cog.abstraction.interfaces.ExecutionService;
+import org.globus.cog.abstraction.interfaces.FileLocation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Service;
import org.globus.cog.abstraction.interfaces.ServiceContact;
@@ -189,8 +190,8 @@
}
catch (Exception e) {
failTask(e.getMessage(), e);
- //No need for cleanup. Reportedly no resource has been created
- //if an exception is thrown
+ // No need for cleanup. Reportedly no resource has been created
+ // if an exception is thrown
gramJob.removeListener(this);
throw new TaskSubmissionException("Cannot submit job: "
+ e.getMessage(), e);
@@ -222,6 +223,9 @@
}
}
+ private static final FileLocation REDIRECT_LOCATION = FileLocation.MEMORY
+ .and(FileLocation.LOCAL);
+
private JobDescriptionType prepareSpecification(JobSpecification spec,
String server) throws IllegalSpecException, TaskSubmissionException {
// if the job specification is explicitly specified
@@ -275,7 +279,8 @@
new String[0]));
boolean batchJob = spec.isBatchJob();
- if (spec.isRedirected()) {
+ if (FileLocation.MEMORY_AND_LOCAL.overlaps(spec.getStdOutputLocation()
+ .and(spec.getStdErrorLocation()))) {
throw new IllegalSpecException(
"The gt4.0.0 provider does not support redirection");
}
@@ -291,7 +296,7 @@
}
}
- if (spec.isLocalExecutable()) {
+ if (FileLocation.LOCAL.overlaps(spec.getExecutableLocation())) {
throw new IllegalSpecException(
"The gt4.0.0 provider does not support local executables");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:27:45
|
Revision: 1691
http://cogkit.svn.sourceforge.net/cogkit/?rev=1691&view=rev
Author: hategan
Date: 2007-08-20 15:27:42 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
removed warning
Removed Paths:
-------------
trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/WARNING.txt
Deleted: trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/WARNING.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/WARNING.txt 2007-08-20 22:25:48 UTC (rev 1690)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/WARNING.txt 2007-08-20 22:27:42 UTC (rev 1691)
@@ -1 +0,0 @@
-Do NOT add these jars to the class path!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:25:50
|
Revision: 1690
http://cogkit.svn.sourceforge.net/cogkit/?rev=1690&view=rev
Author: hategan
Date: 2007-08-20 15:25:48 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
updated redirection stuff
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/CHANGES.txt
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java
Modified: trunk/current/src/cog/modules/provider-gt2/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/CHANGES.txt 2007-08-20 22:24:33 UTC (rev 1689)
+++ trunk/current/src/cog/modules/provider-gt2/CHANGES.txt 2007-08-20 22:25:48 UTC (rev 1690)
@@ -1,3 +1,7 @@
+(08/20/2007)
+
+*** Updated to use the new redirection stuff
+
(08/10/2007)
*** Removed a puzzling thing. Seems like most put/get methods in
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java 2007-08-20 22:24:33 UTC (rev 1689)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java 2007-08-20 22:25:48 UTC (rev 1690)
@@ -20,6 +20,7 @@
import org.globus.cog.abstraction.impl.common.task.TaskSubmissionException;
import org.globus.cog.abstraction.interfaces.DelegatedTaskHandler;
import org.globus.cog.abstraction.interfaces.Delegation;
+import org.globus.cog.abstraction.interfaces.FileLocation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.ServiceContact;
import org.globus.cog.abstraction.interfaces.Status;
@@ -301,16 +302,18 @@
}
else {
boolean batchJob = spec.isBatchJob();
- boolean redirected = spec.isRedirected();
- boolean localExecutable = spec.isLocalExecutable();
- boolean localInput = spec.isLocalInput();
+ boolean redirected = spec.getStdOutputLocation().overlaps(
+ FileLocation.MEMORY_AND_LOCAL)
+ || spec.getStdErrorLocation().overlaps(FileLocation.MEMORY_AND_LOCAL);
if (batchJob && redirected) {
throw new IllegalSpecException(
"Cannot redirect the output/error of a batch job");
}
- if (redirected || localExecutable || localInput) {
+ if (redirected
+ || FileLocation.LOCAL.equals(spec.getStdInputLocation())
+ || FileLocation.LOCAL.equals(spec.getExecutableLocation())) {
this.startGassServer = true;
String gassURL = startGassServer();
Bindings subst = new Bindings("rsl_substitution");
@@ -319,7 +322,7 @@
}
// sets the executable
if (spec.getExecutable() != null) {
- if (this.startGassServer && localExecutable) {
+ if (FileLocation.LOCAL.equals(spec.getExecutableLocation())) {
rsl.add(new NameOpValue("executable", NameOpValue.EQ,
new VarRef("GLOBUSRUN_GASS_URL", null, new Value(
fixAbsPath(spec.getExecutable())))));
@@ -366,7 +369,7 @@
// sets the stdin
if (spec.getStdInput() != null) {
- if (this.startGassServer && localInput) {
+ if (FileLocation.LOCAL.equals(spec.getStdInputLocation())) {
rsl.add(new NameOpValue("stdin", NameOpValue.EQ,
new VarRef("GLOBUSRUN_GASS_URL", null, new Value(
fixAbsPath(spec.getStdInput())))));
@@ -378,11 +381,10 @@
}
// if output is to be redirected
- if (this.startGassServer && redirected) {
+ if (FileLocation.MEMORY_AND_LOCAL.overlaps(spec.getStdOutputLocation())) {
Value v;
// if no output file is specified, use the stdout
- if ((spec.getStdOutput() == null)
- || (spec.getStdOutput().equals(""))) {
+ if (FileLocation.MEMORY.overlaps(spec.getStdOutputLocation())) {
v = new Value("/dev/stdout-"
+ this.task.getIdentity().toString());
}
@@ -398,11 +400,10 @@
.getStdOutput()));
}
// if error is to be redirected
- if (this.startGassServer && redirected) {
+ if (FileLocation.MEMORY_AND_LOCAL.overlaps(spec.getStdErrorLocation())) {
Value v;
// if no error file is specified, use the stdout
- if ((spec.getStdError() == null)
- || (spec.getStdError().equals(""))) {
+ if (FileLocation.MEMORY.overlaps(spec.getStdErrorLocation())) {
v = new Value("/dev/stderr-"
+ this.task.getIdentity().toString());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:24:35
|
Revision: 1689
http://cogkit.svn.sourceforge.net/cogkit/?rev=1689&view=rev
Author: hategan
Date: 2007-08-20 15:24:33 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
updated redirection stuff
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/CHANGES.txt
Modified: trunk/current/src/cog/modules/abstraction-common/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/CHANGES.txt 2007-08-20 22:23:33 UTC (rev 1688)
+++ trunk/current/src/cog/modules/abstraction-common/CHANGES.txt 2007-08-20 22:24:33 UTC (rev 1689)
@@ -17,6 +17,10 @@
JobSpecification.setRedirected
JobSpecification.setLocalExecutable
JobSpecification.setLocatInput
+
+*** Oh, and application failures caused by non-zero exit codes now have
+ their own exception (JobException), which can also be used to
+ retrieve the exit code nicely.
(07/28/2007)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-20 22:23:40
|
Revision: 1688
http://cogkit.svn.sourceforge.net/cogkit/?rev=1688&view=rev
Author: hategan
Date: 2007-08-20 15:23:33 -0700 (Mon, 20 Aug 2007)
Log Message:
-----------
updated redirection stuff
Modified Paths:
--------------
trunk/current/src/cog/modules/abstraction-common/CHANGES.txt
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/JobSpecification.java
Added Paths:
-----------
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/execution/JobException.java
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullOutputStream.java
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullWriter.java
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/OutputStreamMultiplexer.java
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/WriterMultiplexer.java
trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/FileLocation.java
Modified: trunk/current/src/cog/modules/abstraction-common/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/CHANGES.txt 2007-08-17 15:48:59 UTC (rev 1687)
+++ trunk/current/src/cog/modules/abstraction-common/CHANGES.txt 2007-08-20 22:23:33 UTC (rev 1688)
@@ -1,3 +1,23 @@
+(08/20/2007)
+
+*** Made the way redirection works more consistent. As it was, a flag
+ (JobSpecification.setRedirected(true)) would be used to indicate
+ that redirection was desired. That, combined with whether the
+ stdout files were null or not, would dictate, in twisted ways, whether
+ the output would be redirected to a remote file, a local file, or an
+ in-memory object. The way it works now is that for each file (stdin,
+ executable, stdout, stderr) a location can be specified. The location
+ can be either memory, local or remote, or an arbitrary combination
+ of these. So, for example, the stdout could be redirected to both
+ a remote file and an in-memory object, while the stderr would be
+ redirected to a local file. Not all providers will support all
+ combinations of these (GT2 will probably only be able to redirect
+ to one thing at a time). A few things were also deprecated as a
+ consequence:
+ JobSpecification.setRedirected
+ JobSpecification.setLocalExecutable
+ JobSpecification.setLocatInput
+
(07/28/2007)
*** Added a thirdPartyIfPossible property to file transfer specifications.
Added: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/execution/JobException.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/execution/JobException.java (rev 0)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/execution/JobException.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -0,0 +1,26 @@
+//----------------------------------------------------------------------
+//This code is developed as part of the Java CoG Kit project
+//The terms of the license can be found at http://www.cogkit.org/license
+//This message may not be removed or altered.
+//----------------------------------------------------------------------
+
+/*
+ * Created on Aug 20, 2007
+ */
+package org.globus.cog.abstraction.impl.common.execution;
+
+public class JobException extends Exception {
+ private int exitCode;
+
+ public JobException(int exitCode) {
+ this.exitCode = exitCode;
+ }
+
+ public String getMessage() {
+ return "Job failed with an exit code of " + exitCode;
+ }
+
+ public int getExitCode() {
+ return exitCode;
+ }
+}
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java 2007-08-17 15:48:59 UTC (rev 1687)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/task/JobSpecificationImpl.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -19,6 +19,7 @@
import org.globus.cog.abstraction.interfaces.Delegation;
import org.globus.cog.abstraction.interfaces.JobSpecification;
import org.globus.cog.abstraction.interfaces.Specification;
+import org.globus.cog.abstraction.interfaces.FileLocation;
public class JobSpecificationImpl implements JobSpecification {
public static final String ATTR_DELEGATION_ENABLED = "delegationEnabled";
@@ -40,6 +41,8 @@
private Map environment;
private String directory;
private String executable;
+ private FileLocation stdinLocation, stdoutLocation, stderrLocation,
+ executableLocation;
public JobSpecificationImpl() {
this.type = Specification.JOB_SUBMISSION;
@@ -47,6 +50,10 @@
this.additionalAttributes = new HashMap();
this.arguments = new ArrayList();
this.environment = new HashMap();
+ this.stdinLocation = FileLocation.REMOTE;
+ this.stdoutLocation = FileLocation.REMOTE;
+ this.stderrLocation = FileLocation.REMOTE;
+ this.executableLocation = FileLocation.REMOTE;
}
public void setType(int type) {
@@ -172,6 +179,8 @@
public void setStdOutput(String output) {
this.attributes.put(ATTR_STDOUT, output);
+ this.stdoutLocation = inferStreamType(isRedirected(), output != null,
+ true);
}
public String getStdOutput() {
@@ -180,6 +189,10 @@
public void setStdInput(String input) {
this.attributes.put(ATTR_STDIN, input);
+ if (this.attributes.containsKey(ATTR_REDIRECTED)) {
+ this.stdinLocation = inferStreamType(isLocalExecutable(),
+ input != null, false);
+ }
}
public String getStdInput() {
@@ -188,6 +201,10 @@
public void setStdError(String error) {
this.attributes.put(ATTR_STDERR, error);
+ if (this.attributes.containsKey(ATTR_REDIRECTED)) {
+ this.stderrLocation = inferStreamType(isRedirected(),
+ error != null, true);
+ }
}
public String getStdError() {
@@ -204,26 +221,50 @@
public void setRedirected(boolean bool) {
this.attributes.put(ATTR_REDIRECTED, Boolean.valueOf(bool));
+ this.stdoutLocation = inferStreamType(isRedirected(),
+ getStdOutput() != null, true);
+ this.stderrLocation = inferStreamType(isRedirected(),
+ getStdError() != null, true);
}
+ protected FileLocation inferStreamType(boolean redir, boolean isSet,
+ boolean mem) {
+ FileLocation type = FileLocation.NONE;
+ if (redir) {
+ if (mem) {
+ type = type.and(FileLocation.MEMORY);
+ }
+ if (isSet) {
+ type = type.and(FileLocation.LOCAL);
+ }
+ }
+ else {
+ if (isSet) {
+ type = type.and(FileLocation.REMOTE);
+ }
+ }
+ return type;
+ }
+
public boolean isRedirected() {
return getBooleanAttribute(ATTR_REDIRECTED, false);
}
public void setLocalInput(boolean bool) {
- this.attributes.put(ATTR_LOCAL_INPUT, Boolean.valueOf(bool));
+ this.stdinLocation = bool ? FileLocation.LOCAL : FileLocation.REMOTE;
}
public boolean isLocalInput() {
- return getBooleanAttribute(ATTR_LOCAL_INPUT, false);
+ return FileLocation.LOCAL.equals(this.stdinLocation);
}
public void setLocalExecutable(boolean bool) {
- this.attributes.put(ATTR_LOCAL_EXECUTABLE, Boolean.valueOf(bool));
+ this.executableLocation = bool ? FileLocation.LOCAL
+ : FileLocation.REMOTE;
}
public boolean isLocalExecutable() {
- return getBooleanAttribute(ATTR_LOCAL_EXECUTABLE, false);
+ return FileLocation.LOCAL.equals(this.executableLocation);
}
private boolean getBooleanAttribute(final String name, boolean def) {
@@ -273,11 +314,11 @@
delegation ? Delegation.LIMITED_DELEGATION
: Delegation.FULL_DELEGATION));
}
-
+
public int getDelegation() {
return getIntAttribute(ATTR_DELEGATION, Delegation.NO_DELEGATION);
}
-
+
public void setDelegation(int delegation) {
this.attributes.put(ATTR_DELEGATION, new Integer(delegation));
}
@@ -296,4 +337,39 @@
return sb.toString();
}
+ public FileLocation getStdErrorLocation() {
+ return stderrLocation;
+ }
+
+ public FileLocation getStdInputLocation() {
+ return stdinLocation;
+ }
+
+ public FileLocation getStdOutputLocation() {
+ return stdoutLocation;
+ }
+
+ public void setStdErrorLocation(FileLocation type) {
+ this.stderrLocation = type;
+ }
+
+ public void setStdInputLocation(FileLocation type) {
+ this.stdinLocation = type;
+ }
+
+ public void setStdOutputLocation(FileLocation type) {
+ this.stdoutLocation = type;
+ }
+
+ public FileLocation getExecutableLocation() {
+ return executableLocation;
+ }
+
+ public void setExecutableLocation(FileLocation executableLocation) {
+ if (FileLocation.MEMORY.equals(executableLocation)) {
+ throw new IllegalArgumentException(
+ "Memory is not a valid setting for the executable location");
+ }
+ this.executableLocation = executableLocation;
+ }
}
\ No newline at end of file
Added: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullOutputStream.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullOutputStream.java (rev 0)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullOutputStream.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -0,0 +1,18 @@
+//----------------------------------------------------------------------
+//This code is developed as part of the Java CoG Kit project
+//The terms of the license can be found at http://www.cogkit.org/license
+//This message may not be removed or altered.
+//----------------------------------------------------------------------
+
+/*
+ * Created on Aug 20, 2007
+ */
+package org.globus.cog.abstraction.impl.common.util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class NullOutputStream extends OutputStream {
+ public void write(int b) throws IOException {
+ }
+}
Added: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullWriter.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullWriter.java (rev 0)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/NullWriter.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -0,0 +1,24 @@
+//----------------------------------------------------------------------
+//This code is developed as part of the Java CoG Kit project
+//The terms of the license can be found at http://www.cogkit.org/license
+//This message may not be removed or altered.
+//----------------------------------------------------------------------
+
+/*
+ * Created on Aug 20, 2007
+ */
+package org.globus.cog.abstraction.impl.common.util;
+
+import java.io.IOException;
+import java.io.Writer;
+
+public class NullWriter extends Writer {
+ public void close() throws IOException {
+ }
+
+ public void flush() throws IOException {
+ }
+
+ public void write(char[] cbuf, int off, int len) throws IOException {
+ }
+}
Added: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/OutputStreamMultiplexer.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/OutputStreamMultiplexer.java (rev 0)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/OutputStreamMultiplexer.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -0,0 +1,37 @@
+//----------------------------------------------------------------------
+//This code is developed as part of the Java CoG Kit project
+//The terms of the license can be found at http://www.cogkit.org/license
+//This message may not be removed or altered.
+//----------------------------------------------------------------------
+
+/*
+ * Created on Aug 20, 2007
+ */
+package org.globus.cog.abstraction.impl.common.util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class OutputStreamMultiplexer extends OutputStream {
+ private OutputStream os1, os2;
+
+ public OutputStreamMultiplexer(OutputStream os1, OutputStream os2) {
+ this.os1 = os1;
+ this.os2 = os2;
+ }
+
+ public void write(int b) throws IOException {
+ os1.write(b);
+ os2.write(b);
+ }
+
+ public static OutputStream multiplex(OutputStream os1, OutputStream os2) {
+ if (os1 == null) {
+ return os2;
+ }
+ if (os2 == null) {
+ return os1;
+ }
+ return new OutputStreamMultiplexer(os1, os2);
+ }
+}
Added: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/WriterMultiplexer.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/WriterMultiplexer.java (rev 0)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/impl/common/util/WriterMultiplexer.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -0,0 +1,80 @@
+//----------------------------------------------------------------------
+//This code is developed as part of the Java CoG Kit project
+//The terms of the license can be found at http://www.cogkit.org/license
+//This message may not be removed or altered.
+//----------------------------------------------------------------------
+
+/*
+ * Created on Aug 20, 2007
+ */
+package org.globus.cog.abstraction.impl.common.util;
+
+import java.io.IOException;
+import java.io.Writer;
+
+public class WriterMultiplexer extends Writer {
+ private Writer w1, w2;
+
+ public WriterMultiplexer(Writer w1, Writer w2) {
+ this.w1 = w1;
+ this.w2 = w2;
+ }
+
+ public void close() throws IOException {
+ IOException ex = null;
+ try {
+ w1.close();
+ }
+ catch (IOException e) {
+ ex = e;
+ }
+ try {
+ w2.close();
+ }
+ catch (IOException e) {
+ ex = e;
+ }
+ }
+
+ public void flush() throws IOException {
+ IOException ex = null;
+ try {
+ w1.flush();
+ }
+ catch (IOException e) {
+ ex = e;
+ }
+ try {
+ w2.flush();
+ }
+ catch (IOException e) {
+ ex = e;
+ }
+ }
+
+ public void write(char[] cbuf, int off, int len) throws IOException {
+ IOException ex = null;
+ try {
+ w1.write(cbuf, off, len);
+ }
+ catch (IOException e) {
+ ex = e;
+ }
+ try {
+ w2.write(cbuf, off, len);
+ }
+ catch (IOException e) {
+ ex = e;
+ }
+ }
+
+ public static Writer multiplex(Writer w1, Writer w2) {
+ if (w1 == null) {
+ return w2;
+ }
+ if (w2 == null) {
+ return w1;
+ }
+ return new WriterMultiplexer(w1, w2);
+ }
+}
Added: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/FileLocation.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/FileLocation.java (rev 0)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/FileLocation.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -0,0 +1,124 @@
+//----------------------------------------------------------------------
+//This code is developed as part of the Java CoG Kit project
+//The terms of the license can be found at http://www.cogkit.org/license
+//This message may not be removed or altered.
+//----------------------------------------------------------------------
+
+/*
+ * Created on Aug 20, 2007
+ */
+package org.globus.cog.abstraction.interfaces;
+
+public interface FileLocation {
+
+ /**
+ * Specifies that nothing should be done with a job output stream or that
+ * there is nothing provided on the input stream.
+ */
+ public static final FileLocation NONE = new Impl(0);
+
+ /**
+ * Indicates that the contents of the stream is in memory. The contents can
+ * the be retrieved using one of the <code>Task.getXYZContents</code>
+ * methods.
+ */
+ public static final FileLocation MEMORY = new Impl(1);
+ /**
+ * Indicates that the contents of a stream is or is to be redirected to a
+ * local file.
+ */
+ public static final FileLocation LOCAL = new Impl(2);
+
+ /**
+ * Indicates that the contents of a stream is or is to be redirected to a
+ * remote file.
+ */
+ public static final FileLocation REMOTE = new Impl(4);
+
+ public static final FileLocation MEMORY_AND_LOCAL = MEMORY.and(LOCAL);
+
+ /**
+ * Can be used to combine to stream types. The resulting object indicates,
+ * for output streams, that both (or all) redirections should be used.
+ */
+ FileLocation and(FileLocation other);
+
+ /**
+ * Returns <code>true</code> if this StreamType is the same as the
+ * specified StreamType or it can be derived from the specified StreamType
+ * using a certain number of <code>and</code> operations.
+ */
+ boolean includes(FileLocation other);
+
+ /**
+ * Returns <code>true</code> if there is any overlap between this location
+ * and the specified location. For example,
+ * <code>FileLocation.MEMORY.matches(FileLocation.LOCAL.and(FileLocation.MEMORY))</code>
+ * would return <code>true</code>, while
+ * <code>FileLocation.LOCAL.and(FileLocation.REMOTE).matches(FileLocation.MEMORY)</code>
+ * would return <code>false</code>.
+ */
+ boolean overlaps(FileLocation other);
+
+ int getCode();
+
+ public static class Impl implements FileLocation {
+ private int code;
+
+ public Impl(int code) {
+ this.code = code;
+ }
+
+ public FileLocation and(FileLocation other) {
+ return new Impl(code | other.getCode());
+ }
+
+ public boolean includes(FileLocation other) {
+ return (code & other.getCode()) == code;
+ }
+
+ public boolean overlaps(FileLocation other) {
+ return (code & other.getCode()) != 0;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public boolean equals(Object other) {
+ if (other instanceof FileLocation) {
+ return code == ((FileLocation) other).getCode();
+ }
+ else {
+ return false;
+ }
+ }
+
+ public int hashCode() {
+ return code;
+ }
+
+ private static final String[] LOCS = new String[] { "memory", "local",
+ "remote" };
+
+ public String toString() {
+ if (code == 0) {
+ return "none";
+ }
+ StringBuffer sb = new StringBuffer();
+ for (int i = 1; i < 3; i++) {
+ if ((code & (1 >> i)) != 0) {
+ append(sb, LOCS[i]);
+ }
+ }
+ return sb.toString();
+ }
+
+ private void append(StringBuffer sb, String m) {
+ if (sb.length() != 0) {
+ sb.append(" + ");
+ }
+ sb.append(m);
+ }
+ }
+}
Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/JobSpecification.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/JobSpecification.java 2007-08-17 15:48:59 UTC (rev 1687)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/interfaces/JobSpecification.java 2007-08-20 22:23:33 UTC (rev 1688)
@@ -31,6 +31,20 @@
public String getExecutable();
/**
+ * Allows specifying the location of the executable. The default is
+ * {@link FileLocation.REMOTE}.
+ *
+ * @throws IllegalArgumentException if the location is {@link FileLocation.MEMORY}
+ */
+ public void setExecutableLocation(FileLocation location);
+
+ /**
+ * Retrieves the executable location. By default it is
+ * {@link FileLocation.REMOTE}
+ */
+ public FileLocation getExecutableLocation();
+
+ /**
* Sets the working directory on the remote machine.
*
* @param directory
@@ -223,6 +237,17 @@
public String getStdOutput();
/**
+ * Allows specifying the location where the stdout stream of the job should
+ * be redirected.
+ */
+ public void setStdOutputLocation(FileLocation type);
+
+ /**
+ * Retrieves the type of the standard output stream.
+ */
+ public FileLocation getStdOutputLocation();
+
+ /**
* Sets the file from which to redirect the data as stdin on the remote
* machine.
*
@@ -237,6 +262,17 @@
public String getStdInput();
/**
+ * Allows specifying the location of the file to be used for standard input
+ * for this job.
+ */
+ public void setStdInputLocation(FileLocation type);
+
+ /**
+ * Retrieves the type of the standard input stream.
+ */
+ public FileLocation getStdInputLocation();
+
+ /**
* Sets the file for redirecting the error produced on the stderr of the
* remote machine.
*
@@ -253,6 +289,17 @@
public String getStdError();
/**
+ * Allows specifying the location where the stderr stream of the job should
+ * be redirected.
+ */
+ public void setStdErrorLocation(FileLocation type);
+
+ /**
+ * Retrieves the type of the standard error stream.
+ */
+ public FileLocation getStdErrorLocation();
+
+ /**
* Specifies that the <code>Task</code> is to be executed as a batch job.
* If it is a batch job, then the client machine will not be notified
* regarding the stautus of the remote execution. From the client's
@@ -272,7 +319,8 @@
public boolean isBatchJob();
/**
- * Specifies if the stdout and stderr have to be redirected.
+ * Specifies that the stdout and stderr streams of the task are to be
+ * redirected.
* <p>
* If filename for the <code>setStdOutput</code> in this
* <code>Specification</code> is <code>null</code> and the
@@ -280,31 +328,43 @@
* stdout is redirected to the local machine and can be retrieved from the
* <code>getOutput</code> method of the container {@link Task}.
*
+ * @deprecated Use one of the setStd*Type methods
+ *
*/
public void setRedirected(boolean bool);
/**
* Checks if the stdout and stderror is redirected to the local machine.
+ *
+ * @deprecated Use one of the getStd*Type methods.
*/
public boolean isRedirected();
/**
* Specifies that the stdin must be staged-in from the local machine.
+ *
+ * @deprecated Use {@link setStdInputType}
*/
public void setLocalInput(boolean bool);
/**
* Checks if the stdin is staged-in from the local machine.
+ *
+ * @deprecated Use {@link getStdInputType}
*/
public boolean isLocalInput();
/**
* Specifies that the executable must be staged-in from the local machine.
+ *
+ * @deprecated Use {@link setExecutableLocation}
*/
public void setLocalExecutable(boolean bool);
/**
* Checks if the executable is staged-in from the local machine.
+ *
+ * @deprecated Use {@link getExecutableLocation}
*/
public boolean isLocalExecutable();
@@ -358,17 +418,19 @@
* <code>FULL_DELEGATION</code>
*/
public void setDelegation(int delegation);
-
+
/**
- * Queries whether delegation is enabled for this job
- * @deprecated Use {@link #getDelegation()}
- */
- public boolean isDelegationEnabled();
+ * Queries whether delegation is enabled for this job
+ *
+ * @deprecated Use {@link #getDelegation()}
+ */
+ public boolean isDelegationEnabled();
- /**
- * Enables credential delegation for this job. Not all providers may support
- * credential delegation. Delegation is disabled by default.
- * @deprecated Use {@link #setDelegation(int)}
- */
- public void setDelegationEnabled(boolean delegation);
+ /**
+ * Enables credential delegation for this job. Not all providers may support
+ * credential delegation. Delegation is disabled by default.
+ *
+ * @deprecated Use {@link #setDelegation(int)}
+ */
+ public void setDelegationEnabled(boolean delegation);
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-17 15:49:04
|
Revision: 1687
http://cogkit.svn.sourceforge.net/cogkit/?rev=1687&view=rev
Author: hategan
Date: 2007-08-17 08:48:59 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
very old stuff
Removed Paths:
-------------
trunk/current/src/cog/Makefile
Deleted: trunk/current/src/cog/Makefile
===================================================================
--- trunk/current/src/cog/Makefile 2007-08-17 15:45:35 UTC (rev 1686)
+++ trunk/current/src/cog/Makefile 2007-08-17 15:48:59 UTC (rev 1687)
@@ -1,26 +0,0 @@
-USER=`whoami`
-VERSION=`head -1 VERSION.txt`
-DESTINATION=${USER}@cvs.cogkit.org:/www/www.cogkit.org
-RELEASEDIR=release
-QCDIR=${RELEASEDIR}/${VERSION}/qc
-
-
-publish:
- echo Make sure
- echo ${USER}@cvs.cogkit.org:/www/www.cogkit.org/releases/${VERSION} exits
- scp qualitycontrol/findbugs.html ${USER}@cvs.cogkit.org:/www/www.cogkit.org/release/${VERSION}
-
-install-qc:
- cd ../..; cvs -d ${USER}@cvs.cogkit.org:/cvs/cogkit co src/tools
-
-findbugs:
- echo "You can install findbugs by calling 'make install-qc'"
- cd qualitycontrol; '../../tools/findbugs-0.8.6/bin/findbugs.bat' -textui -low -html -project findbugs.fb > findbugs.html
-
-publish-findbugs:
- echo "publish the result of findbugs to the web"
- cp findbugs.html ???
-
-
-getpmd:
- cd ../..; cvs -d ${USER}@cvs.cogkit.org:/cvs/cogkit co src/pmd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-17 15:45:39
|
Revision: 1686
http://cogkit.svn.sourceforge.net/cogkit/?rev=1686&view=rev
Author: hategan
Date: 2007-08-17 08:45:35 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
removed obsolete readme
Removed Paths:
-------------
trunk/current/src/cog/README.GT4.txt
Deleted: trunk/current/src/cog/README.GT4.txt
===================================================================
--- trunk/current/src/cog/README.GT4.txt 2007-08-17 15:44:40 UTC (rev 1685)
+++ trunk/current/src/cog/README.GT4.txt 2007-08-17 15:45:35 UTC (rev 1686)
@@ -1,258 +0,0 @@
-This version of the CoG Kit works with GT4.0.1 and GT 4.0.2. As GT4.0.0 contains
-some limitations we do not recommend that you use GT4.0.0.
-
-The purpose of this readme is to list the dependencies on the string "GT4.0.0"
-and GT4_0_0 to simplify the transition to a more appropriate naming.
-
-To make this more apparent, we will rename GT4_0_0 in near future either to GT4 or GT4.0.2. We have not yet decided what is better.
-
-
-
-BUGS.txt:PLEASE NOTE ALTHOUGH THE PROVIDER FOR GT4_0_0 IS UNDER DEVELOPMENT.
-BUGS.txt:IN THE GT4_0_0 DIRECTORY YOU STILL FIND THE 3.9.5 PROVIDER which is a
-
-Comment: This needs to be changed as we supprt GT4.0.1 and GT4.0.2
-
-bin/release/Makefile:PROVIDERS=gt3-common gt3_2_1 gt4_0_0 local webdav ssh condor gt2ft
-man/cog-job-submit.txt: Provider; available providers: [gt2ft, gsiftp, file, gt4.0.0,
-man/cog-task2xml.txt: Provider; available providers: [gt2ft, gsiftp, file, gt4.0.0,
-man/cogrun.txt: Provider; available providers: [gt2ft, gsiftp, file, gt4.0.0,
-modules/abstraction/dependencies.xml: <property name="module" value="provider-gt4_0_0"/>
-modules/abstraction-examples/meta/cog-file-operation/usage.txt: Provider; available providers: [gt2ft, gsiftp, file, gt4.0.0,
-modules/abstraction-examples/meta/cog-job-submit/usage.txt: Provider; available providers: [gt2ft, gsiftp, file, gt4.0.0,
-modules/abstraction-examples/meta/cog-task2xml/usage.txt: Provider; available providers: [gt2ft, gsiftp, file, gt4.0.0,
-modules/abstraction-examples/meta/cogrun/usage.txt: Provider; available providers: [gt2ft, gsiftp, file, gt4.0.0,
-modules/provider-gt3-common/meta/description.txt:basis wihtout any support. Please use the GT4.0.0 provider instead.
-modules/provider-gt3_0_2/meta/description.txt:basis wihtout any support. Please use the GT4.0.0 provider instead.
-modules/provider-gt3_2_0/meta/description.txt:basis wihtout any support. Please use the GT4.0.0 provider instead.
-modules/provider-gt3_2_1/meta/description.txt:basis wihtout any support. Please use the GT4.0.0 provider instead.
-modules/provider-gt4_0_0/build.xml: <mkdir dir="${dist.dir}/lib-gt4_0_0"/>
-modules/provider-gt4_0_0/build.xml: <copy todir="${dist.dir}/lib-gt4_0_0">
-modules/provider-gt4_0_0/build.xml: <fileset dir="lib-gt4_0_0" includes="*.*"/>
-modules/provider-gt4_0_0/build.xml: <mkdir dir="${dist.dir}/lib-gt4_0_0"/>
-modules/provider-gt4_0_0/build.xml: <copy todir="${dist.dir}/lib-gt4_0_0">
-modules/provider-gt4_0_0/build.xml: <fileset dir="lib-gt4_0_0" includes="*.*"/>
-modules/provider-gt4_0_0/CHANGES.txt: org.globus.cog.abstraction.impl.execution.gt4_0_0ft
-modules/provider-gt4_0_0/CHANGES.txt: org.globus.cog.abstraction.impl.execution.gt4_0_0ft
-modules/provider-gt4_0_0/CHANGES.txt:(04/19/2005) Renamed this module from "core-provider-gt4.0.0" to
-modules/provider-gt4_0_0/CHANGES.txt: "provider-gt4.0.0"
-modules/provider-gt4_0_0/meta/description.txt:The provider-gt4.0.0 module is a component of the abstractions framework.
-modules/provider-gt4_0_0/project.properties:module.name = provider-gt4_0_0
-modules/provider-gt4_0_0/project.properties:long.name = GT4.0.0 provider for abstractions
-modules/provider-gt4_0_0/project.properties:extra.lib.dir = lib-gt4_0_0
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:relative=cog-provider-clref-gt4_0_0
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/addressing-1.0.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/axis-url.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/axis.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/cog-axis.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/cog-url.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/commonj.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/commons-beanutils.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/commons-collections-3.0.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/commons-digester.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/commons-discovery.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/globus_delegation_service.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/globus_delegation_stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/globus_wsrf_mds_aggregator_stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/globus_wsrf_rft_stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/gram-client.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/gram-stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/gram-utils.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/jaxrpc.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/naming-common.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/naming-factory.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/naming-java.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/naming-resources.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/opensaml.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/saaj.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wsdl4j.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wsrf_core.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wsrf_core_stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wsrf_mds_index_stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wsrf_mds_usefulrp_schema_stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wsrf_provider_jce.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wsrf_tools.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/wss4j.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/xalan.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/xercesImpl.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/xml-apis.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/xmlrpc-1.1.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/xmlsec.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/globus_wsrf_rendezvous_stubs.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:rjar=../lib-gt4_0_0/globus_wsrf_rendezvous_service.jar
-modules/provider-gt4_0_0/resources/classloader-gt4_0_0.properties:package=org.globus.cog.abstraction.impl.execution.gt4_0_0
-modules/provider-gt4_0_0/resources/cog-provider.properties:classloader.properties=classloader-gt4_0_0.properties
-modules/provider-gt4_0_0/resources/cog-provider.properties:#classloader.boot=org.globus.cog.abstraction.impl.execution.gt4_0_0.Boot
-modules/provider-gt4_0_0/resources/cog-provider.properties:sandbox.boot=org.globus.cog.abstraction.impl.execution.gt4_0_0.Boot
-modules/provider-gt4_0_0/resources/cog-provider.properties:config.path=${user.home}/.globus/cog-provider-gt4_0_0/
-modules/provider-gt4_0_0/resources/cog-provider.properties:globus.location=${user.home}/.globus/cog-provider-gt4_0_0/
-modules/provider-gt4_0_0/resources/cog-provider.properties:server.webroot=${user.home}/.globus/cog-provider-gt4_0_0/
-modules/provider-gt4_0_0/resources/cog-provider.properties:schema.location=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
-modules/provider-gt4_0_0/resources/cog-provider.properties:SCHEMA_LOCATION=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
-modules/provider-gt4_0_0/resources/cog-provider.properties:executionTaskHandler=org.globus.cog.abstraction.impl.execution.gt4_0_0.TaskHandlerImpl
-modules/provider-gt4_0_0/resources/cog-provider.properties:securityContext=org.globus.cog.abstraction.impl.execution.gt4_0_0.GlobusSecurityContextImpl
-modules/provider-gt4_0_0/resources/cog-provider.properties:alias=gt4.0.0:gt4
-modules/provider-gt4_0_0/resources/cog-provider.properties:classloader.properties=classloader-gt4_0_0.properties
-modules/provider-gt4_0_0/resources/cog-provider.properties:#classloader.boot=org.globus.cog.abstraction.impl.execution.gt4_0_0.Boot
-modules/provider-gt4_0_0/resources/cog-provider.properties:sandbox.boot=org.globus.cog.abstraction.impl.execution.gt4_0_0.Boot
-modules/provider-gt4_0_0/resources/cog-provider.properties:config.path=${user.home}/.globus/cog-provider-gt4_0_0/
-modules/provider-gt4_0_0/resources/cog-provider.properties:globus.location=${user.home}/.globus/cog-provider-gt4_0_0/
-modules/provider-gt4_0_0/resources/cog-provider.properties:server.webroot=${user.home}/.globus/cog-provider-gt4_0_0/
-modules/provider-gt4_0_0/resources/cog-provider.properties:schema.location=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
-modules/provider-gt4_0_0/resources/cog-provider.properties:SCHEMA_LOCATION=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
-modules/provider-gt4_0_0/resources/cog-provider.properties:executionTaskHandler=org.globus.cog.abstraction.impl.execution.gt4_0_0ft.TaskHandlerImpl
-modules/provider-gt4_0_0/resources/cog-provider.properties:securityContext=org.globus.cog.abstraction.impl.execution.gt4_0_0.GlobusSecurityContextImpl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/management/shutdown_bindings.wsdl share/schema/core/management/shutdown_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/management/shutdown_port_type.wsdl share/schema/core/management/shutdown_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/management/shutdown_service.wsdl share/schema/core/management/shutdown_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/notification/notification_consumer_bindings.wsdl share/schema/core/notification/notification_consumer_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/notification/notification_consumer_flattened.wsdl share/schema/core/notification/notification_consumer_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/notification/notification_consumer_service.wsdl share/schema/core/notification/notification_consumer_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/notification/subscription_manager_bindings.wsdl share/schema/core/notification/subscription_manager_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/notification/subscription_manager_flattened.wsdl share/schema/core/notification/subscription_manager_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/notification/subscription_manager_service.wsdl share/schema/core/notification/subscription_manager_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/registry/registry_bindings.wsdl share/schema/core/registry/registry_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/registry/registry_entry_bindings.wsdl share/schema/core/registry/registry_entry_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/registry/registry_entry_flattened.wsdl share/schema/core/registry/registry_entry_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/registry/registry_entry_service.wsdl share/schema/core/registry/registry_entry_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/registry/registry_flattened.wsdl share/schema/core/registry/registry_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/registry/registry_service.wsdl share/schema/core/registry/registry_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/authzService/authzService_bindings.wsdl share/schema/core/samples/authzService/authzService_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/authzService/authzService_flattened.wsdl share/schema/core/samples/authzService/authzService_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/authzService/authzService_service.wsdl share/schema/core/samples/authzService/authzService_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/counter/counter_bindings.wsdl share/schema/core/samples/counter/counter_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/counter/counter_port_type.wsdl share/schema/core/samples/counter/counter_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/counter/counter_service.wsdl share/schema/core/samples/counter/counter_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/management/management_bindings.wsdl share/schema/core/samples/management/management_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/management/management_flattened.wsdl share/schema/core/samples/management/management_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/samples/management/management_service.wsdl share/schema/core/samples/management/management_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/security/authorization/authz_bindings.wsdl share/schema/core/security/authorization/authz_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/security/authorization/authz_port_type.wsdl share/schema/core/security/authorization/authz_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/security/authorization/authz_service.wsdl share/schema/core/security/authorization/authz_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/security/secconv/secure_conversation_bindings.wsdl share/schema/core/security/secconv/secure_conversation_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/security/secconv/secure_conversation_port_type.wsdl share/schema/core/security/secconv/secure_conversation_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/security/secconv/secure_conversation_service.wsdl share/schema/core/security/secconv/secure_conversation_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/types/timestamp.wsdl share/schema/core/types/timestamp.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/core/types/timestamp.xsd share/schema/core/types/timestamp.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/delegationService/delegation_bindings.wsdl share/schema/delegationService/delegation_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/delegationService/delegation_factory_bindings.wsdl share/schema/delegationService/delegation_factory_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/delegationService/delegation_factory_flattened.wsdl share/schema/delegationService/delegation_factory_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/delegationService/delegation_factory_service.wsdl share/schema/delegationService/delegation_factory_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/delegationService/delegation_flattened.wsdl share/schema/delegationService/delegation_flattened.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/delegationService/delegation_service.wsdl share/schema/delegationService/delegation_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/file_system_map_config.wsdl share/schema/gram/file_system_map_config.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/file_system_map_config.xsd share/schema/gram/file_system_map_config.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/job_description.xsd share/schema/gram/job_description.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_executable_job_bindings.wsdl share/schema/gram/managed_executable_job_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_executable_job_data.xsd share/schema/gram/managed_executable_job_data.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_executable_job_port_type.wsdl share/schema/gram/managed_executable_job_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_executable_job_service.wsdl share/schema/gram/managed_executable_job_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_executable_job_state.wsdl share/schema/gram/managed_executable_job_state.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_bindings.wsdl share/schema/gram/managed_job_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_data.xsd share/schema/gram/managed_job_data.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_factory_bindings.wsdl share/schema/gram/managed_job_factory_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_factory_port_type.wsdl share/schema/gram/managed_job_factory_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_factory_service.wsdl share/schema/gram/managed_job_factory_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_faults.xsd share/schema/gram/managed_job_faults.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_port_type.wsdl share/schema/gram/managed_job_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_service.wsdl share/schema/gram/managed_job_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_types.wsdl share/schema/gram/managed_job_types.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_job_types.xsd share/schema/gram/managed_job_types.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_multi_job_bindings.wsdl share/schema/gram/managed_multi_job_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_multi_job_data.xsd share/schema/gram/managed_multi_job_data.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_multi_job_port_type.wsdl share/schema/gram/managed_multi_job_port_type.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_multi_job_service.wsdl share/schema/gram/managed_multi_job_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/gram/managed_multi_job_state.wsdl share/schema/gram/managed_multi_job_state.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/addressing/WS-Addressing.xsd share/schema/ws/addressing/WS-Addressing.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/xml.xsd share/schema/ws/xml.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/policy/policy.xsd share/schema/ws/policy/policy.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/policy/utility.xsd share/schema/ws/policy/utility.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/secconv/ws-secureconversation.xsd share/schema/ws/secconv/ws-secureconversation.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/security/oasis-200401-wss-wssecurity-secext-1.0.xsd share/schema/ws/security/oasis-200401-wss-wssecurity-secext-1.0.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/security/oasis-200401-wss-wssecurity-utility-1.0.xsd share/schema/ws/security/oasis-200401-wss-wssecurity-utility-1.0.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/security/xmldsig-core-schema.xsd share/schema/ws/security/xmldsig-core-schema.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/trust/ws-trust.wsdl share/schema/ws/trust/ws-trust.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/ws/trust/ws-trust.xsd share/schema/ws/trust/ws-trust.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/faults/WS-BaseFaults.wsdl share/schema/wsrf/faults/WS-BaseFaults.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/faults/WS-BaseFaults.xsd share/schema/wsrf/faults/WS-BaseFaults.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/lifetime/WS-ResourceLifetime.wsdl share/schema/wsrf/lifetime/WS-ResourceLifetime.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/lifetime/WS-ResourceLifetime.xsd share/schema/wsrf/lifetime/WS-ResourceLifetime.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/lifetime/WS-ResourceLifetime_bindings.wsdl share/schema/wsrf/lifetime/WS-ResourceLifetime_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/lifetime/WS-ResourceLifetime_service.wsdl share/schema/wsrf/lifetime/WS-ResourceLifetime_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/notification/WS-BaseN.wsdl share/schema/wsrf/notification/WS-BaseN.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/notification/WS-BaseN.xsd share/schema/wsrf/notification/WS-BaseN.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/notification/WS-BaseN_bindings.wsdl share/schema/wsrf/notification/WS-BaseN_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/notification/WS-BaseN_service.wsdl share/schema/wsrf/notification/WS-BaseN_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/notification/WS-Topics.xsd share/schema/wsrf/notification/WS-Topics.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/properties/WS-ResourceProperties.wsdl share/schema/wsrf/properties/WS-ResourceProperties.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/properties/WS-ResourceProperties.xsd share/schema/wsrf/properties/WS-ResourceProperties.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/properties/WS-ResourceProperties_bindings.wsdl share/schema/wsrf/properties/WS-ResourceProperties_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/properties/WS-ResourceProperties_service.wsdl share/schema/wsrf/properties/WS-ResourceProperties_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/servicegroup/WS-ServiceGroup.wsdl share/schema/wsrf/servicegroup/WS-ServiceGroup.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/servicegroup/WS-ServiceGroup.xsd share/schema/wsrf/servicegroup/WS-ServiceGroup.xsd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/servicegroup/WS-ServiceGroup_bindings.wsdl share/schema/wsrf/servicegroup/WS-ServiceGroup_bindings.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/share/schema/wsrf/servicegroup/WS-ServiceGroup_service.wsdl share/schema/wsrf/servicegroup/WS-ServiceGroup_service.wsdl
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/client-config.wsdd client-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_cas_service/registration.xml etc/globus_cas_service/registration.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_cas_service/casDbSchema/cas_pgsql_database_schema.sql etc/globus_cas_service/casDbSchema/cas_pgsql_database_schema.sql
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_cas_service/casDbSchema/cas_mysql_database_schema.sql etc/globus_cas_service/casDbSchema/cas_mysql_database_schema.sql
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_cas_service/security-config.xml etc/globus_cas_service/security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_cas_service/server-config.wsdd etc/globus_cas_service/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_cas_service/jndi-config.xml etc/globus_cas_service/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_delegation_service/service-security-config.xml etc/globus_delegation_service/service-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_delegation_service/factory-security-config.xml etc/globus_delegation_service/factory-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_delegation_service/server-config.wsdd etc/globus_delegation_service/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_delegation_service/jndi-config.xml etc/globus_delegation_service/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_core/global_security_descriptor.xml etc/globus_wsrf_core/global_security_descriptor.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_core/client-server-config.wsdd etc/globus_wsrf_core/client-server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_core/client-jndi-config.xml etc/globus_wsrf_core/client-jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_core/server-config.wsdd etc/globus_wsrf_core/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_core/jndi-config.xml etc/globus_wsrf_core/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_core_registry/server-config.wsdd etc/globus_wsrf_core_registry/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_core_registry/jndi-config.xml etc/globus_wsrf_core_registry/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_aggregator/example-aggregator-registration.xml etc/globus_wsrf_mds_aggregator/example-aggregator-registration.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_aggregator/client-server-config.wsdd etc/globus_wsrf_mds_aggregator/client-server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_aggregator/server-config.wsdd etc/globus_wsrf_mds_aggregator/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/hierarchy.xml etc/globus_wsrf_mds_index/hierarchy.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/entry-security-config.xml etc/globus_wsrf_mds_index/entry-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/index-security-config.xml etc/globus_wsrf_mds_index/index-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/factory-security-config.xml etc/globus_wsrf_mds_index/factory-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/downstream.xml etc/globus_wsrf_mds_index/downstream.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/upstream.xml etc/globus_wsrf_mds_index/upstream.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/server-config.wsdd etc/globus_wsrf_mds_index/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_index/jndi-config.xml etc/globus_wsrf_mds_index/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_trigger/server-config.wsdd etc/globus_wsrf_mds_trigger/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_mds_trigger/jndi-config.xml etc/globus_wsrf_mds_trigger/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_rft/registration.xml etc/globus_wsrf_rft/registration.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_rft/security-config.xml etc/globus_wsrf_rft/security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_rft/factory-security-config.xml etc/globus_wsrf_rft/factory-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_rft/server-config.wsdd etc/globus_wsrf_rft/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_rft/jndi-config.xml etc/globus_wsrf_rft/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_servicegroup/server-config.wsdd etc/globus_wsrf_servicegroup/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/globus_wsrf_servicegroup/jndi-config.xml etc/globus_wsrf_servicegroup/jndi-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/gram-service/managed-job-factory-security-config.xml etc/gram-service/managed-job-factory-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/gram-service/managed-job-security-config.xml etc/gram-service/managed-job-security-config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/gram-service/registration.xml etc/gram-service/registration.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/gram-service/server-config.wsdd etc/gram-service/server-config.wsdd
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/gram-service/globus_gram_fs_map_config.xml etc/gram-service/globus_gram_fs_map_config.xml
-modules/provider-gt4_0_0/resources/config-gt4_0_0.index:config/gt4_0_0/etc/gram-service/jndi-config.xml etc/gram-service/jndi-config.xml
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/Boot.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/Boot.java: private static final String ProviderVersion = "gt4.0.0";
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/Boot.java: private static final String ProviderVersionU = "gt4_0_0";
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/DelegatedTaskHandlerFactory.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/GlobusSecurityContextImpl.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java:// package org.globus.cog.abstraction.impl.execution.gt4_0_0;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java: throw new IllegalSpecException("The gt4.0.0 provider does not support redirection");
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java: "The gt4.0.0 provider does not support local executables");
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/TaskHandlerImpl.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0ft/DelegatedTaskHandlerFactory.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0ft;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0ft/JobSubmissionTaskHandler.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0ft;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0ft/JobSubmissionTaskHandler.java:import org.globus.cog.abstraction.impl.execution.gt4_0_0.GlobusSecurityContextImpl;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0ft/JobSubmissionTaskHandler.java: "The gt4.0.0ft provider does not support redirection");
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0ft/JobSubmissionTaskHandler.java: "The gt4.0.0ft provider does not support file staging");
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0ft/PollThread.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0ft;
-modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0ft/TaskHandlerImpl.java:package org.globus.cog.abstraction.impl.execution.gt4_0_0ft;
-modules/testing/karajan/execution/00-direct.k:test("Execution: direct", ["gt4.0.0", "gt2", "gt3.0.2", "gt3.2.0", "gt3.2.1"], []
-modules/testing/karajan/hosts.k: service(provider="gt4.0.0", type="execution", url="plussed.mcs.anl.gov:4012")
-modules/testing/karajan/hosts.k: service(provider="gt4.0.0", type="execution", url="plussed.mcs.anl.gov:4022")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-17 15:45:05
|
Revision: 1685
http://cogkit.svn.sourceforge.net/cogkit/?rev=1685&view=rev
Author: hategan
Date: 2007-08-17 08:44:40 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
updated version
Modified Paths:
--------------
trunk/current/src/cog/VERSION
Modified: trunk/current/src/cog/VERSION
===================================================================
--- trunk/current/src/cog/VERSION 2007-08-17 15:36:25 UTC (rev 1684)
+++ trunk/current/src/cog/VERSION 2007-08-17 15:44:40 UTC (rev 1685)
@@ -1 +1 @@
-cog.version = 4_1_5
+cog.version = 4_1_6_dev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-17 15:36:27
|
Revision: 1684
http://cogkit.svn.sourceforge.net/cogkit/?rev=1684&view=rev
Author: hategan
Date: 2007-08-17 08:36:25 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
updated version number
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/project.properties
Modified: trunk/current/src/cog/modules/karajan/project.properties
===================================================================
--- trunk/current/src/cog/modules/karajan/project.properties 2007-08-16 23:00:53 UTC (rev 1683)
+++ trunk/current/src/cog/modules/karajan/project.properties 2007-08-17 15:36:25 UTC (rev 1684)
@@ -1,6 +1,6 @@
module.name = karajan
long.name = Karajan Workflow Engine
-version = 0.35
+version = 0.36-dev
project = Java CoG Kit
lib.deps = xpp3*.jar, xstream*.jar, backport-util-concurrent.jar
exclude.dirs = com/thoughtworks/xstream/**/*.*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-16 23:00:55
|
Revision: 1683
http://cogkit.svn.sourceforge.net/cogkit/?rev=1683&view=rev
Author: hategan
Date: 2007-08-16 16:00:53 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
changes
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/CHANGES.txt
Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-08-16 22:52:30 UTC (rev 1682)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt 2007-08-16 23:00:53 UTC (rev 1683)
@@ -1,3 +1,30 @@
+(08/16/2007)
+
+*** task:execute() would redirect the job stderr to stdout. Fixed.
+
+*** Some space optimizations on commonly (read heavily) used types.
+
+*** Global variables set to the Java "null" would be reported as
+ not found. Fixed.
+
+*** task:transfer now sets thirdPartyIfPossible to true by default
+ when the third party argument is not specified. This means that
+ third party transfers would be automatically attempted if possible,
+ while falling back to simulating them if not. If one needs to force
+ third party transfer to always off or always on, the thirdParty
+ argument would do the trick.
+
+*** sys:readFile (or sys:file:read) would add extra newlines of their
+ own for no good reason. Fixed.
+
+*** sys:file:write used to flush the stream after every write. Not
+ any more.
+
+*** Fixed a bug in the scheduler which would cause it to endlessly
+ wait for resources that weren't there to begin with before
+ scheduling certain tasks.
+
+
(07/02/2007)
*** A few size/performance optimizations on argument related things
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-16 22:52:31
|
Revision: 1682
http://cogkit.svn.sourceforge.net/cogkit/?rev=1682&view=rev
Author: hategan
Date: 2007-08-16 15:52:30 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
no throw of such thing
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/ThrottlingScheduler.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/ThrottlingScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/ThrottlingScheduler.java 2007-08-16 22:51:47 UTC (rev 1681)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/ThrottlingScheduler.java 2007-08-16 22:52:30 UTC (rev 1682)
@@ -19,8 +19,7 @@
throw new UnsupportedOperationException("No host(s) specified");
}
- public Service resolveService(BoundContact contact, int taskType)
- throws NoFreeResourceException {
+ public Service resolveService(BoundContact contact, int taskType) {
TaskConstraints tc = contact.getConstraints();
if (tc != null) {
String provider = (String) tc.getConstraint("provider");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-16 22:51:48
|
Revision: 1681
http://cogkit.svn.sourceforge.net/cogkit/?rev=1681&view=rev
Author: hategan
Date: 2007-08-16 15:51:47 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
fix for certain cases when a resource is not readily available
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/LateBindingScheduler.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/LateBindingScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/LateBindingScheduler.java 2007-08-16 22:49:23 UTC (rev 1680)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/LateBindingScheduler.java 2007-08-16 22:51:47 UTC (rev 1681)
@@ -47,7 +47,7 @@
public static final String SUBMIT_THROTTLE = "submitThrottle";
public static final String MAX_TRANSFERS = "maxTransfers";
public static final String SSH_INITIAL_RATE = "sshInitialRate";
- public static final String MAX_FILE_OPERATIONS = "maxFileOperations";
+ public static final String MAX_FILE_OPERATIONS = "maxFileOperations";
public static final int K = 1024;
public static final int THREAD_STACK_SIZE = 192 * K;
@@ -345,9 +345,8 @@
services[i] = resolveService((BoundContact) contacts[i], t.getType());
}
if (services[i] == null) {
- failTask(t, "Could not find a suitable service/provider for host "
- + contacts[i], null);
- return;
+ throw new NoSuchResourceException(
+ "Could not find a suitable service/provider for host " + contacts[i]);
}
t.setService(i, services[i]);
}
@@ -392,8 +391,7 @@
return boundContact;
}
- public Service resolveService(BoundContact contact, int taskType)
- throws NoFreeResourceException {
+ public Service resolveService(BoundContact contact, int taskType) {
Iterator h = this.getTaskHandlerWrappers(getHandlerType(taskType)).iterator();
while (h.hasNext()) {
TaskHandlerWrapper handler = (TaskHandlerWrapper) h.next();
@@ -401,7 +399,7 @@
return contact.getService(handler);
}
}
- throw new NoFreeResourceException("No service found");
+ return null;
}
public int getHandlerType(int taskType) {
@@ -498,7 +496,7 @@
}
else if (t.getType() == Task.JOB_SUBMISSION) {
currentJobs++;
- }
+ }
}
}
@@ -558,9 +556,8 @@
}
if (code == Status.COMPLETED) {
if (logger.isInfoEnabled()) {
- logger.info(task + " Completed. Waiting: "
- + getJobQueue().size() + ", Running: " + (getRunning() - 1)
- + ". Heap size: "
+ logger.info(task + " Completed. Waiting: " + getJobQueue().size()
+ + ", Running: " + (getRunning() - 1) + ". Heap size: "
+ (Runtime.getRuntime().totalMemory() / (1024 * 1024))
+ "M, Heap free: "
+ (Runtime.getRuntime().freeMemory() / (1024 * 1024)) + "M, Max heap: "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-16 22:49:25
|
Revision: 1680
http://cogkit.svn.sourceforge.net/cogkit/?rev=1680&view=rev
Author: hategan
Date: 2007-08-16 15:49:23 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
no flushing on every write
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/FileWrite.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/FileWrite.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/FileWrite.java 2007-08-16 22:48:57 UTC (rev 1679)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/FileWrite.java 2007-08-16 22:49:23 UTC (rev 1680)
@@ -51,7 +51,6 @@
if (item != null) {
try {
os.write(TypeUtil.toString(item).getBytes());
- os.flush();
}
catch (IOException e) {
throw new KarajanRuntimeException(e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-16 22:48:58
|
Revision: 1679
http://cogkit.svn.sourceforge.net/cogkit/?rev=1679&view=rev
Author: hategan
Date: 2007-08-16 15:48:57 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
fixed extra newlines
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java 2007-08-16 22:47:46 UTC (rev 1678)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java 2007-08-16 22:48:57 UTC (rev 1679)
@@ -115,12 +115,12 @@
BufferedReader br = new BufferedReader(new FileReader(new File(
TypeUtil.toString(PA_FILE.getValue(stack)))));
StringBuffer text = new StringBuffer();
- String line = "";
- do {
+ String line = br.readLine();
+ while (line != null) {
text.append(line);
text.append('\n');
line = br.readLine();
- } while (line != null);
+ };
return text.toString();
}
catch (Exception e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2007-08-16 22:47:48
|
Revision: 1678
http://cogkit.svn.sourceforge.net/cogkit/?rev=1678&view=rev
Author: hategan
Date: 2007-08-16 15:47:46 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
stderr goes to stderr
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-08-16 22:47:24 UTC (rev 1677)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2007-08-16 22:47:46 UTC (rev 1678)
@@ -286,7 +286,7 @@
STDOUT.ret(stack, t.getStdOutput());
}
if (t.getStdError() != null) {
- STDOUT.ret(stack, t.getStdError());
+ STDERR.ret(stack, t.getStdError());
}
}
super.taskCompleted(e, stack);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
