[jboss-svn-commits] JBL Code SVN: r8461 - in labs/jbosslabs/trunk/portal-extensions/jmm: . jmm-common jmm-portlet jmm-service jmm-service/src/java/org/jboss/forge/jmm/service/impl/shotoku

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Dec 20 17:03:38 EST 2006


Author: wrzep
Date: 2006-12-20 17:03:29 -0500 (Wed, 20 Dec 2006)
New Revision: 8461

Added:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties.sample
   labs/jbosslabs/trunk/portal-extensions/jmm/project.xml
Removed:
   labs/jbosslabs/trunk/portal-extensions/jmm/common.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties
Modified:
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/shotoku/ShotokuScoresRepositoryManager.java
   labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
   labs/jbosslabs/trunk/portal-extensions/jmm/project.properties
Log:
http://jira.jboss.com/jira/browse/JBLAB-815
Hacking Maven.
Pawel


Deleted: labs/jbosslabs/trunk/portal-extensions/jmm/common.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/common.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/common.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!-- 
-  JBoss, the OpenSource J2EE webOS
-  Distributable under LGPL license.
-  See terms of license at gnu.org. 
- -->
-<project>
-    <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
-    <id>jmm-common</id>
-    <name>JEMS Maturity Matrix Common Library</name>
-    <currentVersion>1.0</currentVersion>
-    <organization>
-        <name>Pawel Wrzeszcz</name>
-        <url></url>
-    </organization>
-    <description></description>
-    <dependencies/>
-</project>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/maven.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -4,23 +4,20 @@
   See terms of license at gnu.org. 
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
-	<!-- Default war-project goals -->
 
 	<goal name="all">
-		<attainGoal name="module-all" />
+		<attainGoal name="clean" />	
+		<attainGoal name="build" />
 	</goal>
 
 	<goal name="build">
-		<attainGoal name="jar" />	
-		<ant:copy toDir="${maven.repo.local}/jboss-forge/jars/" file="target/${maven.final.name}.jar" overwrite="true"/>
+		<attainGoal name="jar" />
 	</goal>
-    
-	<goal name="deploy">	
-		<ant:copy todir="${local.deploy.dir}" file="target/${maven.final.name}.jar" />
-	</goal>
+
 	
 	<goal name="clean">
-		<attainGoal name="module-clean" />
+		<ant:delete dir="${maven.build.dir}"/>
+		<ant:delete dir="${maven.build.dest}"/>
 	</goal>
 
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-common/project.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -6,7 +6,7 @@
  -->
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
+<!--     <extend>../project.xml</extend>  -->
     <id>jmm-common</id>
     <name>JEMS Maturity Matrix Common Library</name>
     <currentVersion>1.0</currentVersion>
@@ -30,6 +30,14 @@
 	    <version>1.0</version>
 	    <jar>shotoku-base.jar</jar>
 	</dependency>
+	
+	<dependency>
+            <groupId>jboss</groupId>
+            <artifactId>jboss-jmx</artifactId>
+            <version>1.0</version>
+            <jar>jboss-jmx.jar</jar>
+        </dependency>
+	
 
   <!-- JBoss EJB3 dependencies -->
 
@@ -71,7 +79,10 @@
 		<version>2.0</version>
 		<jar>jaxb-api.jar</jar>
         </dependency>
- 
  	   
     </dependencies>
+    
+    	 <build>
+        <sourceDirectory>src/java</sourceDirectory>
+    </build>
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/maven.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -7,7 +7,9 @@
 	<!-- Default war-project goals -->
 
 	<goal name="all">
-		<attainGoal name="module-all" />
+		<attainGoal name="clean" />	
+		<attainGoal name="build" />
+		<attainGoal name="deploy" />
 	</goal>
 
 	<goal name="build">
@@ -21,8 +23,9 @@
 	</goal>
 	
 	<goal name="clean">
