Repository: airavata Updated Branches: refs/heads/master 679771b4e -> 3f0d74a5b
fixing time issue Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3f0d74a5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3f0d74a5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3f0d74a5 Branch: refs/heads/master Commit: 3f0d74a5b35b0e7492e8290486b35b73d6a7381c Parents: 679771b Author: scnakandala <[email protected]> Authored: Thu Dec 17 11:34:10 2015 -0500 Committer: scnakandala <[email protected]> Committed: Thu Dec 17 11:34:10 2015 -0500 ---------------------------------------------------------------------- .../server/security/authzcache/DefaultAuthzCacheManager.java | 2 -- .../org/apache/airavata/client/samples/DataManagerSample.java | 4 ++-- .../core/data/catalog/utils/ThriftDataModelConversion.java | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3f0d74a5/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/authzcache/DefaultAuthzCacheManager.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/authzcache/DefaultAuthzCacheManager.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/authzcache/DefaultAuthzCacheManager.java index 232908d..4c8276f 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/authzcache/DefaultAuthzCacheManager.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/security/authzcache/DefaultAuthzCacheManager.java @@ -25,8 +25,6 @@ import org.apache.airavata.security.AiravataSecurityException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Date; - public class DefaultAuthzCacheManager implements AuthzCacheManager { private final static Logger logger = LoggerFactory.getLogger(DefaultAuthzCacheManager.class); http://git-wip-us.apache.org/repos/asf/airavata/blob/3f0d74a5/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 a02adfd..445c401 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 @@ -61,8 +61,8 @@ public class DataManagerSample { String resourceId = client.registerDataResource(authzToken, dataResourceModel); System.out.println(resourceId); - client.copyDataResource(authzToken, resourceId, STORAGE_RESOURCE_ID, "/var/www/portals/gateway-user-data/test-dest"); - + String replicaId = client.copyDataResource(authzToken, resourceId, STORAGE_RESOURCE_ID, "/var/www/portals/gateway-user-data/test-dest"); + System.out.println(replicaId); } catch (Exception e) { logger.error("Error while connecting with server", e.getMessage()); e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/airavata/blob/3f0d74a5/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 7f358fe..7658631 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 @@ -170,11 +170,11 @@ public class ThriftDataModelConversion { dataReplicaLocation.setReplicaDescription(dataReplicaLocationModel.getReplicaDescription()); dataReplicaLocation.setStorageResourceId(dataReplicaLocationModel.getStorageResourceId()); dataReplicaLocation.setFileAbsolutePath(dataReplicaLocationModel.getFileAbsolutePath()); - if(dataReplicaLocationModel.getCreationTime() > 0) + if(dataReplicaLocationModel.getValidUntilTime() > 0) dataReplicaLocation.setValidUntilTime(new Timestamp(dataReplicaLocationModel.getValidUntilTime())); - if(dataReplicaLocationModel.getLastModifiedTime() > 0) + if(dataReplicaLocationModel.getCreationTime() > 0) dataReplicaLocation.setCreationTime(new Timestamp(dataReplicaLocationModel.getCreationTime())); - if(dataReplicaLocationModel.getValidUntilTime() > 0) + if(dataReplicaLocationModel.getLastModifiedTime() > 0) dataReplicaLocation.setLastModifiedTime(new Timestamp(dataReplicaLocationModel.getLastModifiedTime())); if(dataReplicaLocationModel.getReplicaLocationCategory() != null) dataReplicaLocation.setReplicaLocationCategory(dataReplicaLocationModel.getReplicaLocationCategory().toString());
