You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ed...@apache.org on 2004/01/21 19:04:55 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ant DeleteContentTask.java DeleteRCTask.java DeletePoliciesTask.java
edith 2004/01/21 10:04:55
Modified: src/java/org/apache/lenya/cms/ant DeleteContentTask.java
DeleteRCTask.java DeletePoliciesTask.java
Log:
catch delete exception, so that the move don't crash under windows
Revision Changes Path
1.5 +12 -8 cocoon-lenya/src/java/org/apache/lenya/cms/ant/DeleteContentTask.java
Index: DeleteContentTask.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ant/DeleteContentTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteContentTask.java 21 Jan 2004 16:11:44 -0000 1.4
+++ DeleteContentTask.java 21 Jan 2004 18:04:55 -0000 1.5
@@ -119,15 +119,19 @@
File directory = srcFile.getParentFile();
try {
FileUtil.forceDelete(srcFile);
- log("delete file " + srcFile.getAbsolutePath());
- if (directory.exists()
- && directory.isDirectory()
- && directory.listFiles().length == 0) {
+ } catch (IOException e) {
+ //FIXME: catch Exception because of window's delete problem
+ log("exception " + e);
+ }
+ if (directory.exists()
+ && directory.isDirectory()
+ && directory.listFiles().length == 0) {
+ try {
FileUtil.forceDelete(directory);
- log("delete directory " + directory.getAbsolutePath());
+ } catch (IOException e) {
+ //FIXME: catch Exception because of window's delete problem
+ log("exception " + e);
}
- } catch (IOException e) {
- throw new BuildException(e);
}
}
1.2 +40 -28 cocoon-lenya/src/java/org/apache/lenya/cms/ant/DeleteRCTask.java
Index: DeleteRCTask.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ant/DeleteRCTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteRCTask.java 21 Jan 2004 16:11:44 -0000 1.1
+++ DeleteRCTask.java 21 Jan 2004 18:04:55 -0000 1.2
@@ -56,6 +56,8 @@
package org.apache.lenya.cms.ant;
import java.io.File;
+import java.io.IOException;
+
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.SiteTree;
import org.apache.lenya.cms.publication.SiteTreeNode;
@@ -83,45 +85,55 @@
* @see org.apache.lenya.cms.publication.SiteTreeNodeVisitor#visitSiteTreeNode(org.apache.lenya.cms.publication.SiteTreeNode)
*/
public void visitSiteTreeNode(SiteTreeNode node) {
+ Publication publication = getPublication();
+ String publicationPath;
+ String rcmlDirectory;
+ String rcbakDirectory;
try {
- Publication publication = getPublication();
- String publicationPath =
- this.getPublicationDirectory().getCanonicalPath();
- String rcmlDirectory =
+ publicationPath = this.getPublicationDirectory().getCanonicalPath();
+ rcmlDirectory =
new File(publicationPath, this.getRcmldir()).getCanonicalPath();
- String rcbakDirectory =
+ rcbakDirectory =
new File(publicationPath, this.getRcbakdir())
.getCanonicalPath();
+ } catch (IOException e) {
+ throw new BuildException(e);
+ }
- String parentid = node.getAbsoluteParentId();
- String destDocumentid = parentid + "/" + node.getId();
- String srcDocumentid =
- destDocumentid.replaceFirst(
- getSecdocumentid(),
- getFirstdocumentid());
-
- File srcRcmlDir =
- new File(
- rcmlDirectory,
- this.getSrcareadir() + File.separator + srcDocumentid);
+ String parentid = node.getAbsoluteParentId();
+ String destDocumentid = parentid + "/" + node.getId();
+ String srcDocumentid =
+ destDocumentid.replaceFirst(
+ getSecdocumentid(),
+ getFirstdocumentid());
+
+ File srcRcmlDir =
+ new File(
+ rcmlDirectory,
+ this.getSrcareadir() + File.separator + srcDocumentid);
- if (srcRcmlDir.exists()) {
+ if (srcRcmlDir.exists()) {
+ try {
FileUtil.forceDelete(srcRcmlDir);
- log("delete rcml directory " + srcRcmlDir.getAbsolutePath());
+ } catch (IOException e) {
+ //FIXME: catch Exception because of window's delete problem
+ log("exception " + e);
}
+ }
- File srcRcbakDir =
- new File(
- rcbakDirectory,
- this.getSrcareadir() + File.separator + srcDocumentid);
+ File srcRcbakDir =
+ new File(
+ rcbakDirectory,
+ this.getSrcareadir() + File.separator + srcDocumentid);
- if (srcRcbakDir.exists()) {
+ if (srcRcbakDir.exists()) {
+ try {
FileUtil.forceDelete(srcRcbakDir);
- log("delete rcbak directory " + srcRcbakDir.getAbsolutePath());
+ } catch (IOException e) {
+ //FIXME: catch Exception because of window's delete problem
+ log("exception " + e);
}
-
- } catch (Exception e) {
- throw new BuildException(e);
+ log("delete rcbak directory " + srcRcbakDir.getAbsolutePath());
}
}
1.2 +11 -9 cocoon-lenya/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java
Index: DeletePoliciesTask.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeletePoliciesTask.java 21 Jan 2004 16:11:44 -0000 1.1
+++ DeletePoliciesTask.java 21 Jan 2004 18:04:55 -0000 1.2
@@ -122,21 +122,23 @@
log("no policies file to delete");
return;
}
- try {
for (int i = 0; i < authoringPolicies.length; i++) {
+ try {
FileUtil.forceDelete(authoringPolicies[i]);
+ } catch (IOException e) {
+ //FIXME: catch Exception because of window's delete problem
+ log("exception " +e);
+ }
}
if (srcDir.exists() && srcDir.isDirectory() && srcDir.listFiles().length == 0) {
+ try {
FileUtil.forceDelete(srcDir);
- log(
- "delete directory "
- + srcDir.getAbsolutePath());
+ } catch (IOException e) {
+ //FIXME: catch Exception because of window's delete problem
+ log("exception " +e);
+ }
}
- } catch (IOException e) {
- throw new BuildException(e);
- }
-
}
/** (non-Javadoc)
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org