-	        <ant:delete file="${local.deploy.dir}/forge-jmm.war"/>
-		<attainGoal name="module-clean" />
+	    <ant:delete file="${local.deploy.dir}/forge-jmm.war"/>
+		<ant:delete dir="${maven.build.dir}"/>
+		<ant:delete dir="${maven.build.dest}"/>
 	</goal>
 	
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.properties	2006-12-20 22:03:29 UTC (rev 8461)
@@ -1,4 +1,4 @@
 maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/
 maven.junit.fork=yes
 maven.war.src=${basedir}/src/web
-maven.final.name=${pom.artifactId}
\ No newline at end of file
+maven.final.name=${pom.artifactId}

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-portlet/project.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -6,7 +6,7 @@
  -->
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
+    <extend>../project.xml</extend>
     <id>jmm</id>
     <name>JEMS Maturity Matrix Portlet</name>
     <currentVersion>1.0</currentVersion>
@@ -29,7 +29,7 @@
 	</dependency>
 
 	<dependency>
-	    <groupId>jboss-forge</groupId>
+	    <groupId>jmm</groupId>
 	    <artifactId>jmm-common</artifactId>
 	    <jar>jmm-common.jar</jar>
 	    <properties>                


Property changes on: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service
___________________________________________________________________
Name: svn:ignore
   - target


   + target
build.properties




Deleted: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties	2006-12-20 22:03:29 UTC (rev 8461)
@@ -1,3 +0,0 @@
-# Path to JBoss AS for JMM service
-jmm.service.server.dir=${local.server.dir}
-jmm.service.deploy.dir=${jmm.service.server.dir}/server/all/deploy
\ No newline at end of file

Added: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties.sample
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties.sample	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/build.properties.sample	2006-12-20 22:03:29 UTC (rev 8461)
@@ -0,0 +1,3 @@
+# Path to JBoss AS for JMM service
+jmm.service.server.dir=
+jmm.service.deploy.dir=${jmm.service.server.dir}/server/all/deploy
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/maven.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -3,11 +3,12 @@
   Distributable under LGPL license.
   See terms of license at gnu.org. 
  -->
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
-	<!-- Default war-project goals -->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" xmlns:maven="jelly:maven">
 
 	<goal name="all">
-		<attainGoal name="module-all" />
+		<attainGoal name="clean" />	
+		<attainGoal name="build" />
+		<attainGoal name="deploy" />
 	</goal>
 
 	<goal name="build">
@@ -59,13 +60,28 @@
 	</goal>
 	
 	<goal name="clean">
-		<attainGoal name="module-clean" />
+		<ant:delete dir="${maven.build.dir}"/>
+		<ant:delete dir="${maven.build.dest}"/>
 	</goal>
 
 	<goal name="install">
 	       	<ant:copy todir="${jmm.service.server.dir}/server/all/lib"
 		                  file="etc/mysql-connector-java-3.1.12-bin.jar" />
 	</goal>
+	
+	<goal name="help">
+	<echo>
+JEMS Maturity Matrix
+		
+Please note that the default configuration affects only JMM portlet and common libraries.
+		
+If you want to build/deploy the JMM service, please create or modify the following files:
+1. build.properties
+2. jmm-service/build.properties
+3. jmm-service/conf/JMM-ds.xml
+and execute "maven install".
 
