Update of /cvsroot/clirr/clirr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25192
Modified Files:
maven.xml project.properties project.xml
Log Message:
root directory now controls clirr website and multiproject build
Index: maven.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Oct 2003 17:50:56 -0000 1.1
+++ maven.xml 10 Jul 2004 13:48:25 -0000 1.2
@@ -1,27 +1,16 @@
-<?xml version="1.0"?>
-
-<project default="java:jar"
- xmlns:u="jelly:util"
- xmlns:j="jelly:core">
-
- <preGoal name="test:test">
- <attainGoal name="clirr:compiletestlibs"/>
- </preGoal>
-
- <goal name="clirr:compiletestlibs">
- <u:tokenize var="testlibs" delim=", ">${clirr.testlibs}</u:tokenize>
- <j:forEach items="${testlibs}" var="testlib" indexVar="testlibIdx">
-Compiling test input ${testlib}
- <j:set var="testlibclassdir" value="${maven.build.dir}/testinput/${testlib}/classes"/>
- <mkdir dir="${testlibclassdir}"/>
- <javac
- srcdir="${basedir}/src/testinput/${testlib}"
- destdir="${testlibclassdir}"/>
- <jar
- basedir="${testlibclassdir}"
- jarfile="${maven.build.dir}/testinput/${testlib}.jar" />
- </j:forEach>
- </goal>
-
-
- </project>
+<?xml version="1.0"?>
+
+<project default="dist"
+ xmlns:u="jelly:util"
+ xmlns:j="jelly:core">
+
+ <goal name="dist">
+ <j:set var="goal" value="dist"/>
+ <attainGoal name="multiproject:goal"/>
+ </goal>
+
+ <preGoal name="clean">
+ <attainGoal name="multiproject:clean"/>
+ </preGoal>
+
+</project>
Index: project.properties
===================================================================
RCS file: /cvsroot/clirr/clirr/project.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.properties 29 Jun 2004 05:40:20 -0000 1.7
+++ project.properties 10 Jul 2004 13:48:25 -0000 1.8
@@ -23,3 +23,6 @@
# used by test pregoal to generate test input, see maven.xml
clirr.testlibs=testlib-v1, testlib-v2
+
+# place subproject's sites into root context of aggregating site
+maven.multiproject.aggregateDir=
Index: project.xml
===================================================================
RCS file: /cvsroot/clirr/clirr/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 13 Jun 2004 10:29:07 -0000 1.21
+++ project.xml 10 Jul 2004 13:48:25 -0000 1.22
@@ -140,66 +140,20 @@
</contributor>
</contributors>
- <!-- jar files the project is dependent on -->
- <dependencies>
- <dependency>
- <groupId>bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>5.1</version>
- <url>http://jakarta.apache.org/bcel</url>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.5.3-1</version>
- <url>http://ant.apache.org</url>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/commons-cli</url>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
- <url>http://jakarta.apache.org/commons-lang</url>
- </dependency>
- </dependencies>
-
<!-- build information for the project -->
<build>
<nagEmailAddress>cli...@li...</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
-
- <resources>
- <resource>
- <directory>${basedir}/src/conf</directory>
- </resource>
- </resources>
</build>
<reports>
-<!-- <report>maven-changelog-plugin</report> -->
<report>maven-changes-plugin</report>
<report>maven-checkstyle-plugin</report>
-<!-- <report>maven-developer-activity-plugin</report> -->
-<!-- <report>maven-file-activity-plugin</report> -->
<report>maven-javadoc-plugin</report>
<report>maven-jdepend-plugin</report>
<report>maven-junit-report-plugin</report>
<report>maven-jxr-plugin</report>
<report>maven-license-plugin</report>
<!-- <report>maven-linkcheck-plugin</report> -->
-<!-- we got checkstyle already, so who needs pmd... :-) -->
<report>maven-tasklist-plugin</report>
</reports>
|
