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/06/21 20:27:27 UTC
svn commit: r416059 -
/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
Author: andreas
Date: Wed Jun 21 11:27:27 2006
New Revision: 416059
URL: http://svn.apache.org/viewvc?rev=416059&view=rev
Log:
[minor change] code formatting
Modified:
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
Modified: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java?rev=416059&r1=416058&r2=416059&view=diff
==============================================================================
--- lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java (original)
+++ lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java Wed Jun 21 11:27:27 2006
@@ -58,10 +58,9 @@
if (translatedBuildDir != null && translatedBuildDir.startsWith(File.separator)) {
absoluteBuildDir = new File(translatedBuildDir);
} else {
- absoluteBuildDir = new File(getProject().getBaseDir(),
- translatedBuildDir);
+ absoluteBuildDir = new File(getProject().getBaseDir(), translatedBuildDir);
}
-
+
StringTokenizer st = new StringTokenizer(this.pubsRootDirs.toString(), File.pathSeparator);
while (st.hasMoreTokens()) {
@@ -70,23 +69,33 @@
File path = new File(pubsRootDir);
if (path.isDirectory()) {
- // In the case of a publication
+ // In the case of a publication
if (new File(path, "publication.xml").isFile()) {
- copyContentOfDir(new File(path, this.javaDir), absoluteBuildDir, twoTuple,
- new JavaFilenameFilter(), this);
- // In the case of a module
- } else if (new File(path, "module.xml").isFile()) {
- copyContentOfDir(new File(path, this.javaDir), absoluteBuildDir, twoTuple,
- new JavaFilenameFilter(), this);
+ copyContentOfDir(new File(path, this.javaDir),
+ absoluteBuildDir,
+ twoTuple,
+ new JavaFilenameFilter(),
+ this);
+ // In the case of a module
+ } else if (new File(path, "module.xml").isFile()) {
+ copyContentOfDir(new File(path, this.javaDir),
+ absoluteBuildDir,
+ twoTuple,
+ new JavaFilenameFilter(),
+ this);
} else {
- // FIXME: Look for publications defined by the file "publication.xml" or modules defined by the file "module.xml"
+ // FIXME: Look for publications defined by the file "publication.xml" or modules
+ // defined by the file "module.xml"
String[] pubs = path.list();
for (int i = 0; i < pubs.length; i++) {
File pubJavaDir = new File(path, new File(pubs[i], this.javaDir).toString());
- copyContentOfDir(pubJavaDir, absoluteBuildDir, twoTuple,
- new JavaFilenameFilter(), this);
+ copyContentOfDir(pubJavaDir,
+ absoluteBuildDir,
+ twoTuple,
+ new JavaFilenameFilter(),
+ this);
}
}
} else {
@@ -141,15 +150,18 @@
if (file.isFile()) {
copyFile(file, new File(destination, files[i]), twoTuple, client, false);
} else if (file.isDirectory()) {
- copyContentOfDir(file, new File(destination, files[i]), twoTuple,
- filenameFilter, client);
+ copyContentOfDir(file,
+ new File(destination, files[i]),
+ twoTuple,
+ filenameFilter,
+ client);
} else {
- client.log(
- "CopyJavaSourcesTask.copyContentOfDir(): Neither file nor directory: "
- + file, Project.MSG_ERR);
+ client.log("CopyJavaSourcesTask.copyContentOfDir(): Neither file nor directory: "
+ + file,
+ Project.MSG_ERR);
}
}
- }
+ }
}
/**
@@ -159,7 +171,8 @@
* @param twoTuple The twoTuple to use
* @param client The client task
*/
- public static void copyFile(File source, File destination, TwoTuple twoTuple, Task client, boolean force) {
+ public static void copyFile(File source, File destination, TwoTuple twoTuple, Task client,
+ boolean force) {
if (source.isFile()) {
File parentDest = new File(destination.getParent());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org