-	
+JMM service depends on the JMM common libraries that can be build by executing "maven build" in the ../jmm-common directory.
+	</echo>
+	</goal>
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.properties	2006-12-20 22:03:29 UTC (rev 8461)
@@ -4,6 +4,9 @@
 
 maven.ejb.includes=**/service/**,**/META-INF/**
 
+maven.jar.override=on
+maven.jar.jmm-common=${basedir}/../jmm-common/target/jmm-common.jar
+
 jmm.service.final.name=jmm-service.ejb3
 jmm.common.final.name=jmm-common.jar
 jmm.service.sar=jmm-service.sar/
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/project.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -6,7 +6,6 @@
  -->
 <project>
     <pomVersion>3</pomVersion>
-    <extend>../common.xml</extend>
     <id>jmm-service</id>
     <name>JEMS Maturity Matrix Service</name>
     <currentVersion>1.0</currentVersion>
@@ -29,7 +28,7 @@
 	</dependency>
 
 	<dependency>
-	    <groupId>jboss-forge</groupId>
+	    <groupId>jmm</groupId>
 	    <artifactId>jmm-common</artifactId>
 	    <jar>jmm-common.jar</jar>
 	    <properties>
@@ -128,4 +127,8 @@
         </dependency>
 	   
     </dependencies>
+    
+     <build>
+        <sourceDirectory>src/java</sourceDirectory>
+    </build>
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/shotoku/ShotokuScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/shotoku/ShotokuScoresRepositoryManager.java	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/jmm-service/src/java/org/jboss/forge/jmm/service/impl/shotoku/ShotokuScoresRepositoryManager.java	2006-12-20 22:03:29 UTC (rev 8461)
@@ -22,6 +22,16 @@
 
 package org.jboss.forge.jmm.service.impl.shotoku;
 
+
+import java.util.Calendar;
+
+import org.jboss.forge.jmm.common.exceptions.GetScoresException;
+import org.jboss.forge.jmm.common.exceptions.ScoresSaveException;
+import org.jboss.forge.jmm.common.protocol.ScoresRepositoryManager;
+import org.jboss.forge.jmm.common.protocol.conf.PluginValues;
+import org.jboss.forge.jmm.common.protocol.conf.PluginsValues;
+
+/*
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -35,17 +45,17 @@
 import org.jboss.forge.jmm.common.Locations;
 import org.jboss.forge.jmm.common.exceptions.GetScoresException;
 import org.jboss.forge.jmm.common.exceptions.ScoresSaveException;
-import org.jboss.forge.jmm.common.protocol.ScoresRepositoryManager;
 import org.jboss.forge.jmm.common.protocol.conf.PluginValues;
 import org.jboss.forge.jmm.common.protocol.conf.PluginsValues;
 import org.jboss.logging.Logger;
+
 import org.jboss.shotoku.ContentManager;
 import org.jboss.shotoku.Directory;
 import org.jboss.shotoku.Node;
 import org.jboss.shotoku.aop.Inject;
 import org.jboss.shotoku.exceptions.RepositoryException;
 import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
-
+*/
 /**
 * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
 */
@@ -53,6 +63,31 @@
 public class ShotokuScoresRepositoryManager 
 									implements ScoresRepositoryManager {
 
+	public PluginsValues get(Calendar cal) throws GetScoresException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public PluginValues getPluginValues(String pluginId, Calendar cal) throws GetScoresException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public long getValue(String pluginId, String projectId, Calendar cal) throws GetScoresException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	public long getValue(String pluginId, String projectId, Calendar start, Calendar end) throws GetScoresException {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	public void save(PluginsValues pluginsValues) throws ScoresSaveException {
+		// TODO Auto-generated method stub
+		
+	}
+/*
 	private Logger log = Logger.getLogger(this.getClass());
 	
 	private Map<String,PluginsValues> values
@@ -96,10 +131,6 @@
 		save(node, pluginsValues);
 		
 		log.info("Saved succesfully");
-		/*
-		ScoresEntity se = new ScoresEntity("tttest");
-		em.persist(se);
-		log.info("Saved in DB");*/
 	}
 
 	public PluginsValues get(Calendar cal) throws GetScoresException {
@@ -140,7 +171,7 @@
 			
 		return v;
 	}
-	
+*/
 	/**
 	 * Saves plugins values in the given Directory.
 	 * 
@@ -148,6 +179,7 @@
 	 * @param pluginsValues PluginsValues to save
 	 * @throws ScoresSaveException 
 	 */
+/*
 	private synchronized void save(Node node, PluginsValues pluginsValues)
 										throws ScoresSaveException {
 		
@@ -156,7 +188,7 @@
 			ObjectOutputStream oos = new ObjectOutputStream(os);
 			oos.writeObject((PluginsValues) pluginsValues);
 			oos.close(); 
-			node.save("update"); /* os is closed inside save() */
+			node.save("update"); // os is closed inside save()
 			
 		} catch (Exception e) {
 			log.error("Error while saving shotoku node: " +
@@ -164,7 +196,7 @@
 			throw new ScoresSaveException(e);
 		}
 	}
