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/22 10:54:12 UTC
svn commit: r416300 - in
/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant:
GenerateModuleList.class GenerateModuleList.java ModuleDescriptor.class
ModuleDescriptor.java ModuleDescriptorList.class ModuleDescriptorList.java
Author: andreas
Date: Thu Jun 22 01:54:12 2006
New Revision: 416300
URL: http://svn.apache.org/viewvc?rev=416300&view=rev
Log:
Build process: Use ant target dependencies to resolve module dependencies
Removed:
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/ModuleDescriptor.class
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/ModuleDescriptor.java
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/ModuleDescriptorList.class
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/ModuleDescriptorList.java
Modified:
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.class
lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.java
Modified: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.class
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.class?rev=416300&r1=416299&r2=416300&view=diff
==============================================================================
Binary files - no diff available.
Modified: lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.java
URL: http://svn.apache.org/viewvc/lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.java?rev=416300&r1=416299&r2=416300&view=diff
==============================================================================
--- lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.java (original)
+++ lenya/trunk/tools/anttasks/org/apache/lenya/cms/ant/GenerateModuleList.java Thu Jun 22 01:54:12 2006
@@ -19,6 +19,8 @@
package org.apache.lenya.cms.ant;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
import org.apache.lenya.xml.AntDocumentHelper;
@@ -41,7 +43,7 @@
*/
public void execute() throws BuildException {
- ModuleDescriptorList descriptors = new ModuleDescriptorList();
+ List descriptors = new ArrayList();
StringTokenizer st = new StringTokenizer(this.moduleDirectories.toString(),
File.pathSeparator);
@@ -74,11 +76,10 @@
try {
Document doc = AntDocumentHelper.createDocument(NAMESPACE, "modules", null);
- ModuleDescriptor[] modules = descriptors.getSortedDescriptors();
+ File[] modules = (File[]) descriptors.toArray(new File[descriptors.size()]);
for (int i = 0; i < modules.length; i++) {
- File path = modules[i].getSourceDir();
Element element = doc.createElementNS(NAMESPACE, "module");
- element.setAttribute("src", path.getAbsolutePath());
+ element.setAttribute("src", modules[i].getAbsolutePath());
doc.getDocumentElement().appendChild(element);
}
File file = new File(this.moduleFile.replace('/', File.separatorChar));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org