Commit 2b41f73e authored by cdelbe's avatar cdelbe
Browse files

PICKED FROM TRUNK 14868

SCHEDULING-515 Java options and extra classpath were added for Win HPC infrastructure.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/proactive/scheduling/branches/Scheduling_2.0.x@14993 28e8926c-6b08-0410-baaa-805c5e19b8d6
parent 8e5a2c46
...@@ -109,6 +109,15 @@ public class WinHPCInfrastructure extends DefaultInfrastructureManager { ...@@ -109,6 +109,15 @@ public class WinHPCInfrastructure extends DefaultInfrastructureManager {
@Configurable(credential = true) @Configurable(credential = true)
protected File RMCredentialsPath; protected File RMCredentialsPath;
/**
* Additional java options to append to the command executed on the remote host
*/
@Configurable
protected String javaOptions;
@Configurable
protected String extraClassPath;
/** /**
* Credentials used by remote nodes to register to the NS * Credentials used by remote nodes to register to the NS
*/ */
...@@ -265,6 +274,9 @@ public class WinHPCInfrastructure extends DefaultInfrastructureManager { ...@@ -265,6 +274,9 @@ public class WinHPCInfrastructure extends DefaultInfrastructureManager {
throw new RMException("Could not retrieve base64 credentials", e); throw new RMException("Could not retrieve base64 credentials", e);
} }
javaOptions = parameters[10].toString();
extraClassPath = parameters[11].toString();
String classpath = rmPath + "/dist/lib/ProActive.jar;"; String classpath = rmPath + "/dist/lib/ProActive.jar;";
classpath += rmPath + "/dist/lib/ProActive_ResourceManager.jar;"; classpath += rmPath + "/dist/lib/ProActive_ResourceManager.jar;";
classpath += rmPath + "/dist/lib/ProActive_Scheduler-worker.jar;"; classpath += rmPath + "/dist/lib/ProActive_Scheduler-worker.jar;";
...@@ -274,11 +286,15 @@ public class WinHPCInfrastructure extends DefaultInfrastructureManager { ...@@ -274,11 +286,15 @@ public class WinHPCInfrastructure extends DefaultInfrastructureManager {
classpath += rmPath + "/dist/lib/jython-engine.jar;"; classpath += rmPath + "/dist/lib/jython-engine.jar;";
classpath += rmPath + "/dist/lib/commons-logging-1.0.4.jar"; classpath += rmPath + "/dist/lib/commons-logging-1.0.4.jar";
if (extraClassPath.length() > 0) {
classpath += ";" + extraClassPath;
}
command = this.javaPath + " -cp " + classpath; command = this.javaPath + " -cp " + classpath;
command += " " + PAProperties.JAVA_SECURITY_POLICY.getCmdLine(); command += " " + PAProperties.JAVA_SECURITY_POLICY.getCmdLine();
command += rmPath + "/config/security.java.policy"; command += rmPath + "/config/security.java.policy";
command += " -Dproactive.useIPaddress=true "; command += " -Dproactive.useIPaddress=true ";
//command += " " + this.javaOptions + " "; command += " " + this.javaOptions + " ";
command += " org.ow2.proactive.resourcemanager.utils.PAAgentServiceRMStarter "; command += " org.ow2.proactive.resourcemanager.utils.PAAgentServiceRMStarter ";
command += " -r " + RMUrl; command += " -r " + RMUrl;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment