dain 2003/10/21 19:31:13
Modified: . maven.xml project.xml
Log:
Removed the bootlib stuff (bad idea) and used the built in destinations
attribute. This is the way it should have been.
Added 'aggregate' goal which builds just the output target structure.
Revision Changes Path
1.41 +6 -55 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- maven.xml 23 Sep 2003 03:32:13 -0000 1.40
+++ maven.xml 22 Oct 2003 02:31:13 -0000 1.41
@@ -207,11 +207,15 @@
<attainGoal name="modules:default"/>
</goal>
-
<!-- ========================= -->
<!-- Module Output Aggregation -->
<!-- ========================= -->
+ <goal name="aggregate">
+ <attainGoal name="modules:reactor"/>
+ <attainGoal name="modules:aggregate"/>
+ </goal>
+
<!-- Helper tags for module aggregation -->
<define:taglib uri="local:aggregate">
@@ -254,13 +258,6 @@
include="*.jar"/>
</define:tag>
- <define:tag name="bootlib">
- <aggregate:copy
- source="${module.root}/target"
- target="${aggregate.dir}/bootlib"
- include="*.jar"/>
- </define:tag>
-
<define:tag name="default">
<j:if test="${scripts == null || scripts == 'true'}">
<aggregate:scripts/>
@@ -277,10 +274,6 @@
<j:if test="${libraries == null || libraries == 'true'}">
<aggregate:libraries/>
</j:if>
-
- <j:if test="${bootlib == null || bootlib == 'true'}">
- <aggregate:libraries/>
- </j:if>
</define:tag>
</define:taglib>
@@ -332,27 +325,6 @@
<ant:copy todir="${targetDir}"
file="${artifact.path}"/>
</j:forEach>
</j:if>
-
- <j:if test="${dependency.getProperty('bootstrap') ==
'true'}">
- <ant:echo>Processing bootstrap dependency:
${dependency.id}</ant:echo>
-
- <j:choose>
- <j:when
test="${dependency.getProperty('destinations') == null}">
- <j:set var="destinations" value="bootlib"/>
- </j:when>
- <j:otherwise>
- <j:set var="destinations"
value="${dependency.getProperty('destinations')}"/>
- </j:otherwise>
- </j:choose>
-
- <u:tokenize var="destinationSet" delim=","
trim="true">${destinations}</u:tokenize>
-
- <j:forEach var="destination" items="${destinationSet}"
trim="true">
- <j:set var="targetDir"
value="${aggregate.dir}/${destination.trim()}"/>
- <ant:mkdir dir="${targetDir}"/>
- <ant:copy todir="${targetDir}"
file="${artifact.path}"/>
- </j:forEach>
- </j:if>
</j:forEach>
</j:forEach>
@@ -417,11 +389,6 @@
include="*.jar"/>
</goal>
- <goal name="modules:aggregate:geronimo:geronimo-core">
- <!-- Do not do the default libraries stuff -->
- <aggregate:default/>
- </goal>
-
<goal name="modules:aggregate:geronimo:geronimo-web-console">
<!-- Do not do the default libraries stuff -->
<aggregate:default libraries="false"/>
@@ -432,22 +399,6 @@
target="${aggregate.dir}/deploy/jetty"
include="*.war"/>
</goal>
-
- <!--
- <goal name="modules:aggregate:geronimo:geronimo-common">
- <aggregate:default/>
- </goal>
-
- <goal name="modules:aggregate:geronimo:geronimo-twiddle">
- <aggregate:scripts/>
- <aggregate:config/>
- <aggregate:libraries/>
- </goal>
-
- <goal name="modules:aggregate:geronimo:geronimo-core">
- <aggregate:default/>
- </goal>
- -->
<!-- =============================== -->
1.19 +2 -3 incubator-geronimo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 16 Aug 2003 17:15:11 -0000 1.18
+++ project.xml 22 Oct 2003 02:31:13 -0000 1.19
@@ -10,7 +10,7 @@
<!-- ===================== -->
<!-- Module Identification -->
<!-- ===================== -->
-
+
<name>Apache Geronimo</name>
<id>geronimo</id>
<currentVersion>DEV</currentVersion>
@@ -19,5 +19,4 @@
<sourceDirectory></sourceDirectory>
<unitTestSourceDirectory></unitTestSourceDirectory>
</build>
-
</project>
