jvanzyl 2002/07/05 18:58:06
Modified: src/plugins/dependency createpom.dvsl plugin.jelly
Log:
o Applying stephane's patches.
Revision Changes Path
1.2 +3 -3 jakarta-turbine-maven/src/plugins/dependency/createpom.dvsl
Index: createpom.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/dependency/createpom.dvsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- createpom.dvsl 5 Jul 2002 20:35:05 -0000 1.1
+++ createpom.dvsl 6 Jul 2002 01:58:06 -0000 1.2
@@ -18,15 +18,15 @@
#end
# ============================================================================ #
-# Here, we check that the file "deps.xml" that we created in #
-# ${maven.tmpDir}/${project.id} exists, and if so, the file is parsed and the #
+# Here, we check that the file "deps.xml" that we created in the plugin dir of #
+# maven's tmp dir exists, and if so, the file is parsed and the #
# dependencies are added to the POM. #
# ============================================================================ #
#match("dependencies")
<dependencies>
#if(
$context.toolbox.fileutil.file("$context.toolbox.projectDependencies").exists() )
- #set( $deps =
$node.selectNodes("document('$context.toolbox.projectDependencies')") )
+ #set( $deps =
$node.selectNodes("document('$context.toolbox.projectDependencies')/project/*") )
#foreach( $dep in $deps )
<dependency>
<id>$!dep.id</id>
1.9 +32 -10 jakarta-turbine-maven/src/plugins/dependency/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/dependency/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 5 Jul 2002 21:48:19 -0000 1.8
+++ plugin.jelly 6 Jul 2002 01:58:06 -0000 1.9
@@ -15,7 +15,8 @@
<!-- ================================================================== -->
<goal
- name="package-project-map">
+ name="dependency:package-project-map"
+ description="Map the packages to project names in a file">
<define:taglib uri="depTagLib">
<define:jellybean
@@ -39,13 +40,14 @@
<!-- C H E C K O U T S O U R C E S -->
<!-- ================================================================== -->
<!-- This takes the POMs in the subdirectories of -->
- <!-- ${maven.descriptorDir}, retrieves the CVS info, and checks out the -->
+ <!-- maven's descriptor dir, retrieves the CVS info, and checks out the -->
<!-- source to ${maven.tmpDir}. We need to check if the project has -->
<!-- already been checked out, and then simply update the project. -->
<!-- ================================================================== -->
<goal
- name="checkout-sources">
+ name="dependency:checkout-sources"
+ description="Check out the sources of the projects">
<fileScanner var="scanner">
<fileset dir="${maven.descriptorDir}" includes="**/project.xml"/>
@@ -87,7 +89,8 @@
<!-- ================================================================== -->
<goal
- name="resolve-projects">
+ name="dependency:resolve-projects"
+ description="Discovers the dependencies from the source code">
<define:taglib uri="depTagLib">
<define:jellybean
@@ -129,7 +132,8 @@
<!-- POM. -->
<!-- ================================================================== -->
- <goal name="dependencies-to-pom">
+ <goal name="dependency:dependencies-to-pom"
+ description="Put the generated dependencies back to the POM">
<fileScanner var="scanner">
<fileset dir="${maven.descriptorDir}" includes="**/project.xml"/>
@@ -191,22 +195,40 @@
<!-- ================================================================= -->
<goal
- name="process-project-descriptors">
+ name="dependency:process-project-descriptors"
+ description="Map the packages to dependencies, check out the sources,
+ discover the dependencies and update the POM">
+ <attainGoal name="dependency:package-project-map"/>
<!--
Until we can't simply update the sources instead of checking them out
everytime, it's wiser to do it by hand.
- <attainGoal name="package-project-map"/>
- <attainGoal name="checkout-sources"/>
+ <attainGoal name="dependency:checkout-sources"/>
-->
- <attainGoal name="resolve-projects"/>
- <attainGoal name="dependencies-to-pom"/>
+ <attainGoal name="dependency:resolve-projects"/>
+ <attainGoal name="dependency:dependencies-to-pom"/>
<!-- Then, we need to put those dependencies back into the POM -->
+
+ </goal>
+
+ <!-- ================================================================== -->
+ <!-- D E F A U L T G O A L F O R T H I S P L U G I N -->
+ <!-- ================================================================== -->
+ <!-- Map the packages to dependencies, check out the sources, -->
+ <!-- discover the dependencies and update the POM -->
+ <!-- ================================================================== -->
+
+ <goal
+ name="dependency"
+ description="Map the packages to dependencies, check out the sources,
+ discover the dependencies and update the POM">
+
+ <attainGoal name="dependency:process-project-descriptors"/>
</goal>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
