You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/16 05:46:35 UTC
svn commit: r1361899 - in /incubator/airavata/trunk/modules:
commons/registry-api/src/main/java/org/apache/airavata/registry/api/
commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/
xbaya-gui/src/main/java/org/apache/airavata/xbay...
Author: samindaw
Date: Mon Jul 16 03:46:34 2012
New Revision: 1361899
URL: http://svn.apache.org/viewvc?rev=1361899&view=rev
Log:
updating captionning based on workflow data availability and showing experiments eventhough workflow node data is not present
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java?rev=1361899&r1=1361898&r2=1361899&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java Mon Jul 16 03:46:34 2012
@@ -241,6 +241,8 @@ public interface AiravataRegistry extend
public boolean saveWorkflowExecutionServiceOutput(WorkflowServiceIOData workflowOutputData)throws RegistryException;
public List<WorkflowServiceIOData> searchWorkflowExecutionServiceInput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegistryException;
+
+ public String getWorkflowExecutionTemplateName(String experimentId) throws RegistryException;
public List<WorkflowServiceIOData> searchWorkflowExecutionServiceOutput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegistryException;
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java?rev=1361899&r1=1361898&r2=1361899&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java Mon Jul 16 03:46:34 2012
@@ -892,6 +892,28 @@ public class AiravataJCRRegistry extends
return searchWorkflowIO(experimentIdRegEx, workflowNameRegEx, nodeNameRegEx, OUTPUT);
}
+ @Override
+ public String getWorkflowExecutionTemplateName(String experimentId) throws RegistryException{
+ Session session;
+ try {
+ session = getSession();
+ Node experimentsNode = getWorkflowDataNode(session);
+ if (experimentsNode.hasNode(experimentId)){
+ Node expNode = experimentsNode.getNode(experimentId);
+ List<Node> workflowNodes = getChildNodes(expNode);
+ for(Node workflowNode: workflowNodes){
+ if (workflowNode.hasProperty(PROPERTY_WORKFLOW_NAME)){
+ return workflowNode.getProperty(PROPERTY_WORKFLOW_NAME).getString();
+ }
+ }
+
+ }
+ } catch (RepositoryException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
private List<WorkflowServiceIOData> searchWorkflowIO(String experimentIdRegEx, String workflowNameRegEx,
String nodeNameRegEx, String type) throws RegistryException{
List<WorkflowServiceIOData> workflowIODataList = new ArrayList<WorkflowServiceIOData>();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java?rev=1361899&r1=1361898&r2=1361899&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java Mon Jul 16 03:46:34 2012
@@ -47,6 +47,7 @@ public class XBayaWorkflowExperiments {
public List<XBayaWorkflowExperiment> getAllExperiments(){
Map<String, XBayaWorkflowExperiment> experiments=new HashMap<String,XBayaWorkflowExperiment>();
try {
+ initializeExperimentMap(experiments);
List<WorkflowServiceIOData> workflowInput = getRegistry().searchWorkflowExecutionServiceInput(null, null, null);
List<WorkflowServiceIOData> workflowOutput = getRegistry().searchWorkflowExecutionServiceOutput(null, null, null);
createChildren(experiments, workflowInput, true);
@@ -56,6 +57,20 @@ public class XBayaWorkflowExperiments {
}
return Arrays.asList(experiments.values().toArray(new XBayaWorkflowExperiment[]{}));
}
+
+ public void initializeExperimentMap(Map<String, XBayaWorkflowExperiment> experiments){
+ try {
+ List<String> workflowExecutionIdByUser = getRegistry().getWorkflowExecutionIdByUser(".*");
+ for (String expId : workflowExecutionIdByUser) {
+ XBayaWorkflowExperiment xBayaWorkflowExperiment = new XBayaWorkflowExperiment(expId, null);
+ xBayaWorkflowExperiment.add(new XBayaWorkflow(expId,getRegistry().getWorkflowExecutionTemplateName(expId),null));
+ experiments.put(expId,xBayaWorkflowExperiment);
+ }
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
+ }
+
private void createChildren(
Map<String, XBayaWorkflowExperiment> experiments,
List<WorkflowServiceIOData> workflowIO, boolean inputData) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java?rev=1361899&r1=1361898&r2=1361899&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java Mon Jul 16 03:46:34 2012
@@ -62,8 +62,11 @@ public class XBayaWorkflowExperimentNode
String caption=workflowExecutionName;
try {
WorkflowInstanceStatus workflowExecutionStatus = getRegistry().getWorkflowExecutionStatus(getExperiment().getExperimentId());
- if (workflowExecutionStatus!=null){
- caption+=" - <i>"+workflowExecutionStatus.getExecutionStatus().toString() +" as of "+workflowExecutionStatus.getStatusUpdateTime().toString()+"</i>";
+ if (workflowExecutionStatus!=null && workflowExecutionStatus.getExecutionStatus()!=null){
+ caption += " - <i>" + workflowExecutionStatus.getExecutionStatus().toString()+"</i>";
+ if (workflowExecutionStatus.getStatusUpdateTime()!=null) {
+ caption += "<i> as of " + workflowExecutionStatus.getStatusUpdateTime().toString() + "</i>";
+ }
}
} catch (RegistryException e) {
e.printStackTrace();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java?rev=1361899&r1=1361898&r2=1361899&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java Mon Jul 16 03:46:34 2012
@@ -46,7 +46,11 @@ public class XBayaWorkflowNode extends A
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
- return getXbayaWorkflow().getWorkflowName()+" : "+getXbayaWorkflow().getWorkflowId();
+ String caption=getXbayaWorkflow().getWorkflowId();
+ if (getXbayaWorkflow().getWorkflowName()!=null){
+ caption=getXbayaWorkflow().getWorkflowName()+" : "+caption;
+ }
+ return caption;
}
@Override