airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject git commit: fixing test failure in app catalog
Date Fri, 15 Aug 2014 19:07:18 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 010b85fcf -> c21f1d1a6


fixing test failure in app catalog


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c21f1d1a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c21f1d1a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c21f1d1a

Branch: refs/heads/master
Commit: c21f1d1a6426da635f4dd3a8b8cbb1d069f87f6a
Parents: 010b85f
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Fri Aug 15 15:07:13 2014 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Fri Aug 15 15:07:13 2014 -0400

----------------------------------------------------------------------
 .../src/main/resources/appcatalog-derby.sql     | 29 ++++++++++----------
 .../app/catalog/test/ComputeResourceTest.java   |  8 +++---
 .../src/test/resources/appcatalog-derby.sql     |  1 +
 .../src/main/resources/registry-derby.sql       |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/c21f1d1a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
index 8340116..238a823 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
@@ -18,13 +18,14 @@
  * under the License.
  *
  */
+
 CREATE TABLE COMPUTE_RESOURCE
 (
 	RESOURCE_ID VARCHAR (255) NOT NULL,
 	HOST_NAME VARCHAR (255) NOT NULL,
 	RESOURCE_DESCRIPTION VARCHAR (255),
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (RESOURCE_ID)
 );
 
@@ -101,7 +102,7 @@ CREATE TABLE RESOURCE_JOB_MANAGER
 	JOB_MANAGER_BIN_PATH VARCHAR (255),
 	RESOURCE_JOB_MANAGER_TYPE VARCHAR (255) NOT NULL,
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
 );
 
@@ -113,7 +114,7 @@ CREATE TABLE SSH_JOB_SUBMISSION
 	SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
 	SSH_PORT INTEGER,
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
 	FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
 );
@@ -126,7 +127,7 @@ CREATE TABLE SCP_DATA_MOVEMENT
 	ALTERNATIVE_SCP_HOSTNAME VARCHAR (255),
 	SSH_PORT INTEGER,
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
 );
 
@@ -135,7 +136,7 @@ CREATE TABLE GRIDFTP_DATA_MOVEMENT
 	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
 	SECURITY_PROTOCOL VARCHAR (255) NOT NULL,
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
 );
 
@@ -145,7 +146,7 @@ CREATE TABLE GRIDFTP_ENDPOINT
 	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
 	PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID,ENDPOINT),
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID)
ON DELETE CASCADE
 );
 
@@ -178,7 +179,7 @@ CREATE TABLE APPLICATION_MODULE
          MODULE_VERSION VARCHAR(255),
          MODULE_DESC VARCHAR(255),
          CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
          PRIMARY KEY(MODULE_ID)
 );
 
@@ -191,7 +192,7 @@ CREATE TABLE APPLICATION_DEPLOYMENT
 	     PARALLELISM VARCHAR(255),
          APPLICATION_DESC VARCHAR(255),
          CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
          PRIMARY KEY(DEPLOYMENT_ID),
          FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE
CASCADE,
          FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
@@ -238,7 +239,7 @@ CREATE TABLE APPLICATION_INTERFACE
          APPLICATION_NAME VARCHAR(255),
          APPLICATION_DESCRIPTION VARCHAR(255),
          CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
          PRIMARY KEY(INTERFACE_ID)
 );
 
@@ -281,7 +282,7 @@ CREATE TABLE GATEWAY_PROFILE
          GATEWAY_NAME VARCHAR(255),
          GATEWAY_DESC VARCHAR(255),
          CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
          PRIMARY KEY(GATEWAY_ID)
 );
 
@@ -329,7 +330,7 @@ CREATE TABLE JOB_SUBMISSION_INTERFACE
 	JOB_SUBMISSION_PROTOCOL VARCHAR (255) NOT NULL,
 	PRIORITY_ORDER INTEGER,
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID),
 	FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
 );
@@ -341,7 +342,7 @@ CREATE TABLE DATA_MOVEMENT_INTERFACE
 	DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
 	PRIORITY_ORDER INTEGER,
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
 	FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
 );
@@ -360,7 +361,7 @@ CREATE TABLE LOCAL_SUBMISSION
 	RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
 	JOB_SUBMISSION_INTERFACE_ID VARCHAR (255) NOT NULL,
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
 	FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
 );
@@ -378,7 +379,7 @@ CREATE TABLE WORKFLOW
 	GRAPH CLOB,
 	OWNER VARCHAR(255),
 	CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+	UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
 	PRIMARY KEY (WF_TEMPLATE_ID)
 );
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/c21f1d1a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
index e0ee1cf..79fb9ff 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
@@ -87,13 +87,13 @@ public class ComputeResourceTest {
             sshSubmissionInt.setJobSubmissionInterfaceId(sshsubmissionId);
             sshSubmissionInt.setPriorityOrder(1);
             sshSubmissionInt.setJobSubmissionProtocol(JobSubmissionProtocol.SSH);
-            JobSubmissionInterface globusSubInt = new JobSubmissionInterface();
+//            JobSubmissionInterface globusSubInt = new JobSubmissionInterface();
 //            globusSubInt.setJobSubmissionInterfaceId(globusSubmissionId);
-            globusSubInt.setPriorityOrder(2);
-            globusSubInt.setJobSubmissionProtocol(JobSubmissionProtocol.GLOBUS);
+//            globusSubInt.setPriorityOrder(2);
+//            globusSubInt.setJobSubmissionProtocol(JobSubmissionProtocol.GLOBUS);
             List<JobSubmissionInterface> interfaceList = new ArrayList<JobSubmissionInterface>();
             interfaceList.add(sshSubmissionInt);
-            interfaceList.add(globusSubInt);
+//            interfaceList.add(globusSubInt);
             description.setJobSubmissionInterfaces(interfaceList);
 
             String scpDataMoveId = addSCPDataMovement();

http://git-wip-us.apache.org/repos/asf/airavata/blob/c21f1d1a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
index a9da4b7..238a823 100644
--- a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
@@ -18,6 +18,7 @@
  * under the License.
  *
  */
+
 CREATE TABLE COMPUTE_RESOURCE
 (
 	RESOURCE_ID VARCHAR (255) NOT NULL,

http://git-wip-us.apache.org/repos/asf/airavata/blob/c21f1d1a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
index 9ed5ca9..8e27188 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
@@ -21,7 +21,7 @@
 CREATE TABLE GATEWAY
 (
         GATEWAY_NAME VARCHAR(255),
-	      OWNER VARCHAR(255),
+	    OWNER VARCHAR(255),
         PRIMARY KEY (GATEWAY_NAME)
 );
 


Mime
View raw message