[jboss-svn-commits] JBL Code SVN: r17632 - in labs/jbosslabs/labs-3.0-build/maven-labs-plugin: src/main/java/org/jboss/labs/plugin and 1 other directory.

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

Author: szimano
Date: 2008-01-08 11:06:54 -0500 (Tue, 08 Jan 2008)
New Revision: 17632

Modified:
   labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml
   labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java
Log:
labs.properties parsed from parent projects

Modified: labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml	2008-01-08 14:59:55 UTC (rev 17631)
+++ labs/jbosslabs/labs-3.0-build/maven-labs-plugin/pom.xml	2008-01-08 16:06:54 UTC (rev 17632)
@@ -14,6 +14,21 @@
 			<version>2.0</version>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-artifact</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-model</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-project</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>3.8.1</version>

Modified: labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java	2008-01-08 14:59:55 UTC (rev 17631)
+++ labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java	2008-01-08 16:06:54 UTC (rev 17632)
@@ -12,6 +12,7 @@
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
 
 public abstract class LabsMojo extends AbstractMojo {
 
@@ -35,11 +36,18 @@
 	 */
 	protected String configuration;
 
+	/**
+	 * The Maven project object
+	 * 
+	 * @parameter expression="${project}"
+	 */
+	private MavenProject project;
+
 	public final void execute() throws MojoExecutionException,
 			MojoFailureException {
 
 		// load properties
-		loadProperties();
+		loadProperties(project);
 
 		// Check parameters
 
@@ -59,8 +67,13 @@
 		executeLabs();
 	}
 
-	private void loadProperties() {
-		File props = new File(LABS_PROPERTIES);
+	private void loadProperties(MavenProject project) {
+		if (project.getParent() != null) {
+			loadProperties(project.getParent());
+		}
+
+		File props = new File(project.getBasedir().getAbsolutePath() + "/"
+				+ LABS_PROPERTIES);
 		if (props.exists()) {
 			Properties p = new Properties();
 			FileInputStream fis = null;