Author: chathuri
Date: Fri Nov 30 20:31:36 2012
New Revision: 1415840
URL: http://svn.apache.org/viewvc?rev=1415840&view=rev
Log:
fixing experiments not showing in the registry view
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
Fri Nov 30 20:31:36 2012
@@ -62,7 +62,7 @@ public class ConfigurationResourceClient
}
private URI getBaseURI() {
- logger.info("Creating Base URI");
+ logger.debug("Creating Base URI");
return UriBuilder.fromUri(baseURI).build();
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
Fri Nov 30 20:31:36 2012
@@ -63,7 +63,7 @@ public class DescriptorResourceClient {
}
private URI getBaseURI() {
- logger.info("Creating Base URI");
+ logger.debug("Creating Base URI");
return UriBuilder.fromUri(baseURI).build();
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
Fri Nov 30 20:31:36 2012
@@ -61,7 +61,7 @@ public class ExperimentResourceClient {
}
private URI getBaseURI() {
- logger.info("Creating Base URI");
+ logger.debug("Creating Base URI");
return UriBuilder.fromUri(baseURI).build();
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
Fri Nov 30 20:31:36 2012
@@ -58,7 +58,7 @@ public class ProjectResourceClient {
}
private URI getBaseURI() {
- logger.info("Creating Base URI");
+ logger.debug("Creating Base URI");
return UriBuilder.fromUri(baseURI).build();
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
Fri Nov 30 20:31:36 2012
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
import java.text.DateFormat;
@@ -65,7 +66,7 @@ public class ProvenanceResourceClient {
}
private URI getBaseURI() {
- logger.info("Creating Base URI");
+ logger.debug("Creating Base URI");
return UriBuilder.fromUri(baseURI).build();
}
@@ -356,6 +357,7 @@ public class ProvenanceResourceClient {
MultivaluedMap queryParams = new MultivaluedMapImpl();
queryParams.add("instanceId", instanceId);
ClientResponse response =
webResource.queryParams(queryParams).accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
+
int status = response.getStatus();
if (status != ClientConstant.HTTP_OK && status !=
ClientConstant.HTTP_UNAUTHORIZED) {
logger.error(response.getEntity(String.class));
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
Fri Nov 30 20:31:36 2012
@@ -62,7 +62,7 @@ public class PublishedWorkflowResourceCl
}
private URI getBaseURI() {
- logger.info("Creating Base URI");
+ logger.debug("Creating Base URI");
return UriBuilder.fromUri(baseURI).build();
}
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=1415840&r1=1415839&r2=1415840&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
Fri Nov 30 20:31:36 2012
@@ -493,7 +493,7 @@ public class RegistryClient extends Aira
public List<WorkflowInstance> getExperimentWorkflowInstances(String
experimentId) throws RegistryException {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return
getProvenanceResourceClient().getExperimentWorkflowInstances(experimentId);
}
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
Fri Nov 30 20:31:36 2012
@@ -60,7 +60,7 @@ public class UserWorkflowResourceClient
}
private URI getBaseURI() {
- logger.info("Creating Base URI");
+ logger.debug("Creating Base URI");
return UriBuilder.fromUri(baseURI).build();
}
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java?rev=1415840&r1=1415839&r2=1415840&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
Fri Nov 30 20:31:36 2012
@@ -49,7 +49,7 @@ public class XBayaWorkflowExperiments {
}
public void initializeExperimentMap(Map<String,
XBayaWorkflowExperiment> experiments) throws AiravataAPIInvocationException {
- List<String> experimentIdByUser =
getAiravataAPI().getProvenanceManager().getExperimentIdList(null);
+ List<String> experimentIdByUser =
getAiravataAPI().getProvenanceManager().getExperimentIdList();
for (String id : experimentIdByUser) {
experiments.put(id, new XBayaWorkflowExperiment(id,
getAiravataAPI()));
}
