[jboss-svn-commits] JBL Code SVN: r8469 - in labs/jbosslabs/trunk/portal-extensions/jmm: . jmm-portlet

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2006-12-20 18:08:17 -0500 (Wed, 20 Dec 2006)
New Revision: 8469

Modified:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties
   labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
Log:
http://jira.jboss.com/jira/browse/JBLAB-815
fixing fixes...

Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties	2006-12-20 23:05:04 UTC (rev 8468)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties	2006-12-20 23:08:17 UTC (rev 8469)
@@ -2,3 +2,6 @@
 maven.junit.fork=yes
 maven.war.src=${basedir}/src/web
 maven.final.name=${pom.artifactId}
+
+maven.jar.override=on
+maven.jar.jmm-common=${basedir}/../jmm-common/target/jmm-common.jar

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml	2006-12-20 23:05:04 UTC (rev 8468)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml	2006-12-20 23:08:17 UTC (rev 8469)
@@ -13,14 +13,14 @@
 	</goal>
 
 	<goal name="build">
-		<maven:reactor includes="project.xml" excludes="" basedir="jmm-common" 
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-common" 
 			       banner="Building" 
 			       goals="build" ignoreFailures="false" />
-		<maven:reactor includes="project.xml" excludes="" basedir="jmm-portlet" 
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-portlet" 
 			       banner="Building" 
 			       goals="build" ignoreFailures="false" />
        <j:if test="${jmm.deploy.service}">
-			  <maven:reactor includes="project.xml" excludes="" basedir="jmm-service" 
+			  <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-service" 
 			  	   banner="Building" 
 	  		       goals="build" ignoreFailures="false" />
 		</j:if>
@@ -28,11 +28,11 @@
     
 	<goal name="deploy">
 		<ant:copy todir="${local.deploy.dir}" file="jmm-common/target/jmm-common.jar" />
-		<maven:reactor includes="project.xml" excludes="" basedir="jmm-portlet" 
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-portlet" 
 			       banner="Deploy" 
 			       goals="deploy" ignoreFailures="false" />
 		<j:if test="${jmm.deploy.service}">
-             <maven:reactor includes="project.xml" excludes="" basedir="jmm-service" 
+             <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-service" 
 			       banner="Deploy" 
 			       goals="deploy" ignoreFailures="false" />
          </j:if>
@@ -41,25 +41,25 @@
 	<goal name="clean">
 	
 		<!-- A trick to allow us execute scripts in jmm-portlet and jmm-common even if jmm-common.jar is not build -->
-	    <u:file var="file" name="jmm-common/target/jmm-common.jar" />
+ 	    <u:file var="file" name="jmm-common/target/jmm-common.jar" />
 		<j:if test="${!(file.exists())}">
-			<maven:reactor includes="project.xml" excludes="" basedir="jmm-common" 
+			<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-common" 
 			       banner="Building" 
 			       goals="build" ignoreFailures="false" />
 		</j:if>
 		
-		<maven:reactor includes="project.xml" excludes="" basedir="jmm-portlet" 
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-portlet" 
 			       banner="Clean" 
 			       goals="clean" ignoreFailures="false" />
        <j:if test="${jmm.deploy.service}">
-			  <maven:reactor includes="project.xml" excludes="" basedir="jmm-service" 
+			  <maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-service" 
 			  	   banner="Clean" 
 	  		       goals="clean" ignoreFailures="false" />
 		</j:if>
-		<maven:reactor includes="project.xml" excludes="" basedir="jmm-common" 
+		<maven:reactor includes="project.xml" excludes="" basedir="${basedir}/jmm-common" 
 			       banner="Clean" 
 			       goals="clean" ignoreFailures="false" />
-		
+
 	
 		<!-- Clead old "status" files -->
 		<ant:delete file="${local.deploy.dir}/forge-status.war" />