smor 2002/07/13 13:18:00
Modified: src/plugins/dependency plugin.jelly
src/java/org/apache/maven/dependency ProjectResolver.java
Log:
o The dependencies should be correctly guessed, now.
o The dependency:checkout-sources goal adds a cvspass entry for each project
Revision Changes Path
1.12 +21 -16 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- plugin.jelly 12 Jul 2002 19:49:39 -0000 1.11
+++ plugin.jelly 13 Jul 2002 20:17:59 -0000 1.12
@@ -6,6 +6,19 @@
xmlns:maven="jelly:maven"
xmlns:dep="depTagLib">
+ <define:taglib uri="depTagLib">
+ <define:jellybean
+ name="packageProjectMap"
+ className="org.apache.maven.dependency.PackageProjectMap"
+ method="execute"
+ />
+ <define:jellybean
+ name="resolveProjects"
+ className="org.apache.maven.dependency.ProjectResolver"
+ method="execute"
+ />
+ </define:taglib>
+
<!-- ================================================================== -->
<!-- P A C K A G E T O P R O J E C T M A P -->
<!-- ================================================================== -->
@@ -18,14 +31,6 @@
name="dependency:package-project-map"
description="Map the packages to project names in a file">
- <define:taglib uri="depTagLib">
- <define:jellybean
- name="packageProjectMap"
- className="org.apache.maven.dependency.PackageProjectMap"
- method="execute"
- />
- </define:taglib>
-
<echo>Generating package to project id map ...</echo>
<echo>descriptorDir: ${maven.descriptorDir}</echo>
@@ -69,6 +74,11 @@
<mkdir dir="${maven.tmpDir}"/>
+ <cvspass
+ cvsRoot="${project.repository.cvsRoot}"
+ password="${project.repository.password}"
+ />
+
<cvs
cvsRoot="${project.repository.cvsRoot}"
package="${project.repository.cvsModule}"
@@ -92,20 +102,15 @@
name="dependency:resolve-projects"
description="Discovers the dependencies from the source code">
- <define:taglib uri="depTagLib">
- <define:jellybean
- name="resolveProjects"
- className="org.apache.maven.dependency.ProjectResolver"
- method="execute"
- />
- </define:taglib>
-
<!--
For each project directory we want to look at the Java sources
and determine the project references.
-->
+ <echo>Discover the depedne ...</echo>
+ <echo>descriptorDir: ${maven.descriptorDir}</echo>
+
<maven:directoryList directory="${maven.tmpDir}"/>
1.3 +8 -5
jakarta-turbine-maven/src/java/org/apache/maven/dependency/ProjectResolver.java
Index: ProjectResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/dependency/ProjectResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectResolver.java 3 Jul 2002 21:50:05 -0000 1.2
+++ ProjectResolver.java 13 Jul 2002 20:17:59 -0000 1.3
@@ -280,15 +280,18 @@
File f = new File(getBase(), "deps.xml");
PrintStream ps = new PrintStream( new FileOutputStream( new
File(getBase(),"deps.xml") ) );
+ ps.println("<project>");
for (Iterator i = projectReferences.iterator(); i.hasNext();)
{
String projectReference = (String) i.next();
- ps.println("<dependency>");
- ps.println("<id>" + projectReference + "</id>");
- ps.println("<version>???</version>");
- ps.println("</dependency>");
+ ps.println(" <dependency>");
+ ps.println(" <id>" + projectReference + "</id>");
+ ps.println(" <version>???</version>");
+ ps.println(" </dependency>");
}
+
+ ps.println("</project>");
ps.flush();
ps.close();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
