You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/04/30 18:45:03 UTC
svn commit: r398376 - in
/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya: ac/file/ cms/ant/
cms/publication/ cms/publication/util/ cms/scheduler/
Author: antonio
Date: Sun Apr 30 09:45:01 2006
New Revision: 398376
URL: http://svn.apache.org/viewcvs?rev=398376&view=rev
Log:
Use commons-io instead of creating nested annonymous classes.
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FilePolicyManager.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/ResourcesManager.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/util/LinkRewriter.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FilePolicyManager.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FilePolicyManager.java?rev=398376&r1=398375&r2=398376&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FilePolicyManager.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/file/FilePolicyManager.java Sun Apr 30 09:45:01 2006
@@ -36,6 +36,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.util.NetUtils;
+import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.lenya.ac.AccessControlException;
@@ -82,6 +83,9 @@
protected static final String SUBTREE_FILENAME = "subtree-policy.acml";
protected static final String USER_ADMIN_URL = "/admin/users/";
+ private static final FileFilter POLICY_ACML_FILEFILTER =
+ FileFilterUtils.orFileFilter(FileFilterUtils.nameFileFilter(SUBTREE_FILENAME), FileFilterUtils.nameFileFilter(URL_FILENAME));
+
/**
* Builds the URL policy for a URL from a file. When the file is not present, an empty policy is
* returned.
@@ -394,12 +398,7 @@
protected void removeAccreditable(AccreditableManager manager, Accreditable accreditable,
File policyDirectory) throws AccessControlException {
- File[] policyFiles = policyDirectory.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.getName().equals(SUBTREE_FILENAME)
- || file.getName().equals(URL_FILENAME);
- }
- });
+ File[] policyFiles = policyDirectory.listFiles(POLICY_ACML_FILEFILTER);
try {
RemovedAccreditablePolicyBuilder builder = new RemovedAccreditablePolicyBuilder(manager);
@@ -422,16 +421,11 @@
throw new AccessControlException(e);
}
- File[] directories = policyDirectory.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.isDirectory();
- }
- });
+ File[] directories = policyDirectory.listFiles((FileFilter)FileFilterUtils.directoryFileFilter());
for (int i = 0; i < directories.length; i++) {
removeAccreditable(manager, accreditable, directories[i]);
}
-
}
/**
@@ -488,5 +482,4 @@
}
}
}
-
-}
\ No newline at end of file
+}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java?rev=398376&r1=398375&r2=398376&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/CopyPoliciesTask.java Sun Apr 30 09:45:01 2006
@@ -20,7 +20,6 @@
package org.apache.lenya.cms.ant;
import java.io.File;
-import java.io.FileFilter;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
@@ -60,18 +59,13 @@
* @param directory The directory
* @return List of files
*/
- public File[] getFiles(File directory) {
- FileFilter filter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isFile();
- }
- };
- if (directory.exists() && directory.isDirectory()) {
- return directory.listFiles(filter);
- }
- return null;
- }
+ public File[] getFiles(File directory) {
+ if (directory.exists() && directory.isDirectory()) {
+ return FileUtils.convertFileCollectionToFileArray(
+ FileUtils.listFiles(directory, null, false));
+ }
+ return null;
+ }
/**
* Copies the policies file
@@ -133,7 +127,6 @@
+ destDocumentid);
copyPolicies(srcLiveDir, destLiveDir);
-
} else if (
destArea.equals(Publication.ARCHIVE_AREA)
| destArea.equals(Publication.TRASH_AREA)) {
@@ -165,7 +158,6 @@
+ destDocumentid);
copyPolicies(srcLiveDir, destLiveDir);
-
}
} else if (
srcArea.equals(Publication.ARCHIVE_AREA)
@@ -201,7 +193,6 @@
+ destDocumentid);
copyPolicies(srcLiveDir, destLiveDir);
-
}
}
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java?rev=398376&r1=398375&r2=398376&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/ant/DeletePoliciesTask.java Sun Apr 30 09:45:01 2006
@@ -62,18 +62,13 @@
* @param directory The directory
* @return List of files
*/
- public File[] getFiles(File directory) {
- FileFilter filter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isFile();
- }
- };
- if (directory.exists() && directory.isDirectory()) {
- return directory.listFiles(filter);
- }
- return null;
- }
+ public File[] getFiles(File directory) {
+ if (directory.exists() && directory.isDirectory()) {
+ return FileUtils.convertFileCollectionToFileArray(
+ FileUtils.listFiles(directory, null, false));
+ }
+ return null;
+ }
/**
* Delte the policies file
@@ -90,16 +85,15 @@
FileUtils.forceDelete(authoringPolicies[i]);
} catch (IOException e) {
//FIXME: catch Exception because of window's delete problem
- log("exception " +e);
+ log("exception " + e);
}
-
}
if (srcDir.exists() && srcDir.isDirectory() && srcDir.listFiles().length == 0) {
try {
FileUtils.forceDelete(srcDir);
} catch (IOException e) {
//FIXME: catch Exception because of window's delete problem
- log("exception " +e);
+ log("exception " + e);
}
}
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/ResourcesManager.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/ResourcesManager.java?rev=398376&r1=398375&r2=398376&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/ResourcesManager.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/ResourcesManager.java Sun Apr 30 09:45:01 2006
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ResourcesManager.java,v 1.13 2004/08/26 22:18:52 roku Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publication;
@@ -123,7 +123,6 @@
if (getPath().isDirectory()) {
files = getPath().listFiles(filter);
}
-
return files;
}
@@ -159,7 +158,7 @@
file.getName().equals(resource.getName().concat(RESOURCES_META_SUFFIX));
}
};
-
+
final File[] metaFiles = getFiles(filter);
assert(metaFiles.length == 0);
return metaFiles[0];
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/util/LinkRewriter.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/util/LinkRewriter.java?rev=398376&r1=398375&r2=398376&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/util/LinkRewriter.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/util/LinkRewriter.java Sun Apr 30 09:45:01 2006
@@ -22,7 +22,7 @@
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuilder;
import org.apache.lenya.cms.publication.Publication;
@@ -40,20 +40,7 @@
*/
public class LinkRewriter {
- private FileFilter directoryFilter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isDirectory();
- }
- };
-
- private FileFilter xmlFileFilter = new FileFilter() {
-
- public boolean accept(File file) {
- return file.isFile() && FilenameUtils.getExtension(file.getName()).equals("xml");
- }
- };
-
+ private FileFilter xmlFileFilter = FileFilterUtils.suffixFileFilter(".xml");
/**
* Ctor.
*/
@@ -177,7 +164,7 @@
List list = new ArrayList();
- File[] directories = directory.listFiles(directoryFilter);
+ File[] directories = directory.listFiles((FileFilter)FileFilterUtils.directoryFileFilter());
for (int i = 0; i < directories.length; i++) {
list.addAll(getDocumentFiles(directories[i]));
}
@@ -185,5 +172,4 @@
list.addAll(Arrays.asList(xmlFiles));
return list;
}
-
-}
\ No newline at end of file
+}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java?rev=398376&r1=398375&r2=398376&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java Sun Apr 30 09:45:01 2006
@@ -39,6 +39,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.lenya.cms.publication.DocumentBuildException;
import org.apache.lenya.cms.publication.Publication;
import org.apache.lenya.cms.publication.PublicationException;
@@ -349,11 +350,7 @@
File publicationsDirectory =
new File(getServletContextDirectory(), PublishingEnvironment.PUBLICATION_PREFIX);
- File[] publicationDirectories = publicationsDirectory.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.isDirectory();
- }
- });
+ File[] publicationDirectories = publicationsDirectory.listFiles((FileFilter)FileFilterUtils.directoryFileFilter());
log.debug("=========================================");
log.debug(" Restoring jobs.");
@@ -408,7 +405,6 @@
String value = (String) map.get(keys[i]);
requestUri += keys[i] + "=" + value;
}
-
return requestUri;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org