-	
+*/	
 	/**
 	 * Creates new shotoku Node.
 	 * 
@@ -173,6 +205,7 @@
 	 * @return Node
 	 * @throws ScoresSaveException 
 	 */
+/*
 	private Node createNode(Directory dir, String nodeName)
 											throws ScoresSaveException {
 		
@@ -189,7 +222,7 @@
 		
 		return node;
 	}
-
+*/
 	/**
 	 * Gets shotoku Directory with name <code>dirName</code>
 	 * from specified shotoku Directory.
@@ -201,6 +234,7 @@
 	 * or null when creating Directory failed.  
 	 * @throws ScoresSaveException 
 	 */
+/*
 	private Directory getDir(Directory rootDir, String dirName)
 										throws ScoresSaveException {
 		
@@ -218,7 +252,7 @@
 			
 		return dir;
 	}
-
+*/
 	/**
 	 * Creates new shotoku Directory.
 	 * 
@@ -227,6 +261,7 @@
 	 * @return Directory or null if errors occured
 	 * @throws ScoresSaveException 
 	 */
+/*
 	private Directory createDir(Directory rootDir, String dirName)
 												throws ScoresSaveException {
 		
@@ -243,13 +278,14 @@
 		
 		return dir;
 	}
-
+*/
 	/**
 	 * Gets name of Node containing saved data from specified datestamp.
 	 * Notice that only year, month and day matter in passed <code>cal</code>.
 	 * 
 	 * @return Node name
 	 */
+/*
 	private String getNodeName(Calendar cal) {
 		
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -258,17 +294,18 @@
 		
 		return df.format(date);
 	}
-	
+*/
 	/**
 	 * @return name of Node containging data saved today
 	 */
+/*
 	private String getCurrentNodeName() {
 		
 		Calendar today = Calendar.getInstance();
 		
 		return getNodeName(today); 
 	}
-	
+*/
 	/**
 	 * Returns historical scores from the specified directory.
 	 * 
@@ -276,6 +313,7 @@
 	 * @return
 	 * @throws GetScoresException 
 	 */
+/*
 	private PluginsValues getPluginsValues(Directory dir, Calendar cal)
 												throws GetScoresException {
 		
@@ -353,5 +391,5 @@
 			}	
 		}
 	}
-	
+	*/
 }

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/maven.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -7,45 +7,60 @@
 	<!-- Default war-project goals -->
 
 	<goal name="all">
+		<attainGoal name="clean" />
 		<attainGoal name="build" />
 		<attainGoal name="deploy" />
 	</goal>
 
 	<goal name="build">
-		<maven:reactor includes="jmm-common/project.xml" excludes="" basedir="." 
+		<maven:reactor includes="project.xml" excludes="" basedir="jmm-common" 
 			       banner="Building" 
-			       goals="clean,build" ignoreFailures="false" />
-		<maven:reactor includes="jmm-portlet/project.xml" excludes="" basedir="." 
+			       goals="build" ignoreFailures="false" />
+		<maven:reactor includes="project.xml" excludes="" basedir="jmm-portlet" 
 			       banner="Building" 
-			       goals="clean,build" ignoreFailures="false" />
-			       
-        <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="." 
-			  	   banner="Clean" 
-	  		       goals="clean" ignoreFailures="false" />
+			       goals="build" ignoreFailures="false" />
        <j:if test="${jmm.deploy.service}">
-			  <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="." 
+			  <maven:reactor includes="project.xml" excludes="" basedir="jmm-service" 
 			  	   banner="Building" 
 	  		       goals="build" ignoreFailures="false" />
 		</j:if>
 	</goal>
     
 	<goal name="deploy">
-		<maven:reactor includes="jmm-common/project.xml" excludes="" basedir="." 
+		<ant:copy todir="${local.deploy.dir}" file="jmm-common/target/jmm-common.jar" />
+		<maven:reactor includes="project.xml" excludes="" basedir="jmm-portlet" 
 			       banner="Deploy" 
 			       goals="deploy" ignoreFailures="false" />
