airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1558903 - in /airavata/trunk/modules: gfac/gfac-core/src/main/java/org/apache/airavata/gfac/ orchestrator/orchestrator-core/src/test/resources/ registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ regi...
Date Thu, 16 Jan 2014 20:20:11 GMT
Author: chathuri
Date: Thu Jan 16 20:20:10 2014
New Revision: 1558903

URL: http://svn.apache.org/r1558903
Log:
changing ochastratorDataResource

Modified:
    airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java
    airavata/trunk/modules/orchestrator/orchestrator-core/src/test/resources/data-derby.sql
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
    airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql

Modified: airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java
(original)
+++ airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java
Thu Jan 16 20:20:10 2014
@@ -67,8 +67,9 @@ public class GFacAPI {
 
             // Executing in handlers in the order as they have configured in GFac configuration
             invokeInFlowHandlers(jobExecutionContext);
-            registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE);
-
+//            if (experimentID != null){
+//                registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE);
+//            }
 
             // After executing the in handlers provider instance should be set to job execution
context.
             // We get the provider instance and execute it.
@@ -79,7 +80,9 @@ public class GFacAPI {
                 disposeProvider(provider, jobExecutionContext);
             }
             invokeOutFlowHandlers(jobExecutionContext);
-            registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.OUTHANDLERSDONE);
+//            if (experimentID != null){
+//                registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.OUTHANDLERSDONE);
+//            }
         }catch (Exception e){
             jobExecutionContext.setProperty(ERROR_SENT,"true");
             jobExecutionContext.getNotifier().publish(new ExecutionFailEvent(e.getCause()));

Modified: airavata/trunk/modules/orchestrator/orchestrator-core/src/test/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/orchestrator/orchestrator-core/src/test/resources/data-derby.sql?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/orchestrator/orchestrator-core/src/test/resources/data-derby.sql
(original)
+++ airavata/trunk/modules/orchestrator/orchestrator-core/src/test/resources/data-derby.sql
Thu Jan 16 20:20:10 2014
@@ -268,7 +268,6 @@ CREATE TABLE Execution_Error
 create table Orchestrator_Data
 (
         experiment_ID varchar(255) NOT NULL,
-        orchestrator_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
         username varchar(255),
         status varchar(255),
         state varchar(255),

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
Thu Jan 16 20:20:10 2014
@@ -33,18 +33,8 @@ import javax.persistence.EntityNotFoundE
 import javax.persistence.Persistence;
 import javax.persistence.Query;
 
-import org.apache.airavata.persistance.registry.jpa.model.Configuration;
-import org.apache.airavata.persistance.registry.jpa.model.Configuration_PK;
-import org.apache.airavata.persistance.registry.jpa.model.Gateway;
-import org.apache.airavata.persistance.registry.jpa.model.Gateway_Worker;
-import org.apache.airavata.persistance.registry.jpa.model.Gateway_Worker_PK;
-import org.apache.airavata.persistance.registry.jpa.model.Users;
-import org.apache.airavata.persistance.registry.jpa.resources.AbstractResource;
-import org.apache.airavata.persistance.registry.jpa.resources.ConfigurationResource;
-import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
-import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
-import org.apache.airavata.persistance.registry.jpa.resources.Utils;
-import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
+import org.apache.airavata.persistance.registry.jpa.model.*;
+import org.apache.airavata.persistance.registry.jpa.resources.*;
 import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
 import org.apache.airavata.registry.api.exception.AiravataRegistryUninitializedException;
 import org.apache.airavata.registry.api.exception.RegistryException;
@@ -321,6 +311,27 @@ public class ResourceUtils {
         }
     }
 
+    public List<Resource> getOrchestratorDataWithStatus(String status) {
+        List<Resource> resourceList = new ArrayList<Resource>();
+        EntityManager em = ResourceUtils.getEntityManager();
+        em.getTransaction().begin();
+        QueryGenerator generator = new QueryGenerator(AbstractResource.ORCHESTRATORDATA);
+        generator.setParameter(AbstractResource.OrchestratorDataConstants.STATUS, status);
+        Query q = generator.selectQuery(em);
+        List<?> results = q.getResultList();
+        if (results.size() != 0) {
+            for (Object result : results) {
+                Orchestrator_Data orchestratorData = (Orchestrator_Data) result;
+                OrchestratorDataResource orchestratorDataResource = (OrchestratorDataResource)
+                        Utils.getResource(ResourceType.ORCHESTRATOR_DATA, orchestratorData);
+                resourceList.add(orchestratorDataResource);
+            }
+        }
+        em.getTransaction().commit();
+        em.close();
+        return resourceList;
+    }
+
     public static Lock getLock() {
         return lock;
     }

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java
Thu Jan 16 20:20:10 2014
@@ -12,8 +12,6 @@ public class Orchestrator_Data {
 	
 	@Id
     private String experiment_ID;
-	@GeneratedValue
-	private int orchestrator_ID;
 	private String username;
 	private String status;
 	private String state;
@@ -29,12 +27,6 @@ public class Orchestrator_Data {
 		this.experiment_ID = experiment_ID;
 	}
 	
-	public int getOrchestrator_ID() {
-		return orchestrator_ID;
-	}
-	public void setOrchestrator_ID(int orchestrator_ID) {
-		this.orchestrator_ID = orchestrator_ID;
-	}
 	public String getUserName() {
 		return username;
 	}

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
Thu Jan 16 20:20:10 2014
@@ -214,7 +214,6 @@ public abstract class AbstractResource i
 
 	// Orchestrator_Data table
 	public final class OrchestratorDataConstants {
-		public static final String ORCHESTRATOR_ID = "orchestrator_ID";
 		public static final String EXPERIMENT_ID = "experiment_ID";
 		public static final String USERNAME = "username";
 		public static final String STATUS = "status";

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
Thu Jan 16 20:20:10 2014
@@ -194,6 +194,12 @@ public class GatewayResource extends Abs
                 q = generator.deleteQuery(em);
                 q.executeUpdate();
                 break;
+            case ORCHESTRATOR_DATA:
+                generator = new QueryGenerator(ORCHESTRATORDATA);
+                generator.setParameter(OrchestratorDataConstants.EXPERIMENT_ID, name);
+                q = generator.deleteQuery(em);
+                q.executeUpdate();
+                break;
             default:
                 logger.error("Unsupported resource type for gateway resource.", new IllegalArgumentException());
                 break;
@@ -281,6 +287,16 @@ public class GatewayResource extends Abs
                 em.getTransaction().commit();
                 em.close();
                 return applicationDescriptorResource;
+            case ORCHESTRATOR_DATA:
+                generator = new QueryGenerator(ORCHESTRATORDATA);
+                generator.setParameter(OrchestratorDataConstants.EXPERIMENT_ID, name);
+                q = generator.selectQuery(em);
+                Orchestrator_Data orchData = (Orchestrator_Data) q.getSingleResult();
+                OrchestratorDataResource orchestratorDataResource =
+                        (OrchestratorDataResource)Utils.getResource(ResourceType.ORCHESTRATOR_DATA,
orchData);
+                em.getTransaction().commit();
+                em.close();
+                return orchestratorDataResource;
             default:
                 em.getTransaction().commit();
                 em.close();
@@ -413,6 +429,16 @@ public class GatewayResource extends Abs
 		        	resourceList.add(userResource);
 		        }
 		        break;
+            case ORCHESTRATOR_DATA:
+                generator = new QueryGenerator(ORCHESTRATORDATA);
+                q = generator.selectQuery(em);
+                for (Object o : q.getResultList()) {
+                    Orchestrator_Data orchData = (Orchestrator_Data) o;
+                    OrchestratorDataResource orchestratorDataResource =
+                            (OrchestratorDataResource)Utils.getResource(ResourceType.ORCHESTRATOR_DATA,
orchData);
+                    resourceList.add(orchestratorDataResource);
+                }
+                break;
             default:
                 em.getTransaction().commit();
                 em.close();

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java
Thu Jan 16 20:20:10 2014
@@ -19,7 +19,6 @@ public class OrchestratorDataResource ex
    
 	private final static Logger log = LoggerFactory.getLogger(OrchestratorDataResource.class);
 	private String experimentID;
-	private int orchestratorID;
 	private String userName;
 	private String applicationName;
 	private String status;
@@ -32,10 +31,6 @@ public class OrchestratorDataResource ex
 		return experimentID;
 	}
 
-	public int getOrchestratorID() {
-		return orchestratorID;
-	}
-
 	public String getUserName() {
 		return userName;
 	}
@@ -44,10 +39,6 @@ public class OrchestratorDataResource ex
 		this.experimentID = experimentID;
 	}
 
