You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2013/03/04 17:20:10 UTC
svn commit: r1452368 - in /airavata/trunk/modules: credential-store/
gfac-core/src/main/java/org/apache/airavata/core/gfac/external/
gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/
gfac-core/src/main/java/org/apache/airavata/core/gfac/p...
Author: heshan
Date: Mon Mar 4 16:20:09 2013
New Revision: 1452368
URL: http://svn.apache.org/r1452368
Log:
AIRAVATA-202 Moving the EC2Provider specific code to the new package hierarchy (as the core.gfac package will be removed.)
Added:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/AbstractProvider.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/EC2Provider.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/EC2Provider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/SSHProvider.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/ContactInfo.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/ContactInfo.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/DataIDType.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/DataIDType.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/FileTransferService.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/FileTransferService.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SSHClient.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SSHClient.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SshFileTransferService.java
- copied, changed from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SshFileTransferService.java
Removed:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/ContactInfo.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/DataIDType.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/FileTransferService.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SSHClient.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SshFileTransferService.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/EC2Provider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java
Modified:
airavata/trunk/modules/credential-store/airavata-credential-store.iml
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
Modified: airavata/trunk/modules/credential-store/airavata-credential-store.iml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/credential-store/airavata-credential-store.iml?rev=1452368&r1=1452367&r2=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/credential-store/airavata-credential-store.iml (original)
+++ airavata/trunk/modules/credential-store/airavata-credential-store.iml Mon Mar 4 16:20:09 2013
@@ -11,10 +11,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/target/maven-shared-archive-resources" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
- <excludeFolder url="file://$MODULE_DIR$/target/generated-sources" />
- <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
- <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
- <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
</content>
<orderEntry type="inheritedJdk" />
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java?rev=1452368&r1=1452367&r2=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/GramProvider.java Mon Mar 4 16:20:09 2013
@@ -47,7 +47,7 @@ import org.apache.airavata.core.gfac.exc
import org.apache.airavata.core.gfac.exception.SecurityException;
import org.apache.airavata.core.gfac.exception.ToolsException;
import org.apache.airavata.core.gfac.external.GridFtp;
-import org.apache.airavata.core.gfac.provider.AbstractProvider;
+import org.apache.airavata.gfac.provider.impl.AbstractProvider;
import org.apache.airavata.core.gfac.provider.utils.GramRSLGenerator;
import org.apache.airavata.core.gfac.provider.utils.JobSubmissionListener;
import org.apache.airavata.core.gfac.utils.GfacUtils;
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java?rev=1452368&r1=1452367&r2=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/LocalProvider.java Mon Mar 4 16:20:09 2013
@@ -32,7 +32,7 @@ import java.util.Map;
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.ProviderException;
-import org.apache.airavata.core.gfac.provider.AbstractProvider;
+import org.apache.airavata.gfac.provider.impl.AbstractProvider;
import org.apache.airavata.core.gfac.provider.utils.InputStreamToFileWriter;
import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.apache.airavata.core.gfac.utils.GfacUtils;
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java?rev=1452368&r1=1452367&r2=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/scheduler/impl/SchedulerImpl.java Mon Mar 4 16:20:09 2013
@@ -38,7 +38,7 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.exception.ProviderException;
import org.apache.airavata.core.gfac.exception.SchedulerException;
import org.apache.airavata.core.gfac.provider.Provider;
-import org.apache.airavata.core.gfac.provider.impl.EC2Provider;
+import org.apache.airavata.gfac.provider.impl.EC2Provider;
import org.apache.airavata.core.gfac.provider.impl.GramProvider;
import org.apache.airavata.core.gfac.provider.impl.LocalProvider;
import org.apache.airavata.core.gfac.scheduler.Scheduler;
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/AbstractProvider.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/AbstractProvider.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/AbstractProvider.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/AbstractProvider.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/AbstractProvider.java Mon Mar 4 16:20:09 2013
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.core.gfac.provider;
+package org.apache.airavata.gfac.provider.impl;
import java.util.Map;
@@ -27,6 +27,7 @@ import org.apache.airavata.common.workfl
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
import org.apache.airavata.core.gfac.exception.*;
import org.apache.airavata.core.gfac.notification.GFacNotifier;
+import org.apache.airavata.core.gfac.provider.Provider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/EC2Provider.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/EC2Provider.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/EC2Provider.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/EC2Provider.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/EC2Provider.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/EC2Provider.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/EC2Provider.java Mon Mar 4 16:20:09 2013
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.core.gfac.provider.impl;
+package org.apache.airavata.gfac.provider.impl;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
@@ -49,7 +49,7 @@ import java.util.List;
// TODO
// import com.sshtools.j2ssh.util.Base64;
-public class EC2Provider extends SSHProvider{
+public class EC2Provider extends SSHProvider {
//private static MLogger log = MLogger.getLogger(GFacConstants.LOGGER_NAME);
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/SSHProvider.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/SSHProvider.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/SSHProvider.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/provider/impl/SSHProvider.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/SSHProvider.java Mon Mar 4 16:20:09 2013
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.core.gfac.provider.impl;
+package org.apache.airavata.gfac.provider.impl;
import java.io.File;
import java.io.IOException;
@@ -44,7 +44,6 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.context.security.impl.SSHSecurityContextImpl;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.exception.ProviderException;
-import org.apache.airavata.core.gfac.provider.AbstractProvider;
import org.apache.airavata.core.gfac.utils.GFacConstants;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.apache.airavata.core.gfac.utils.InputUtils;
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/ContactInfo.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/ContactInfo.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/ContactInfo.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/ContactInfo.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/ContactInfo.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/ContactInfo.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/ContactInfo.java Mon Mar 4 16:20:09 2013
@@ -1,4 +1,4 @@
-package org.apache.airavata.core.gfac.external;
+package org.apache.airavata.gfac.provider.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/DataIDType.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/DataIDType.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/DataIDType.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/DataIDType.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/DataIDType.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/DataIDType.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/DataIDType.java Mon Mar 4 16:20:09 2013
@@ -1,4 +1,4 @@
-package org.apache.airavata.core.gfac.external;
+package org.apache.airavata.gfac.provider.utils;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.xmlpull.v1.builder.XmlElement;
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/FileTransferService.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/FileTransferService.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/FileTransferService.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/FileTransferService.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/FileTransferService.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/FileTransferService.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/FileTransferService.java Mon Mar 4 16:20:09 2013
@@ -1,4 +1,4 @@
-package org.apache.airavata.core.gfac.external;
+package org.apache.airavata.gfac.provider.utils;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.ietf.jgss.GSSCredential;
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SSHClient.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SSHClient.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SSHClient.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SSHClient.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SSHClient.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SSHClient.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SSHClient.java Mon Mar 4 16:20:09 2013
@@ -1,4 +1,4 @@
-package org.apache.airavata.core.gfac.external;
+package org.apache.airavata.gfac.provider.utils;
import com.sshtools.j2ssh.SshClient;
import com.sshtools.j2ssh.authentication.AuthenticationProtocolState;
@@ -16,7 +16,6 @@ import com.sshtools.j2ssh.util.InvalidSt
import org.apache.airavata.core.gfac.exception.GfacException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import xsul.MLogger;
import java.io.File;
import java.io.IOException;
Copied: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SshFileTransferService.java (from r1449433, airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SshFileTransferService.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SshFileTransferService.java?p2=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SshFileTransferService.java&p1=airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SshFileTransferService.java&r1=1449433&r2=1452368&rev=1452368&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/external/SshFileTransferService.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/provider/utils/SshFileTransferService.java Mon Mar 4 16:20:09 2013
@@ -1,22 +1,19 @@
-package org.apache.airavata.core.gfac.external;
+package org.apache.airavata.gfac.provider.utils;
import com.sshtools.j2ssh.SftpClient;
import com.sshtools.j2ssh.SshClient;
import com.sshtools.j2ssh.sftp.SftpFile;
import org.apache.airavata.core.gfac.context.invocation.ExecutionContext;
import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
-import org.apache.airavata.core.gfac.context.security.impl.SSHSecurityContextImpl;
import org.apache.airavata.core.gfac.exception.GfacException;
import org.apache.airavata.core.gfac.utils.GfacUtils;
import org.apache.airavata.schemas.wec.ContextHeaderDocument;
import org.apache.airavata.schemas.wec.SecurityContextDocument;
-import org.apache.airavata.core.gfac.context.invocation.ExecutionContext;
import org.apache.axiom.om.OMElement;
import org.apache.xmlbeans.XmlException;
import org.ietf.jgss.GSSCredential;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import xsul.MLogger;
import javax.xml.stream.XMLStreamException;
import java.io.*;