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 23:36:31 UTC
airavata git commit: fixing destination path issues
Repository: airavata
Updated Branches:
refs/heads/master 5c6899a49 -> 392260101
fixing destination path issues
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/39226010
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/39226010
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/39226010
Branch: refs/heads/master
Commit: 392260101b18f8f5546bc88baa3c6ee060a2305e
Parents: 5c6899a
Author: scnakandala <su...@gmail.com>
Authored: Thu Dec 17 17:36:25 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Dec 17 17:36:25 2015 -0500
----------------------------------------------------------------------
.../data/manager/core/DataManagerImpl.java | 6 +++---
.../data/manager/core/ssh/SSHUtils.java | 3 ++-
.../src/main/resources/datacatalog-mysql.sql | 20 ++++++++++----------
3 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/39226010/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java b/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java
index 75dedbd..9dc707a 100644
--- a/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java
+++ b/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/DataManagerImpl.java
@@ -342,7 +342,7 @@ public class DataManagerImpl implements DataManager {
DataReplicaLocationModel sourceReplica, StorageResourceDescription destStorageResource,
DataMovementInterface destDataMovementInterface, StoragePreference destResourcePreference,
String destinationParentPath)
- throws TException, ApplicationSettingsException, AppCatalogException, JSchException, IOException {
+ throws Exception {
//Creating JSch sessions
//Source session
Properties config = new java.util.Properties();
@@ -391,11 +391,11 @@ public class DataManagerImpl implements DataManager {
Session destSession = destJSch.getSession(destLoginUserName, destHostName, destPort);
destSession.setConfig(config);
destSession.connect();
+
+ SSHUtils.scpThirdParty(sourceFilePath, sourceSession, destinationParentPath, destSession);
if(!destinationParentPath.endsWith(File.separator))
destinationParentPath += File.separator;
String destFilePath = destinationParentPath + (new File(sourceFilePath).getName());
-
- SSHUtils.scpThirdParty(sourceFilePath, sourceSession, destFilePath, destSession);
return destFilePath;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/39226010/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/ssh/SSHUtils.java
----------------------------------------------------------------------
diff --git a/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/ssh/SSHUtils.java b/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/ssh/SSHUtils.java
index de8c157..582cade 100644
--- a/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/ssh/SSHUtils.java
+++ b/modules/data-manager/data-manager-core/src/main/java/org/apache/airavata/data/manager/core/ssh/SSHUtils.java
@@ -267,7 +267,7 @@ public class SSHUtils {
* @return returns the final local file path of the new file came from the remote resource
*/
public static void scpThirdParty(String sourceFile, Session sourceSession, String destinationFile, Session destinationSession) throws
- IOException, JSchException {
+ Exception{
OutputStream sout = null;
InputStream sin = null;
OutputStream dout = null;
@@ -390,6 +390,7 @@ public class SSHUtils {
} catch (Exception e) {
log.error(e.getMessage(), e);
+ throw e;
} finally {
try {
if (dout != null) dout.close();
http://git-wip-us.apache.org/repos/asf/airavata/blob/39226010/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 cb10b5b..04b6715 100644
--- a/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/datacatalog-mysql.sql
@@ -24,12 +24,12 @@ CREATE TABLE DATA_RESOURCE
RESOURCE_ID VARCHAR (255),
GATEWAY_ID VARCHAR (255),
RESOURCE_NAME VARCHAR (255),
- RESOURCE_DESCRIPTION VARCHAR (1024),
+ RESOURCE_DESCRIPTION VARCHAR (255),
OWNER_NAME VARCHAR (255),
PARENT_RESOURCE_ID VARCHAR (255),
RESOURCE_SIZE INT,
- CREATION_TIME TIMESTAMP DEFAULT NULL,
- LAST_MODIFIED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+ CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
+ LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (RESOURCE_ID)
);
@@ -38,12 +38,12 @@ CREATE TABLE DATA_REPLICA_LOCATION
REPLICA_ID VARCHAR (255),
RESOURCE_ID VARCHAR (255) NOT NULL,
REPLICA_NAME VARCHAR (255),
- REPLICA_DESCRIPTION VARCHAR (1024),
+ REPLICA_DESCRIPTION VARCHAR (255),
STORAGE_RESOURCE_ID VARCHAR (255),
- FILE_ABSOLUTE_PATH VARCHAR (4096),
- CREATION_TIME TIMESTAMP DEFAULT NULL,
- LAST_MODIFIED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
- VALID_UNTIL_TIME TIMESTAMP DEFAULT NULL,
+ FILE_ABSOLUTE_PATH VARCHAR (255),
+ CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
+ LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ VALID_UNTIL_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (REPLICA_ID),
FOREIGN KEY (RESOURCE_ID) REFERENCES DATA_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
);
@@ -52,7 +52,7 @@ CREATE TABLE DATA_RESOURCE_METADATA
(
RESOURCE_ID VARCHAR(255),
METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(2048),
+ METADATA_VALUE VARCHAR(255),
PRIMARY KEY(RESOURCE_ID, METADATA_KEY),
FOREIGN KEY (RESOURCE_ID) REFERENCES DATA_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
);
@@ -61,7 +61,7 @@ CREATE TABLE DATA_REPLICA_METADATA
(
REPLICA_ID VARCHAR(255),
METADATA_KEY VARCHAR(255),
- METADATA_VALUE VARCHAR(2048),
+ METADATA_VALUE VARCHAR(255),
PRIMARY KEY(REPLICA_ID, METADATA_KEY),
FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
);