Hey Christopher,
Looks like you didn't check in FileCopierBase.
Derik
On Aug 6, 2012, at 3:21 PM, [email protected] wrote:
> Author: brooks
> Date: 2012-08-06 15:21:30 -0700 (Mon, 06 Aug 2012)
> New Revision: 30352
>
> Modified:
> trunk/modules/actors/src/org/sdm/spa/actors/transport/BbcpCopier.java
> trunk/modules/actors/src/org/sdm/spa/actors/transport/FileCopierFactory.java
> trunk/modules/actors/src/org/sdm/spa/actors/transport/GenericFileCopier.java
> trunk/modules/actors/src/org/sdm/spa/actors/transport/LocalFileCopier.java
> trunk/modules/actors/src/org/sdm/spa/actors/transport/ScpCopier.java
> trunk/modules/actors/src/org/sdm/spa/actors/transport/SftpCopier.java
> trunk/modules/actors/src/org/sdm/spa/actors/transport/SrmliteCopier.java
> Log:
> Renamed abstract class FileCopier to FileCopierBase so as to differentiate it
> from the other FileCopier.java files
>
> Modified:
> trunk/modules/actors/src/org/sdm/spa/actors/transport/BbcpCopier.java
> ===================================================================
> --- trunk/modules/actors/src/org/sdm/spa/actors/transport/BbcpCopier.java
> 2012-08-06 21:53:11 UTC (rev 30351)
> +++ trunk/modules/actors/src/org/sdm/spa/actors/transport/BbcpCopier.java
> 2012-08-06 22:21:30 UTC (rev 30352)
> @@ -9,7 +9,7 @@
> import org.kepler.ssh.ExecException;
> import org.kepler.ssh.SshException;
> import org.kepler.ssh.SshExec;
> -import org.sdm.spa.actors.transport.FileCopier.CopyResult;
> +import org.sdm.spa.actors.transport.FileCopierBase.CopyResult;
> import org.sdm.spa.actors.transport.vo.ConnectionDetails;
>
> import java.util.ArrayList;
> @@ -36,7 +36,7 @@
> * @author Chandrika Sivaramakrishnan
> *
> */
> -public class BbcpCopier extends FileCopier {
> +public class BbcpCopier extends FileCopierBase {
>
> // /////////////////////Private
> Variables/////////////////////////////////
> private static final Log log = LogFactory
>
> Modified:
> trunk/modules/actors/src/org/sdm/spa/actors/transport/FileCopierFactory.java
> ===================================================================
> ---
> trunk/modules/actors/src/org/sdm/spa/actors/transport/FileCopierFactory.java
> 2012-08-06 21:53:11 UTC (rev 30351)
> +++
> trunk/modules/actors/src/org/sdm/spa/actors/transport/FileCopierFactory.java
> 2012-08-06 22:21:30 UTC (rev 30352)
> @@ -15,7 +15,7 @@
> * @param protocol - the protocol to be used to copy files
> * @return instance of appropriate FileCopier class. Defaults to
> LocalFileCopier
> */
> - public static FileCopier getFileCopier(String protocol){
> + public static FileCopierBase getFileCopier(String protocol){
>
> if("scp".equals(protocol)){
> return new ScpCopier();
>
> Modified:
> trunk/modules/actors/src/org/sdm/spa/actors/transport/GenericFileCopier.java
> ===================================================================
> ---
> trunk/modules/actors/src/org/sdm/spa/actors/transport/GenericFileCopier.java
> 2012-08-06 21:53:11 UTC (rev 30351)
> +++
> trunk/modules/actors/src/org/sdm/spa/actors/transport/GenericFileCopier.java
> 2012-08-06 22:21:30 UTC (rev 30352)
> @@ -354,7 +354,7 @@
> boolean recursiveVal = ((BooleanToken)
> recursive.getToken()).booleanValue();
>
> boolean connectFromDestVal = ((BooleanToken)
> connectFromDest.getToken()).booleanValue(); //Added by Chandrika
> - FileCopier.CopyResult result = null;
> + FileCopierBase.CopyResult result = null;
> String srcFile = "";
> String destFile = "";
> String strSource = "";
> @@ -397,7 +397,7 @@
> }
>
> // Create instance of copier and pass on all the user inputs
> - FileCopier copier = createFileCopier(strSource, strDestination);
> + FileCopierBase copier = createFileCopier(strSource, strDestination);
> //Added by Chandrika - Start
> //set source and destination details
> destDetails.setConnectionOrigin(connectFromDestVal);
> @@ -535,7 +535,7 @@
>
> // Create an instance of copier and set the necessary variables based on
> // the user input
> - private FileCopier createFileCopier(String src, String dest)
> + private FileCopierBase createFileCopier(String src, String dest)
> throws IllegalActionException {
>
> String strProtocol = ((StringToken)
> protocol.getToken()).stringValue()
> @@ -566,7 +566,7 @@
> }
>
>
> - FileCopier copier =
> FileCopierFactory.getFileCopier(strProtocol);
> + FileCopierBase copier =
> FileCopierFactory.getFileCopier(strProtocol);
> String strPathSrc;
> String strPathDest;
> Token temp = null;
>
> Modified:
> trunk/modules/actors/src/org/sdm/spa/actors/transport/LocalFileCopier.java
> ===================================================================
> ---
> trunk/modules/actors/src/org/sdm/spa/actors/transport/LocalFileCopier.java
> 2012-08-06 21:53:11 UTC (rev 30351)
> +++
> trunk/modules/actors/src/org/sdm/spa/actors/transport/LocalFileCopier.java
> 2012-08-06 22:21:30 UTC (rev 30352)
> @@ -11,7 +11,7 @@
> * @author D3X140
> *
> */
> -public class LocalFileCopier extends FileCopier {
> +public class LocalFileCopier extends FileCopierBase {
>
> @Override
> protected CopyResult copyFrom(ConnectionDetails srcDetails, String
> srcFile,
>
> Modified: trunk/modules/actors/src/org/sdm/spa/actors/transport/ScpCopier.java
> ===================================================================
> --- trunk/modules/actors/src/org/sdm/spa/actors/transport/ScpCopier.java
> 2012-08-06 21:53:11 UTC (rev 30351)
> +++ trunk/modules/actors/src/org/sdm/spa/actors/transport/ScpCopier.java
> 2012-08-06 22:21:30 UTC (rev 30352)
> @@ -14,7 +14,7 @@
> import org.kepler.ssh.ExecException;
> import org.kepler.ssh.SshException;
> import org.kepler.ssh.SshExec;
> -import org.sdm.spa.actors.transport.FileCopier.CopyResult;
> +import org.sdm.spa.actors.transport.FileCopierBase.CopyResult;
> import org.sdm.spa.actors.transport.vo.ConnectionDetails;
>
> import com.jcraft.jsch.Session;
> @@ -40,7 +40,7 @@
> * @author Chandrika Sivaramakrishnan
> *
> */
> -public class ScpCopier extends FileCopier {
> +public class ScpCopier extends FileCopierBase {
>
> // /////////////////////Private
> Variables/////////////////////////////////
> private static final Log log =
> LogFactory.getLog(ScpCopier.class.getName());
>
> Modified:
> trunk/modules/actors/src/org/sdm/spa/actors/transport/SftpCopier.java
> ===================================================================
> --- trunk/modules/actors/src/org/sdm/spa/actors/transport/SftpCopier.java
> 2012-08-06 21:53:11 UTC (rev 30351)
> +++ trunk/modules/actors/src/org/sdm/spa/actors/transport/SftpCopier.java
> 2012-08-06 22:21:30 UTC (rev 30352)
> @@ -14,7 +14,7 @@
> import org.kepler.ssh.SftpExec;
> import org.kepler.ssh.SshException;
> import org.kepler.ssh.SshExec;
> -import org.sdm.spa.actors.transport.FileCopier.CopyResult;
> +import org.sdm.spa.actors.transport.FileCopierBase.CopyResult;
> import org.sdm.spa.actors.transport.vo.ConnectionDetails;
>
> /**
> @@ -46,7 +46,7 @@
> *
> */
>
> -public class SftpCopier extends FileCopier {
> +public class SftpCopier extends FileCopierBase {
>
> // private variables
> private static final Log log = LogFactory
>
> Modified:
> trunk/modules/actors/src/org/sdm/spa/actors/transport/SrmliteCopier.java
> ===================================================================
> --- trunk/modules/actors/src/org/sdm/spa/actors/transport/SrmliteCopier.java
> 2012-08-06 21:53:11 UTC (rev 30351)
> +++ trunk/modules/actors/src/org/sdm/spa/actors/transport/SrmliteCopier.java
> 2012-08-06 22:21:30 UTC (rev 30352)
> @@ -15,7 +15,7 @@
> import org.kepler.ssh.LocalExec;
> import org.kepler.ssh.SshException;
> import org.kepler.ssh.SshExec;
> -import org.sdm.spa.actors.transport.FileCopier.CopyResult;
> +import org.sdm.spa.actors.transport.FileCopierBase.CopyResult;
> import org.sdm.spa.actors.transport.vo.ConnectionDetails;
>
> import ptolemy.data.StringToken;
> @@ -51,7 +51,7 @@
> *
> * Anand: We assume that target location is always a directory.
> */
> -public class SrmliteCopier extends FileCopier {
> +public class SrmliteCopier extends FileCopierBase {
>
> // /////////////////////Private
> Variables/////////////////////////////////
> private static final Log log = LogFactory.getLog(SrmliteCopier.class
>
> _______________________________________________
> Kepler-cvs mailing list
> [email protected]
> http://lists.nceas.ucsb.edu/kepler/mailman/listinfo/kepler-cvs
_______________________________________________
Kepler-dev mailing list
[email protected]
http://lists.nceas.ucsb.edu/kepler/mailman/listinfo/kepler-dev
