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 2003/08/04 12:08:45 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ant CopyJavaSourcesTask.java JavaFilenameFilter.java
gregor 2003/08/04 03:08:45
Modified: src/java/org/apache/lenya/cms/ant CopyJavaSourcesTask.java
Removed: src/java/org/apache/lenya/cms/ant JavaFilenameFilter.java
Log:
replace JavaFilenameFilter with RegexFilenameFilter
Revision Changes Path
1.13 +8 -15 cocoon-lenya/src/java/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
Index: CopyJavaSourcesTask.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CopyJavaSourcesTask.java 23 Jul 2003 13:21:23 -0000 1.12
+++ CopyJavaSourcesTask.java 4 Aug 2003 10:08:45 -0000 1.13
@@ -60,6 +60,8 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
+import org.apache.lenya.util.RegexFilter;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -71,12 +73,13 @@
/**
- * @author <a href="mailto:michael.wechner@apache.org">Michael Wechner</a>
+ * @author <a href="mailto:michi@apache.org">Michael Wechner</a>
*/
public class CopyJavaSourcesTask extends Task {
private Path pubsRootDirs;
private String javaDir;
private String buildDir;
+ private static final String FILENAMEPATTERN = "*\\.java";
/**
*
@@ -88,32 +91,26 @@
File absoluteBuildDir = new File(getProject().getBaseDir(), Project.translatePath(buildDir));
- //System.out.println("CopyJavaSourcesTask.execute(): " + absoluteBuildDir);
- //System.out.println("CopyJavaSourcesTask.execute(): " + pubsRootDirs);
StringTokenizer st = new StringTokenizer(pubsRootDirs.toString(), File.pathSeparator);
while (st.hasMoreTokens()) {
String pubsRootDir = st.nextToken();
- //System.out.println("CopyJavaSourcesTask.execute(): " + pubsRootDir);
File path = new File(pubsRootDir);
if (path.isDirectory()) {
if (new File(path, "publication.xml").isFile()) {
copyContentOfDir(new File(path, javaDir), absoluteBuildDir, twoTuple,
- new JavaFilenameFilter());
+ new RegexFilter(FILENAMEPATTERN));
} else {
// FIXME: Look for publications defined by the file "publication.xml"
String[] pubs = path.list();
for (int i = 0; i < pubs.length; i++) {
- //System.out.println("CopyJavaSourcesTask.execute(): " + pubs[i]);
- File pubJavaDir = new File(path, new File(pubs[i], javaDir).toString());
+ File pubJavaDir = new File(path, new File(pubs[i], javaDir).toString());
- //System.out.println("CopyJavaSourcesTask.execute(): " + pubJavaDir);
- //System.out.println("CopyJavaSourcesTask.execute(): " + absoluteBuildDir);
copyContentOfDir(pubJavaDir, absoluteBuildDir, twoTuple,
- new JavaFilenameFilter());
+ new RegexFilter(FILENAMEPATTERN));
}
}
} else {
@@ -158,7 +155,6 @@
if (file.isFile()) {
copyFile(file, new File(destination, files[i]), twoTuple);
} else if (file.isDirectory()) {
- //System.out.println("CopyJavaSourcesTask.copyDir(): " + source + " " + destination);
copyContentOfDir(file, new File(destination, files[i]), twoTuple, filenameFilter);
} else {
System.err.println(
@@ -166,7 +162,6 @@
}
}
} else {
- //System.err.println("CopyJavaSourcesTask.copyContentOfDir(): No such directory: " + source);
}
}
@@ -181,7 +176,6 @@
if (!parentDest.exists()) {
parentDest.mkdirs();
- //System.out.println("CopyJavaSourcesTask.copyFile(): Directory created: " + parentDest);
int numberOfDirectoriesCreated = twoTuple.x;
numberOfDirectoriesCreated++;
twoTuple.x = numberOfDirectoriesCreated;
@@ -210,7 +204,6 @@
numberOfFilesCopied++;
twoTuple.y = numberOfFilesCopied;
- //System.out.println("CopyJavaSourcesTask.copyFile(): File copied (" + numberOfFilesCopied + "): " + source + " " + destination);
} catch (Exception e) {
System.err.println("CopyJavaSourcesTask.copyFile(): " + e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org