-	public void setOrchestratorID(int orchestratorID) {
-		this.orchestratorID = orchestratorID;
-	}
-
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}
@@ -102,21 +93,9 @@ public class OrchestratorDataResource ex
 
 	@Override
 	public Resource create(ResourceType type) {
-		 if (type == ResourceType.ORCHESTRATOR_DATA) {
-	            OrchestratorDataResource orchestratorResource = new OrchestratorDataResource();
-	            orchestratorResource.setExperimentID(experimentID);
-	            orchestratorResource.setUserName(userName);
-	            orchestratorResource.setState(state);
-	            orchestratorResource.setStatus(status);
-	            orchestratorResource.setGfacEPR(gfacEPR);
-	            orchestratorResource.setApplicationName(applicationName);
-	            orchestratorResource.setJobRequest(jobRequest);
-	            return orchestratorResource;
-	        } else {
-	            log.error("Unsupported resource type for orchestrator resource.", new IllegalArgumentException());
-	            throw new IllegalArgumentException("Unsupported resource type for orchestrator
resource.");
-	        }
-	}
+        log.error("Unsupported resource type for orchestrator resource.", new IllegalArgumentException());
+        throw new IllegalArgumentException("Unsupported resource type for orchestrator resource.");
+    }
 
 	@Override
 	public void remove(ResourceType type, Object name) {
@@ -126,80 +105,14 @@ public class OrchestratorDataResource ex
 
 	@Override
 	public Resource get(ResourceType type, Object name) {
-		  EntityManager em = ResourceUtils.getEntityManager();
-	      em.getTransaction().begin();
-	      QueryGenerator generator;
-	      Query q;
-	        switch (type) {
-	            case ORCHESTRATOR_DATA:
-	                generator = new QueryGenerator(ORCHESTRATORDATA);
-	                generator.setParameter(OrchestratorDataConstants.EXPERIMENT_ID, name.toString());
-	                q = generator.selectQuery(em);
-	                Orchestrator_Data orchestrator_data = (Orchestrator_Data)q.getSingleResult();
-	                OrchestratorDataResource orchestratorDataResource = (OrchestratorDataResource)Utils.getResource(ResourceType.ORCHESTRATOR_DATA,
orchestrator_data);
-	                em.getTransaction().commit();
-	                em.close();
-	                return orchestratorDataResource;
-	            default:
-	                em.getTransaction().commit();
-	                em.close();
-	                log.error("Unsupported resource type for node data resource.", new IllegalArgumentException());
-	                throw new IllegalArgumentException("Unsupported resource type for node data
resource.");
-	        }
-	}
-	public List<Resource> getDataWithStatus(ResourceType type,Object name) {
-		 List<Resource> resourceList = new ArrayList<Resource>();
-
-	        if (type == ResourceType.ORCHESTRATOR_DATA) {
-	            EntityManager em = ResourceUtils.getEntityManager();
-	            em.getTransaction().begin();
-	        	QueryGenerator generator = new QueryGenerator(ORCHESTRATORDATA);
-	        	generator.setParameter(OrchestratorDataConstants.STATUS, name);
-	        	Query q = generator.selectQuery(em);
-	            List<?> results = q.getResultList();
-	            if (results.size() != 0) {
-	                for (Object result : results) {
-	                	Orchestrator_Data orchestratorData = (Orchestrator_Data) result;
-	                	OrchestratorDataResource orchestratorDataResource = (OrchestratorDataResource)
-	                            Utils.getResource(ResourceType.ORCHESTRATOR_DATA, orchestratorData);
-	                    resourceList.add(orchestratorDataResource);
-	                }
-	            }
-	            em.getTransaction().commit();
-	            em.close();
-	        } else {
-	            log.error("Unsupported resource type for orchestrator data resource.", new IllegalArgumentException());
-	            throw new IllegalArgumentException("Unsupported resource type for orchestrator
data resource.");
-	        }
-	        return resourceList;
+        log.error("Unsupported resource type for orchestrator data.", new UnsupportedOperationException());
+        throw new UnsupportedOperationException();
 	}
-	
+
 	@Override
 	public List<Resource> get(ResourceType type) {
-		 List<Resource> resourceList = new ArrayList<Resource>();
-
-	        if (type == ResourceType.ORCHESTRATOR_DATA) {
-	            EntityManager em = ResourceUtils.getEntityManager();
-	            em.getTransaction().begin();
-	        	QueryGenerator generator = new QueryGenerator(ORCHESTRATORDATA);
-	        	generator.setParameter(OrchestratorDataConstants.EXPERIMENT_ID, experimentID);
-	        	Query q = generator.selectQuery(em);
-	            List<?> results = q.getResultList();
-	            if (results.size() != 0) {
-	                for (Object result : results) {
-	                	Orchestrator_Data orchestratorData = (Orchestrator_Data) result;
-	                	OrchestratorDataResource orchestratorDataResource = (OrchestratorDataResource)
-	                            Utils.getResource(ResourceType.ORCHESTRATOR_DATA, orchestratorData);
-	                    resourceList.add(orchestratorDataResource);
-	                }
-	            }
-	            em.getTransaction().commit();
-	            em.close();
-	        } else {
-	            log.error("Unsupported resource type for orchestrator data resource.", new IllegalArgumentException());
-	            throw new IllegalArgumentException("Unsupported resource type for orchestrator
data resource.");
-	        }
-	        return resourceList;
+        log.error("Unsupported resource type for orchestrator data.", new UnsupportedOperationException());
+        throw new UnsupportedOperationException();
 	}
 
 	@Override

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
Thu Jan 16 20:20:10 2014
@@ -268,8 +268,7 @@ CREATE TABLE Execution_Error
 create table Orchestrator_Data
 (
         experiment_ID varchar(255) NOT NULL,
-        orchestrator_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-        user varchar(255),
+        username varchar(255),
         status varchar(255),
         state varchar(255),
         gfacEPR varchar(255),

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
Thu Jan 16 20:20:10 2014
@@ -265,7 +265,6 @@ CREATE TABLE Execution_Error
 create table Orchestrator_Data
 (
         experiment_ID varchar(255) NOT NULL,
-        orchestrator_ID INT NOT NULL AUTO_INCREMENT,
         username varchar(255),
         status varchar(255),
         state varchar(255),

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
Thu Jan 16 20:20:10 2014
@@ -7,14 +7,15 @@ import org.apache.airavata.persistance.r
 import org.apache.airavata.persistance.registry.jpa.resources.OrchestratorDataResource;
 
 public class OrchestratorDataResourceTest extends AbstractResourceTest{
-	 private OrchestratorDataResource dataResource;
-	 private String experimentID = UUID.randomUUID().toString();
-	 private String applicationName = "echo_test";
+	private OrchestratorDataResource dataResource;
+    private GatewayResource gatewayResource;
+	private String experimentID = UUID.randomUUID().toString();
+	private String applicationName = "echo_test";
 	
 	 @Override
 	    public void setUp() throws Exception {
 	        super.setUp();
-	        GatewayResource gatewayResource = super.getGatewayResource();
+	        gatewayResource = super.getGatewayResource();
 		    dataResource = (OrchestratorDataResource) gatewayResource.create(ResourceType.ORCHESTRATOR_DATA);
 	      
 	   }
@@ -26,7 +27,7 @@ public class OrchestratorDataResourceTes
 	        dataResource.save();
 	        assertNotNull("Orchestrator data resource created successfully", dataResource);
 	        // Get saved data
-	        assertNotNull("Orchestrator data resource get successfully", dataResource.get(ResourceType.ORCHESTRATOR_DATA,
experimentID));
+	        assertNotNull("Orchestrator data resource get successfully", gatewayResource.get(ResourceType.ORCHESTRATOR_DATA,
experimentID));
 	    }
 
 	    @Override

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
(original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
Thu Jan 16 20:20:10 2014
@@ -269,7 +269,6 @@ CREATE TABLE Execution_Error
 create table Orchestrator_Data
 (
         experiment_ID varchar(255) NOT NULL,
-        orchestrator_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
         username varchar(255),
         status varchar(255),
         state varchar(255),

Modified: airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql?rev=1558903&r1=1558902&r2=1558903&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
(original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
Thu Jan 16 20:20:10 2014
@@ -266,6 +266,18 @@ CREATE TABLE Execution_Error
        FOREIGN KEY (experiment_ID) REFERENCES Experiment_Data(experiment_ID) ON DELETE CASCADE
 );
 
+create table Orchestrator_Data
+(
+        experiment_ID varchar(255) NOT NULL,
+        username varchar(255),
+        status varchar(255),
+        state varchar(255),
+        gfacEPR varchar(255),
+        applicationName varchar(255),
+        jobRequest CLOB,
+        PRIMARY KEY (experiment_ID)
+);
+
 
 
 



Mime
View raw message