jvanzyl 02/02/21 18:08:09
Modified: src/java/org/apache/maven/build BaseProjectTask.java
ProjectProperties.java
Log:
- first stab at building with the project descriptor, trying to build
the classpath and the source directory references to begin with which
are all that are required for the main build.
Revision Changes Path
1.2 +4 -4
jakarta-turbine-maven/src/java/org/apache/maven/build/BaseProjectTask.java
Index: BaseProjectTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/build/BaseProjectTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseProjectTask.java 22 Feb 2002 01:11:03 -0000 1.1
+++ BaseProjectTask.java 22 Feb 2002 02:08:09 -0000 1.2
@@ -72,7 +72,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.1 2002/02/22 01:11:03 jvanzyl Exp $
+ * @version $Id: BaseProjectTask.java,v 1.2 2002/02/22 02:08:09 jvanzyl Exp $
*/
public class BaseProjectTask
extends TexenTask
@@ -90,7 +90,7 @@
/**
* Project
*/
- protected Project project;
+ protected Project mavenProject;
/**
* Set the project descriptor file. This file must exist.
@@ -113,10 +113,10 @@
try
{
Mapper m = new Mapper();
- project = (Project) m.map(projectDescriptor,
+ mavenProject = (Project) m.map(projectDescriptor,
"org.apache.maven.project.Project");
- context.put("project", project);
+ context.put("project", mavenProject);
return context;
}
catch (Exception e)
1.2 +41 -2
jakarta-turbine-maven/src/java/org/apache/maven/build/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/build/ProjectProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectProperties.java 22 Feb 2002 01:11:03 -0000 1.1
+++ ProjectProperties.java 22 Feb 2002 02:08:09 -0000 1.2
@@ -54,7 +54,11 @@
* <http://www.apache.org/>.
*/
+import java.io.File;
+import java.util.Iterator;
+import org.apache.tools.ant.types.Path;
import org.apache.velocity.context.Context;
+import org.apache.maven.project.Dependency;
/**
* An ant task that takes values from the project descriptor and
@@ -62,7 +66,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.1 2002/02/22 01:11:03 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.2 2002/02/22 02:08:09 jvanzyl Exp $
*/
public class ProjectProperties
extends BaseProjectTask
@@ -77,8 +81,43 @@
{
super.initControlContext();
- context.put("developers", project.getDevelopers());
+ createClasspathReference();
+ createSourceSetReference();
return context;
}
+
+ // Create the classpath reference
+ private void createClasspathReference()
+ {
+ Path classpath = new Path(project);
+ String libRepo = project.getProperty("lib.repo");
+
+ for (Iterator i = mavenProject.getDependencies().iterator(); i.hasNext();)
+ {
+ Dependency dependency = (Dependency) i.next();
+ Path p = new Path(project);
+ p.setPath(new File(libRepo, dependency.getJar()).getAbsolutePath());
+ }
+
+ project.addReference("classpath", classpath);
+ }
+
+ // Create the source directories reference
+ private void createSourceSetReference()
+ {
+ Path srcSet = new Path(project);
+ String libRepo = project.getProperty("lib.repo");
+
+ for (Iterator i =
+ mavenProject.getBuild().getSourceDirectories().iterator();
i.hasNext();)
+ {
+ String sourceDirectory = (String) i.next();
+ Path p = new Path(project);
+ p.setPath(new File(sourceDirectory).getAbsolutePath());
+ }
+
+ project.addReference("src.set", srcSet);
+ }
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
