dion 02/05/01 09:54:31
Modified: src/templates/build Control.vm
src/java/org/apache/maven BaseProjectTask.java
Added: src/templates/build Control-j2ee.vm
Log:
Start of plug-in architecture for extending maven.
Revision Changes Path
1.17 +9 -4 jakarta-turbine-maven/src/templates/build/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/Control.vm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Control.vm 1 May 2002 14:10:09 -0000 1.16
+++ Control.vm 1 May 2002 16:54:31 -0000 1.17
@@ -9,9 +9,8 @@
$buildElements.add("build-maven.xml")
$buildElements.add("build-reactor.xml")
$buildElements.add("build-init.xml")
-$buildElements.add("build-j2ee.xml")
-$buildElements.add("j2ee.properties")
$buildElements.add("default.properties")
+
## -------------------------------------------------------
## Make our list of build.xml delegators
## -------------------------------------------------------
@@ -63,9 +62,15 @@
$files.mkdir($outputDir)
## -------------------------------------------------------
-## Make our list of build-j2ee.xml delegators
+## Call plug-ins
## -------------------------------------------------------
-$delegators.put("war","build-j2ee.xml")
+$plugins.add("j2ee")
+#set ($pluginPrefix = "Control-")
+#set ($pluginSuffix = ".vm")
+#foreach ($plugin in $plugins)
+ #parse("$pluginPrefix$plugin$pluginSuffix")
+#end
+
## -------------------------------------------------------
## Generate all the maven specific build elements that
1.1 jakarta-turbine-maven/src/templates/build/Control-j2ee.vm
Index: Control-j2ee.vm
===================================================================
## -------------------------------------------------------
## Control file for Maven j2ee plug-in
## -------------------------------------------------------
## -------------------------------------------------------
## Add build files to the list
## -------------------------------------------------------
$buildElements.add("build-j2ee.xml")
$buildElements.add("j2ee.properties")
## -------------------------------------------------------
## Make the list of build-j2ee.xml delegators
## -------------------------------------------------------
$delegators.put("war","build-j2ee.xml")
1.8 +2 -1
jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java
Index: BaseProjectTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseProjectTask.java 22 Apr 2002 02:43:32 -0000 1.7
+++ BaseProjectTask.java 1 May 2002 16:54:31 -0000 1.8
@@ -74,7 +74,7 @@
* An ant task for creating an xml schema from an sql schema
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: BaseProjectTask.java,v 1.7 2002/04/22 02:43:32 dion Exp $
+ * @version $Id: BaseProjectTask.java,v 1.8 2002/05/01 16:54:31 dion Exp $
*/
public class BaseProjectTask
extends TexenTask
@@ -136,6 +136,7 @@
"org.apache.maven.project.Project");
context.put("buildElements", new ArrayList());
+ context.put("plugins", new ArrayList());
context.put("delegators", new HashMap());
context.put("project", mavenProject);
context.put("jars", ListTask.getList(listFile));
