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:46 UTC
[3/4] airavata git commit: fixing test failure
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>