Skip to content

Commit d42b55b

Browse files
committed
There were two version commands/handlers. Removed one.
1 parent b4eb527 commit d42b55b

File tree

7 files changed

+11
-84
lines changed

7 files changed

+11
-84
lines changed

cogkit/modules/karajan/src/org/globus/cog/karajan/compiled/nodes/grid/GridExec.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public class GridExec extends AbstractGridNode {
8383
protected ArgRef<Map<String, Object>> attributes;
8484
protected ArgRef<Boolean> failOnJobError;
8585
protected ArgRef<Boolean> batch;
86+
protected ArgRef<String> name;
8687

8788
protected ArgRef<List<EnvironmentVariable>> environment;
8889
protected ChannelRef<List<?>> c_stagein;
@@ -115,6 +116,7 @@ protected Signature getSignature() {
115116
optional("failOnJobError", true),
116117
optional("batch", false),
117118
optional("environment", null),
119+
optional("name", null),
118120
channel("stagein"),
119121
channel("stageout"),
120122
channel("cleanup")
@@ -133,6 +135,11 @@ public void submitTask(Stack stack) {
133135
js.setExecutable(this.executable.getValue(stack));
134136
setArguments(js, this.arguments.getValue(stack));
135137
this.arguments.set(stack, null);
138+
139+
String name = this.name.getValue(stack);
140+
if (name != null) {
141+
task.setName(name);
142+
}
136143

137144
if (this.redirect.getValue(stack)) {
138145
js.setStdOutputLocation(FileLocation.MEMORY);

cogkit/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/CoasterRequestManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929
package org.globus.cog.abstraction.coaster.service;
3030

31+
import org.globus.cog.abstraction.coaster.service.local.VersionHandler;
3132
import org.globus.cog.abstraction.impl.execution.coaster.CancelJobCommand;
3233
import org.globus.cog.abstraction.impl.execution.coaster.SubmitJobCommand;
3334
import org.globus.cog.abstraction.impl.file.coaster.commands.ChmodCommand;
@@ -57,7 +58,6 @@
5758
import org.globus.cog.coaster.handlers.ChannelConfigurationHandler;
5859
import org.globus.cog.coaster.handlers.HeartBeatHandler;
5960
import org.globus.cog.coaster.handlers.InfoHandler;
60-
import org.globus.cog.coaster.handlers.VersionHandler;
6161

6262
public class CoasterRequestManager extends AbstractRequestManager {
6363
public CoasterRequestManager() {

cogkit/modules/provider-coaster/src/org/globus/cog/coaster/Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import java.util.Map;
3636

3737
import org.apache.log4j.Logger;
38+
import org.globus.cog.abstraction.coaster.service.VersionCommand;
3839
import org.globus.cog.coaster.channels.CoasterChannel;
3940
import org.globus.cog.coaster.commands.Command;
40-
import org.globus.cog.coaster.commands.VersionCommand;
4141

4242
public class Client {
4343
private static final Logger logger = Logger.getLogger(Client.class);

cogkit/modules/provider-coaster/src/org/globus/cog/coaster/ClientRequestManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
*/
2929
package org.globus.cog.coaster;
3030

31+
import org.globus.cog.abstraction.coaster.service.local.VersionHandler;
3132
import org.globus.cog.coaster.handlers.EchoHandler;
32-
import org.globus.cog.coaster.handlers.VersionHandler;
3333

3434
public class ClientRequestManager extends AbstractRequestManager {
3535
public ClientRequestManager() {

cogkit/modules/provider-coaster/src/org/globus/cog/coaster/ServiceRequestManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
*/
2929
package org.globus.cog.coaster;
3030

31+
import org.globus.cog.abstraction.coaster.service.local.VersionHandler;
3132
import org.globus.cog.coaster.handlers.EchoHandler;
3233
import org.globus.cog.coaster.handlers.HeartBeatHandler;
3334
import org.globus.cog.coaster.handlers.ShutdownHandler;
34-
import org.globus.cog.coaster.handlers.VersionHandler;
3535

3636
public class ServiceRequestManager extends AbstractRequestManager {
3737
public ServiceRequestManager() {

cogkit/modules/provider-coaster/src/org/globus/cog/coaster/commands/VersionCommand.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

cogkit/modules/provider-coaster/src/org/globus/cog/coaster/handlers/VersionHandler.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)