You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2014/08/04 10:12:54 UTC
svn commit: r1615496 - in /oodt/trunk/protocol/api: pom.xml
src/main/assembly/assembly.xml
src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java
Author: bfoster
Date: Mon Aug 4 08:12:53 2014
New Revision: 1615496
URL: http://svn.apache.org/r1615496
Log:
Updates to Delete Emtpty Directory Action ------ OODT-730
Modified:
oodt/trunk/protocol/api/pom.xml
oodt/trunk/protocol/api/src/main/assembly/assembly.xml
oodt/trunk/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java
Modified: oodt/trunk/protocol/api/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/protocol/api/pom.xml?rev=1615496&r1=1615495&r2=1615496&view=diff
==============================================================================
--- oodt/trunk/protocol/api/pom.xml (original)
+++ oodt/trunk/protocol/api/pom.xml Mon Aug 4 08:12:53 2014
@@ -101,6 +101,11 @@
<artifactId>cas-cli</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-sftp</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Modified: oodt/trunk/protocol/api/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/protocol/api/src/main/assembly/assembly.xml?rev=1615496&r1=1615495&r2=1615496&view=diff
==============================================================================
--- oodt/trunk/protocol/api/src/main/assembly/assembly.xml (original)
+++ oodt/trunk/protocol/api/src/main/assembly/assembly.xml Mon Aug 4 08:12:53 2014
@@ -63,7 +63,15 @@ the License.
<directory>${basedir}/src/main/resources/policy</directory>
<outputDirectory>policy</outputDirectory>
<includes>
- <include>*.xml</include>
+ <include>cmd-line-actions.xml</include>
+ <include>cmd-line-options.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/src/main/java/org/apache/oodt/cas/protocol</directory>
+ <outputDirectory>policy</outputDirectory>
+ <includes>
+ <include>protocol-config.xml</include>
</includes>
</fileSet>
<fileSet>
@@ -83,3 +91,4 @@ the License.
</dependencySet>
</dependencySets>
</assembly>
+
Modified: oodt/trunk/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java
URL: http://svn.apache.org/viewvc/oodt/trunk/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java?rev=1615496&r1=1615495&r2=1615496&view=diff
==============================================================================
--- oodt/trunk/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java (original)
+++ oodt/trunk/protocol/api/src/main/java/org/apache/oodt/cas/protocol/cli/action/DeleteEmptyDirectoriesCliAction.java Mon Aug 4 08:12:53 2014
@@ -20,10 +20,14 @@ package org.apache.oodt.cas.protocol.cli
import java.util.List;
import java.util.regex.Pattern;
+
+
// OODT imports
import org.apache.oodt.cas.cli.exception.CmdLineActionException;
import org.apache.oodt.cas.protocol.Protocol;
+import org.apache.oodt.cas.protocol.ProtocolFactory;
import org.apache.oodt.cas.protocol.ProtocolFile;
+import org.apache.oodt.cas.protocol.verify.ProtocolVerifierFactory;
/**
* {@link ProtocolAction} for deleting empty files from site.
@@ -33,15 +37,22 @@ import org.apache.oodt.cas.protocol.Prot
public class DeleteEmptyDirectoriesCliAction extends ProtocolCliAction {
private String directoryRegex = ".+";
+ private ProtocolVerifierFactory verifierFactory;
@Override
- public void execute(ActionMessagePrinter arg0) throws CmdLineActionException {
+ public void execute(ActionMessagePrinter printer) throws CmdLineActionException {
try {
- Protocol protocol = getProtocolManager().getProtocolBySite(getSite(), getAuthentication(), null);
+ Protocol protocol = getProtocolManager().getProtocolBySite(
+ getSite(), getAuthentication(), verifierFactory.newInstance());
List<ProtocolFile> files = protocol.ls();
for (ProtocolFile file : files) {
if (file.isDir() && Pattern.matches(directoryRegex, file.getName())) {
- protocol.delete(file);
+ try {
+ protocol.delete(file);
+ printer.println("Success: " + file.getPath());
+ } catch (Exception e) {
+ printer.println("Failed: " + file.getPath());
+ }
}
}
} catch (Exception e) {
@@ -52,4 +63,9 @@ public class DeleteEmptyDirectoriesCliAc
public void setDirectoryRegex(String directoryRegex) {
this.directoryRegex = directoryRegex;
}
+
+ public void setVerifierFactory(ProtocolVerifierFactory verifierFactory) {
+ this.verifierFactory = verifierFactory;
+ }
}
+