jvanzyl 02/04/16 11:17:36
Modified: . build-bootstrap.xml build.xml project.properties
src/test/org/apache/maven/java SourceToolTest.java
xdocs project-descriptor.xml
Log:
Turning the debugging off in the java parser.
Revision Changes Path
1.73 +41 -2 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- build-bootstrap.xml 12 Apr 2002 15:39:16 -0000 1.72
+++ build-bootstrap.xml 16 Apr 2002 18:17:35 -0000 1.73
@@ -296,6 +296,31 @@
<fileset dir="src/images"/>
</copy>
+ <!--
+ Make the examples directory in the Maven install that will
+ allow a user to easily create a sample Maven project.
+ -->
+
+ <copy
+ toDir="${maven.home}/examples"
+ file="src/examples/build-project.xml"
+ />
+
+ <copy
+ toDir="${maven.home}/examples"
+ file="project.xml"
+ />
+
+ <copy
+ toDir="${maven.home}/examples"
+ file="project.properties"
+ />
+
+ <copy
+ toDir="${maven.home}/examples"
+ file="src/templates/build/build.xml"
+ />
+
</target>
<!-- ================================================================== -->
@@ -378,11 +403,25 @@
name="project-map">
<taskdef
+ name="create-classpath"
+ classname="org.apache.maven.ant.CreateClasspath">
+ <classpath>
+ <pathelement location="target/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+ <create-classpath
+ listFile="jars.list"
+ reference="bootstrap-classpath"
+ baseDir="${lib.repo}"
+ />
+
+ <taskdef
name="package-project-map"
classname="org.apache.maven.PackageProjectMap">
- <classpath refid="classpath"/>
+ <classpath refid="bootstrap-classpath"/>
<classpath>
- <pathelement location="${lib.repo}/maven.jar"/>
+ <pathelement location="target/maven.jar"/>
</classpath>
</taskdef>
1.25 +2 -2 jakarta-turbine-maven/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 15 Apr 2002 01:50:16 -0000 1.24
+++ build.xml 16 Apr 2002 18:17:35 -0000 1.25
@@ -34,8 +34,8 @@
<javacc
target="${parserGrammar}"
javacchome="${javacc.home}"
- debugparser="true"
- debugtokenmanager="true"
+ debugparser="false"
+ debugtokenmanager="false"
/>
</target>
1.7 +1 -1 jakarta-turbine-maven/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 11 Apr 2002 06:37:24 -0000 1.6
+++ project.properties 16 Apr 2002 18:17:35 -0000 1.7
@@ -12,7 +12,7 @@
final.name = maven
parserJJTreeGrammar = ${src.dir}/java/org/apache/maven/java/parser/JavaParser.jjt
-outputDirectory = ${build.dir}/src/java/org/apache/maven/java/parser
+outputDirectory = ${src.dir}/java/org/apache/maven/java/parser
parserGrammar = ${src.dir}/java/org/apache/maven/java/parser/JavaParser.jj
nodePackage = org.apache.maven.java.parser
workspace = src/descriptors/workspace/jvz.xml
1.2 +3 -3
jakarta-turbine-maven/src/test/org/apache/maven/java/SourceToolTest.java
Index: SourceToolTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/java/SourceToolTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceToolTest.java 16 Mar 2002 04:54:21 -0000 1.1
+++ SourceToolTest.java 16 Apr 2002 18:17:36 -0000 1.2
@@ -56,10 +56,10 @@
assertEquals("org.apache.turbine.ParameterParser",(String)is.get(8));
// Check the number of methods
- assertEquals(3,dv.getMethods().size());
+ assertEquals(6,dv.getMethods().size());
// Check return types of methods
- assertEquals("void",((Method)dv.getMethods().get(0)).getReturnType());
- assertEquals("Object",((Method)dv.getMethods().get(1)).getReturnType());
+ assertEquals("void",((Method)dv.getMethods().get(1)).getReturnType());
+ assertEquals("Object",((Method)dv.getMethods().get(2)).getReturnType());
}
}
1.20 +4 -2 jakarta-turbine-maven/xdocs/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/project-descriptor.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project-descriptor.xml 15 Apr 2002 08:26:25 -0000 1.19
+++ project-descriptor.xml 16 Apr 2002 18:17:36 -0000 1.20
@@ -23,10 +23,12 @@
href="http://cvs.apache.org/viewcvs/jakarta-turbine-maven/src/dtd/project.xsd";>CVS
Repository</a>. In addition, a sample project descriptor is
presented in the <a href="integrate.html">Integration</a>
- document. For those wondering, yes, Maven's build system is
- built by Maven (we believe in eating our own dog food :)
+ document and there is visual representation of the project descriptor
+ <a href="images/project-descriptor.gif">here</a>. For those wondering,
+ yes, Maven's build system is built by Maven (we believe in eating our own
dog food :)
</p>
</section>
+
<section name="project">
<p>
The <code><project></code> element specifies various
