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...> - 2008-05-30 03:00:41
|
Revision: 2031
http://cogkit.svn.sourceforge.net/cogkit/?rev=2031&view=rev
Author: hategan
Date: 2008-05-29 20:00:39 -0700 (Thu, 29 May 2008)
Log Message:
-----------
added exception to signature
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/AbstractGridNode.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/AbstractGridNode.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/AbstractGridNode.java 2008-05-27 19:09:34 UTC (rev 2030)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/AbstractGridNode.java 2008-05-30 03:00:39 UTC (rev 2031)
@@ -216,7 +216,7 @@
}
public void submitScheduled(Scheduler scheduler, Task task, VariableStack stack,
- Object constraints) {
+ Object constraints) throws ExecutionException {
setTaskIdentity(stack, task);
if (logger.isDebugEnabled()) {
logger.debug(task);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-27 19:09:43
|
Revision: 2030
http://cogkit.svn.sourceforge.net/cogkit/?rev=2030&view=rev
Author: hategan
Date: 2008-05-27 12:09:34 -0700 (Tue, 27 May 2008)
Log Message:
-----------
pass CA dir from local environment
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java
Modified: trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh 2008-05-27 19:08:36 UTC (rev 2029)
+++ trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh 2008-05-27 19:09:34 UTC (rev 2030)
@@ -11,18 +11,31 @@
rm -f $DJ
exit 1
}
-if [ "$L" == "" ]; then
+if [ "$L" == "" ]; then
L=~/coaster-boot-$ID.log
fi
DJ=`mktemp /tmp/bootstrap.XXXXXX`
echo "BS: $BS" >>$L
-wget -c -q $BS/coaster-bootstrap.jar -O $DJ >>$L 2>&1
+WGET=`which wget 2>/dev/null`
+if [ "X$WGET" == "X" ]; then
+ WGET=`which curl 2>/dev/null`
+ if [ "X$WGET" == "X" ]; then
+ error "No wget or curl available"
+ fi
+ WGET="curl -O $DJ $BS/coaster-bootstrap.jar >>$L 2>&1"
+else
+ WGET="wget -c -q $BS/coaster-bootstrap.jar -O $DJ >>$L 2>&1"
+fi
+eval $WGET
if [ "$?" != "0" ]; then
error "Failed to download bootstrap jar from $BS"
fi
-MD5SUM=`which gmd5sum`
+MD5SUM=`which gmd5sum 2>/dev/null`
if [ "X$MD5SUM" == "X" ]; then
- MD5SUM=`which md5sum`
+ MD5SUM=`which md5sum 2>/dev/null`
+ if [ "X$MD5SUM" == "X" ]; then
+ error "No md5sum or gmd5sum found"
+ fi
fi
AMD5=`$MD5SUM $DJ`
echo "Expected checksum: $EMD5" >>$L
@@ -30,7 +43,6 @@
if [ "${AMD5:0:32}" != "$EMD5" ]; then
error "Bootstrap jar checksum failed: $EMD5 != ${AMD5:0:32}"
fi
-
if [ "X$JAVA_HOME" != "X" ]; then
JAVA=$JAVA_HOME/bin/java
else
@@ -40,9 +52,9 @@
echo "JAVA=$JAVA" >>$L
if [ -x $JAVA ]; then
echo "$JAVA -Djava.home="$JAVA_HOME" -DX509_USER_PROXY="$X509_USER_PROXY" -DGLOBUS_HOSTNAME="$H" -jar $DJ $BS $LMD5 $LS $ID" >>$L
- $JAVA -Djava.home="$JAVA_HOME" -DGLOBUS_TCP_PORT_RANGE="$GLOBUS_TCP_PORT_RANGE" -DX509_USER_PROXY="$X509_USER_PROXY" -DGLOBUS_HOSTNAME="$H" -jar $DJ $BS $LMD5 $LS $ID >>$L 2>&1
+ $JAVA -Djava.home="$JAVA_HOME" -DGLOBUS_TCP_PORT_RANGE="$GLOBUS_TCP_PORT_RANGE" -DX509_USER_PROXY="$X509_USER_PROXY" -DX509_CERT_DIR="$X509_CERT_DIR" -DGLOBUS_HOSTNAME="$H" -jar $DJ $BS $LMD5 $LS $ID >>$L 2>&1
EC=$?
- echo "Exit code: $EC" >>$L
+ echo "EC: $EC" >>$L
rm -f $DJ
exit $EC
else
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java 2008-05-27 19:08:36 UTC (rev 2029)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java 2008-05-27 19:09:34 UTC (rev 2030)
@@ -213,6 +213,7 @@
addProperty(args, "X509_USER_PROXY");
addProperty(args, "GLOBUS_HOSTNAME");
addProperty(args, "GLOBUS_TCP_PORT_RANGE");
+ addProperty(args, "X509_CERT_DIR");
}
private void addProperty(List args, String name) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-27 19:08:40
|
Revision: 2029
http://cogkit.svn.sourceforge.net/cogkit/?rev=2029&view=rev
Author: hategan
Date: 2008-05-27 12:08:36 -0700 (Tue, 27 May 2008)
Log Message:
-----------
redirect stdout/stderr
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java 2008-05-27 19:07:13 UTC (rev 2028)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/ServiceManager.java 2008-05-27 19:08:36 UTC (rev 2029)
@@ -196,6 +196,8 @@
t.setAttribute(TASK_ATTR_ID, id);
js.addArgument(id);
js.addArgument(orig.getService(0).getServiceContact().getHost());
+ js.setStdOutputLocation(FileLocation.MEMORY);
+ js.setStdErrorLocation(FileLocation.MEMORY);
t.setSpecification(js);
ExecutionService s = new ExecutionServiceImpl();
s.setServiceContact(orig.getService(0).getServiceContact());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-27 19:07:22
|
Revision: 2028
http://cogkit.svn.sourceforge.net/cogkit/?rev=2028&view=rev
Author: hategan
Date: 2008-05-27 12:07:13 -0700 (Tue, 27 May 2008)
Log Message:
-----------
report exception if task submission fails
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java 2008-05-26 17:28:46 UTC (rev 2027)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/local/LocalService.java 2008-05-27 19:07:13 UTC (rev 2028)
@@ -16,6 +16,8 @@
import org.apache.log4j.Logger;
import org.globus.cog.abstraction.coaster.service.Registering;
+import org.globus.cog.abstraction.impl.common.task.TaskSubmissionException;
+import org.globus.cog.abstraction.interfaces.Status;
import org.globus.cog.abstraction.interfaces.Task;
import org.globus.cog.karajan.workflow.service.ConnectionHandler;
import org.globus.cog.karajan.workflow.service.GSSService;
@@ -60,12 +62,12 @@
}
public String waitForRegistration(Task t, String id)
- throws InterruptedException, IOException {
+ throws InterruptedException, TaskSubmissionException {
return waitForRegistration(t, id, DEFAULT_REGISTRATION_TIMEOUT);
}
public String waitForRegistration(Task t, String id, long timeout)
- throws InterruptedException, IOException {
+ throws InterruptedException, TaskSubmissionException {
if (logger.isDebugEnabled()) {
logger.debug("Waiting for registration from service " + id);
}
@@ -74,14 +76,16 @@
while (!services.containsKey(id)) {
services.wait(1000);
if (timeout < System.currentTimeMillis() - start) {
- throw new IOException(
+ throw new TaskSubmissionException(
"Timed out waiting for registration for " + id);
}
- if (t.getStatus().isTerminal()) {
- throw new IOException(
- "Task ended before registration was received."
+ Status s = t.getStatus();
+ if (s.isTerminal()) {
+ throw new TaskSubmissionException(
+ "Task ended before registration was received"
+ + (s.getMessage() == null ? ". " : ": " + s.getMessage())
+ "\nSTDOUT: " + t.getStdOutput()
- + "\nSTDERR: " + t.getStdError());
+ + "\nSTDERR: " + t.getStdError(), s.getException());
}
}
return (String) services.get(id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-26 17:28:50
|
Revision: 2027
http://cogkit.svn.sourceforge.net/cogkit/?rev=2027&view=rev
Author: hategan
Date: 2008-05-26 10:28:46 -0700 (Mon, 26 May 2008)
Log Message:
-----------
fixed setting properties from subclasses
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-05-23 18:41:17 UTC (rev 2026)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java 2008-05-26 17:28:46 UTC (rev 2027)
@@ -335,7 +335,7 @@
else {
double val = TypeUtil.toDouble(value);
try {
- Field f = this.getClass().getField(name);
+ Field f = WeightedHostScoreScheduler.class.getDeclaredField(name);
if (f.getClass().equals(int.class)) {
f.setInt(this, (int) val);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-23 18:41:30
|
Revision: 2026
http://cogkit.svn.sourceforge.net/cogkit/?rev=2026&view=rev
Author: hategan
Date: 2008-05-23 11:41:17 -0700 (Fri, 23 May 2008)
Log Message:
-----------
slightly more compact code
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/SubmitJobCommand.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/SubmitJobCommand.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/SubmitJobCommand.java 2008-05-23 18:00:55 UTC (rev 2025)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/SubmitJobCommand.java 2008-05-23 18:41:17 UTC (rev 2026)
@@ -94,16 +94,9 @@
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
switch (c) {
- case '\n': {
+ case '\n':
+ case '\\':
baos.write('\\');
- baos.write('\n');
- break;
- }
- case '\\': {
- baos.write('\\');
- baos.write('\\');
- break;
- }
default:
baos.write(c);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-23 18:01:17
|
Revision: 2025
http://cogkit.svn.sourceforge.net/cogkit/?rev=2025&view=rev
Author: hategan
Date: 2008-05-23 11:00:55 -0700 (Fri, 23 May 2008)
Log Message:
-----------
fixed attribute mess
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-05-23 16:49:27 UTC (rev 2024)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-05-23 18:00:55 UTC (rev 2025)
@@ -153,8 +153,8 @@
String sid = String.valueOf(id);
Task t = new TaskImpl();
t.setType(Task.JOB_SUBMISSION);
- t.setSpecification(buildSpecification(sid, maxWallTime, prototype));
- copyAttributes(t, prototype);
+ t.setSpecification(buildSpecification(sid, prototype));
+ copyAttributes(t, prototype, maxWallTime);
t.setRequiredService(1);
t.setService(0, buildService(prototype));
try {
@@ -170,7 +170,7 @@
}
}
- private JobSpecification buildSpecification(String id, int maxWallTime,
+ private JobSpecification buildSpecification(String id,
Task prototype) {
JobSpecification ps = (JobSpecification) prototype.getSpecification();
JobSpecification js = new JobSpecificationImpl();
@@ -178,17 +178,7 @@
js.addArgument(script.getAbsolutePath());
js.addArgument(id);
js.addArgument(callbackURI.toString());
- Iterator i = ps.getAttributeNames().iterator();
- while (i.hasNext()) {
- String name = (String) i.next();
- if(name == "maxwalltime") {
- logger.warn("Ignoring maxwalltime attribute when submitting worker");
- } else {
- js.setAttribute(name, ps.getAttribute(name));
- }
- }
- js.setAttribute("maxwalltime", new WallTime(maxWallTime)
- .getSpecInMinutes());
+
return js;
}
@@ -214,12 +204,16 @@
return s;
}
- private void copyAttributes(Task t, Task prototype) {
- Iterator i = prototype.getAttributeNames().iterator();
+ private void copyAttributes(Task t, Task prototype, int maxWallTime) {
+ JobSpecification pspec = (JobSpecification) prototype.getSpecification();
+ JobSpecification tspec = (JobSpecification) prototype.getSpecification();
+ Iterator i = pspec.getAttributeNames().iterator();
while (i.hasNext()) {
String name = (String) i.next();
- t.setAttribute(name, prototype.getAttribute(name));
+ tspec.setAttribute(name, pspec.getAttribute(name));
}
+ tspec.setAttribute("maxwalltime", new WallTime(maxWallTime)
+ .getSpecInMinutes());
}
private int k;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-19 22:22:14
|
Revision: 2023
http://cogkit.svn.sourceforge.net/cogkit/?rev=2023&view=rev
Author: hategan
Date: 2008-05-19 15:21:51 -0700 (Mon, 19 May 2008)
Log Message:
-----------
fixed hostname issue. the previous thing was written with the wrong assumption
Modified Paths:
--------------
trunk/current/src/cog/etc/unix/example-launcher-template
trunk/current/src/cog/etc/unix/launcher-template
Modified: trunk/current/src/cog/etc/unix/example-launcher-template
===================================================================
--- trunk/current/src/cog/etc/unix/example-launcher-template 2008-05-19 20:00:27 UTC (rev 2022)
+++ trunk/current/src/cog/etc/unix/example-launcher-template 2008-05-19 22:21:51 UTC (rev 2023)
@@ -59,6 +59,10 @@
USERID=`id | awk '{printf("%s\n", substr($1, 5, index($1, "(")-5 ) ) }'`
+if [ "X$GLOBUS_HOSTNAME" == "X" ] && [ "X$HOSTNAME" != "X" ]; then
+ GLOBUS_HOSTNAME=$HOSTNAME
+fi
+
updateOptions "$USERID" "UID"
updateOptions "$GLOBUS_INSTALL_PATH" "GLOBUS_INSTALL_PATH"
updateOptions "$GLOBUS_DEPLOY_PATH" "GLOBUS_DEPLOY_PATH"
@@ -66,7 +70,6 @@
updateOptions "$GLOBUS_TCP_SOURCE_PORT_RANGE" "GLOBUS_TCP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_UDP_SOURCE_PORT_RANGE" "GLOBUS_UDP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_HOSTNAME" "GLOBUS_HOSTNAME"
-updateOptions "$HOSTNAME" "hostname"
updateOptions "$X509_USER_CERT" "X509_USER_CERT"
updateOptions "$X509_USER_KEY" "X509_USER_KEY"
updateOptions "$X509_CERT_DIR" "X509_CERT_DIR"
Modified: trunk/current/src/cog/etc/unix/launcher-template
===================================================================
--- trunk/current/src/cog/etc/unix/launcher-template 2008-05-19 20:00:27 UTC (rev 2022)
+++ trunk/current/src/cog/etc/unix/launcher-template 2008-05-19 22:21:51 UTC (rev 2023)
@@ -61,6 +61,10 @@
USERID=`id | awk '{printf("%s\n", substr($1, 5, index($1, "(")-5 ) ) }'`
+if [ "X$GLOBUS_HOSTNAME" == "X" ] && [ "X$HOSTNAME" != "X" ]; then
+ GLOBUS_HOSTNAME=$HOSTNAME
+fi
+
updateOptions "$USERID" "UID"
updateOptions "$GLOBUS_INSTALL_PATH" "GLOBUS_INSTALL_PATH"
updateOptions "$GLOBUS_DEPLOY_PATH" "GLOBUS_DEPLOY_PATH"
@@ -68,7 +72,6 @@
updateOptions "$GLOBUS_TCP_SOURCE_PORT_RANGE" "GLOBUS_TCP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_UDP_SOURCE_PORT_RANGE" "GLOBUS_UDP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_HOSTNAME" "GLOBUS_HOSTNAME"
-updateOptions "$HOSTNAME" "hostname"
updateOptions "$X509_USER_CERT" "X509_USER_CERT"
updateOptions "$X509_USER_KEY" "X509_USER_KEY"
updateOptions "$X509_CERT_DIR" "X509_CERT_DIR"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-19 20:02:12
|
Revision: 2022
http://cogkit.svn.sourceforge.net/cogkit/?rev=2022&view=rev
Author: hategan
Date: 2008-05-19 13:00:27 -0700 (Mon, 19 May 2008)
Log Message:
-----------
pass hostname
Modified Paths:
--------------
trunk/current/src/cog/etc/unix/example-launcher-template
trunk/current/src/cog/etc/unix/launcher-template
Modified: trunk/current/src/cog/etc/unix/example-launcher-template
===================================================================
--- trunk/current/src/cog/etc/unix/example-launcher-template 2008-05-16 14:01:46 UTC (rev 2021)
+++ trunk/current/src/cog/etc/unix/example-launcher-template 2008-05-19 20:00:27 UTC (rev 2022)
@@ -66,6 +66,7 @@
updateOptions "$GLOBUS_TCP_SOURCE_PORT_RANGE" "GLOBUS_TCP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_UDP_SOURCE_PORT_RANGE" "GLOBUS_UDP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_HOSTNAME" "GLOBUS_HOSTNAME"
+updateOptions "$HOSTNAME" "hostname"
updateOptions "$X509_USER_CERT" "X509_USER_CERT"
updateOptions "$X509_USER_KEY" "X509_USER_KEY"
updateOptions "$X509_CERT_DIR" "X509_CERT_DIR"
Modified: trunk/current/src/cog/etc/unix/launcher-template
===================================================================
--- trunk/current/src/cog/etc/unix/launcher-template 2008-05-16 14:01:46 UTC (rev 2021)
+++ trunk/current/src/cog/etc/unix/launcher-template 2008-05-19 20:00:27 UTC (rev 2022)
@@ -68,6 +68,7 @@
updateOptions "$GLOBUS_TCP_SOURCE_PORT_RANGE" "GLOBUS_TCP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_UDP_SOURCE_PORT_RANGE" "GLOBUS_UDP_SOURCE_PORT_RANGE"
updateOptions "$GLOBUS_HOSTNAME" "GLOBUS_HOSTNAME"
+updateOptions "$HOSTNAME" "hostname"
updateOptions "$X509_USER_CERT" "X509_USER_CERT"
updateOptions "$X509_USER_KEY" "X509_USER_KEY"
updateOptions "$X509_CERT_DIR" "X509_CERT_DIR"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-13 14:59:12
|
Revision: 2019
http://cogkit.svn.sourceforge.net/cogkit/?rev=2019&view=rev
Author: hategan
Date: 2008-05-13 07:59:06 -0700 (Tue, 13 May 2008)
Log Message:
-----------
fixed disappearing attributes
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 2008-05-13 13:53:17 UTC (rev 2018)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2008-05-13 14:59:06 UTC (rev 2019)
@@ -90,7 +90,7 @@
else if (A_ARGS.isPresent(stack)) {
setArguments(js, A_ARGS.getValue(stack));
}
-
+
if (TypeUtil.toBoolean(A_REDIRECT.getValue(stack))) {
js.setStdOutputLocation(FileLocation.MEMORY);
js.setStdErrorLocation(FileLocation.MEMORY);
@@ -280,14 +280,19 @@
protected final static Arg[] MISC_ATTRS = new Arg[] { A_COUNT, A_HOST_COUNT, A_JOBTYPE,
A_MAXTIME, A_MAXWALLTIME, A_MAXCPUTIME, A_QUEUE, A_PROJECT, A_MINMEMORY, A_MAXMEMORY };
- protected void setMiscAttributes(JobSpecification js, VariableStack stack) {
+ protected void setMiscAttributes(JobSpecification js, VariableStack stack)
+ throws ExecutionException {
for (int i = 0; i < MISC_ATTRS.length; i++) {
setAttributeIfPresent(MISC_ATTRS[i], js, stack);
}
}
-
- protected void setAttributeIfPresent(Arg arg, JobSpecification js, VariableStack stack) {
-
+
+ protected void setAttributeIfPresent(Arg arg, JobSpecification js, VariableStack stack)
+ throws ExecutionException {
+ Object value = arg.getValue(stack, null);
+ if (value != null) {
+ js.setAttribute(arg.getName(), value);
+ }
}
private List stringify(List l) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-13 13:53:36
|
Revision: 2018
http://cogkit.svn.sourceforge.net/cogkit/?rev=2018&view=rev
Author: hategan
Date: 2008-05-13 06:53:17 -0700 (Tue, 13 May 2008)
Log Message:
-----------
reverted 2016 and committed forgotten boot class
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties
trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/Boot.java
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties 2008-05-13 13:51:34 UTC (rev 2017)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties 2008-05-13 13:53:17 UTC (rev 2018)
@@ -25,7 +25,7 @@
provider=gt4
#this is where client-server-config.wsdd will be looked for
-config.path=${user.home}/.globus/cog-provider-gt4_0_0-2/etc/
+config.path=${user.home}/.globus/cog-provider-gt4_0_0-2/
#this is where ogsa.properties will be looked for
globus.location=${user.home}/.globus/cog-provider-gt4_0_0-2/
@@ -73,7 +73,7 @@
provider=gt4ft
#this is where client-server-config.wsdd will be looked for
-config.path=${user.home}/.globus/cog-provider-gt4_0_0-2/etc/
+config.path=${user.home}/.globus/cog-provider-gt4_0_0-2/
#this is where ogsa.properties will be looked for
globus.location=${user.home}/.globus/cog-provider-gt4_0_0-2/
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/Boot.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/Boot.java 2008-05-13 13:51:34 UTC (rev 2017)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/Boot.java 2008-05-13 13:53:17 UTC (rev 2018)
@@ -27,23 +27,21 @@
System.setProperty("GLOBUS_LOCATION", globusLocation);
System.setProperty("org.globus.wsrf.container.webroot", configPath);
ContainerConfig.getConfig().setOption(ContainerConfig.WSRF_LOCATION, globusLocation);
- String ip = CoGProperties.getDefault().getIPAddress();
- if (ip != null) {
- ContainerConfig.getConfig().setOption(ContainerConfig.LOGICAL_HOST, ip);
- // ??
- CoGProperties.getDefault().setHostName(ip);
- }
+ String hostname = CoGProperties.getDefault().getHostName();
+ if (hostname != null) {
+ ContainerConfig.getConfig().setOption(ContainerConfig.LOGICAL_HOST, hostname);
+ }
ContainerConfig.getConfig().setOption(ContainerConfig.INTERNAL_WEB_ROOT_PROPERTY,
AbstractionProperties.getProperties("gt4.0.0").getProperty("server.webroot"));
AxisProperties.setProperty(EngineConfigurationFactoryDefault.OPTION_CLIENT_CONFIG_FILE,
- configPath + File.separator + "client-config.wsdd");
+ configPath + File.separator + "etc" + File.separator + "client-config.wsdd");
BootUtil.checkConfigDir(configPath, "config-gt4_0_0.index", Boot.class.getClassLoader());
}
catch (Exception e) {
- logger.error("Error booting gt4.0.0", e);
+ logger.error("Error booting the GT4.0.x provider", e);
}
catch (Error e) {
- logger.fatal("Java Error caught; this is bad", e);
+ logger.fatal("Java Error caught; this may indicate a problem with the class loading mechanism.", e);
throw e;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 2017
http://cogkit.svn.sourceforge.net/cogkit/?rev=2017&view=rev
Author: hategan
Date: 2008-05-13 06:51:34 -0700 (Tue, 13 May 2008)
Log Message:
-----------
a trivial mesasge change
Modified Paths:
--------------
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/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 2008-05-13 11:50:51 UTC (rev 2016)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/src/org/globus/cog/abstraction/impl/execution/gt4_0_0/JobSubmissionTaskHandler.java 2008-05-13 13:51:34 UTC (rev 2017)
@@ -335,7 +335,7 @@
if (FileLocation.LOCAL.overlaps(spec.getExecutableLocation())) {
throw new IllegalSpecException(
- "The gt4.0.0 provider does not support local executables");
+ "The GT4.0.x provider does not support local executables");
}
desc.setExecutable(spec.getExecutable());
@@ -364,7 +364,7 @@
if ("true".equals(AbstractionProperties.getProperties("gt4")
.getProperty("fail.on.redirect"))) {
throw new IllegalSpecException(
- "The gt4.0.0 provider does not support redirection");
+ "The GT4.0.x provider does not support redirection");
}
else {
synchronized (JobSubmissionTaskHandler.class) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 23:16:26
|
Revision: 2015
http://cogkit.svn.sourceforge.net/cogkit/?rev=2015&view=rev
Author: hategan
Date: 2008-05-12 16:16:16 -0700 (Mon, 12 May 2008)
Log Message:
-----------
updated changes
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-05-12 23:15:06 UTC (rev 2014)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/CHANGES.txt 2008-05-12 23:16:16 UTC (rev 2015)
@@ -1,3 +1,9 @@
+(05/12/2008)
+
+*** Updated settings such that callback servers (and who knows
+ what else) are reported to the services using their host
+ names instead of a resolved IP address.
+
(04/30/2008)
*** Print a warning instead of failing when redirection is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 23:15:13
|
Revision: 2014
http://cogkit.svn.sourceforge.net/cogkit/?rev=2014&view=rev
Author: hategan
Date: 2008-05-12 16:15:06 -0700 (Mon, 12 May 2008)
Log Message:
-----------
changed config path so that changes get re-deployed
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties 2008-05-12 23:14:36 UTC (rev 2013)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/resources/cog-provider.properties 2008-05-12 23:15:06 UTC (rev 2014)
@@ -25,18 +25,18 @@
provider=gt4
#this is where client-server-config.wsdd will be looked for
-config.path=${user.home}/.globus/cog-provider-gt4_0_0/
+config.path=${user.home}/.globus/cog-provider-gt4_0_0-2/
#this is where ogsa.properties will be looked for
-globus.location=${user.home}/.globus/cog-provider-gt4_0_0/
+globus.location=${user.home}/.globus/cog-provider-gt4_0_0-2/
#this is where the local server will fetch things from (in particular schemas)
-server.webroot=${user.home}/.globus/cog-provider-gt4_0_0/
+server.webroot=${user.home}/.globus/cog-provider-gt4_0_0-2/
#the location of the schemas. The second one is used for backwards compatibility
#with cog2 style providers.
-schema.location=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
-SCHEMA_LOCATION=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
+schema.location=${user.home}/.globus/cog-provider-gt4_0_0-2/share/schema/
+SCHEMA_LOCATION=${user.home}/.globus/cog-provider-gt4_0_0-2/share/schema/
executionTaskHandler=org.globus.cog.abstraction.impl.execution.gt4_0_0.TaskHandlerImpl
securityContext=org.globus.cog.abstraction.impl.execution.gt4_0_0.GlobusSecurityContextImpl
@@ -73,18 +73,18 @@
provider=gt4ft
#this is where client-server-config.wsdd will be looked for
-config.path=${user.home}/.globus/cog-provider-gt4_0_0/
+config.path=${user.home}/.globus/cog-provider-gt4_0_0-2/
#this is where ogsa.properties will be looked for
-globus.location=${user.home}/.globus/cog-provider-gt4_0_0/
+globus.location=${user.home}/.globus/cog-provider-gt4_0_0-2/
#this is where the local server will fetch things from (in particular schemas)
-server.webroot=${user.home}/.globus/cog-provider-gt4_0_0/
+server.webroot=${user.home}/.globus/cog-provider-gt4_0_0-2/
#the location of the schemas. The second one is used for backwards compatibility
#with cog2 style providers.
-schema.location=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
-SCHEMA_LOCATION=${user.home}/.globus/cog-provider-gt4_0_0/share/schema/
+schema.location=${user.home}/.globus/cog-provider-gt4_0_0-2/share/schema/
+SCHEMA_LOCATION=${user.home}/.globus/cog-provider-gt4_0_0-2/share/schema/
executionTaskHandler=org.globus.cog.abstraction.impl.execution.gt4_0_0ft.TaskHandlerImpl
securityContext=org.globus.cog.abstraction.impl.execution.gt4_0_0.GlobusSecurityContextImpl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 23:14:41
|
Revision: 2013
http://cogkit.svn.sourceforge.net/cogkit/?rev=2013&view=rev
Author: hategan
Date: 2008-05-12 16:14:36 -0700 (Mon, 12 May 2008)
Log Message:
-----------
disable dns lookups
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/globus_wsrf_core/client-server-config.wsdd
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/globus_wsrf_core/client-server-config.wsdd
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/globus_wsrf_core/client-server-config.wsdd 2008-05-12 23:13:04 UTC (rev 2012)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/globus_wsrf_core/client-server-config.wsdd 2008-05-12 23:14:36 UTC (rev 2013)
@@ -12,6 +12,7 @@
<globalConfiguration>
<parameter name="sendXsiTypes" value="true"/>
+ <parameter name="disableDNS" value="true"/>
<!-- Authentication service -->
<parameter name="authenticationService"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 23:13:22
|
Revision: 2012
http://cogkit.svn.sourceforge.net/cogkit/?rev=2012&view=rev
Author: hategan
Date: 2008-05-12 16:13:04 -0700 (Mon, 12 May 2008)
Log Message:
-----------
moved client-config
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt4_0_0/resources/config-gt4_0_0.index
Modified: trunk/current/src/cog/modules/provider-gt4_0_0/resources/config-gt4_0_0.index
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/resources/config-gt4_0_0.index 2008-05-12 23:12:08 UTC (rev 2011)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/resources/config-gt4_0_0.index 2008-05-12 23:13:04 UTC (rev 2012)
@@ -88,7 +88,7 @@
config/gt4_0_0/share/schema/wsrf/servicegroup/WS-ServiceGroup.xsd share/schema/wsrf/servicegroup/WS-ServiceGroup.xsd
config/gt4_0_0/share/schema/wsrf/servicegroup/WS-ServiceGroup_bindings.wsdl share/schema/wsrf/servicegroup/WS-ServiceGroup_bindings.wsdl
config/gt4_0_0/share/schema/wsrf/servicegroup/WS-ServiceGroup_service.wsdl share/schema/wsrf/servicegroup/WS-ServiceGroup_service.wsdl
-config/gt4_0_0/client-config.wsdd client-config.wsdd
+config/gt4_0_0/etc/client-config.wsdd etc/client-config.wsdd
config/gt4_0_0/etc/globus_cas_service/registration.xml etc/globus_cas_service/registration.xml
config/gt4_0_0/etc/globus_cas_service/casDbSchema/cas_pgsql_database_schema.sql etc/globus_cas_service/casDbSchema/cas_pgsql_database_schema.sql
config/gt4_0_0/etc/globus_cas_service/casDbSchema/cas_mysql_database_schema.sql etc/globus_cas_service/casDbSchema/cas_mysql_database_schema.sql
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 23:12:12
|
Revision: 2011
http://cogkit.svn.sourceforge.net/cogkit/?rev=2011&view=rev
Author: hategan
Date: 2008-05-12 16:12:08 -0700 (Mon, 12 May 2008)
Log Message:
-----------
removed junk
Removed Paths:
-------------
trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/schema/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 23:11:49
|
Revision: 2010
http://cogkit.svn.sourceforge.net/cogkit/?rev=2010&view=rev
Author: hategan
Date: 2008-05-12 16:11:45 -0700 (Mon, 12 May 2008)
Log Message:
-----------
moved client-config
Added Paths:
-----------
trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/client-config.wsdd
Removed Paths:
-------------
trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/client-config.wsdd
Deleted: trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/client-config.wsdd
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/client-config.wsdd 2008-05-12 20:53:20 UTC (rev 2009)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/client-config.wsdd 2008-05-12 23:11:45 UTC (rev 2010)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <globalConfiguration>
- <parameter name="adminPassword" value="admin"/>
- <parameter name="disablePrettyXML" value="true"/>
- <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
- <parameter name="sendXsiTypes" value="true"/>
- <parameter name="sendMultiRefs" value="true"/>
- <parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.globus.wsrf.handlers.AddressingHandler"/>
- <handler type="java:org.globus.wsrf.impl.security.authorization.ClientPropertiesHandler"/>
- <handler type="java:org.globus.wsrf.impl.security.authentication.ClientPropertiesHandler"/>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.globus.wsrf.impl.security.authentication.securemsg.X509EncryptHandler"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.globus.wsrf.impl.security.authentication.securemsg.X509SignHandler"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.globus.wsrf.impl.security.authentication.UsernameHandler"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="authService" value="auto"/>
- <parameter name="className" value="org.globus.wsrf.impl.security.authentication.secureconv.SecContextHandler"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.globus.wsrf.impl.security.authentication.secureconv.GSSHandler"/>
- </handler>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.globus.wsrf.impl.security.authorization.TrustedTargetHandler"/>
- </handler>
- <handler type="java:org.globus.wsrf.handlers.MessageLoggingHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="java:org.globus.wsrf.handlers.AddressingHandler"/>
- <handler type="java:org.globus.wsrf.handlers.MessageLoggingHandler"/>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.globus.wsrf.impl.security.authentication.wssec.WSSecurityClientHandler"/>
- </handler>
- </responseFlow>
- </globalConfiguration>
- <transport name="java" pivot="java:org.apache.axis.transport.java.JavaSender"/>
- <transport name="https" pivot="java:org.globus.axis.transport.HTTPSSender">
- <requestFlow>
- <handler type="java:org.globus.axis.handlers.HTTP11Handler"/>
- </requestFlow>
- </transport>
- <transport name="http" pivot="java:org.apache.axis.transport.http.HTTPSender">
- <requestFlow>
- <handler type="java:org.globus.axis.handlers.HTTP11Handler"/>
- </requestFlow>
- </transport>
- <transport name="local" pivot="java:org.apache.axis.transport.local.LocalSender"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns1:ExecutionFailedFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.ExecutionFailedFaultType" xmlns:ns1="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns2:FilePermissionsFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.FilePermissionsFaultType" xmlns:ns2="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns3:ServiceLevelAgreementFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.ServiceLevelAgreementFaultType" xmlns:ns3="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns4:ServiceNameType" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.apache.axis.message.addressing.ServiceNameType" xmlns:ns4="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns5:BinaryExchangeType" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.globus.ws.trust.BinaryExchangeType" xmlns:ns5="http://schemas.xmlsoap.org/ws/2004/04/trust"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns6:AggregatorContent" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.mds.aggregator.types.AggregatorContent" xmlns:ns6="http://mds.globus.org/aggregator/types"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns7:EndpointReferenceType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.axis.message.addressing.EndpointReferenceType" xmlns:ns7="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns8:UnsupportedFeatureFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.UnsupportedFeatureFaultType" xmlns:ns8="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns9:SecurityContextTokenType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.ws.sc.SecurityContextTokenType" xmlns:ns9="http://schemas.xmlsoap.org/ws/2004/04/sc"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns10:ReferencePropertiesType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.axis.message.addressing.ReferencePropertiesType" xmlns:ns10="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
- <typeMapping deserializer="org.globus.wsrf.encoding.AnyListDeserializerFactory" encodingStyle="" qname="ns11:>SetResourceProperties" serializer="org.globus.wsrf.encoding.AnyListSerializerFactory" type="java:org.oasis.wsrf.properties.SetResourceProperties_Element" xmlns:ns11="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns12:FaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.FaultType" xmlns:ns12="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns13:BaseFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.oasis.wsrf.faults.BaseFaultType" xmlns:ns13="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns14:InsufficientCredentialsFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InsufficientCredentialsFaultType" xmlns:ns14="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns15:AttributedURI" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.apache.axis.message.addressing.AttributedURI" xmlns:ns15="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
- <typeMapping deserializer="org.globus.wsrf.encoding.TopicExpressionDeserializerFactory" encodingStyle="" qname="ns16:TopicExpressionType" serializer="org.globus.wsrf.encoding.TopicExpressionSerializerFactory" type="java:org.oasis.wsn.TopicExpressionType" xmlns:ns16="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns17:CredentialSerializationFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.CredentialSerializationFaultType" xmlns:ns17="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns18:InternalFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InternalFaultType" xmlns:ns18="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns19:StagingFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.StagingFaultType" xmlns:ns19="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns20:InvalidPathFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InvalidPathFaultType" xmlns:ns20="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns21:AttributedQName" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.apache.axis.message.addressing.AttributedQName" xmlns:ns21="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns22:InvalidCredentialsFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InvalidCredentialsFaultType" xmlns:ns22="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
- <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns23:QueryExpressionDialect" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:java.lang.String" xmlns:ns23="http://www.globus.org/foobar"/>
- <typeMapping deserializer="org.globus.wsrf.encoding.QueryExpressionDeserializerFactory" encodingStyle="" qname="ns24:QueryExpressionType" serializer="org.globus.wsrf.encoding.QueryExpressionSerializerFactory" type="java:org.oasis.wsrf.properties.QueryExpressionType" xmlns:ns24="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"/>
-</deployment>
Added: trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/client-config.wsdd
===================================================================
--- trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/client-config.wsdd (rev 0)
+++ trunk/current/src/cog/modules/provider-gt4_0_0/resources/config/gt4_0_0/etc/client-config.wsdd 2008-05-12 23:11:45 UTC (rev 2010)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
+ <globalConfiguration>
+ <parameter name="adminPassword" value="admin"/>
+ <parameter name="disablePrettyXML" value="true"/>
+ <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
+ <parameter name="sendXsiTypes" value="true"/>
+ <parameter name="sendMultiRefs" value="true"/>
+ <parameter name="sendXMLDeclaration" value="true"/>
+ <requestFlow>
+ <handler type="java:org.globus.wsrf.handlers.AddressingHandler"/>
+ <handler type="java:org.globus.wsrf.impl.security.authorization.ClientPropertiesHandler"/>
+ <handler type="java:org.globus.wsrf.impl.security.authentication.ClientPropertiesHandler"/>
+ <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
+ <parameter name="className" value="org.globus.wsrf.impl.security.authentication.securemsg.X509EncryptHandler"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
+ <parameter name="className" value="org.globus.wsrf.impl.security.authentication.securemsg.X509SignHandler"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
+ <parameter name="className" value="org.globus.wsrf.impl.security.authentication.UsernameHandler"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
+ <parameter name="authService" value="auto"/>
+ <parameter name="className" value="org.globus.wsrf.impl.security.authentication.secureconv.SecContextHandler"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
+ <parameter name="className" value="org.globus.wsrf.impl.security.authentication.secureconv.GSSHandler"/>
+ </handler>
+ <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
+ <parameter name="className" value="org.globus.wsrf.impl.security.authorization.TrustedTargetHandler"/>
+ </handler>
+ <handler type="java:org.globus.wsrf.handlers.MessageLoggingHandler"/>
+ </requestFlow>
+ <responseFlow>
+ <handler type="java:org.globus.wsrf.handlers.AddressingHandler"/>
+ <handler type="java:org.globus.wsrf.handlers.MessageLoggingHandler"/>
+ <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
+ <parameter name="className" value="org.globus.wsrf.impl.security.authentication.wssec.WSSecurityClientHandler"/>
+ </handler>
+ </responseFlow>
+ </globalConfiguration>
+ <transport name="java" pivot="java:org.apache.axis.transport.java.JavaSender"/>
+ <transport name="https" pivot="java:org.globus.axis.transport.HTTPSSender">
+ <requestFlow>
+ <handler type="java:org.globus.axis.handlers.HTTP11Handler"/>
+ </requestFlow>
+ </transport>
+ <transport name="http" pivot="java:org.apache.axis.transport.http.HTTPSender">
+ <requestFlow>
+ <handler type="java:org.globus.axis.handlers.HTTP11Handler"/>
+ </requestFlow>
+ </transport>
+ <transport name="local" pivot="java:org.apache.axis.transport.local.LocalSender"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns1:ExecutionFailedFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.ExecutionFailedFaultType" xmlns:ns1="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns2:FilePermissionsFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.FilePermissionsFaultType" xmlns:ns2="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns3:ServiceLevelAgreementFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.ServiceLevelAgreementFaultType" xmlns:ns3="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns4:ServiceNameType" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.apache.axis.message.addressing.ServiceNameType" xmlns:ns4="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns5:BinaryExchangeType" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.globus.ws.trust.BinaryExchangeType" xmlns:ns5="http://schemas.xmlsoap.org/ws/2004/04/trust"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns6:AggregatorContent" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.mds.aggregator.types.AggregatorContent" xmlns:ns6="http://mds.globus.org/aggregator/types"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns7:EndpointReferenceType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.axis.message.addressing.EndpointReferenceType" xmlns:ns7="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns8:UnsupportedFeatureFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.UnsupportedFeatureFaultType" xmlns:ns8="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns9:SecurityContextTokenType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.ws.sc.SecurityContextTokenType" xmlns:ns9="http://schemas.xmlsoap.org/ws/2004/04/sc"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns10:ReferencePropertiesType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.apache.axis.message.addressing.ReferencePropertiesType" xmlns:ns10="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
+ <typeMapping deserializer="org.globus.wsrf.encoding.AnyListDeserializerFactory" encodingStyle="" qname="ns11:>SetResourceProperties" serializer="org.globus.wsrf.encoding.AnyListSerializerFactory" type="java:org.oasis.wsrf.properties.SetResourceProperties_Element" xmlns:ns11="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns12:FaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.FaultType" xmlns:ns12="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns13:BaseFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.oasis.wsrf.faults.BaseFaultType" xmlns:ns13="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-BaseFaults-1.2-draft-01.xsd"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns14:InsufficientCredentialsFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InsufficientCredentialsFaultType" xmlns:ns14="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns15:AttributedURI" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.apache.axis.message.addressing.AttributedURI" xmlns:ns15="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
+ <typeMapping deserializer="org.globus.wsrf.encoding.TopicExpressionDeserializerFactory" encodingStyle="" qname="ns16:TopicExpressionType" serializer="org.globus.wsrf.encoding.TopicExpressionSerializerFactory" type="java:org.oasis.wsn.TopicExpressionType" xmlns:ns16="http://docs.oasis-open.org/wsn/2004/06/wsn-WS-BaseNotification-1.2-draft-01.xsd"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns17:CredentialSerializationFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.CredentialSerializationFaultType" xmlns:ns17="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns18:InternalFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InternalFaultType" xmlns:ns18="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns19:StagingFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.StagingFaultType" xmlns:ns19="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns20:InvalidPathFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InvalidPathFaultType" xmlns:ns20="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns21:AttributedQName" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:org.apache.axis.message.addressing.AttributedQName" xmlns:ns21="http://schemas.xmlsoap.org/ws/2004/03/addressing"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory" encodingStyle="" qname="ns22:InvalidCredentialsFaultType" serializer="org.apache.axis.encoding.ser.BeanSerializerFactory" type="java:org.globus.exec.generated.InvalidCredentialsFaultType" xmlns:ns22="http://www.globus.org/namespaces/2004/10/gram/job/faults"/>
+ <typeMapping deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory" encodingStyle="" qname="ns23:QueryExpressionDialect" serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory" type="java:java.lang.String" xmlns:ns23="http://www.globus.org/foobar"/>
+ <typeMapping deserializer="org.globus.wsrf.encoding.QueryExpressionDeserializerFactory" encodingStyle="" qname="ns24:QueryExpressionType" serializer="org.globus.wsrf.encoding.QueryExpressionSerializerFactory" type="java:org.oasis.wsrf.properties.QueryExpressionType" xmlns:ns24="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd"/>
+</deployment>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 20:54:38
|
Revision: 2009
http://cogkit.svn.sourceforge.net/cogkit/?rev=2009&view=rev
Author: hategan
Date: 2008-05-12 13:53:20 -0700 (Mon, 12 May 2008)
Log Message:
-----------
use the same scheme as servers in jglobus to find local host address
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/GassServerFactory.java
Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/GassServerFactory.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/GassServerFactory.java 2008-05-12 20:51:34 UTC (rev 2008)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/GassServerFactory.java 2008-05-12 20:53:20 UTC (rev 2009)
@@ -12,6 +12,7 @@
import org.globus.common.CoGProperties;
import org.globus.io.gass.server.GassServer;
+import org.globus.util.Util;
import org.ietf.jgss.GSSCredential;
public class GassServerFactory {
@@ -22,15 +23,14 @@
public synchronized static GassServer getGassServer(GSSCredential credential)
throws GassServerException {
if (cogIP == null) {
- if (CoGProperties.getDefault().getIPAddress() == null) {
+ cogIP = Util.getLocalHostAddress();
+ if (cogIP == null) {
throw new GassServerException(
"Could not determine this host's IP address. Please set an IP address in cog.properties");
- } else {
- cogIP = CoGProperties.getDefault().getIPAddress();
}
} else if (!cogIP.equalsIgnoreCase(CoGProperties.getDefault()
.getIPAddress())) {
- cogIP = CoGProperties.getDefault().getIPAddress();
+ cogIP = Util.getLocalHostAddress();
shutdownGassServers();
}
GassServer server;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 20:52:49
|
Revision: 2008
http://cogkit.svn.sourceforge.net/cogkit/?rev=2008&view=rev
Author: hategan
Date: 2008-05-12 13:51:34 -0700 (Mon, 12 May 2008)
Log Message:
-----------
properly chain exceptions
Modified Paths:
--------------
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/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 2008-05-12 19:17:59 UTC (rev 2007)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java 2008-05-12 20:51:34 UTC (rev 2008)
@@ -426,7 +426,7 @@
}
catch (Exception e) {
throw new IllegalSpecException(
- "Cannot parse the user defined attributes");
+ "Cannot parse the user defined attributes", e);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 19:18:17
|
Revision: 2007
http://cogkit.svn.sourceforge.net/cogkit/?rev=2007&view=rev
Author: hategan
Date: 2008-05-12 12:17:59 -0700 (Mon, 12 May 2008)
Log Message:
-----------
pre-defined classpath comes after our classpath
Modified Paths:
--------------
trunk/current/src/cog/etc/unix/example-launcher-template
trunk/current/src/cog/etc/unix/launcher-template
Modified: trunk/current/src/cog/etc/unix/example-launcher-template
===================================================================
--- trunk/current/src/cog/etc/unix/example-launcher-template 2008-05-12 16:56:13 UTC (rev 2006)
+++ trunk/current/src/cog/etc/unix/example-launcher-template 2008-05-12 19:17:59 UTC (rev 2007)
@@ -47,10 +47,11 @@
OPTIONS="$OPTIONS -Djava.endorsed.dirs=$COG_INSTALL_PATH/lib/endorsed"
-LOCALCLASSPATH=$CLASSPATH$CPDELIM$COG_INSTALL_PATH/etc
+LOCALCLASSPATH=$COG_INSTALL_PATH/etc
for JAR in $COG_INSTALL_PATH/lib/*.jar; do
LOCALCLASSPATH="$LOCALCLASSPATH$CPDELIM$JAR"
done
+LOCALCLASSPATH=$LOCALCLASSPATH$CPDELIM$CLASSPATH
CMDLINE=`fixCommandLine "$@"`
Modified: trunk/current/src/cog/etc/unix/launcher-template
===================================================================
--- trunk/current/src/cog/etc/unix/launcher-template 2008-05-12 16:56:13 UTC (rev 2006)
+++ trunk/current/src/cog/etc/unix/launcher-template 2008-05-12 19:17:59 UTC (rev 2007)
@@ -49,10 +49,11 @@
OPTIONS="$OPTIONS -Djava.endorsed.dirs=$COG_INSTALL_PATH/lib/endorsed"
-LOCALCLASSPATH=$CLASSPATH$CPDELIM$COG_INSTALL_PATH/etc
+LOCALCLASSPATH=$COG_INSTALL_PATH/etc
for JAR in $COG_INSTALL_PATH/lib/*.jar; do
LOCALCLASSPATH="$LOCALCLASSPATH$CPDELIM$JAR"
done
+LOCALCLASSPATH=$LOCALCLASSPATH$CPDELIM$CLASSPATH
CMDLINE=`fixCommandLine "$@"`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 16:56:22
|
Revision: 2006
http://cogkit.svn.sourceforge.net/cogkit/?rev=2006&view=rev
Author: hategan
Date: 2008-05-12 09:56:13 -0700 (Mon, 12 May 2008)
Log Message:
-----------
cleaned imports and removed unused variable
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 2008-05-12 16:54:26 UTC (rev 2005)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2008-05-12 16:56:13 UTC (rev 2006)
@@ -26,8 +26,6 @@
import org.globus.cog.abstraction.interfaces.Task;
import org.globus.cog.abstraction.interfaces.TaskHandler;
import org.globus.cog.karajan.arguments.Arg;
-import org.globus.cog.karajan.arguments.ArgUtil;
-import org.globus.cog.karajan.arguments.NamedArguments;
import org.globus.cog.karajan.arguments.VariableArguments;
import org.globus.cog.karajan.scheduler.Scheduler;
import org.globus.cog.karajan.scheduler.TaskConstraints;
@@ -99,7 +97,6 @@
}
String stmp;
- int itmp;
stmp = TypeUtil.toString(A_STDIN.getValue(stack, null));
if (stmp != null) {
js.setStdInput(stmp);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-12 16:54:39
|
Revision: 2005
http://cogkit.svn.sourceforge.net/cogkit/?rev=2005&view=rev
Author: hategan
Date: 2008-05-12 09:54:26 -0700 (Mon, 12 May 2008)
Log Message:
-----------
avoid passing arguments of derived classes as attributes and general cleanup
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 2008-05-12 09:46:36 UTC (rev 2004)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/grid/GridExec.java 2008-05-12 16:54:26 UTC (rev 2005)
@@ -74,130 +74,80 @@
static {
setArguments(GridExec.class, new Arg[] { A_EXECUTABLE, A_ARGS, A_ARGUMENTS, A_HOST,
A_STDOUT, A_STDERR, A_STDOUTLOCATION, A_STDERRLOCATION, A_STDIN, A_PROVIDER,
- A_COUNT, A_HOST_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, A_BATCH });
+ A_COUNT, A_HOST_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, A_BATCH });
}
public void submitTask(VariableStack stack) throws ExecutionException {
try {
JobSpecificationImpl js = new JobSpecificationImpl();
Task task = new TaskImpl();
- NamedArguments named = ArgUtil.getNamedArguments(stack);
- 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));
- }
- else if (name.equals(A_ARGS.getName()) || name.equals(A_ARGUMENTS.getName())) {
- if (value instanceof List) {
- js.setArguments(stringify((List) value));
- }
- else if (value instanceof VariableArguments) {
- js.setArguments(stringify(((VariableArguments) value).getAll()));
- }
- else {
- js.setArguments(TypeUtil.toString(value));
- }
- }
- else if (name.equals(A_REDIRECT.getName())) {
- redirect = TypeUtil.toBoolean(value);
- }
- else if (name.equals(A_STDIN.getName())) {
- js.setStdInput(TypeUtil.toString(value));
- }
- 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));
- }
- else if (name.equals(A_JOBTYPE.getName())) {
- js.setAttribute("jobType", value);
- }
- else if (name.equals(A_NATIVESPEC.getName())) {
- js.setSpecification(TypeUtil.toString(value));
- }
- else if (name.equals(A_PROVIDER.getName())) {
- provider = TypeUtil.toString(value);
- }
- else if (name.equals(A_SECURITY_CONTEXT.getName())) {
- // set later
- }
- else if (name.equals(A_DELEGATION.getName())) {
- js.setDelegationEnabled(TypeUtil.toBoolean(value));
- }
- else if (name.equals(A_HOST.getName())) {
- host = value;
- }
- else if (name.equals(A_ENVIRONMENT.getName())) {
- if (value instanceof Map) {
- Iterator j = ((Map) value).entrySet().iterator();
- while (j.hasNext()) {
- Map.Entry e = (Map.Entry) j.next();
- js.addEnvironmentVariable((String) e.getKey(), (String) e.getValue());
- }
- }
- else if (value instanceof String) {
- StringTokenizer st = new StringTokenizer((String) value, ",");
- while (st.hasMoreTokens()) {
- String el = st.nextToken().trim();
- String[] nv = el.split("=");
- if (nv.length > 2 || el.length() == 0) {
- throw new ExecutionException("Invalid environment entry: '" + el
- + "'");
- }
- else if (nv.length == 1) {
- js.addEnvironmentVariable(nv[0].trim(), "");
- }
- else {
- js.addEnvironmentVariable(nv[0].trim(), nv[1].trim());
- }
- }
- }
- }
- else if (name.equals(A_ATTRIBUTES.getName())) {
- Map m = (Map) checkClass(A_ATTRIBUTES.getValue(stack), Map.class, "map");
- Iterator ai = m.entrySet().iterator();
- while (ai.hasNext()) {
- Map.Entry e = (Map.Entry) ai.next();
- try {
- js.setAttribute((String) e.getKey(), e.getValue());
- }
- catch (ClassCastException ex) {
- throw new ExecutionException("Invalid attribute name (" + e.getKey()
- + ")", ex);
- }
- }
- }
- else if (name.equals(A_BATCH.getName())) {
- js.setBatchJob(TypeUtil.toBoolean(value));
- }
- else {
- js.setAttribute(name, value);
- }
+ js.setExecutable(TypeUtil.toString(A_EXECUTABLE.getValue(stack)));
+ if (A_ARGUMENTS.isPresent(stack)) {
+ setArguments(js, A_ARGUMENTS.getValue(stack));
}
-
- if (redirect) {
+ else if (A_ARGS.isPresent(stack)) {
+ setArguments(js, A_ARGS.getValue(stack));
+ }
+
+ if (TypeUtil.toBoolean(A_REDIRECT.getValue(stack))) {
js.setStdOutputLocation(FileLocation.MEMORY);
js.setStdErrorLocation(FileLocation.MEMORY);
}
+ String stmp;
+ int itmp;
+ stmp = TypeUtil.toString(A_STDIN.getValue(stack, null));
+ if (stmp != null) {
+ js.setStdInput(stmp);
+ }
+ stmp = TypeUtil.toString(A_STDOUT.getValue(stack, null));
+ if (stmp != null) {
+ js.setStdOutput(stmp);
+ }
+ stmp = TypeUtil.toString(A_STDERR.getValue(stack, null));
+ if (stmp != null) {
+ js.setStdError(stmp);
+ }
+ if (A_STDOUTLOCATION.isPresent(stack)) {
+ js.setStdOutputLocation(new FileLocation.Impl(
+ TypeUtil.toInt(A_STDOUTLOCATION.getValue(stack))));
+ }
+ if (A_STDERRLOCATION.isPresent(stack)) {
+ js.setStdErrorLocation(new FileLocation.Impl(
+ TypeUtil.toInt(A_STDERRLOCATION.getValue(stack))));
+ }
+ stmp = TypeUtil.toString(A_DIRECTORY.getValue(stack, null));
+ if (stmp != null) {
+ js.setDirectory(stmp);
+ }
+ stmp = TypeUtil.toString(A_JOBTYPE.getValue(stack, null));
+ if (stmp != null) {
+ js.setAttribute("jobType", stmp);
+ }
+ stmp = TypeUtil.toString(A_NATIVESPEC.getValue(stack, null));
+ if (stmp != null) {
+ js.setSpecification(stmp);
+ }
+ js.setDelegationEnabled(TypeUtil.toBoolean(A_DELEGATION.getValue(stack)));
+ if (A_ENVIRONMENT.isPresent(stack)) {
+ setEnvironment(js, A_ENVIRONMENT.getValue(stack));
+ }
+ if (A_ATTRIBUTES.isPresent(stack)) {
+ setAttributes(js, A_ATTRIBUTES.getValue(stack));
+ }
+ if (A_ATTRIBUTES.isPresent(stack)) {
+ setAttributes(js, A_ATTRIBUTES.getValue(stack));
+ }
+ js.setBatchJob(TypeUtil.toBoolean(A_BATCH.getValue(stack)));
+ setMiscAttributes(js, stack);
+
+ Object host = A_HOST.getValue(stack, null);
+ String provider = TypeUtil.toString(A_PROVIDER.getValue(stack, null));
+
VariableArguments env = C_ENVIRONMENT.get(stack);
Iterator j = env.iterator();
while (j.hasNext()) {
@@ -278,6 +228,71 @@
}
}
+ protected void setArguments(JobSpecification js, Object value) {
+ if (value instanceof List) {
+ js.setArguments(stringify((List) value));
+ }
+ else if (value instanceof VariableArguments) {
+ js.setArguments(stringify(((VariableArguments) value).getAll()));
+ }
+ else {
+ js.setArguments(TypeUtil.toString(value));
+ }
+ }
+
+ protected void setEnvironment(JobSpecification js, Object value) throws ExecutionException {
+ if (value instanceof Map) {
+ Iterator j = ((Map) value).entrySet().iterator();
+ while (j.hasNext()) {
+ Map.Entry e = (Map.Entry) j.next();
+ js.addEnvironmentVariable((String) e.getKey(), (String) e.getValue());
+ }
+ }
+ else if (value instanceof String) {
+ StringTokenizer st = new StringTokenizer((String) value, ",");
+ while (st.hasMoreTokens()) {
+ String el = st.nextToken().trim();
+ String[] nv = el.split("=");
+ if (nv.length > 2 || el.length() == 0) {
+ throw new ExecutionException("Invalid environment entry: '" + el + "'");
+ }
+ else if (nv.length == 1) {
+ js.addEnvironmentVariable(nv[0].trim(), "");
+ }
+ else {
+ js.addEnvironmentVariable(nv[0].trim(), nv[1].trim());
+ }
+ }
+ }
+ }
+
+ protected void setAttributes(JobSpecification js, Object value) throws ExecutionException {
+ Map m = (Map) checkClass(value, Map.class, "map");
+ Iterator ai = m.entrySet().iterator();
+ while (ai.hasNext()) {
+ Map.Entry e = (Map.Entry) ai.next();
+ try {
+ js.setAttribute((String) e.getKey(), e.getValue());
+ }
+ catch (ClassCastException ex) {
+ throw new ExecutionException("Invalid attribute name (" + e.getKey() + ")", ex);
+ }
+ }
+ }
+
+ protected final static Arg[] MISC_ATTRS = new Arg[] { A_COUNT, A_HOST_COUNT, A_JOBTYPE,
+ A_MAXTIME, A_MAXWALLTIME, A_MAXCPUTIME, A_QUEUE, A_PROJECT, A_MINMEMORY, A_MAXMEMORY };
+
+ protected void setMiscAttributes(JobSpecification js, VariableStack stack) {
+ for (int i = 0; i < MISC_ATTRS.length; i++) {
+ setAttributeIfPresent(MISC_ATTRS[i], js, stack);
+ }
+ }
+
+ protected void setAttributeIfPresent(Arg arg, JobSpecification js, VariableStack stack) {
+
+ }
+
private List stringify(List l) {
ArrayList sl = new ArrayList(l.size());
Iterator i = l.iterator();
@@ -311,14 +326,14 @@
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));
- }
+ if (!TypeUtil.toBoolean(A_FAIL_ON_JOB_ERROR.getValue(stack))) {
+ Arg.VARGS.ret(stack, new Integer(0));
+ }
super.taskCompleted(e, stack);
}
protected void returnOutputs(Task t, VariableStack stack) throws ExecutionException {
- JobSpecification spec = (JobSpecification) t.getSpecification();
+ JobSpecification spec = (JobSpecification) t.getSpecification();
if (t.getStdOutput() != null && FileLocation.MEMORY.overlaps(spec.getStdOutputLocation())) {
STDOUT.ret(stack, t.getStdOutput());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-08 03:50:24
|
Revision: 2003
http://cogkit.svn.sourceforge.net/cogkit/?rev=2003&view=rev
Author: hategan
Date: 2008-05-07 20:50:15 -0700 (Wed, 07 May 2008)
Log Message:
-----------
make canceling of tasks non blocking
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/LateBindingScheduler.java
Added Paths:
-----------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/NonBlockingCancel.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 2008-05-08 03:49:11 UTC (rev 2002)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/LateBindingScheduler.java 2008-05-08 03:50:15 UTC (rev 2003)
@@ -34,6 +34,7 @@
import org.globus.cog.karajan.scheduler.submitQueue.GlobalSubmitQueue;
import org.globus.cog.karajan.scheduler.submitQueue.HostSubmitQueue;
import org.globus.cog.karajan.scheduler.submitQueue.InstanceSubmitQueue;
+import org.globus.cog.karajan.scheduler.submitQueue.NonBlockingCancel;
import org.globus.cog.karajan.scheduler.submitQueue.NonBlockingSubmit;
import org.globus.cog.karajan.scheduler.submitQueue.SubmitQueue;
import org.globus.cog.karajan.util.BoundContact;
@@ -650,13 +651,7 @@
public void cancelTask(Task task) {
TaskHandler handler = getHandler(task);
if (handler != null) {
- try {
- handler.cancel(task);
- }
- catch (Exception e) {
- // force it
- task.setStatus(Status.CANCELED);
- }
+ new NonBlockingCancel(handler, task).go();
}
}
Added: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/NonBlockingCancel.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/NonBlockingCancel.java (rev 0)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/NonBlockingCancel.java 2008-05-08 03:50:15 UTC (rev 2003)
@@ -0,0 +1,40 @@
+//----------------------------------------------------------------------
+//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 May 7, 2008
+ */
+package org.globus.cog.karajan.scheduler.submitQueue;
+
+import org.globus.cog.abstraction.interfaces.Status;
+import org.globus.cog.abstraction.interfaces.Task;
+import org.globus.cog.abstraction.interfaces.TaskHandler;
+
+public class NonBlockingCancel extends NonBlockingSubmit {
+
+ public NonBlockingCancel(TaskHandler th, Task task) {
+ super(th, task, null);
+ }
+
+ public void run() {
+ try {
+ getTaskHandler().cancel(getTask());
+ notifyPreviousQueue(null);
+ }
+ catch (Exception e) {
+ //force it
+ getTask().setStatus(Status.CANCELED);
+ notifyPreviousQueue(e);
+ }
+ catch (ThreadDeath td) {
+ throw td;
+ }
+ catch (Throwable t) {
+ notifyPreviousQueue(new Exception(t));
+ t.printStackTrace();
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2008-05-08 03:49:13
|
Revision: 2002
http://cogkit.svn.sourceforge.net/cogkit/?rev=2002&view=rev
Author: hategan
Date: 2008-05-07 20:49:11 -0700 (Wed, 07 May 2008)
Log Message:
-----------
added toString()
Modified Paths:
--------------
trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/Property.java
Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/Property.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/Property.java 2008-05-07 12:27:41 UTC (rev 2001)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/util/Property.java 2008-05-08 03:49:11 UTC (rev 2002)
@@ -84,4 +84,8 @@
this.value = value;
return old;
}
+
+ public String toString() {
+ return name + "=" + value;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
