You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/12/17 06:11:44 UTC
[1/4] airavata git commit: changing the mysql script
Repository: airavata
Updated Branches:
refs/heads/master 1837eea8c -> 74201879b
changing the mysql script
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fd62b238
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fd62b238
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fd62b238
Branch: refs/heads/master
Commit: fd62b238e14bb769c887121731f4f39b0777527e
Parents: 1837eea
Author: scnakandala <su...@gmail.com>
Authored: Wed Dec 16 22:42:54 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Dec 16 22:42:54 2015 -0500
----------------------------------------------------------------------
.../registry/core/data/catalog/impl/DataCatalogImpl.java | 2 +-
.../src/main/resources/datacatalog-mysql.sql | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd62b238/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
index 0957709..91e3ce5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
@@ -41,7 +41,7 @@ public class DataCatalogImpl implements DataCatalog {
private final static Logger logger = LoggerFactory.getLogger(DataCatalogImpl.class);
- private final static long DEFAULT_REPLICA_VALID_TIME = 1000 * 60 * 60 * 24 * 365 + 10;
+ private final static long DEFAULT_REPLICA_VALID_TIME = 1000 * 60 * 60 * 24 * 365 * 10;
@Override
public String registerResource(DataResourceModel resourceModel) throws DataCatalogException {
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd62b238/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
index 7bff542..cb10b5b 100644
--- a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
@@ -28,8 +28,8 @@ CREATE TABLE DATA_RESOURCE
OWNER_NAME VARCHAR (255),
PARENT_RESOURCE_ID VARCHAR (255),
RESOURCE_SIZE INT,
- CREATION_TIME TIMESTAMP,
- LAST_MODIFIED_TIME TIMESTAMP,
+ CREATION_TIME TIMESTAMP DEFAULT NULL,
+ LAST_MODIFIED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
PRIMARY KEY (RESOURCE_ID)
);
@@ -41,9 +41,9 @@ CREATE TABLE DATA_REPLICA_LOCATION
REPLICA_DESCRIPTION VARCHAR (1024),
STORAGE_RESOURCE_ID VARCHAR (255),
FILE_ABSOLUTE_PATH VARCHAR (4096),
- CREATION_TIME TIMESTAMP,
- LAST_MODIFIED_TIME TIMESTAMP,
- VALID_UNTIL_TIME TIMESTAMP,
+ CREATION_TIME TIMESTAMP DEFAULT NULL,
+ LAST_MODIFIED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+ VALID_UNTIL_TIME TIMESTAMP DEFAULT NULL,
PRIMARY KEY (REPLICA_ID),
FOREIGN KEY (RESOURCE_ID) REFERENCES DATA_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
);
[4/4] airavata git commit: changing the order of groupId
Posted by sc...@apache.org.
changing the order of groupId
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/74201879
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/74201879
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/74201879
Branch: refs/heads/master
Commit: 74201879bd02ebf40c0f6874da42bc3df8a79817
Parents: ee8a15e
Author: scnakandala <su...@gmail.com>
Authored: Thu Dec 17 00:11:36 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Dec 17 00:11:36 2015 -0500
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/74201879/airavata-api/airavata-api-server/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index 367dff6..9e3c27b 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -14,8 +14,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>airavata-api</artifactId>
<groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-api</artifactId>
<version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
[3/4] airavata git commit: fixing test failure
Posted by sc...@apache.org.
fixing test failure
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ee8a15e4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ee8a15e4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ee8a15e4
Branch: refs/heads/master
Commit: ee8a15e4d7fad3c73fb23f70fc1c8ecf49f37c89
Parents: 3d5bf9e
Author: scnakandala <su...@gmail.com>
Authored: Wed Dec 16 23:34:17 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Dec 16 23:34:17 2015 -0500
----------------------------------------------------------------------
airavata-api/airavata-data-models/pom.xml | 2 +-
.../catalog/utils/ThriftDataModelConversion.java | 15 ++++++++++-----
samples/java-client/experiment/pom.xml | 6 +++---
3 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee8a15e4/airavata-api/airavata-data-models/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml
index 220ab7a..cf18efc 100644
--- a/airavata-api/airavata-data-models/pom.xml
+++ b/airavata-api/airavata-data-models/pom.xml
@@ -13,8 +13,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>airavata-api</artifactId>
<groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-api</artifactId>
<version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee8a15e4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java
index 3ea4dad..7f358fe 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/utils/ThriftDataModelConversion.java
@@ -53,8 +53,10 @@ public class ThriftDataModelConversion {
dataResourceModel.setResourceDescription(dataResource.getResourceDescription());
dataResourceModel.setOwnerName(dataResource.getOwnerName());
dataResourceModel.setResourceSize(dataResource.getResourceSize());
- dataResourceModel.setCreationTime(dataResource.getCreationTime().getTime());
- dataResourceModel.setLastModifiedTime(dataResource.getLastModifiedTime().getTime());
+ if(dataResource.getCreationTime() != null)
+ dataResourceModel.setCreationTime(dataResource.getCreationTime().getTime());
+ if(dataResource.getLastModifiedTime() != null)
+ dataResourceModel.setLastModifiedTime(dataResource.getLastModifiedTime().getTime());
dataResourceModel.setResourceMetadata(getResourceMetaData(dataResource.getDataResourceMetaData()));
if(dataResource.getDataReplicaLocations() != null){
ArrayList<DataReplicaLocationModel> dataReplicaLocationModels = new ArrayList<>();
@@ -133,10 +135,13 @@ public class ThriftDataModelConversion {
replicaLocationModel.setReplicaName(replicaLocation.getReplicaName());
replicaLocationModel.setReplicaDescription(replicaLocation.getReplicaDescription());
replicaLocationModel.setStorageResourceId(replicaLocation.getStorageResourceId());
- replicaLocationModel.setValidUntilTime(replicaLocation.getValidUntilTime().getTime());
+ if(replicaLocation.getValidUntilTime() != null)
+ replicaLocationModel.setValidUntilTime(replicaLocation.getValidUntilTime().getTime());
replicaLocationModel.setFileAbsolutePath(replicaLocation.getFileAbsolutePath());
- replicaLocationModel.setCreationTime(replicaLocation.getCreationTime().getTime());
- replicaLocationModel.setLastModifiedTime(replicaLocation.getLastModifiedTime().getTime());
+ if(replicaLocation.getCreationTime() != null)
+ replicaLocationModel.setCreationTime(replicaLocation.getCreationTime().getTime());
+ if(replicaLocation.getLastModifiedTime() != null)
+ replicaLocationModel.setLastModifiedTime(replicaLocation.getLastModifiedTime().getTime());
if(replicaLocation.getReplicaLocationCategory() != null)
replicaLocationModel.setReplicaLocationCategory(ReplicaLocationCategory.valueOf(replicaLocation
.getReplicaLocationCategory().toString()));
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee8a15e4/samples/java-client/experiment/pom.xml
----------------------------------------------------------------------
diff --git a/samples/java-client/experiment/pom.xml b/samples/java-client/experiment/pom.xml
index 472b660..4f37ccd 100644
--- a/samples/java-client/experiment/pom.xml
+++ b/samples/java-client/experiment/pom.xml
@@ -13,19 +13,19 @@
<parent>
<groupId>org.apache.airavata</groupId>
<artifactId>samples</artifactId>
- <version>0.12-SNAPSHOT</version>
+ <version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId.airavata.registry.core.experiment.sample</artifactId>
+ <artifactId>airavata.registry.core.experiment.sample</artifactId>
<name>Samples - Single application experiment</name>
<url>http://airavata.apache.org/</url>
<dependencies>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>distribution</artifactId>
+ <artifactId>apache-airavata-distribution</artifactId>
<type>pom</type>
<version>${project.version}</version>
<exclusions>
[2/4] airavata git commit: changes to the validUntil time
Posted by sc...@apache.org.
changes to the validUntil time
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3d5bf9ee
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3d5bf9ee
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3d5bf9ee
Branch: refs/heads/master
Commit: 3d5bf9eeacdc2dacf0b9425e555eade954c18314
Parents: fd62b23
Author: scnakandala <su...@gmail.com>
Authored: Wed Dec 16 22:45:30 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Dec 16 22:45:30 2015 -0500
----------------------------------------------------------------------
.../org/apache/airavata/client/samples/DataManagerSample.java | 7 ++++---
.../registry/core/data/catalog/impl/DataCatalogImpl.java | 6 ------
2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3d5bf9ee/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java
index 44e20cf..c417f31 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/DataManagerSample.java
@@ -22,9 +22,7 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.model.data.resource.DataReplicaLocationModel;
-import org.apache.airavata.model.data.resource.DataResourceModel;
-import org.apache.airavata.model.data.resource.DataResourceType;
+import org.apache.airavata.model.data.resource.*;
import org.apache.airavata.model.security.AuthzToken;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,6 +51,9 @@ public class DataManagerSample {
DataReplicaLocationModel replicaLocationModel = new DataReplicaLocationModel();
replicaLocationModel.setStorageResourceId(STORAGE_RESOURCE_ID);
+ replicaLocationModel.setReplicaName("test-1-replica-1");
+ replicaLocationModel.setReplicaLocationCategory(ReplicaLocationCategory.GATEWAY_DATA_STORE);
+ replicaLocationModel.setReplicaPersistentType(ReplicaPersistentType.PERSISTENT);
replicaLocationModel.setFileAbsolutePath("/var/www/portal/");
dataResourceModel.addToReplicaLocations(replicaLocationModel);
http://git-wip-us.apache.org/repos/asf/airavata/blob/3d5bf9ee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
index 91e3ce5..f596980 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/data/catalog/impl/DataCatalogImpl.java
@@ -41,8 +41,6 @@ public class DataCatalogImpl implements DataCatalog {
private final static Logger logger = LoggerFactory.getLogger(DataCatalogImpl.class);
- private final static long DEFAULT_REPLICA_VALID_TIME = 1000 * 60 * 60 * 24 * 365 * 10;
-
@Override
public String registerResource(DataResourceModel resourceModel) throws DataCatalogException {
String resourceId = UUID.randomUUID().toString();
@@ -56,8 +54,6 @@ public class DataCatalogImpl implements DataCatalog {
r.setReplicaId(UUID.randomUUID().toString());
r.setCreationTime(currentTime);
r.setLastModifiedTime(currentTime);
- if(r.getValidUntilTime() <= 0)
- r.setValidUntilTime(currentTime + DEFAULT_REPLICA_VALID_TIME);
});
}
resourceModel.setCreationTime(System.currentTimeMillis());
@@ -165,8 +161,6 @@ public class DataCatalogImpl implements DataCatalog {
long currentTime = System.currentTimeMillis();
dataReplicaLocationModel.setCreationTime(currentTime);
dataReplicaLocationModel.setLastModifiedTime(currentTime);
- if(dataReplicaLocationModel.getValidUntilTime() <= 0)
- dataReplicaLocationModel.setValidUntilTime(currentTime + DEFAULT_REPLICA_VALID_TIME);
dataReplicaLocationModel.setCreationTime(System.currentTimeMillis());
dataReplicaLocationModel.setLastModifiedTime(System.currentTimeMillis());
DataReplicaLocation replicaLocation = ThriftDataModelConversion.getDataReplicaLocation(dataReplicaLocationModel);