You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/04/13 00:40:10 UTC
cvs commit: jakarta-jetspeed maven.xml project.xml
sgala 2005/04/12 15:40:09
Modified: . maven.xml project.xml
Log:
changes by Ate (recovered from crashed disk :-) ) to have org.apache.jetspeed.fusion in maven
to manage build including fusion or "classic"
Revision Changes Path
1.40 +13 -5 jakarta-jetspeed/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- maven.xml 3 Apr 2005 20:06:38 -0000 1.39
+++ maven.xml 12 Apr 2005 22:40:09 -0000 1.40
@@ -22,15 +22,16 @@
<goal name="allClean"
description="Clean the master project and all subprojects">
+ <j:if test="${context.getVariable('org.apache.jetspeed.fusion') == 'true'}">
<maven:reactor
basedir="${basedir}"
includes="fusion/project.xml"
excludes=""
goals="clean"
banner="Cleaning"
- ignoreFailures="false"/>
-
- <attainGoal name="clean"/>
+ ignoreFailures="true"/>
+ </j:if>
+ <attainGoal name="clean"/>
</goal>
@@ -95,7 +96,12 @@
<filter token="AUTODEPLOYMENT_PASSWORD" value="${org.apache.jetspeed.services.autodeployment.password}"/>
</filterset>
</copy>
- <j:forEach var="lib" items="${pom.artifacts}">
+
+ <!-- determine fusion dependencies from fusion/project.xml instead of our current pom -->
+ <maven:pom var="fusionPom" projectDescriptor="fusion/project.xml"/>
+
+ <!-- loop through all dependencies and look for custom attr. fusion.include -->
+ <j:forEach var="lib" items="${fusionPom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
<!--<echo>Dep: ${dep.getArtifactId()} ${dep.getProperty('fusion.include')</echo>-->
<j:if test="${dep.getProperty('fusion.include')=='true'}">
@@ -108,6 +114,8 @@
</j:if>
</j:if>
</j:forEach>
+ <!-- add fusion artifact to build too -->
+ <copy todir="${maven.war.webapp.dir}/WEB-INF/lib" file="${basedir}/fusion/target/${fusionPom.artifactId}-${fusionPom.currentVersion}.jar"/>
<!-- define custom task for oeverriding properties -->
<taskdef name="props_override" classname="org.apache.jetspeed.util.ant.OverwritePropertiesTask">
@@ -468,4 +476,4 @@
</java>
</goal>
-</project>
+</project>
\ No newline at end of file
1.60 +3 -3 jakarta-jetspeed/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/project.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- project.xml 4 Jan 2005 17:10:10 -0000 1.59
+++ project.xml 12 Apr 2005 22:40:09 -0000 1.60
@@ -169,7 +169,7 @@
&spring;
&fusion;
&activemq;
-
+<!--
<dependency>
<groupId>jetspeed</groupId>
<artifactId>jetspeed-fusion</artifactId>
@@ -179,7 +179,7 @@
<fusion.include>true</fusion.include>
</properties>
</dependency>
-
+-->
<!--Jetspeed-->
<dependency>
<id>activation</id>
@@ -532,4 +532,4 @@
<report>maven-tasklist-plugin</report>
</reports>
-</project>
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org