You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/01/09 22:23:57 UTC
svn commit: r124738 - in lenya/trunk/src/java/org/apache/lenya: cms/ant cms/workflow util
Author: gregor
Date: Sun Jan 9 13:23:54 2005
New Revision: 124738
URL: http://svn.apache.org/viewcvs?view=rev&rev=124738
Log:
Completed migration from a.o.l.util.FileUtil to excalibur FileUtil
Removed:
lenya/trunk/src/java/org/apache/lenya/util/FileUtil.java
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyContentTask.java
lenya/trunk/src/java/org/apache/lenya/cms/ant/ResourcePublisher.java
lenya/trunk/src/java/org/apache/lenya/cms/workflow/CMSHistory.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyContentTask.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyContentTask.java?view=diff&rev=124738&p1=lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyContentTask.java&r1=124737&p2=lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyContentTask.java&r2=124738
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyContentTask.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ant/CopyContentTask.java Sun Jan 9 13:23:54 2005
@@ -23,11 +23,11 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.site.Label;
import org.apache.lenya.cms.site.tree.SiteTreeNode;
-import org.apache.lenya.util.FileUtil;
import org.apache.tools.ant.BuildException;
/**
@@ -75,7 +75,7 @@
log("copy file " + srcFile.getAbsolutePath() + "to file " + destFile.getAbsolutePath());
try {
- FileUtil.copy(srcFile.getAbsolutePath(), destFile.getAbsolutePath());
+ FileUtil.copyFile(srcFile, destFile);
} catch (FileNotFoundException e) {
throw new BuildException(e);
} catch (IOException e) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ant/ResourcePublisher.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ant/ResourcePublisher.java?view=diff&rev=124738&p1=lenya/trunk/src/java/org/apache/lenya/cms/ant/ResourcePublisher.java&r1=124737&p2=lenya/trunk/src/java/org/apache/lenya/cms/ant/ResourcePublisher.java&r2=124738
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ant/ResourcePublisher.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ant/ResourcePublisher.java Sun Jan 9 13:23:54 2005
@@ -22,10 +22,10 @@
import java.util.Arrays;
import java.util.List;
+import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.ResourcesManager;
-import org.apache.lenya.util.FileUtil;
import org.apache.tools.ant.BuildException;
/**
@@ -63,7 +63,7 @@
String destPath = liveResource.getAbsolutePath();
log("Copy file [" + resources[i].getAbsolutePath() + "] to [" + destPath + "]");
- FileUtil.copy(resources[i].getAbsolutePath(), destPath);
+ FileUtil.copyFile(resources[i], liveResource);
}
} catch (Exception e) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/workflow/CMSHistory.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/workflow/CMSHistory.java?view=diff&rev=124738&p1=lenya/trunk/src/java/org/apache/lenya/cms/workflow/CMSHistory.java&r1=124737&p2=lenya/trunk/src/java/org/apache/lenya/cms/workflow/CMSHistory.java&r2=124738
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/workflow/CMSHistory.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/workflow/CMSHistory.java Sun Jan 9 13:23:54 2005
@@ -21,10 +21,10 @@
import java.io.File;
+import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentIdToPathMapper;
import org.apache.lenya.cms.publication.Publication;
-import org.apache.lenya.util.FileUtil;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.WorkflowException;
import org.apache.lenya.workflow.impl.History;
@@ -225,6 +225,17 @@
super.delete();
File stopDirectory = new File(getDocument().getPublication().getDirectory(), HISTORY_PATH);
- FileUtil.deleteParentDirs(getHistoryFile(), stopDirectory);
+ if (!stopDirectory.isDirectory())
+ throw new WorkflowException("Stop dir '" + stopDirectory.getAbsolutePath()
+ + "' is not a directory");
+ if (!getHistoryFile().getAbsolutePath().startsWith(stopDirectory.getAbsolutePath()))
+ throw new WorkflowException("Start dir '" + getHistoryFile().getAbsolutePath()
+ + "' is not a descending sibling of stop directory '" + stopDirectory.getAbsolutePath()
+ + "'.");
+
+ File parent = getHistoryFile().getParentFile();
+
+ while (!parent.equals(stopDirectory) && parent.delete())
+ parent = parent.getParentFile();
}
}
Deleted: /lenya/trunk/src/java/org/apache/lenya/util/FileUtil.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/util/FileUtil.java?view=auto&rev=124737
==============================================================================
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org