[jboss-cvs] JBossAS SVN: r75809 - in projects/demos/trunk: bootstrap/src/resources/META-INF and 1 other directories.

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

Author: alesj
Date: 2008-07-14 18:18:37 -0400 (Mon, 14 Jul 2008)
New Revision: 75809

Modified:
   projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java
   projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml
   projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java
Log:
Use system property to determine demos home.

Modified: projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java
===================================================================
--- projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java	2008-07-14 21:58:40 UTC (rev 75808)
+++ projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java	2008-07-14 22:18:37 UTC (rev 75809)
@@ -27,6 +27,7 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
 import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
+import org.jboss.util.StringPropertyReplacer;
 
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -46,27 +47,37 @@
 
    protected void configure(String[] args)
    {
+      // demos.home
+      if (System.getProperty("demos.home") == null)
+      {
+         String demosHome;
+         if (args.length > 0)
+            demosHome = args[0];
+         else
+            demosHome = "/projects/demos";
+
+         System.setProperty("demos.home", demosHome);
+      }
+
       try
       {
-         String rootString = "/projects/demos/bootstrap/src/resources/META-INF/bootstrap-beans.xml";
-         if (args.length > 0)
-            rootString = args[0];
-         System.out.println("Using bootstrap: " + rootString);
+         String rootString = "${demos.home}/bootstrap/src/resources/META-INF/bootstrap-beans.xml";
+         if (args.length > 1)
+            rootString = args[1];
          if (args != null)
          {
             if (args.length > 0)
                rootString = args[0];
          }
-         File rootFile = new File(rootString);
-         if (rootFile.exists() == false)
-            throw new IllegalArgumentException(rootFile + " doesn't exist!");
+         URL rootURL = getURL(rootString);
+         System.out.println("Using bootstrap: " + rootURL.toExternalForm());
 
          BasicBootstrap bootstrap = new BasicBootstrap();
          bootstrap.run();
          kernel = bootstrap.getKernel();
 
          kernelDeployer = new BasicXMLDeployer(kernel);
-         kernelDeployer.deploy(rootFile.toURL());
+         kernelDeployer.deploy(rootURL);
          kernelDeployer.validate();
       }
       catch (Throwable t)
@@ -83,13 +94,25 @@
       return main;
    }
 
-   public static void deploy(URL... urls) throws Throwable
+   public static URL getURL(String url) throws Exception
    {
+      // replace ${} inputs
+      url = StringPropertyReplacer.replaceProperties(url, System.getProperties());
+      File file = new File(url);
+      if (file.exists() == false)
+         throw new IllegalArgumentException("No such file: " + url);
+
+      return file.toURL();
+   }
+
+   public static void deploy(String... urls) throws Throwable
+   {
       if (urls == null)
          return;
 
-      for (URL url : urls)
+      for (String urlString : urls)
       {
+         URL url = getURL(urlString);
          getMain().kernelDeployer.deploy(url);
          System.out.println("Deployed URL: " + url);
       }
@@ -100,13 +123,14 @@
       getMain().kernelDeployer.validate();
    }
 
-   public static void undeploy(URL... urls) throws Throwable
+   public static void undeploy(String... urls) throws Throwable
    {
       if (urls == null)
          return;
 
-      for (URL url : urls)
+      for (String urlString : urls)
       {
+         URL url = getURL(urlString);
          getMain().kernelDeployer.undeploy(url);
          System.out.println("Undeployed URL: " + url);
       }

Modified: projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml
===================================================================
--- projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml	2008-07-14 21:58:40 UTC (rev 75808)
+++ projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml	2008-07-14 22:18:37 UTC (rev 75809)
@@ -118,7 +118,7 @@
   <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
      <constructor>
         <parameter><inject bean="MainDeployerHelper"/></parameter>
-        <parameter>/projects/demos/sandbox</parameter>
+        <parameter>${demos.home}/sandbox</parameter>
      </constructor>
      <property name="scanPeriod">10000</property>
      <property name="scanThreadName">HDScanner</property>

Modified: projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java
===================================================================
--- projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java	2008-07-14 21:58:40 UTC (rev 75808)
+++ projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java	2008-07-14 22:18:37 UTC (rev 75809)
@@ -21,9 +21,6 @@
 */
 package org.jboss.demos.bootstrap.jmx;
 
-import java.io.File;
-import java.net.URL;
-
 import org.jboss.demos.boostrap.Main;
 
 /**
@@ -37,9 +34,11 @@
 
       try
       {
-         Main.deploy(getURL("/projects/demos/jmx/src/resources/META-INF/system-jmx-beans.xml"));
-         Main.deploy(getURL("/projects/demos/jmx/src/resources/META-INF/aop-beans.xml"));
-         Main.deploy(getURL("/projects/demos/jmx/src/resources/META-INF/varia-deployers-beans.xml"));
+         Main.deploy(
+               "${demos.home}/jmx/src/resources/META-INF/system-jmx-beans.xml",
+               "${demos.home}/jmx/src/resources/META-INF/aop-beans.xml",
+               "${demos.home}/jmx/src/resources/META-INF/varia-deployers-beans.xml"
+         );
 
          Main.validate();
       }
@@ -48,13 +47,4 @@
          t.printStackTrace();
       }
    }
-
-   protected static URL getURL(String url) throws Exception
-   {
-      File file = new File(url);
-      if (file.exists() == false)
-         throw new IllegalArgumentException("No such file: " + url);
-
-      return file.toURL();
-   }
 }