jvanzyl 01/09/02 12:41:11
Modified: proposal/maven/src/java/org/apache/maven/digester
ModuleDigester.java
Log:
- adjusting module digester to pick up all version info if available
Revision Changes Path
1.2 +10 -5
jakarta-alexandria/proposal/maven/src/java/org/apache/maven/digester/ModuleDigester.java
Index: ModuleDigester.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/maven/src/java/org/apache/maven/digester/ModuleDigester.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModuleDigester.java 2001/08/27 16:35:04 1.1
+++ ModuleDigester.java 2001/09/02 19:41:11 1.2
@@ -11,7 +11,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: ModuleDigester.java,v 1.1 2001/08/27 16:35:04 jvanzyl Exp $
+ * @version $Id: ModuleDigester.java,v 1.2 2001/09/02 19:41:11 jvanzyl Exp $
*/
public class ModuleDigester
extends Digester
@@ -21,8 +21,8 @@
*/
protected boolean configured = false;
- protected String projectClass = "org.apache.maven.bean.Project";
protected String moduleClass = "org.apache.maven.bean.Module";
+ protected String projectClass = "org.apache.maven.bean.Project";
/**
* Parse the content of the specified file using this Digester. Returns
@@ -138,12 +138,17 @@
// consider optional dependencies full dependencies
// for now. We also need the depends inside the
// </ant> tags.
- addCallMethod("module/project/depend", "addDependency", 1);
+ addCallMethod("module/project/depend", "addDependency", 2);
addCallParam("module/project/depend", 0, "project");
- addCallMethod("module/project/option", "addDependency", 1);
+ addCallParam("module/project/depend", 1, "version");
+
+ addCallMethod("module/project/option", "addDependency", 2);
addCallParam("module/project/option", 0, "project");
- addCallMethod("module/project/ant/depend", "addDependency", 1);
+ addCallParam("module/project/option", 1, "version");
+
+ addCallMethod("module/project/ant/depend", "addDependency", 2);
addCallParam("module/project/ant/depend", 0, "project");
+ addCallParam("module/project/ant/depend", 1, "version");
// Collect any Ant specific information that is used
// for creating the ant files for the build process.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
