airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject git commit: created time and update time for app catalog and update API version to 0.14
Date Fri, 15 Aug 2014 19:41:33 GMT
Repository: airavata
Updated Branches:
  refs/heads/master c21f1d1a6 -> bb8e448cf


created time and update time for app catalog and update API version to 0.14


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

Branch: refs/heads/master
Commit: bb8e448cf1c4b88b27aaeca10b9147afec04e619
Parents: c21f1d1
Author: Chathuri Wimalasena <kamalasini@gmail.com>
Authored: Fri Aug 15 15:41:27 2014 -0400
Committer: Chathuri Wimalasena <kamalasini@gmail.com>
Committed: Fri Aug 15 15:41:27 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/api/airavataAPIConstants.java     | 2 +-
 .../src/main/resources/lib/airavata/airavataAPI_constants.cpp  | 2 +-
 .../src/main/resources/lib/Airavata/API/Types.php              | 2 +-
 .../apache/airavata/client/samples/CreateLaunchExperiment.java | 6 +++---
 airavata-api/thrift-interface-descriptions/airavataAPI.thrift  | 2 +-
 .../catalog/data/resources/AppDeploymentResource.java          | 5 +++--
 .../catalog/data/resources/AppInterfaceResource.java           | 5 +++--
 .../application/catalog/data/resources/AppModuleResource.java  | 5 +++--
 .../catalog/data/resources/ComputeResourceResource.java        | 5 +++--
 .../catalog/data/resources/DataMovementInterfaceResource.java  | 5 +++--
 .../catalog/data/resources/GatewayProfileResource.java         | 5 +++--
 .../catalog/data/resources/GridftpDataMovementResource.java    | 5 +++--
 .../catalog/data/resources/GridftpEndpointResource.java        | 5 +++--
 .../catalog/data/resources/JobSubmissionInterfaceResource.java | 5 +++--
 .../catalog/data/resources/LocalSubmissionResource.java        | 5 +++--
 .../catalog/data/resources/ResourceJobManagerResource.java     | 5 +++--
 .../catalog/data/resources/ScpDataMovementResource.java        | 5 +++--
 .../catalog/data/resources/SshJobSubmissionResource.java       | 5 +++--
 .../application/catalog/data/resources/WorkflowResource.java   | 5 +++--
 19 files changed, 49 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
index 7daf027..3685b9f 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/airavataAPIConstants.java
@@ -65,6 +65,6 @@ import org.slf4j.LoggerFactory;
    *              in a change to major/minor version numbers.
    * 
    */
