You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/06/01 09:06:43 UTC
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/
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);