airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1387686 - in /incubator/airavata/trunk/modules: registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/reso...
Date Wed, 19 Sep 2012 17:25:48 GMT
Author: lahiru
Date: Wed Sep 19 17:25:47 2012
New Revision: 1387686

URL: http://svn.apache.org/viewvc?rev=1387686&view=rev
Log:
aplying patch AIRAVATA-546.1.patch

Modified:
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
Wed Sep 19 17:25:47 2012
@@ -26,11 +26,12 @@ import javax.persistence.*;
 @IdClass(Gram_DataPK.class)
 public class Gram_Data {
 
-	@Id
 	@ManyToOne(cascade = CascadeType.PERSIST)
 	@JoinColumn(name = "workflow_instanceID")
 	private Workflow_Data workflow_Data;
 
+    @Id
+    private String workflow_instanceID;
 	@Id
 	private String node_id;
 
@@ -78,5 +79,13 @@ public class Gram_Data {
     public void setLocal_Job_ID(String local_Job_ID) {
         this.local_Job_ID = local_Job_ID;
     }
+
+    public String getWorkflow_instanceID() {
+        return workflow_instanceID;
+    }
+
+    public void setWorkflow_instanceID(String workflow_instanceID) {
+        this.workflow_instanceID = workflow_instanceID;
+    }
 }
 

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_DataPK.java
Wed Sep 19 17:25:47 2012
@@ -2,15 +2,15 @@ package org.apache.airavata.persistance.
 
 
 public class Gram_DataPK {
-	private String workflow_Data;
+	private String workflow_instanceID;
 	private String node_id;
 
 	public Gram_DataPK() {
 		;
 	}
 
-    public Gram_DataPK(String workflow_Data, String node_id) {
-        this.workflow_Data = workflow_Data;
+    public Gram_DataPK(String workflow_instanceID, String node_id) {
+        this.workflow_instanceID = workflow_instanceID;
         this.node_id = node_id;
     }
 
@@ -24,15 +24,15 @@ public class Gram_DataPK {
 		return 1;
 	}
 
-	public String getWorkflow_Data() {
-		return workflow_Data;
-	}
+    public String getWorkflow_instanceID() {
+        return workflow_instanceID;
+    }
 
-	public void setWorkflow_Data(String workflow_Data) {
-		this.workflow_Data = workflow_Data;
-	}
+    public void setWorkflow_instanceID(String workflow_instanceID) {
+        this.workflow_instanceID = workflow_instanceID;
+    }
 
-	public String getNode_id() {
+    public String getNode_id() {
 		return node_id;
 	}
 

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
Wed Sep 19 17:25:47 2012
@@ -29,6 +29,8 @@ import javax.persistence.*;
 public class Node_Data {
 
 	@Id
+    private String workflow_instanceID;
+
 	@ManyToOne()
 	@JoinColumn(name = "workflow_instanceID")
 	private Workflow_Data workflow_Data;
@@ -108,5 +110,13 @@ public class Node_Data {
 	public void setLast_update_time(Timestamp last_update_time) {
 		this.last_update_time = last_update_time;
 	}
+
+    public String getWorkflow_instanceID() {
+        return workflow_instanceID;
+    }
+
+    public void setWorkflow_instanceID(String workflow_instanceID) {
+        this.workflow_instanceID = workflow_instanceID;
+    }
 }
 

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
Wed Sep 19 17:25:47 2012
@@ -2,15 +2,15 @@ package org.apache.airavata.persistance.
 
 
 public class Node_DataPK {
-	private String workflow_Data;
+	private String workflow_instanceID;
 	private String node_id;
 
 	public Node_DataPK() {
 		;
 	}
 
-    public Node_DataPK(String workflow_Data, String node_id) {
-        this.workflow_Data = workflow_Data;
+    public Node_DataPK(String workflow_instanceID, String node_id) {
+        this.workflow_instanceID = workflow_instanceID;
         this.node_id = node_id;
     }
 
@@ -24,15 +24,15 @@ public class Node_DataPK {
 		return 1;
 	}
 
-	public String getWorkflow_Data() {
-		return workflow_Data;
-	}
+    public String getWorkflow_instanceID() {
+        return workflow_instanceID;
+    }
 
-	public void setWorkflow_Data(String workflow_Data) {
-		this.workflow_Data = workflow_Data;
-	}
+    public void setWorkflow_instanceID(String workflow_instanceID) {
+        this.workflow_instanceID = workflow_instanceID;
+    }
 
-	public String getNode_id() {
+    public String getNode_id() {
 		return node_id;
 	}
 

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Workflow_Data.java
Wed Sep 19 17:25:47 2012
@@ -20,8 +20,6 @@
 */
 package org.apache.airavata.persistance.registry.jpa.model;
 
-import org.apache.airavata.persistance.registry.jpa.model.Experiment_Data;
-
 import java.sql.Timestamp;
 
 import javax.persistence.*;
@@ -31,7 +29,9 @@ public class Workflow_Data {
 
 	@ManyToOne(cascade = CascadeType.PERSIST)
 	@JoinColumn(name="experiment_ID")
-	private Experiment_Data experiment_Data;
+    private Experiment_Data experiment_data;
+
+//	private String experiment_ID;
 	@Id
 	private String workflow_instanceID;
 	private String template_name;
@@ -39,13 +39,13 @@ public class Workflow_Data {
 	private Timestamp start_time;
 	private Timestamp last_update_time;
 
-	public Experiment_Data getExperiment_Data() {
-		return experiment_Data;
-	}
-
-	public void setExperiment_Data(Experiment_Data experiment_Data) {
-		this.experiment_Data = experiment_Data;
-	}
+//	public String getExperiment_ID() {
+//		return experiment_ID;
+//	}
+//
+//	public void setExperiment_ID(String experiment_ID) {
+//		this.experiment_ID = experiment_ID;
+//	}
 
 	public String getWorkflow_instanceID() {
 		return workflow_instanceID;
@@ -86,4 +86,12 @@ public class Workflow_Data {
 	public void setLast_update_time(Timestamp last_update_time) {
 		this.last_update_time = last_update_time;
 	}
+
+    public Experiment_Data getExperiment_data() {
+        return experiment_data;
+    }
+
+    public void setExperiment_data(Experiment_Data experiment_data) {
+        this.experiment_data = experiment_data;
+    }
 }

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
Wed Sep 19 17:25:47 2012
@@ -97,7 +97,7 @@ public class ExperimentDataResource exte
         switch (type) {
             case WORKFLOW_DATA:
                 generator = new QueryGenerator(WORKFLOW_DATA);
-                generator.setParameter(WorkflowDataConstants.EXPERIMENT_ID, experimentID);
+//                generator.setParameter(WorkflowDataConstants.EXPERIMENT_ID, experimentID);
                 generator.setParameter(WorkflowDataConstants.WORKFLOW_INSTANCE_ID, name);
                 q = generator.selectQuery(em);
                 Workflow_Data eworkflowData = (Workflow_Data)q.getSingleResult();
@@ -107,8 +107,7 @@ public class ExperimentDataResource exte
                 return workflowDataResource;
             case EXPERIMENT_METADATA:
                 generator = new QueryGenerator(EXPERIMENT_METADATA);
-                generator.setParameter(ExperimentDataConstants.EXPERIMENT_ID, experimentID);
-                generator.setParameter(ExperimentDataConstants.METADATA, name);
+                generator.setParameter(ExperimentDataConstants.EXPERIMENT_ID, name);
                 q = generator.selectQuery(em);
                 Experiment_Metadata expMetadata = (Experiment_Metadata)q.getSingleResult();
                 ExperimentMetadataResource experimentMetadataResource = (ExperimentMetadataResource)Utils.getResource(ResourceType.EXPERIMENT_METADATA,
expMetadata);

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
Wed Sep 19 17:25:47 2012
@@ -57,14 +57,18 @@ public class ExperimentMetadataResource 
         em = ResourceUtils.getEntityManager();
         em.getTransaction().begin();
         Experiment_Metadata experimentMetadata = new Experiment_Metadata();
-        existingExpMetaData.setMetadata(metadata);
+        experimentMetadata.setExperiment_ID(expID);
+        experimentMetadata.setMetadata(metadata);
 
         if(existingExpMetaData != null){
             existingExpMetaData.setMetadata(metadata);
+            existingExpMetaData.setExperiment_ID(expID);
             experimentMetadata = em.merge(existingExpMetaData);
         }else{
-            em.persist(existingExpMetaData);
+            em.persist(experimentMetadata);
         }
+        em.getTransaction().commit();
+        em.close();
 
     }
 }

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
Wed Sep 19 17:25:47 2012
@@ -86,6 +86,7 @@ public class GramDataResource extends Ab
         em.close();
 
         em = ResourceUtils.getEntityManager();
+        em.getTransaction().begin();
         Gram_Data gramData = new Gram_Data();
         gramData.setNode_id(nodeID);
         Workflow_Data workflow_data = em.find(Workflow_Data.class, workflowDataResource.getWorkflowInstanceID());

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
Wed Sep 19 17:25:47 2012
@@ -113,6 +113,7 @@ public class NodeDataResource extends Ab
         em.close();
 
         em = ResourceUtils.getEntityManager();
+        em.getTransaction().begin();
         Node_Data nodeData = new Node_Data();
         nodeData.setNode_id(nodeID);
         Workflow_Data workflow_data = em.find(Workflow_Data.class, workflowDataResource.getWorkflowInstanceID());

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
Wed Sep 19 17:25:47 2012
@@ -366,7 +366,7 @@ public class Utils {
 
     private static Resource createWorkflowData(Workflow_Data o){
         WorkflowDataResource workflowDataResource = new WorkflowDataResource();
-        workflowDataResource.setExperimentID(o.getExperiment_Data().getExperiment_ID());
+        workflowDataResource.setExperimentID(o.getExperiment_data().getExperiment_ID());
         workflowDataResource.setWorkflowInstanceID(o.getWorkflow_instanceID());
         workflowDataResource.setTemplateName(o.getTemplate_name());
         workflowDataResource.setStatus(o.getStatus());

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowDataResource.java
Wed Sep 19 17:25:47 2012
@@ -209,14 +209,14 @@ public class WorkflowDataResource extend
         em.getTransaction().begin();
         Workflow_Data workflowData = new Workflow_Data();
         Experiment_Data expData = em.find(Experiment_Data.class, experimentID);
-        workflowData.setExperiment_Data(expData);
+        workflowData.setExperiment_data(expData);
         workflowData.setWorkflow_instanceID(workflowInstanceID);
         workflowData.setLast_update_time(lastUpdatedTime);
         workflowData.setStart_time(startTime);
         workflowData.setTemplate_name(templateName);
         workflowData.setStatus(status);
         if(existingWFData != null){
-            existingWFData.setExperiment_Data(expData);
+            existingWFData.setExperiment_data(expData);
             existingWFData.setLast_update_time(lastUpdatedTime);
             existingWFData.setStart_time(startTime);
             existingWFData.setStatus(status);

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml
Wed Sep 19 17:25:47 2012
@@ -35,6 +35,7 @@
         <class>org.apache.airavata.persistance.registry.jpa.model.Application_Descriptor</class>
         <class>org.apache.airavata.persistance.registry.jpa.model.Experiment</class>
         <class>org.apache.airavata.persistance.registry.jpa.model.Experiment_Data</class>
+        <class>org.apache.airavata.persistance.registry.jpa.model.Experiment_Metadata</class>
 		<class>org.apache.airavata.persistance.registry.jpa.model.Workflow_Data</class>
 		<class>org.apache.airavata.persistance.registry.jpa.model.Node_Data</class>
 		<class>org.apache.airavata.persistance.registry.jpa.model.Gram_Data</class>

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
(original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
Wed Sep 19 17:25:47 2012
@@ -4,6 +4,7 @@ import junit.framework.TestCase;
 import org.apache.airavata.persistance.registry.jpa.model.Project;
 import org.apache.airavata.persistance.registry.jpa.resources.*;
 
+import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.List;
 
@@ -13,8 +14,81 @@ public class GatewayResourceTest extends
     @Override
     public void setUp() throws Exception {
         super.setUp();
+//        java.util.Date date= new java.util.Date();
+//        Timestamp time = new Timestamp(date.getTime());
+//        ExperimentResource experimentResource = new ExperimentResource();
+//        experimentResource.setExpID("Experiement_ID1");
+//        ExperimentDataResource experimentDataResource = (ExperimentDataResource)experimentResource.create(ResourceType.EXPERIMENT_DATA);
+//        experimentDataResource.setExpName("name1");
+//        experimentDataResource.setUserName("admin");
+//        experimentDataResource.save();
+
+//        ExperimentMetadataResource experimentMetadataResource = (ExperimentMetadataResource)experimentDataResource.create(ResourceType.EXPERIMENT_METADATA);
+
+//        experimentMetadataResource.setMetadata("test metadata");
+//        experimentMetadataResource.save();
+
+//        ExperimentDataResource experimentDataResource = (ExperimentDataResource)experimentResource.get(ResourceType.EXPERIMENT_DATA,
"Experiement_ID1");
+//        WorkflowDataResource workflowDataResource = (WorkflowDataResource)experimentDataResource.get(ResourceType.WORKFLOW_DATA,
"workflow1");
+//        NodeDataResource nodeDataResource = (NodeDataResource)workflowDataResource.create(ResourceType.NODE_DATA);
+//        GramDataResource gramDataResource = (GramDataResource)workflowDataResource.create(ResourceType.GRAM_DATA);
+
+//        NodeDataResource nodeDataResource = new NodeDataResource();
+
+//        nodeDataResource.setWorkflowDataResource(workflowDataResource);
+//        nodeDataResource.setLastUpdateTime(time);
+//        nodeDataResource.setStartTime(time);
+//        nodeDataResource.setInputs("inputs");
+//        nodeDataResource.setOutputs("outputs");
+//        nodeDataResource.setNodeID("node1");
+//        nodeDataResource.setNodeType("nodeType1");
+//        nodeDataResource.setStatus("OKState");
+//        nodeDataResource.save();
+
+//        GramDataResource gramDataResource = new GramDataResource();
+//        gramDataResource.setWorkflowDataResource(workflowDataResource);
+//        gramDataResource.setNodeID("node1");
+//        gramDataResource.setRsl("rsl");
+//        gramDataResource.setInvokedHost("host1");
+//        gramDataResource.setLocalJobID("job1");
+//        gramDataResource.save();
+//
+//        nodeDataResource = (NodeDataResource)workflowDataResource.get(ResourceType.NODE_DATA,
"node1");
+//        System.out.println(nodeDataResource.getInputs());
+//        System.out.println(nodeDataResource.getOutputs());
+//        System.out.println(nodeDataResource.getLastUpdateTime());
+//        System.out.println(nodeDataResource.getNodeID());
+//        System.out.println(nodeDataResource.getNodeType());
+//        System.out.println(nodeDataResource.getStartTime());
+//        System.out.println(nodeDataResource.getStatus());
+//        System.out.println(nodeDataResource.getWorkflowDataResource().getWorkflowInstanceID());
+//
+//        gramDataResource = (GramDataResource)workflowDataResource.get(ResourceType.GRAM_DATA,
"node1");
+//        System.out.println(gramDataResource.getWorkflowDataResource().getWorkflowInstanceID());
+//        System.out.println(gramDataResource.getInvokedHost());
+//        System.out.println(gramDataResource.getLocalJobID());
+//        System.out.println(gramDataResource.getNodeID());
+//        System.out.println(gramDataResource.getRsl());
+
+
+
+
+//        workflowDataResource.setWorkflowInstanceID("workflow1");
+//        workflowDataResource.setStatus("OKstatus");
+//        workflowDataResource.setTemplateName("workflow1");
+//        workflowDataResource.setLastUpdatedTime(time);
+//        workflowDataResource.setStartTime(time);
+//        workflowDataResource.save();
 
 
+//        System.out.println("Exp ID : " +workflowDataResource.getExperimentID());
+//        System.out.println("WF Name : " + workflowDataResource.getWorkflowInstanceID());
+//
+//        System.out.println("Status : " +workflowDataResource.getStatus());
+
+//        experimentMetadataResource = (ExperimentMetadataResource)experimentDataResource.get(ResourceType.EXPERIMENT_METADATA,
"Experiement_ID1");
+//        System.out.println("exp metadata : " + experimentMetadataResource.getMetadata());
+
 
 
 //        gatewayResource = new GatewayResource();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java?rev=1387686&r1=1387685&r2=1387686&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java
Wed Sep 19 17:25:47 2012
@@ -23,6 +23,8 @@ package org.apache.airavata.xbaya.ui.men
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.net.URI;
+import java.util.List;
 
 import javax.swing.AbstractAction;
 import javax.swing.JMenu;
@@ -95,7 +97,11 @@ public class ViewMenuItem {
 		JMenuItem menuItem = new JMenuItem("Airavata Registry");
 		menuItem.addActionListener(new AbstractAction() {
 			public void actionPerformed(ActionEvent e) {
-				engine.getGUI().viewJCRBrowserPanel();
+                List<URI> list = engine.getConfiguration().getJcrComponentRegistry().getRegistry().getGFacURIs();
+                for(URI uris: list){
+                    System.out.println(uris.toString());
+                }
+//				engine.getGUI().viewJCRBrowserPanel();
 			}
 		});
 		return menuItem;



Mime
View raw message