jvanzyl 02/02/21 19:32:55
Modified: . NOTES build-bootstrap.sh build-bootstrap.xml
default.properties project-maven.xml
src/java/org/apache/maven/build BaseProjectTask.java
ProjectProperties.java
src/templates/build Control.vm
Log:
- maven will now bootstrap itself
Revision Changes Path
1.4 +2 -0 jakarta-turbine-maven/NOTES
Index: NOTES
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/NOTES,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NOTES 21 Feb 2002 21:06:30 -0000 1.3
+++ NOTES 22 Feb 2002 03:32:54 -0000 1.4
@@ -1,3 +1,5 @@
+. encourage the use of a central repository of JARs -> ${lib.repo}
+
!!! if you're developing maven remember to take your maven.jar out of
your $ANT_LIB/home ... arg.
1.2 +1 -0 jakarta-turbine-maven/build-bootstrap.sh
Index: build-bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-bootstrap.sh 22 Feb 2002 01:11:51 -0000 1.1
+++ build-bootstrap.sh 22 Feb 2002 03:32:54 -0000 1.2
@@ -18,6 +18,7 @@
# Bootstrap directory of classes needed to generate the
# build system.
+rm -rf work
rm -rf bootstrap
mkdir bootstrap
1.4 +9 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-bootstrap.xml 22 Feb 2002 01:11:51 -0000 1.3
+++ build-bootstrap.xml 22 Feb 2002 03:32:54 -0000 1.4
@@ -27,6 +27,15 @@
projectDescriptor="project-maven.xml"
/>
+ <copy tofile="work/project.xml" file="project-maven.xml"/>
+ <copy tofile="work/maven.jar" file="target/maven.jar"/>
+ <chmod file="work/test.sh" perm="+x"/>
+ <copy todir="work">
+ <fileset dir=".">
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
</target>
</project>
1.6 +2 -1 jakarta-turbine-maven/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/default.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.properties 21 Feb 2002 21:06:30 -0000 1.5
+++ default.properties 22 Feb 2002 03:32:54 -0000 1.6
@@ -35,9 +35,10 @@
parserGrammar = ${src.dir}/java/org/apache/maven/java/parser/JavaParser.jj
nodePackage = org.apache.maven.java.parser
-bcel.jar = ${lib.repo}/bcel.jar
stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
+
+bcel.jar = ${lib.repo}/bcel.jar
dvsl.jar = ${lib.repo}/velocity-dvsl-0.40.jar
log4j.jar = ${lib.repo}/log4j-1.1.3.jar
1.9 +1 -0 jakarta-turbine-maven/project-maven.xml
Index: project-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project-maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project-maven.xml 22 Feb 2002 01:59:54 -0000 1.8
+++ project-maven.xml 22 Feb 2002 03:32:54 -0000 1.9
@@ -184,6 +184,7 @@
</runtimeTestClassEntries>
<sourceDirectories>
+ <sourceDirectory>src/java/org</sourceDirectory>
</sourceDirectories>
<testSourceDirectories>
1.3 +1 -3
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseProjectTask.java 22 Feb 2002 02:08:09 -0000 1.2
+++ BaseProjectTask.java 22 Feb 2002 03:32:54 -0000 1.3
@@ -66,13 +66,11 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.texen.ant.TexenTask;
-import org.apache.commons.graph.Graphable;
-
/**
* 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.2 2002/02/22 02:08:09 jvanzyl Exp $
+ * @version $Id: BaseProjectTask.java,v 1.3 2002/02/22 03:32:54 jvanzyl Exp $
*/
public class BaseProjectTask
extends TexenTask
1.3 +49 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectProperties.java 22 Feb 2002 02:08:09 -0000 1.2
+++ ProjectProperties.java 22 Feb 2002 03:32:54 -0000 1.3
@@ -57,8 +57,13 @@
import java.io.File;
import java.util.Iterator;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
import org.apache.velocity.context.Context;
import org.apache.maven.project.Dependency;
+import org.apache.maven.project.Project;
+
+import org.apache.stratum.xo.Mapper;
/**
* An ant task that takes values from the project descriptor and
@@ -66,25 +71,59 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.2 2002/02/22 02:08:09 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.3 2002/02/22 03:32:54 jvanzyl Exp $
*/
public class ProjectProperties
- extends BaseProjectTask
+ extends Task
{
/**
+ * Project descriptor.
+ */
+ protected File projectDescriptor;
+
+ /**
+ * Project
+ */
+ protected Project mavenProject;
+
+ /**
+ * Set the project descriptor file. This file must exist.
+ */
+ public void setProjectDescriptor (File projectDescriptor)
+ {
+ this.projectDescriptor = projectDescriptor;
+ }
+
+ /**
* Execute the task.
*
* @throws BuildException
*/
- public Context initControlContext()
- throws Exception
+ public void execute()
+ throws BuildException
{
- super.initControlContext();
+ log("Mapping project descriptor ...");
+
+ try
+ {
+ Mapper m = new Mapper();
+ mavenProject = (Project) m.map(projectDescriptor,
+ "org.apache.maven.project.Project");
+
+ }
+ catch (Exception e)
+ {
+ // Propagate the error up the stack so that
+ // the stacktrace will appear in the standard
+ // ant output.
+ throw new BuildException(e);
+ }
+ log("Creating classpath ref ...");
createClasspathReference();
+ log("Creating source set ref ...");
createSourceSetReference();
- return context;
}
// Create the classpath reference
@@ -96,8 +135,10 @@
for (Iterator i = mavenProject.getDependencies().iterator(); i.hasNext();)
{
Dependency dependency = (Dependency) i.next();
+ log(dependency.toString());
Path p = new Path(project);
p.setPath(new File(libRepo, dependency.getJar()).getAbsolutePath());
+ classpath.append(p);
}
project.addReference("classpath", classpath);
@@ -113,8 +154,10 @@
mavenProject.getBuild().getSourceDirectories().iterator();
i.hasNext();)
{
String sourceDirectory = (String) i.next();
+ log(sourceDirectory);
Path p = new Path(project);
p.setPath(new File(sourceDirectory).getAbsolutePath());
+ srcSet.append(p);
}
project.addReference("src.set", srcSet);
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Control.vm 21 Feb 2002 21:03:45 -0000 1.2
+++ Control.vm 22 Feb 2002 03:32:55 -0000 1.3
@@ -1,4 +1,4 @@
-#set ($buildElements =
["build-docs.xml","build-test.xml","build.xml","default.properties","LICENSE","README.txt"])
+#set ($buildElements =
["build-docs.xml","build-test.xml","build.xml","default.properties","LICENSE","README.txt","test.sh"])
$project
$project.name
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
