antonio 2004/07/12 05:47:29
Modified: . status.xml
src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java
JavaLanguage.java
Added: src/deprecated/java/org/apache/cocoon/util
JavaArchiveFilter.java
Removed: src/java/org/apache/cocoon/util JavaArchiveFilter.java
Log:
Deprecated class o.a.c.util.JavaArchiveFilter.
To be removed in cocoon 2.3. Moved to the deprecated dir
Revision Changes Path
1.397 +5 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- status.xml 11 Jul 2004 23:45:08 -0000 1.396
+++ status.xml 12 Jul 2004 12:47:29 -0000 1.397
@@ -204,6 +204,10 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="AG" type="update">
+ Deprecated class org.apache.cocoon.util.JavaArchiveFilter.
+ To be removed in cocoon 2.3. Moved to the deprecated dir
+ </action>
<action dev="AG" type="update">
Update qdox to 1.5 and jdt-core to 3.0.0.
</action>
1.1
cocoon-2.1/src/deprecated/java/org/apache/cocoon/util/JavaArchiveFilter.java
Index: JavaArchiveFilter.java
===================================================================
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.cocoon.util;
import java.io.File;
import java.io.FileFilter;
/**
* Implements a filter for java archives.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</A>
* @version CVS $Id: JavaArchiveFilter.java,v 1.1 2004/07/12 12:47:29 antonio
Exp $
* @deprecated To be removed in Cocoon 2.3
*/
public class JavaArchiveFilter implements FileFilter {
public boolean accept(File file) {
String name = file.getName().toLowerCase();
return (name.endsWith(".jar") || name.endsWith(".zip"));
}
}
1.3 +9 -3
cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaLanguage.java 11 Jul 2004 20:40:07 -0000 1.2
+++ JavaLanguage.java 12 Jul 2004 12:47:29 -0000 1.3
@@ -16,6 +16,7 @@
package org.apache.cocoon.components.language.programming.java;
import java.io.File;
+import java.io.FileFilter;
import java.io.IOException;
import java.util.List;
import java.util.StringTokenizer;
@@ -37,7 +38,6 @@
import org.apache.cocoon.components.language.programming.CompilerError;
import org.apache.cocoon.components.language.programming.LanguageCompiler;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.cocoon.util.JavaArchiveFilter;
import org.apache.commons.lang.SystemUtils;
/**
@@ -263,7 +263,13 @@
getLogger().warn("Attempted to retrieve directory
listing of non-directory " + dir.toString());
}
} else {
- File[] files = dir.listFiles(new JavaArchiveFilter());
+ File[] files = dir.listFiles(new FileFilter() {
+ public boolean accept(File file) {
+ String name = file.getName().toLowerCase();
+ return (name.endsWith(".jar") ||
name.endsWith(".zip"));
+ }
+ }
+ );
for (int i = 0; i < files.length; i++) {
buffer.append(files[i]).append(File.pathSeparator);
}
