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 2007/04/24 09:29:16 UTC
svn commit: r531801 - in /lenya/trunk/tools/anttasks:
build/classes/org/apache/lenya/cms/ant/ src/org/apache/lenya/cms/ant/
Author: andreas
Date: Tue Apr 24 00:29:15 2007
New Revision: 531801
URL: http://svn.apache.org/viewvc?view=rev&rev=531801
Log:
Updating Ant tasks: changed location of module.xml. Thanks to Richard Frovarp for the patch.
Modified:
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyPublicationsTask.class
lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/GenerateModuleList.class
lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java
lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/GenerateModuleList.java
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyJavaSourcesTask.class?view=diff&rev=531801&r1=531800&r2=531801
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyPublicationsTask.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/CopyPublicationsTask.class?view=diff&rev=531801&r1=531800&r2=531801
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/GenerateModuleList.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/build/classes/org/apache/lenya/cms/ant/GenerateModuleList.class?view=diff&rev=531801&r1=531800&r2=531801
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java?view=diff&rev=531801&r1=531800&r2=531801
==============================================================================
--- lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java (original)
+++ lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyJavaSourcesTask.java Tue Apr 24 00:29:15 2007
@@ -78,7 +78,7 @@
new JavaFilenameFilter(),
this);
// In the case of a module
- } else if (new File(path, "module.xml").isFile()) {
+ } else if (new File(path, "/config/module.xml").isFile()) {
copyContentOfDir(new File(path, this.javaDir),
absoluteBuildDir,
twoTuple,
Modified: lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java?view=diff&rev=531801&r1=531800&r2=531801
==============================================================================
--- lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java (original)
+++ lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/CopyPublicationsTask.java Tue Apr 24 00:29:15 2007
@@ -86,7 +86,7 @@
}
// In the case the pubsRootDir is module dir
- } else if (new File(pubsRootDir, "module.xml").isFile()) {
+ } else if (new File(pubsRootDir, "/config/module.xml").isFile()) {
log("Copy module: " + pubsRootDir);
CopyJavaSourcesTask.copyDir(new File(pubsRootDir), new File(this.toDir.toString()), twoTuple, filter, this);
} else {
Modified: lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/GenerateModuleList.java
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/GenerateModuleList.java?view=diff&rev=531801&r1=531800&r2=531801
==============================================================================
--- lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/GenerateModuleList.java (original)
+++ lenya/trunk/tools/anttasks/src/org/apache/lenya/cms/ant/GenerateModuleList.java Tue Apr 24 00:29:15 2007
@@ -115,7 +115,7 @@
protected static final String NAMESPACE = "http://apache.org/lenya/module-list/1.0";
protected boolean isModuleDirectory(File path) {
- File moduleFile = new File(path, "module.xml");
+ File moduleFile = new File(path, "config" + File.separator + "module.xml");
return moduleFile.isFile();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org