Return-Path: 
 <scm-return-28716-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 3867 invoked from network); 1 Jun 2008 07:07:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Jun 2008 07:07:04 -0000
Received: (qmail 46318 invoked by uid 500); 1 Jun 2008 07:07:07 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 46272 invoked by uid 500); 1 Jun 2008 07:07:07 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 46263 invoked by uid 99); 1 Jun 2008 07:07:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jun 2008 00:07:07 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Jun 2008 07:06:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E15C92388A27; Sun,  1 Jun 2008 00:06:43 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r662155 - in /geronimo/gshell/trunk:
 gshell-assembly/src/main/underlay/etc/
 gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/
 gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/
Date: Sun, 01 Jun 2008 07:06:43 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080601070643.E15C92388A27@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Sun Jun  1 00:06:43 2008
New Revision: 662155

URL: http://svn.apache.org/viewvc?rev=662155&view=rev
Log:
Add model properties as values sources for interpolation

Modified:
    geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
    geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
    geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java

Modified: geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=662155&r1=662154&r2=662155&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Sun Jun  1 00:06:43 2008
@@ -25,7 +25,7 @@
     <groupId>org.apache.geronimo.gshell</groupId>
     <artifactId>gshell</artifactId>
     <version>1.0-alpha-2-SNAPSHOT</version>
-    
+
     <localRepository>
         <!-- 
         FIXME: Update the interpolation muck to auto-resolve relative paths to ${gshell.home}

Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java?rev=662155&r1=662154&r2=662155&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java Sun Jun  1 00:06:43 2008
@@ -140,10 +140,8 @@
 
         // Add value sources to resolve muck
         interp.addValueSource(new PropertiesBasedValueSource(System.getProperties()));
-        
-        //
-        // TODO: Add more
-        //
+        interp.addValueSource(new PropertiesBasedValueSource(app.getProperties()));
+        // TODO: Add settings.properties
         
         app = interp.interpolate(app);
         

Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java?rev=662155&r1=662154&r2=662155&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/settings/DefaultSettingsManager.java Sun Jun  1 00:06:43 2008
@@ -83,10 +83,7 @@
 
         // Add value sources to resolve muck
         interp.addValueSource(new PropertiesBasedValueSource(System.getProperties()));
-        
-        //
-        // TODO: Add more
-        //
+        interp.addValueSource(new PropertiesBasedValueSource(settings.getProperties()));
         
         settings = interp.interpolate(settings);