Author: oheger
Date: Sun Nov 8 20:57:49 2009
New Revision: 833925
URL: http://svn.apache.org/viewvc?rev=833925&view=rev
Log:
[CONFIGURATION-399] Updated user guide and changes report.
Modified:
commons/proper/configuration/trunk/xdocs/changes.xml
commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
Modified: commons/proper/configuration/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/xdocs/changes.xml?rev=833925&r1=833924&r2=833925&view=diff
==============================================================================
--- commons/proper/configuration/trunk/xdocs/changes.xml (original)
+++ commons/proper/configuration/trunk/xdocs/changes.xml Sun Nov 8 20:57:49
2009
@@ -23,6 +23,10 @@
<body>
<release version="1.7" date="in SVN" description="">
+ <action dev="oheger" type="add" issue="CONFIGURATION-399">
+ Default variable interpolation now supports the env: prefix for
+ referencing environment variables.
+ </action>
<action dev="rgoers" type="fix" issue="CONFIGURATION-397">
Schema violation exceptions are now propagated back to the caller.
</action>
Modified:
commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml?rev=833925&r1=833924&r2=833925&view=diff
==============================================================================
--- commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
(original)
+++ commons/proper/configuration/trunk/xdocs/userguide/howto_basicfeatures.xml
Sun Nov 8 20:57:49 2009
@@ -165,7 +165,7 @@
variables are interpreted as the keys of other properties. This is only a
special case, the general syntax of a variable name is
<code>${prefix:name}</code>. The prefix tells Commons Configuration that
- the variable is to evaluated in a certain context. We have already seen
+ the variable is to be evaluated in a certain context. We have already
seen
that the context is the current configuration instance if the prefix is
missing. The following other prefix names are supported by default:
<table border="1">
@@ -190,6 +190,11 @@
specified class will be loaded and the value of this field will be
obtained.</td>
</tr>
+ <tr>
+ <td valign="top">env</td>
+ <td>Variables can also reference OS-specific environment properties.
+ This is indicated by the <code>env</code> prefix.</td>
+ </tr>
</table>
Here are some examples (again using properties syntax):
</p>
@@ -197,6 +202,8 @@
user.file = ${sys:user.home}/settings.xml
action.key = ${const:java.awt.event.KeyEvent.VK_CANCEL}
+
+java.home = ${env:JAVA_HOME}
]]></source>
<p>
If a variable cannot be resolved, e.g. because the name is invalid or an
@@ -204,7 +211,7 @@
including the dollar sign and the curly braces.
</p>
</subsection>
-
+
<subsection name="Customizing interpolation">
<p>
This sub section goes a bit behind the scenes of interpolation and
