commit 1350d0ca4df7c3089f904497fb822144ea66f0fa
author Herve Boutemy <hboutemy@apache.org> Sat Mar 26 16:53:33 2016 +0000
committer Herve Boutemy <hboutemy@apache.org> Sat Mar 26 16:53:33 2016 +0000
tree da2bd710c570c4674a553dd107f5629baa9b0e16
parent 0ec95a33a3be450d1495ef8d77618e214a8ddda2

evaluate env vars after everything else

git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1736700 13f79535-47bb-0310-9956-ffa450edef68

doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
index 7591504..6790330 100644
--- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -513,17 +513,6 @@
 
         RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
 
-        try
-        {
-            interpolator.addValueSource( new EnvarBasedValueSource() );
-        }
-        catch ( IOException e )
-        {
-            // Prefer logging?
-            throw new SiteToolException( "IOException: cannot interpolate environment properties: " + e.getMessage(),
-                                         e );
-        }
-
         if ( isEarly )
         {
             interpolator.addValueSource( new PrefixedObjectValueSource( "this.", aProject ) );
@@ -537,6 +526,17 @@
 
         try
         {
+            interpolator.addValueSource( new EnvarBasedValueSource() );
+        }
+        catch ( IOException e )
+        {
+            // Prefer logging?
+            throw new SiteToolException( "IOException: cannot interpolate environment properties: " + e.getMessage(),
+                                         e );
+        }
+
+        try
+        {
             // FIXME: this does not escape xml entities, see MSITE-226, PLXCOMP-118
             return interpolator.interpolate( siteDescriptorContent, isEarly ? null : "project" );
         }