jvanzyl 02/02/21 13:06:31
Modified: . NOTES build-bootstrap.xml default.properties
src/descriptors build.xml
src/test/org/apache/maven/project TestProjectMapper.java
Log:
- updating the project mapper to test for new properties
Revision Changes Path
1.3 +3 -0 jakarta-turbine-maven/NOTES
Index: NOTES
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/NOTES,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOTES 20 Feb 2002 08:11:13 -0000 1.2
+++ NOTES 21 Feb 2002 21:06:30 -0000 1.3
@@ -1,3 +1,6 @@
+!!! if you're developing maven remember to take your maven.jar out of
+your $ANT_LIB/home ... arg.
+
. object model for a java project
the project is the unit of work for alexandria and that's
1.2 +10 -4 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-bootstrap.xml 21 Feb 2002 15:01:06 -0000 1.1
+++ build-bootstrap.xml 21 Feb 2002 21:06:30 -0000 1.2
@@ -14,10 +14,13 @@
<pathelement location="${dom4j.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-util.jar}"/>
+ <pathelement location="${commons-graph.jar}"/>
<pathelement location="${velocity.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${stratum.jar}"/>
- <pathelement location="${dom4j.jar}" />
+ <pathelement location="${dom4j.jar}"/>
+ <pathelement location="${build.dest}"/>
</path>
<!-- ================================================================== -->
@@ -28,6 +31,8 @@
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
<echo message="lib.repo = ${lib.repo}"/>
+
+ <echo message="${commons-graph.jar}"/>
</target>
<!-- ================================================================== -->
@@ -46,16 +51,17 @@
<mkdir dir="work"/>
<taskdef
- name="texen"
- classname="org.apache.velocity.texen.ant.TexenTask">
+ name="create-build-system"
+ classname="org.apache.maven.build.CreateBuildSystem">
<classpath refid="classpath"/>
</taskdef>
- <texen
+ <create-build-system
controlTemplate="Control.vm"
outputDirectory="./work"
templatePath="${src.dir}/templates/build"
outputFile="bootstrap.report"
+ projectDescriptor="project-maven.xml"
/>
</target>
1.5 +1 -0 jakarta-turbine-maven/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 20 Feb 2002 16:20:02 -0000 1.4
+++ default.properties 21 Feb 2002 21:06:30 -0000 1.5
@@ -48,6 +48,7 @@
commons-graph.jar = ${lib.repo}/commons-graph.jar
oro.jar = ${lib.repo}/oro.jar
gnu.regex.jar = ${lib.repo}/gnu-regexp-1.1.4.jar
+maven.jar = ${lib.repo}/maven.jar
workspace = src/descriptors/workspace/jvz.xml
1.2 +1 -1 jakarta-turbine-maven/src/descriptors/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 19 Feb 2002 18:09:58 -0000 1.1
+++ build.xml 21 Feb 2002 21:06:31 -0000 1.2
@@ -34,7 +34,7 @@
extension=".xml"
style="${basedir}/convert-project.dvsl"
includes="**/*.xml"
- toolbox="toolbox.properties"
+ toolboxfile="${basedir}/toolbox.properties"
/>
<dvsl
1.3 +18 -16
jakarta-turbine-maven/src/test/org/apache/maven/project/TestProjectMapper.java
Index: TestProjectMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/TestProjectMapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestProjectMapper.java 19 Feb 2002 23:46:51 -0000 1.2
+++ TestProjectMapper.java 21 Feb 2002 21:06:31 -0000 1.3
@@ -10,8 +10,7 @@
public class TestProjectMapper
extends TestCase
{
- private static String TEST_DOCUMENT =
- "src/test/jakarta-turbine-3.xml";
+ private static String TEST_DOCUMENT = "project-maven.xml";
private static String TEST_CLASS =
"org.apache.maven.project.Project";
@@ -41,9 +40,12 @@
m.setDebug(true);
Project p = (Project) m.map(TEST_DOCUMENT, TEST_CLASS);
- assertEquals("jakarta-turbine-3",p.getName());
- assertEquals("http://jakarta.apache.org/turbine/",p.getUrl());
-
assertEquals("http://cvs.apache.org/viewcvs/jakarta-turbine-3/",p.getCvsWebUrl());
+ assertEquals("jakarta-turbine-maven",p.getName());
+ assertEquals("maven", p.getId());
+ assertEquals("Apache Software Foundation", p.getOrganization());
+ assertEquals("http://jakarta.apache.org/turbine/maven/",p.getUrl());
+
assertEquals("http://cvs.apache.org/viewcvs/jakarta-turbine-maven/",p.getCvsWebUrl());
+ assertEquals("0.1", p.getCurrentVersion());
// Test Mailing List info
assertEquals("Turbine User List",
@@ -54,9 +56,9 @@
((MailingList)p.getMailingLists().get(0)).getUnsubscribe());
// Test Developer List info
- assertEquals("Jeff Brekke",
+ assertEquals("Jauncarlo Arnez",
((Developer)p.getDevelopers().get(0)).getName());
- assertEquals("[EMAIL PROTECTED]",
+ assertEquals("[EMAIL PROTECTED]",
((Developer)p.getDevelopers().get(0)).getEmail());
// Test Dependencies
@@ -67,27 +69,27 @@
assertEquals("0.1",
((Dependency)p.getDependencies().get(0)).getVersion());
-
+
// Test Jar Resources
- assertEquals("include =
conf/*pipeline.xml",(String)p.getBuild().getJarResources().get(0));
+ //assertEquals("include =
conf/*pipeline.xml",(String)p.getBuild().getJarResources().get(0));
// Test Unit Test Classes
- assertEquals("include = **/*Test.class",
- (String)p.getBuild().getUnitTestClassEntries().get(0));
+ //assertEquals("include = **/*Test.class",
+ // (String)p.getBuild().getUnitTestClassEntries().get(0));
// Test Runtime Test Classes
- assertEquals("include = **/*Test.class",
- (String)p.getBuild().getRuntimeTestClassEntries().get(0));
+ //assertEquals("include = **/*Test.class",
+ // (String)p.getBuild().getRuntimeTestClassEntries().get(0));
// Test Source Directories
-
assertEquals("src/java/org",(String)p.getBuild().getSourceDirectories().get(0));
+
//assertEquals("src/java/org",(String)p.getBuild().getSourceDirectories().get(0));
// Test Test Source Directories ;-)
-
assertEquals("src/java/org",(String)p.getBuild().getTestSourceDirectories().get(0));
+
//assertEquals("src/java/org",(String)p.getBuild().getTestSourceDirectories().get(0));
// Test Source Directories
-
assertEquals("src/java/org",(String)p.getBuild().getAspectSourceDirectories().get(0));
+
//assertEquals("src/java/org",(String)p.getBuild().getAspectSourceDirectories().get(0));
}
catch (Exception e)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