-  public static final String AIRAVATA_API_VERSION = "0.13.0";
+  public static final String AIRAVATA_API_VERSION = "0.14.0";
 
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_constants.cpp
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_constants.cpp
index 6fecfd9..0161d32 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_constants.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_constants.cpp
@@ -28,7 +28,7 @@ namespace apache { namespace airavata { namespace api {
 const airavataAPIConstants g_airavataAPI_constants;
 
 airavataAPIConstants::airavataAPIConstants() {
-  AIRAVATA_API_VERSION = "0.13.0";
+  AIRAVATA_API_VERSION = "0.14.0";
 
 }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
index e99ad0b..cb100bc 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Types.php
@@ -17,6 +17,6 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
 use Thrift\Exception\TApplicationException;
 
 
-$GLOBALS['airavataAPI_CONSTANTS']['AIRAVATA_API_VERSION'] = "0.13.0";
+$GLOBALS['airavataAPI_CONSTANTS']['AIRAVATA_API_VERSION'] = "0.14.0";
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 5178965..f0c932d 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -62,9 +62,9 @@ public class CreateLaunchExperiment {
     private static final String DEFAULT_USER = "default.registry.user";
     private static final String DEFAULT_GATEWAY = "default.registry.gateway";
     private static Airavata.Client client;
-    private static String localHostAppId = "localhost_9c5b098c-8906-4be1-9ef3-a7706c9b1e2c,SimpleEcho0_315d9b93-2cdb-4c1b-8dc3-d2077936f5ae";
+    private static String localHostAppId = "localhost_33e36776-9e85-4a59-996c-9f558c2693fa,SimpleEcho0_e04db7e1-6984-46a5-9046-639bb827886b";
     private static String sshHostAppId;
-    private static String pbsEchoAppId = "trestles.sdsc.edu_d4b6dfd0-d273-4499-b5dd-19b7f83176ed,SimpleEcho2_060f9325-3f72-4ff6-b8a2-8a2b4911e09d";
+    private static String pbsEchoAppId = "trestles.sdsc.edu_3380f118-a66e-44f2-9e35-341db37b8cb5,SimpleEcho2_3cdaae1e-d4cc-40f6-a0fc-de1aca14b316";
     private static String pbsWRFAppId = "trestles.sdsc.edu_03d239f1-b923-487a-9aa4-fcc7aed8628e,WRF_a5a7372d-2c59-4986-8351-eac563b53f89";
     private static String slurmAppId = "stampede.tacc.xsede.org_b2ef59cb-f626-4767-9ca0-601f94c42ba4,SimpleEcho3_b81c2559-a088-42a3-84ce-40119d874918";
     private static String sgeAppId;
@@ -80,7 +80,7 @@ public class CreateLaunchExperiment {
         try {
             AiravataUtils.setExecutionAsClient();
             client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
-//            System.out.println("API version is " + client.getAPIVersion());
+            System.out.println("API version is " + client.getAPIVersion());
 //            getExperiment(client, "WRFExperiment_2a2de26c-7f74-47c9-8e14-40e50dedfe0f");
 //            addDescriptors();
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index 9ad2eed..f71d6d1 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -54,7 +54,7 @@ namespace js ApacheAiravataAPI
  *              in a change to major/minor version numbers.
  *
 */
-const string AIRAVATA_API_VERSION = "0.13.0"
+const string AIRAVATA_API_VERSION = "0.14.0"
 
 service Airavata {
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
index 6dfd69b..33351de 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java
@@ -29,6 +29,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -371,7 +372,7 @@ public class AppDeploymentResource extends AbstractResource {
                 existingDeployment.setHostID(hostId);
                 existingDeployment.setExecutablePath(executablePath);
                 existingDeployment.setParallelism(parallelism);
-                existingDeployment.setUpdateTime(updatedTime);
+                existingDeployment.setUpdateTime(AiravataUtils.getCurrentTimestamp());
                 em.merge(existingDeployment);
             }else {
                 ApplicationDeployment deployment  = new ApplicationDeployment();
@@ -383,7 +384,7 @@ public class AppDeploymentResource extends AbstractResource {
                 deployment.setComputeResource(computeHost);
                 deployment.setExecutablePath(executablePath);
                 deployment.setParallelism(parallelism);
-                deployment.setCreationTime(createdTime);
+                deployment.setCreationTime(AiravataUtils.getCurrentTimestamp());
                 em.persist(deployment);
             }
             em.getTransaction().commit();

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
index d013a9f..7d8f771 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
@@ -27,6 +27,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -302,14 +303,14 @@ public class AppInterfaceResource extends AbstractResource {
             if (existigAppInterface !=  null){
                 existigAppInterface.setAppName(appName);
                 existigAppInterface.setAppDescription(appDescription);
-                existigAppInterface.setUpdateTime(updatedTime);
+                existigAppInterface.setUpdateTime(AiravataUtils.getCurrentTimestamp());
                 em.merge(existigAppInterface);
             }else {
                 ApplicationInterface applicationInterface = new ApplicationInterface();
                 applicationInterface.setInterfaceID(interfaceId);
                 applicationInterface.setAppName(appName);
                 applicationInterface.setAppDescription(appDescription);
-                applicationInterface.setCreationTime(createdTime);
+                applicationInterface.setCreationTime(AiravataUtils.getCurrentTimestamp());
                 em.persist(applicationInterface);
             }
             em.getTransaction().commit();

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
index 3da66c5..a04de85 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleResource.java
@@ -27,6 +27,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -256,7 +257,7 @@ public class AppModuleResource extends AbstractResource {
                 existingModule.setModuleName(moduleName);
                 existingModule.setModuleVersion(moduleVersion);
                 existingModule.setModuleDesc(moduleDesc);
-                existingModule.setUpdateTime(updatedTime);
+                existingModule.setUpdateTime(AiravataUtils.getCurrentTimestamp());
                 em.merge(existingModule);
             }else {
                 ApplicationModule applicationModule = new ApplicationModule();
@@ -264,7 +265,7 @@ public class AppModuleResource extends AbstractResource {
                 applicationModule.setModuleName(moduleName);
                 applicationModule.setModuleVersion(moduleVersion);
                 applicationModule.setModuleDesc(moduleDesc);
-                applicationModule.setCreationTime(createdTime);
+                applicationModule.setCreationTime(AiravataUtils.getCurrentTimestamp());
                 em.persist(applicationModule);
             }
             em.getTransaction().commit();

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
index 2ecaeb6..296debf 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java
@@ -27,6 +27,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -265,10 +266,10 @@ public class ComputeResourceResource extends AbstractResource {
 			em.getTransaction().begin();
 			if (existingComputeResource == null) {
 				computeResource = new ComputeResource();
-                computeResource.setCreationTime(createdTime);
+                computeResource.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				computeResource = existingComputeResource;
-                computeResource.setUpdateTime(updatedTime);
+                computeResource.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			computeResource.setResourceDescription(getResourceDescription());
 			computeResource.setResourceId(getResourceId());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java
index c9016ef..267cd23 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementInterfaceResource.java
@@ -38,6 +38,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -237,10 +238,10 @@ public class DataMovementInterfaceResource extends AbstractResource
{
 			em.getTransaction().begin();
 			if (existingDataMovementInterface == null) {
 				dataMovementInterface = new DataMovementInterface();
-                dataMovementInterface.setCreationTime(createdTime);
+                dataMovementInterface.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				dataMovementInterface = existingDataMovementInterface;
-                dataMovementInterface.setUpdateTime(updatedTime);
+                dataMovementInterface.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			dataMovementInterface.setComputeResourceId(getComputeResourceId());
 			ComputeResource computeResource = em.find(ComputeResource.class, getComputeResourceId());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GatewayProfileResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GatewayProfileResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GatewayProfileResource.java
index 3fe339a..50c6972 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GatewayProfileResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GatewayProfileResource.java
@@ -25,6 +25,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -239,14 +240,14 @@ public class GatewayProfileResource extends AbstractResource {
             if (existingGatewayProfile != null) {
                 existingGatewayProfile.setGatewayDesc(gatewayDesc);
                 existingGatewayProfile.setGatewayName(gatewayName);
-                existingGatewayProfile.setUpdateTime(updatedTime);
+                existingGatewayProfile.setUpdateTime(AiravataUtils.getCurrentTimestamp());
                 em.merge(existingGatewayProfile);
             } else {
                 GatewayProfile gatewayProfile = new GatewayProfile();
                 gatewayProfile.setGatewayID(gatewayID);
                 gatewayProfile.setGatewayName(gatewayName);
                 gatewayProfile.setGatewayDesc(gatewayDesc);
-                gatewayProfile.setCreationTime(createdTime);
+                gatewayProfile.setCreationTime(AiravataUtils.getCurrentTimestamp());
                 em.persist(gatewayProfile);
             }
             em.getTransaction().commit();

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpDataMovementResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpDataMovementResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpDataMovementResource.java
index 70b9af9..35b36e0 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpDataMovementResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpDataMovementResource.java
@@ -32,6 +32,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -212,10 +213,10 @@ public class GridftpDataMovementResource extends AbstractResource {
 			em.getTransaction().begin();
 			if (existingGridftpDataMovement == null) {
 				gridftpDataMovement = new GridftpDataMovement();
-                gridftpDataMovement.setCreationTime(createdTime);
+                gridftpDataMovement.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				gridftpDataMovement = existingGridftpDataMovement;
-                gridftpDataMovement.setUpdateTime(updatedTime);
+                gridftpDataMovement.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			gridftpDataMovement.setDataMovementInterfaceId(getDataMovementInterfaceId());
 			gridftpDataMovement.setSecurityProtocol(getSecurityProtocol());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpEndpointResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpEndpointResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpEndpointResource.java
index 8364711..f484568 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpEndpointResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/GridftpEndpointResource.java
@@ -36,6 +36,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -233,10 +234,10 @@ public class GridftpEndpointResource extends AbstractResource {
 			em.getTransaction().begin();
 			if (existingGridftpEndpoint == null) {
 				gridftpEndpoint = new GridftpEndpoint();
-                gridftpEndpoint.setCreationTime(createdTime);
+                gridftpEndpoint.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				gridftpEndpoint = existingGridftpEndpoint;
-                gridftpEndpoint.setUpdateTime(updatedTime);
+                gridftpEndpoint.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			gridftpEndpoint.setEndpoint(getEndpoint());
 			gridftpEndpoint.setDataMovementInterfaceId(getDataMovementInterfaceId());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/JobSubmissionInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/JobSubmissionInterfaceResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/JobSubmissionInterfaceResource.java
index 8654789..a5acbef 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/JobSubmissionInterfaceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/JobSubmissionInterfaceResource.java
@@ -38,6 +38,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -237,10 +238,10 @@ public class JobSubmissionInterfaceResource extends AbstractResource
{
 			em.getTransaction().begin();
 			if (existingJobSubmissionInterface == null) {
 				jobSubmissionInterface = new JobSubmissionInterface();
-                jobSubmissionInterface.setCreationTime(createdTime);
+                jobSubmissionInterface.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				jobSubmissionInterface = existingJobSubmissionInterface;
-                jobSubmissionInterface.setUpdateTime(updatedTime);
+                jobSubmissionInterface.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			jobSubmissionInterface.setJobSubmissionInterfaceId(getJobSubmissionInterfaceId());
 			jobSubmissionInterface.setComputeResourceId(getComputeResourceId());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/LocalSubmissionResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/LocalSubmissionResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/LocalSubmissionResource.java
index e954fae..487e5dc 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/LocalSubmissionResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/LocalSubmissionResource.java
@@ -35,6 +35,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -216,10 +217,10 @@ public class LocalSubmissionResource extends AbstractResource {
 			em.getTransaction().begin();
 			if (existingLocalSubmission == null) {
 				localSubmission = new LocalSubmission();
-                localSubmission.setCreationTime(createdTime);
+                localSubmission.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				localSubmission = existingLocalSubmission;
-                localSubmission.setUpdateTime(updatedTime);
+                localSubmission.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			localSubmission.setResourceJobManagerId(getResourceJobManagerId());
 			ResourceJobManager resourceJobManager = em.find(ResourceJobManager.class, getResourceJobManagerId());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ResourceJobManagerResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ResourceJobManagerResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ResourceJobManagerResource.java
index 3addb71..0cc5a18 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ResourceJobManagerResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ResourceJobManagerResource.java
@@ -34,6 +34,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -216,10 +217,10 @@ public class ResourceJobManagerResource extends AbstractResource {
 			em.getTransaction().begin();
 			if (existingResourceJobManager == null) {
 				resourceJobManager = new ResourceJobManager();
-                resourceJobManager.setCreationTime(createdTime);
+                resourceJobManager.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				resourceJobManager = existingResourceJobManager;
-                resourceJobManager.setUpdateTime(updatedTime);
+                resourceJobManager.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			resourceJobManager.setResourceJobManagerId(getResourceJobManagerId());
 			resourceJobManager.setPushMonitoringEndpoint(getPushMonitoringEndpoint());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ScpDataMovementResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ScpDataMovementResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ScpDataMovementResource.java
index 8c995b6..8c593f3 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ScpDataMovementResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ScpDataMovementResource.java
@@ -25,6 +25,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -214,10 +215,10 @@ public class ScpDataMovementResource extends AbstractResource {
 			em.getTransaction().begin();
 			if (existingScpDataMovement == null) {
 				scpDataMovement = new ScpDataMovement();
-                scpDataMovement.setCreationTime(createdTime);
+                scpDataMovement.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				scpDataMovement = existingScpDataMovement;
-                scpDataMovement.setUpdateTime(updatedTime);
+                scpDataMovement.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			scpDataMovement.setQueueDescription(getQueueDescription());
 			scpDataMovement.setDataMovementInterfaceId(getDataMovementInterfaceId());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/SshJobSubmissionResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/SshJobSubmissionResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/SshJobSubmissionResource.java
index c94a8b1..4b46dd3 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/SshJobSubmissionResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/SshJobSubmissionResource.java
@@ -33,6 +33,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -217,10 +218,10 @@ public class SshJobSubmissionResource extends AbstractResource {
 			em.getTransaction().begin();
 			if (existingSshJobSubmission == null) {
 				sshJobSubmission = new SshJobSubmission();
-                sshJobSubmission.setCreationTime(createdTime);
+                sshJobSubmission.setCreationTime(AiravataUtils.getCurrentTimestamp());
 			} else {
 				sshJobSubmission = existingSshJobSubmission;
-                sshJobSubmission.setUpdateTime(updatedTime);
+                sshJobSubmission.setUpdateTime(AiravataUtils.getCurrentTimestamp());
 			}
 			sshJobSubmission.setResourceJobManagerId(getResourceJobManagerId());
 			ResourceJobManager resourceJobManager = em.find(ResourceJobManager.class, getResourceJobManagerId());

http://git-wip-us.apache.org/repos/asf/airavata/blob/bb8e448c/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowResource.java
b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowResource.java
index f0d59d1..c15b521 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/WorkflowResource.java
@@ -27,6 +27,7 @@ import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
 import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -271,10 +272,10 @@ public class WorkflowResource extends AbstractResource {
             em.getTransaction().begin();
             if (existingWorkflow == null) {
                 workflow = new Workflow();
-                workflow.setCreatedUser(createdUser);
+                workflow.setCreationTime(AiravataUtils.getCurrentTimestamp());
             } else {
                 workflow = existingWorkflow;
-                workflow.setUpdateTime(updatedTime);
+                workflow.setUpdateTime(AiravataUtils.getCurrentTimestamp());
             }
             workflow.setWfName(getWfName());
             workflow.setCreatedUser(getCreatedUser());


Mime
View raw message