[jboss-svn-commits] JBL Code SVN: r17609 - 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 04:22:51 -0500 (Tue, 08 Jan 2008)
New Revision: 17609

Added:
   labs/jbosslabs/labs-3.0-build/labs.properties.sample
Modified:
   labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java
Log:
jboss_home in labs.properties

Added: labs/jbosslabs/labs-3.0-build/labs.properties.sample
===================================================================
--- labs/jbosslabs/labs-3.0-build/labs.properties.sample	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/labs.properties.sample	2008-01-08 09:22:51 UTC (rev 17609)
@@ -0,0 +1,4 @@
+# JBOSS_HOME of a server - this will be used for deployment
+
+JBOSS_HOME=
+

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 08:24:10 UTC (rev 17608)
+++ labs/jbosslabs/labs-3.0-build/maven-labs-plugin/src/main/java/org/jboss/labs/plugin/LabsMojo.java	2008-01-08 09:22:51 UTC (rev 17609)
@@ -6,6 +6,8 @@
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Properties;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -15,6 +17,8 @@
 
 	private static final String JBOSS_HOME = "JBOSS_HOME";
 
+	private static final String LABS_PROPERTIES = "labs.properties";
+
 	/**
 	 * JBoss Server directory - can be set in plugin configuration or my
 	 * JBOSS_HOME env value. If not set plugin will throw an exception
@@ -33,10 +37,17 @@
 
 	public final void execute() throws MojoExecutionException,
 			MojoFailureException {
+
+		// load properties
+		loadProperties();
+
 		// Check parameters
 
 		if (jbossHome == null) {
-			if (System.getenv(JBOSS_HOME) != null) {
+
+			if (System.getProperty(JBOSS_HOME) != null) {
+				jbossHome = new File(System.getProperty(JBOSS_HOME));
+			} else if (System.getenv(JBOSS_HOME) != null) {
 				jbossHome = new File(System.getenv(JBOSS_HOME));
 			} else {
 				throw new MojoExecutionException(
@@ -48,6 +59,35 @@
 		executeLabs();
 	}
 
+	private void loadProperties() {
+		File props = new File(LABS_PROPERTIES);
+		if (props.exists()) {
+			Properties p = new Properties();
+			FileInputStream fis = null;
+			try {
+				fis = new FileInputStream(props);
+				p.load(fis);
+			} catch (FileNotFoundException e) {
+				getLog().error("Couldn't load labs file", e);
+			} catch (IOException e) {
+				getLog().error("Couldn't load properties", e);
+			} finally {
+				try {
+					fis.close();
+				} catch (IOException e) {
+					// 
+				}
+			}
+			Enumeration<Object> en = p.keys();
+			while (en.hasMoreElements()) {
+				String key = en.nextElement().toString();
+				String value = p.getProperty(key);
+
+				System.setProperty(key, value);
+			}
+		}
+	}
+
 	protected void copyFile(File fromFile, File toFile)
 			throws MojoExecutionException {
 		FileInputStream from = null;