airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject svn commit: r1558119 - in /airavata/trunk/modules: orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/ orchestrator/orchestrator-core/src/test/resources/ registry/airavata-jpa-registry/src/main/java/org/apache/airavata/p...
Date Tue, 14 Jan 2014 17:26:18 GMT
Author: raminder
Date: Tue Jan 14 17:26:17 2014
New Revision: 1558119

URL: http://svn.apache.org/r1558119
Log:
updated database as user is reserved word

Modified:
    airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.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/model/Orchestrator_Data.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/test/resources/data-derby.sql

Modified: airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java?rev=1558119&r1=1558118&r2=1558119&view=diff
==============================================================================
--- airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java
(original)
+++ airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java
Tue Jan 14 17:26:17 2014
@@ -21,10 +21,10 @@
 package org.apache.airavata.orchestrator.core;
 
 import junit.framework.TestCase;
+
 import org.apache.airavata.orchestrator.core.util.Initialize;
 import org.apache.airavata.persistance.registry.jpa.ResourceType;
 import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
-import org.apache.airavata.persistance.registry.jpa.model.Orchestrator_Data;
 import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
 import org.apache.airavata.persistance.registry.jpa.resources.OrchestratorDataResource;
 import org.apache.airavata.persistance.registry.jpa.resources.UserResource;

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=1558119&r1=1558118&r2=1558119&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
Tue Jan 14 17:26:17 2014
@@ -267,11 +267,12 @@ CREATE TABLE Execution_Error
 
 create table Orchestrator_Data
 (
-        orchestrator_ID varchar(255),
-        experiment_ID varchar(255),
+        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),
+        gfacEPR varchar(255),
         PRIMARY KEY (experiment_ID)
 );
 

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=1558119&r1=1558118&r2=1558119&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
Tue Jan 14 17:26:17 2014
@@ -13,7 +13,7 @@ public class Orchestrator_Data {
     private String experiment_ID;
 	@GeneratedValue
 	private int orchestrator_ID;
-	private String user;
+	private String username;
 	private String status;
 	private String state;
 	private String gfacEPR;
@@ -31,11 +31,11 @@ public class Orchestrator_Data {
 	public void setOrchestrator_ID(int orchestrator_ID) {
 		this.orchestrator_ID = orchestrator_ID;
 	}
-	public String getUser() {
-		return user;
+	public String getUserName() {
+		return username;
 	}
-	public void setUser(String user) {
-		this.user = user;
+	public void setUserName(String username) {
+		this.username = username;
 	}
 	public String getStatus() {
 		return status;

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=1558119&r1=1558118&r2=1558119&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
Tue Jan 14 17:26:17 2014
@@ -166,13 +166,13 @@ public class OrchestratorDataResource ex
 		em.getTransaction().begin();
 		Orchestrator_Data orchestratorData = new Orchestrator_Data();
 		orchestratorData.setExperiment_ID(experimentID);
-		orchestratorData.setUser(userName);
+		orchestratorData.setUserName(userName);
 		orchestratorData.setGfacEPR(gfacEPR);
 		orchestratorData.setState(state);
 		orchestratorData.setStatus(status);
 		if (existingOrchestratorData != null) {
 			existingOrchestratorData.setExperiment_ID(experimentID);
-			existingOrchestratorData.setUser(userName);
+			existingOrchestratorData.setUserName(userName);
 			existingOrchestratorData.setState(state);
 			existingOrchestratorData.setStatus(status);
 			existingOrchestratorData.setGfacEPR(gfacEPR);

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=1558119&r1=1558118&r2=1558119&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
Tue Jan 14 17:26:17 2014
@@ -270,7 +270,7 @@ 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),



Mime
View raw message