svn commit: r1592288 - in /oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull: config/ConfigParserMetKeys.java config/PropFilesInfo.java config/RemoteSpecs.java retrievalsystem/RetrievalSetup.java

[bf...@apache.org]

Author: bfoster
Date: Sat May  3 22:28:35 2014
New Revision: 1592288

URL: http://svn.apache.org/r1592288
Log:
- Created deleteOnSuccess option for pushpull config files in RemoteSpecs

OODT-683

Modified:
    oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
    oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java
    oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
    oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java

Modified: oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java?rev=1592288&r1=1592287&r2=1592288&view=diff
==============================================================================
--- oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java (original)
+++ oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ConfigParserMetKeys.java Sat May  3 22:28:35 2014
@@ -84,6 +84,8 @@ public interface ConfigParserMetKeys {
 
     public static final String AFTER_USE_TAG = "afterUse";
 
+    public static final String DELETE_ON_SUCCESS_ATTR = "deleteOnSuccess";
+
     public static final String MOVEON_TO_SUCCESS_ATTR = "moveToOnSuccess";
 
     public static final String MOVEON_TO_FAIL_ATTR = "moveToOnFail";

Modified: oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java?rev=1592288&r1=1592287&r2=1592288&view=diff
==============================================================================
--- oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java (original)
+++ oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/PropFilesInfo.java Sat May  3 22:28:35 2014
@@ -39,6 +39,8 @@ public class PropFilesInfo {
 
     private File localDir;
 
+    private boolean deleteOnSuccess;
+
     private File successLoc;
 
     private File failLoc;
@@ -116,6 +118,14 @@ public class PropFilesInfo {
         return this.localDir;
     }
 
+    public void setDeleteOnSuccess(boolean deleteOnSuccess) {
+        this.deleteOnSuccess = deleteOnSuccess;
+    }
+
+    public boolean getDeleteOnSuccess() {
+      return deleteOnSuccess;
+    }
+
     public String toString() {
         return "PropFilesInfo\n" + "   " + "Local directory: " + this.localDir
                 + "\n" + "   " + "Patterns: " + this.patterns + "\n" + "   "

Modified: oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java?rev=1592288&r1=1592287&r2=1592288&view=diff
==============================================================================
--- oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java (original)
+++ oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java Sat May  3 22:28:35 2014
@@ -223,6 +223,10 @@ public class RemoteSpecs implements Conf
                                 .replaceEnvVariables(afterUse
                                         .getAttribute(MOVEON_TO_FAIL_ATTR)));
                         pfi.setAfterUseEffects(onSuccessDir, onFailDir);
+                        boolean deleteOnSuccess = Boolean.parseBoolean(PathUtils
+                            .replaceEnvVariables(afterUse
+                                    .getAttribute(DELETE_ON_SUCCESS_ATTR)));
+                        pfi.setDeleteOnSuccess(deleteOnSuccess);
                     }
 
                 } else

Modified: oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java?rev=1592288&r1=1592287&r2=1592288&view=diff
==============================================================================
--- oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java (original)
+++ oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/retrievalsystem/RetrievalSetup.java Sat May  3 22:28:35 2014
@@ -244,6 +244,10 @@ public class RetrievalSetup {
 
     private void movePropsFileToFinalDestination(PropFilesInfo pfi,
             File dirstructFile, String errorMsgs) throws IOException {
+        if (pfi.getDeleteOnSuccess()) {
+          dirstructFile.delete();
+          return;
+        }
         File moveToDir = pfi.getFinalDestination(errorMsgs == null);
         moveToDir.mkdirs();
         File newLoc = new File(moveToDir, dirstructFile.getName());