-		<maven:reactor includes="jmm-portlet/project.xml" excludes="" basedir="." 
-			       banner="Deploy" 
-			       goals="deploy" ignoreFailures="false" />
-			  
 		<j:if test="${jmm.deploy.service}">
-             <maven:reactor includes="jmm-service/project.xml" excludes="" basedir="." 
+             <maven:reactor includes="project.xml" excludes="" basedir="jmm-service" 
 			       banner="Deploy" 
 			       goals="deploy" ignoreFailures="false" />
          </j:if>
-			   
 	</goal>
 	
 	<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" />
+		<j:if test="${!(file.exists())}">
+			<maven:reactor includes="project.xml" excludes="" basedir="jmm-common" 
+			       banner="Building" 
+			       goals="build" ignoreFailures="false" />
+		</j:if>
+		
+		<maven:reactor includes="project.xml" excludes="" basedir="jmm-portlet" 
+			       banner="Clean" 
+			       goals="clean" ignoreFailures="false" />
+       <j:if test="${jmm.deploy.service}">
+			  <maven:reactor includes="project.xml" excludes="" basedir="jmm-service" 
+			  	   banner="Clean" 
+	  		       goals="clean" ignoreFailures="false" />
+		</j:if>
+		<maven:reactor includes="project.xml" excludes="" basedir="jmm-common" 
+			       banner="Clean" 
+			       goals="clean" ignoreFailures="false" />
+		
+	
 		<!-- Clead old "status" files -->
 		<ant:delete file="${local.deploy.dir}/forge-status.war" />
 		<ant:delete file="${local.deploy.dir}/status-service.ejb3" />
@@ -54,19 +69,7 @@
 		<!-- Clean JMM service local files (in case we want to use remote service) -->
 		<ant:delete file="${local.deploy.dir}/jmm-service.ejb3" />
 		<ant:delete dir="${local.deploy.dir}/jmm-service.sar" />
+		<ant:delete dir="${local.deploy.dir}/JMM-ds.xml" />
 	</goal>
-
-	<!--  helper goals -->
-
-	<goal name="module-clean">
-		<ant:delete dir="${maven.build.dir}"/>
-		<ant:delete dir="${maven.build.dest}"/>
-	</goal>
 	
-	<goal name="module-all">
-		<attainGoal name="clean" />	
-		<attainGoal name="build" />
-		<attainGoal name="deploy" />
-	</goal>
-	
 </project>

Modified: labs/jbosslabs/trunk/portal-extensions/jmm/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/project.properties	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/project.properties	2006-12-20 22:03:29 UTC (rev 8461)
@@ -2,8 +2,5 @@
 maven.junit.fork=yes
 maven.war.src=${basedir}/src/web
 
-maven.ejb.includes=**/service/**,**/META-INF/**
-
-jmm.service.final.name=jmm-service.ejb3
-jmm.common.final.name=jmm-common.jar
-jmm.service.sar=jmm-service.sar/
\ No newline at end of file
+maven.jar.override=on
+maven.jar.jmm-common=jmm-common/target/jmm-common.jar
\ No newline at end of file

Added: labs/jbosslabs/trunk/portal-extensions/jmm/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jmm/project.xml	2006-12-20 21:47:35 UTC (rev 8460)
+++ labs/jbosslabs/trunk/portal-extensions/jmm/project.xml	2006-12-20 22:03:29 UTC (rev 8461)
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!-- 
+  JBoss, the OpenSource J2EE webOS
+  Distributable under LGPL license.
+  See terms of license at gnu.org. 
+ -->
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../common.xml</extend>
+    <id>jmm</id>
+    <name>JEMS Maturity Matrix</name>
+    <currentVersion>1.0</currentVersion>
+    <organization>
+        <name>Pawel Wrzeszcz</name>
+        <url></url>
+    </organization>
+    <description></description>
+    <dependencies/>
+</project>




More information about the jboss-svn-commits mailing list