Author: lahiru
Date: Thu Jan 9 17:06:39 2014
New Revision: 1556879
URL: http://svn.apache.org/r1556879
Log:
fixing build errors.
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
airavata/trunk/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1556879&r1=1556878&r2=1556879&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Thu Jan 9 17:06:39 2014
@@ -425,7 +425,7 @@ public class AiravataClient extends Obse
ExperimentAdvanceOptions options =
api.getExecutionManager().createExperimentAdvanceOptions();
options.getCustomWorkflowSchedulingSettings().addNewNodeSettings("data1",
"comma_app", 1, 1);
String workflow = "Workflow3";
- List<WorkflowInput> inputs =
api.getWorkflowManager().getWorkflowInputs(workflow);
+ List<WorkflowInput> inputs =
api.getWorkflowManager().getWorkflowInputs(workflow);
System.out.println(api.getExecutionManager().runExperiment(workflow,
inputs,options));
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1556879&r1=1556878&r2=1556879&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
Thu Jan 9 17:06:39 2014
@@ -27,17 +27,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.airavata.common.utils.AiravataJobState;
import org.apache.airavata.common.utils.Version;
import org.apache.airavata.commons.gfac.type.ApplicationDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataExperiment;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.AiravataUser;
+import org.apache.airavata.registry.api.*;
import org.apache.airavata.registry.api.ExecutionErrors.Source;
-import org.apache.airavata.registry.api.PasswordCallback;
-import org.apache.airavata.registry.api.ResourceMetadata;
-import org.apache.airavata.registry.api.WorkspaceProject;
import org.apache.airavata.registry.api.exception.RegistryException;
import
org.apache.airavata.registry.api.exception.UnimplementedRegistryOperationException;
import
org.apache.airavata.registry.api.exception.worker.ExperimentDoesNotExistsException;
@@ -62,7 +58,6 @@ public class RegistryClient extends Aira
private PublishedWorkflowResourceClient publishedWorkflowResourceClient;
private UserWorkflowResourceClient userWorkflowResourceClient;
private CredentialStoreResourceClient credentialStoreResourceClient;
-
// private CookieManager cookieManager = new CookieManager();
@@ -106,6 +101,7 @@ public class RegistryClient extends Aira
}
+
@Override
protected void initialize() {
CookieManager.setCookie(new NewCookie("", ""));
@@ -1024,4 +1020,45 @@ public class RegistryClient extends Aira
return
getCredentialStoreResourceClient().createCredential(gatewayId, tokenId,
username);
}
+
+ //todo implement these methods properly
+ public Map<String, Integer> getGFACNodeList() throws RegistryException {
+ return null; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public boolean storeExperiment(String userName, String experimentID)
throws RegistryException {
+ return false; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public boolean changeStatus(String experimentID, AiravataJobState.State
state) throws RegistryException {
+ return false; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public AiravataJobState getState(String experimentID) throws
RegistryException {
+ return null; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public List<String> getAllJobsWithState(AiravataJobState state) throws
RuntimeException {
+ return null; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public List<String> getAllAcceptedJobs() throws RegistryException {
+ return null; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public String fetchAcceptedJob(String experimentID) throws
RegistryException {
+ return null; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public List<String> getAllHangedJobs() throws RegistryException {
+ return null; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public int getHangedJobCount() throws RegistryException {
+ return 0; //To change body of implemented methods use File | Settings
| File Templates.
+ }
+
+ public boolean resetHangedJob(String experimentID) throws
RegistryException {
+ return false; //To change body of implemented methods use File |
Settings | File Templates.
+ }
}
Modified:
airavata/trunk/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java?rev=1556879&r1=1556878&r2=1556879&view=diff
==============================================================================
---
airavata/trunk/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java
(original)
+++
airavata/trunk/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java
Thu Jan 9 17:06:39 2014
@@ -192,7 +192,7 @@ public class PBSCluster implements Clust
GSISSHIdentityRepository identityRepository = new
GSISSHIdentityRepository(jSch);
identityRepository.add(identityFile);
- // Set repository to session
+ // Set repository to session
j
session.setIdentityRepository(identityRepository);
// Set the user info
