You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by mi...@apache.org on 2022/06/11 13:43:39 UTC
svn commit: r1901828 [35/36] - in /maven/website/components/shared-archives/maven-filtering-LATEST: ./ apidocs/ apidocs/org/apache/maven/shared/filtering/ apidocs/org/apache/maven/shared/filtering/class-use/ css/ fonts/ js/ testapidocs/ testapidocs/org...
Modified: maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/MavenResourcesFiltering.html
==============================================================================
--- maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/MavenResourcesFiltering.html (original)
+++ maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/MavenResourcesFiltering.html Sat Jun 11 13:43:37 2022
@@ -17,7 +17,7 @@
<a class="jxr_linenumber" name="L9" href="#L9">9</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
<a class="jxr_linenumber" name="L10" href="#L10">10</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
<a class="jxr_linenumber" name="L11" href="#L11">11</a> <em class="jxr_comment"> *</em>
-<a class="jxr_linenumber" name="L12" href="#L12">12</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2." target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.</a>0</em>
+<a class="jxr_linenumber" name="L12" href="#L12">12</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
<a class="jxr_linenumber" name="L13" href="#L13">13</a> <em class="jxr_comment"> *</em>
<a class="jxr_linenumber" name="L14" href="#L14">14</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
<a class="jxr_linenumber" name="L15" href="#L15">15</a> <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
@@ -32,7 +32,7 @@
<a class="jxr_linenumber" name="L24" href="#L24">24</a> <em class="jxr_javadoccomment">/**</em>
<a class="jxr_linenumber" name="L25" href="#L25">25</a> <em class="jxr_javadoccomment"> * @author Olivier Lamy</em>
<a class="jxr_linenumber" name="L26" href="#L26">26</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a href="../../../../../org/apache/maven/shared/filtering/MavenResourcesFiltering.html">MavenResourcesFiltering</a>
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">interface</strong> <a name="MavenResourcesFiltering" href="../../../../../org/apache/maven/shared/filtering/MavenResourcesFiltering.html#MavenResourcesFiltering">MavenResourcesFiltering</a>
<a class="jxr_linenumber" name="L28" href="#L28">28</a> {
<a class="jxr_linenumber" name="L29" href="#L29">29</a>
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <em class="jxr_javadoccomment">/**</em>
@@ -54,11 +54,11 @@
<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_javadoccomment"> * @param mavenResourcesExecution {@link MavenResourcesExecution}</em>
<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em class="jxr_javadoccomment"> * @throws MavenFilteringException in case of failure.</em>
<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">void</strong> filterResources( MavenResourcesExecution mavenResourcesExecution )
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong class="jxr_keyword">void</strong> filterResources( <a name="MavenResourcesExecution" href="../../../../../org/apache/maven/shared/filtering/MavenResourcesExecution.html#MavenResourcesExecution">MavenResourcesExecution</a> mavenResourcesExecution )
<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong class="jxr_keyword">throws</strong> MavenFilteringException;
<a class="jxr_linenumber" name="L51" href="#L51">51</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2002–2022 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file
Modified: maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html
==============================================================================
--- maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html (original)
+++ maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html Sat Jun 11 13:43:37 2022
@@ -17,7 +17,7 @@
<a class="jxr_linenumber" name="L9" href="#L9">9</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
<a class="jxr_linenumber" name="L10" href="#L10">10</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
<a class="jxr_linenumber" name="L11" href="#L11">11</a> <em class="jxr_comment"> *</em>
-<a class="jxr_linenumber" name="L12" href="#L12">12</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2." target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.</a>0</em>
+<a class="jxr_linenumber" name="L12" href="#L12">12</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
<a class="jxr_linenumber" name="L13" href="#L13">13</a> <em class="jxr_comment"> *</em>
<a class="jxr_linenumber" name="L14" href="#L14">14</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
<a class="jxr_linenumber" name="L15" href="#L15">15</a> <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
@@ -46,8 +46,8 @@
<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> * @author Olivier Lamy</em>
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em class="jxr_javadoccomment"> * @since 1.0</em>
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html">MultiDelimiterInterpolatorFilterReaderLineEnding</a>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.html">AbstractFilterReaderLineEnding</a>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a name="MultiDelimiterInterpolatorFilterReaderLineEnding" href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html#MultiDelimiterInterpolatorFilterReaderLineEnding">MultiDelimiterInterpolatorFilterReaderLineEnding</a>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong class="jxr_keyword">extends</strong> <a name="AbstractFilterReaderLineEnding" href="../../../../../org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.html#AbstractFilterReaderLineEnding">AbstractFilterReaderLineEnding</a>
<a class="jxr_linenumber" name="L43" href="#L43">43</a> {
<a class="jxr_linenumber" name="L44" href="#L44">44</a>
<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em class="jxr_javadoccomment">/**</em>
@@ -99,7 +99,7 @@
<a class="jxr_linenumber" name="L91" href="#L91">91</a> <em class="jxr_javadoccomment"> * @param interpolator interpolator instance to use</em>
<a class="jxr_linenumber" name="L92" href="#L92">92</a> <em class="jxr_javadoccomment"> * @param supportMultiLineFiltering If multi line filtering is allowed</em>
<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html">MultiDelimiterInterpolatorFilterReaderLineEnding</a>( Reader in, Interpolator interpolator,
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong class="jxr_keyword">public</strong> <a name="MultiDelimiterInterpolatorFilterReaderLineEnding" href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html#MultiDelimiterInterpolatorFilterReaderLineEnding">MultiDelimiterInterpolatorFilterReaderLineEnding</a>( Reader in, Interpolator interpolator,
<a class="jxr_linenumber" name="L95" href="#L95">95</a> <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering )
<a class="jxr_linenumber" name="L96" href="#L96">96</a> {
<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">this</strong>( in, interpolator, <strong class="jxr_keyword">new</strong> SimpleRecursionInterceptor(), supportMultiLineFiltering );
@@ -111,7 +111,7 @@
<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_javadoccomment"> * @param ri The {@link RecursionInterceptor} to use to prevent recursive expressions.</em>
<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_javadoccomment"> * @param supportMultiLineFiltering If multi line filtering is allowed</em>
<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html">MultiDelimiterInterpolatorFilterReaderLineEnding</a>( Reader in, Interpolator interpolator,
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong class="jxr_keyword">public</strong> <a name="MultiDelimiterInterpolatorFilterReaderLineEnding" href="../../../../../org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.html#MultiDelimiterInterpolatorFilterReaderLineEnding">MultiDelimiterInterpolatorFilterReaderLineEnding</a>( Reader in, Interpolator interpolator,
<a class="jxr_linenumber" name="L107" href="#L107">107</a> RecursionInterceptor ri,
<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong class="jxr_keyword">boolean</strong> supportMultiLineFiltering )
<a class="jxr_linenumber" name="L109" href="#L109">109</a> {
@@ -146,7 +146,7 @@
<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * @param specs set of specs.</em>
<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> * @return {@link MultiDelimiterInterpolatorFilterReaderLineEnding}</em>
<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.html">AbstractFilterReaderLineEnding</a> setDelimiterSpecs( Set<String> specs )
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <strong class="jxr_keyword">public</strong> <a name="AbstractFilterReaderLineEnding" href="../../../../../org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.html#AbstractFilterReaderLineEnding">AbstractFilterReaderLineEnding</a> setDelimiterSpecs( Set<String> specs )
<a class="jxr_linenumber" name="L142" href="#L142">142</a> {
<a class="jxr_linenumber" name="L143" href="#L143">143</a> delimiters.clear();
<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong class="jxr_keyword">for</strong> ( String spec : specs )
@@ -238,7 +238,7 @@
<a class="jxr_linenumber" name="L230" href="#L230">230</a> <strong class="jxr_keyword">return</strong> -1;
<a class="jxr_linenumber" name="L231" href="#L231">231</a> }
<a class="jxr_linenumber" name="L232" href="#L232">232</a>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> <a href="../../../../../org/apache/maven/shared/filtering/BoundedReader.html">BoundedReader</a> in = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/maven/shared/filtering/BoundedReader.html">BoundedReader</a>( <strong class="jxr_keyword">this</strong>.in, markLength );
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <a name="BoundedReader" href="../../../../../org/apache/maven/shared/filtering/BoundedReader.html#BoundedReader">BoundedReader</a> in = <strong class="jxr_keyword">new</strong> <a name="BoundedReader" href="../../../../../org/apache/maven/shared/filtering/BoundedReader.html#BoundedReader">BoundedReader</a>( <strong class="jxr_keyword">this</strong>.in, markLength );
<a class="jxr_linenumber" name="L234" href="#L234">234</a>
<a class="jxr_linenumber" name="L235" href="#L235">235</a> <strong class="jxr_keyword">int</strong> ch = in.read();
<a class="jxr_linenumber" name="L236" href="#L236">236</a> <strong class="jxr_keyword">if</strong> ( ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
@@ -467,7 +467,7 @@
<a class="jxr_linenumber" name="L459" href="#L459">459</a> <em class="jxr_javadoccomment"> * @return this</em>
<a class="jxr_linenumber" name="L460" href="#L460">460</a> <em class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L461" href="#L461">461</a> <em class="jxr_comment">// CHECKSTYLE_OFF: LineLength</em>
-<a class="jxr_linenumber" name="L462" href="#L462">462</a> <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.html">AbstractFilterReaderLineEnding</a> setRecursionInterceptor( RecursionInterceptor givenRecursionInterceptor )
+<a class="jxr_linenumber" name="L462" href="#L462">462</a> <strong class="jxr_keyword">public</strong> <a name="AbstractFilterReaderLineEnding" href="../../../../../org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.html#AbstractFilterReaderLineEnding">AbstractFilterReaderLineEnding</a> setRecursionInterceptor( RecursionInterceptor givenRecursionInterceptor )
<a class="jxr_linenumber" name="L463" href="#L463">463</a> <em class="jxr_comment">// CHECKSTYLE_ON: LineLength</em>
<a class="jxr_linenumber" name="L464" href="#L464">464</a> {
<a class="jxr_linenumber" name="L465" href="#L465">465</a> <strong class="jxr_keyword">this</strong>.recursionInterceptor = givenRecursionInterceptor;
@@ -477,6 +477,6 @@
<a class="jxr_linenumber" name="L469" href="#L469">469</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2002–2022 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file
Modified: maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/PropertyUtils.html
==============================================================================
--- maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/PropertyUtils.html (original)
+++ maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/PropertyUtils.html Sat Jun 11 13:43:37 2022
@@ -17,7 +17,7 @@
<a class="jxr_linenumber" name="L9" href="#L9">9</a> <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
<a class="jxr_linenumber" name="L10" href="#L10">10</a> <em class="jxr_comment"> * with the License. You may obtain a copy of the License at</em>
<a class="jxr_linenumber" name="L11" href="#L11">11</a> <em class="jxr_comment"> *</em>
-<a class="jxr_linenumber" name="L12" href="#L12">12</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2." target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.</a>0</em>
+<a class="jxr_linenumber" name="L12" href="#L12">12</a> <em class="jxr_comment"> * <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
<a class="jxr_linenumber" name="L13" href="#L13">13</a> <em class="jxr_comment"> *</em>
<a class="jxr_linenumber" name="L14" href="#L14">14</a> <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
<a class="jxr_linenumber" name="L15" href="#L15">15</a> <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
@@ -36,255 +36,256 @@
<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong class="jxr_keyword">import</strong> java.util.List;
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong class="jxr_keyword">import</strong> java.util.Properties;
<a class="jxr_linenumber" name="L30" href="#L30">30</a>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.apache.maven.shared.utils.StringUtils;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong class="jxr_keyword">import</strong> org.codehaus.plexus.logging.Logger;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:kenney@neonics.com" target="alexandria_uri">mailto:kenney@neonics.com</a>">Kenney Westerhof</a></em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * @author William Ferguson</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/maven/shared/filtering/PropertyUtils.html">PropertyUtils</a>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> {
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment"> * Private empty constructor to prevent instantiation.</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/maven/shared/filtering/PropertyUtils.html">PropertyUtils</a>()
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> {
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em class="jxr_comment">// prevent instantiation</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> }
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables, using the supplied base properties.</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> * The properties are resolved iteratively, so if the value of property A refers to property B, then after</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> * resolution the value of property B will contain the value of property B.</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment"> * @param propFile The property file to load.</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em class="jxr_javadoccomment"> * @param baseProps Properties containing the initial values to substitute into the properties file.</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em class="jxr_javadoccomment"> * @return Properties object containing the properties in the file with their values fully resolved.</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propFile, Properties baseProps )
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong class="jxr_keyword">return</strong> loadPropertyFile( propFile, baseProps, <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables, using the supplied base properties.</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <em class="jxr_javadoccomment"> * <p></em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_javadoccomment"> * The properties are resolved iteratively, so if the value of property A refers to property B, then after</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> * resolution the value of property B will contain the value of property B.</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_javadoccomment"> * </p></em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> <em class="jxr_javadoccomment"> * @param propFile The property file to load.</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em class="jxr_javadoccomment"> * @param baseProps Properties containing the initial values to substitute into the properties file.</em>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <em class="jxr_javadoccomment"> * @return Properties object containing the properties in the file with their values fully resolved.</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> <em class="jxr_javadoccomment"> * @since 3.1.2</em>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propFile, Properties baseProps, Logger logger )
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> {
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong class="jxr_keyword">if</strong> ( !propFile.exists() )
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> {
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> FileNotFoundException( propFile.toString() );
-<a class="jxr_linenumber" name="L87" href="#L87">87</a> }
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong class="jxr_keyword">final</strong> Properties fileProps = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong class="jxr_keyword">try</strong> ( InputStream inStream = Files.newInputStream( propFile.toPath() ) )
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> {
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> fileProps.load( inStream );
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong class="jxr_keyword">final</strong> Properties combinedProps = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="L97" href="#L97">97</a> combinedProps.putAll( baseProps == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> Properties() : baseProps );
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> combinedProps.putAll( fileProps );
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_comment">// The algorithm iterates only over the fileProps which is all that is required to resolve</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_comment">// the properties defined within the file. This is slightly different to current, however</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_comment">// I suspect that this was the actual original intent.</em>
-<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_comment">// The difference is that #loadPropertyFile(File, boolean, boolean) also resolves System properties</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_comment">// whose values contain expressions. I believe this is unexpected and is not validated by the test cases,</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_comment">// as can be verified by replacing the implementation of #loadPropertyFile(File, boolean, boolean)</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_comment">// with the commented variant I have provided that reuses this method.</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong class="jxr_keyword">for</strong> ( Object o : fileProps.keySet() )
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> {
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong class="jxr_keyword">final</strong> String k = (String) o;
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">final</strong> String propValue = getPropertyValue( k, combinedProps, logger );
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> fileProps.setProperty( k, propValue );
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> }
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> <strong class="jxr_keyword">return</strong> fileProps;
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> }
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables.</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment"> * @param propfile The property file to load</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment"> * @param fail whether to throw an exception when the file cannot be loaded or to return null</em>
-<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment"> * @param useSystemProps whether to incorporate System.getProperties settings into the returned Properties object.</em>
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment"> * @return the loaded and fully resolved Properties object</em>
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propfile, <strong class="jxr_keyword">boolean</strong> fail, <strong class="jxr_keyword">boolean</strong> useSystemProps )
-<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L130" href="#L130">130</a> {
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> <strong class="jxr_keyword">return</strong> loadPropertyFile( propfile, fail, useSystemProps, <strong class="jxr_keyword">null</strong> );
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> }
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables.</em>
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> * @param propfile The property file to load</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * @param fail whether to throw an exception when the file cannot be loaded or to return null</em>
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> * @param useSystemProps whether to incorporate System.getProperties settings into the returned Properties object.</em>
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
-<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment"> * @return the loaded and fully resolved Properties object</em>
-<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment"> * @since 3.1.2</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propfile, <strong class="jxr_keyword">boolean</strong> fail, <strong class="jxr_keyword">boolean</strong> useSystemProps, Logger logger )
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">throws</strong> IOException
-<a class="jxr_linenumber" name="L148" href="#L148">148</a> {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong class="jxr_keyword">final</strong> Properties baseProps = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> <strong class="jxr_keyword">if</strong> ( useSystemProps )
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> {
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> baseProps.putAll( System.getProperties() );
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> }
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> <strong class="jxr_keyword">final</strong> Properties resolvedProps = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> {
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> resolvedProps.putAll( loadPropertyFile( propfile, baseProps, logger ) );
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> }
-<a class="jxr_linenumber" name="L162" href="#L162">162</a> <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> {
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong class="jxr_keyword">if</strong> ( fail )
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> {
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> FileNotFoundException( propfile.toString() );
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> }
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> }
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong class="jxr_keyword">if</strong> ( useSystemProps )
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> {
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> resolvedProps.putAll( baseProps );
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> }
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong class="jxr_keyword">return</strong> resolvedProps;
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> }
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment"> * Retrieves a property value, replacing values like ${token} using the Properties to look them up. It will leave</em>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment"> * unresolved properties alone, trying for System properties, and implements reparsing (in the case that the value</em>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment"> * of a property contains a key), and will not loop endlessly on a pair like test = ${test}.</em>
-<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment"> * @param k</em>
-<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment"> * @param p</em>
-<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
-<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment"> * @return The filtered property value.</em>
-<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getPropertyValue( String k, Properties p, Logger logger )
-<a class="jxr_linenumber" name="L189" href="#L189">189</a> {
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_comment">// This can also be done using InterpolationFilterReader,</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_comment">// but it requires reparsing the file over and over until</em>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_comment">// it doesn't change.</em>
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>
-<a class="jxr_linenumber" name="L194" href="#L194">194</a> <em class="jxr_comment">// for cycle detection</em>
-<a class="jxr_linenumber" name="L195" href="#L195">195</a> List<String> valueChain = <strong class="jxr_keyword">new</strong> LinkedList<>();
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> valueChain.add( k );
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> String v = p.getProperty( k );
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> String defaultValue = v;
-<a class="jxr_linenumber" name="L200" href="#L200">200</a> String ret = <span class="jxr_string">""</span>;
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> <strong class="jxr_keyword">int</strong> idx, idx2;
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>
-<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong class="jxr_keyword">while</strong> ( ( idx = v.indexOf( <span class="jxr_string">"${"</span> ) ) >= 0 )
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> {
-<a class="jxr_linenumber" name="L205" href="#L205">205</a> <em class="jxr_comment">// append prefix to result</em>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> ret += v.substring( 0, idx );
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> <em class="jxr_comment">// strip prefix from original</em>
-<a class="jxr_linenumber" name="L209" href="#L209">209</a> v = v.substring( idx + 2 );
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>
-<a class="jxr_linenumber" name="L211" href="#L211">211</a> <em class="jxr_comment">// if no matching } then bail</em>
-<a class="jxr_linenumber" name="L212" href="#L212">212</a> idx2 = v.indexOf( '}' );
-<a class="jxr_linenumber" name="L213" href="#L213">213</a> <strong class="jxr_keyword">if</strong> ( idx2 < 0 )
-<a class="jxr_linenumber" name="L214" href="#L214">214</a> {
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L216" href="#L216">216</a> }
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a> <em class="jxr_comment">// strip out the key and resolve it</em>
-<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_comment">// resolve the key/value for the ${statement}</em>
-<a class="jxr_linenumber" name="L220" href="#L220">220</a> String nk = v.substring( 0, idx2 );
-<a class="jxr_linenumber" name="L221" href="#L221">221</a> v = v.substring( idx2 + 1 );
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> String nv = p.getProperty( nk );
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>
-<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong class="jxr_keyword">if</strong> ( valueChain.contains( nk ) )
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> {
-<a class="jxr_linenumber" name="L226" href="#L226">226</a> <strong class="jxr_keyword">if</strong> ( logger != <strong class="jxr_keyword">null</strong> )
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> {
-<a class="jxr_linenumber" name="L228" href="#L228">228</a> logCircularDetection( valueChain, nk, logger );
-<a class="jxr_linenumber" name="L229" href="#L229">229</a> }
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> <strong class="jxr_keyword">return</strong> defaultValue;
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> }
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a> {
-<a class="jxr_linenumber" name="L234" href="#L234">234</a> valueChain.add( nk );
-<a class="jxr_linenumber" name="L235" href="#L235">235</a>
-<a class="jxr_linenumber" name="L236" href="#L236">236</a> <em class="jxr_comment">// try global environment..</em>
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> <strong class="jxr_keyword">if</strong> ( nv == <strong class="jxr_keyword">null</strong> && !StringUtils.isEmpty( nk ) )
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> {
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> nv = System.getProperty( nk );
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> }
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>
-<a class="jxr_linenumber" name="L242" href="#L242">242</a> <em class="jxr_comment">// if the key cannot be resolved,</em>
-<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_comment">// leave it alone ( and don't parse again )</em>
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_comment">// else prefix the original string with the</em>
-<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_comment">// resolved property ( so it can be parsed further )</em>
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_comment">// taking recursion into account.</em>
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong class="jxr_keyword">if</strong> ( nv == <strong class="jxr_keyword">null</strong> || nv.equals( k ) || k.equals( nk ) )
-<a class="jxr_linenumber" name="L248" href="#L248">248</a> {
-<a class="jxr_linenumber" name="L249" href="#L249">249</a> ret += <span class="jxr_string">"${"</span> + nk + <span class="jxr_string">"}"</span>;
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> }
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="L252" href="#L252">252</a> {
-<a class="jxr_linenumber" name="L253" href="#L253">253</a> v = nv + v;
-<a class="jxr_linenumber" name="L254" href="#L254">254</a> }
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> }
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> }
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>
-<a class="jxr_linenumber" name="L258" href="#L258">258</a> <strong class="jxr_keyword">return</strong> ret + v;
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> }
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>
-<a class="jxr_linenumber" name="L261" href="#L261">261</a> <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em class="jxr_javadoccomment"> * Logs the detected cycle in properties resolution</em>
-<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment"> * @param valueChain the sequence of properties resolved so far</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment"> * @param nk the key the closes the cycle</em>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
-<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> logCircularDetection( List<String> valueChain, String nk, Logger logger )
-<a class="jxr_linenumber" name="L268" href="#L268">268</a> {
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder( <span class="jxr_string">"Circular reference between properties detected: "</span> );
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong class="jxr_keyword">for</strong> ( String key : valueChain )
-<a class="jxr_linenumber" name="L271" href="#L271">271</a> {
-<a class="jxr_linenumber" name="L272" href="#L272">272</a> sb.append( key ).append( <span class="jxr_string">" => "</span> );
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> }
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> sb.append( nk );
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> logger.warn( sb.toString() );
-<a class="jxr_linenumber" name="L276" href="#L276">276</a> }
-<a class="jxr_linenumber" name="L277" href="#L277">277</a> }
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.apache.maven.shared.filtering.FilteringUtils.isEmpty;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em class="jxr_javadoccomment"> * @author <a href="<a href="mailto:kenney@neonics.com" target="alexandria_uri">mailto:kenney@neonics.com</a>">Kenney Westerhof</a></em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <em class="jxr_javadoccomment"> * @author William Ferguson</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a name="PropertyUtils" href="../../../../../org/apache/maven/shared/filtering/PropertyUtils.html#PropertyUtils">PropertyUtils</a>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> {
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em class="jxr_javadoccomment"> * Private empty constructor to prevent instantiation.</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong class="jxr_keyword">private</strong> <a name="PropertyUtils" href="../../../../../org/apache/maven/shared/filtering/PropertyUtils.html#PropertyUtils">PropertyUtils</a>()
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> {
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em class="jxr_comment">// prevent instantiation</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> }
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables, using the supplied base properties.</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em class="jxr_javadoccomment"> * The properties are resolved iteratively, so if the value of property A refers to property B, then after</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em class="jxr_javadoccomment"> * resolution the value of property B will contain the value of property B.</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em class="jxr_javadoccomment"> * </p></em>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em class="jxr_javadoccomment"> * @param propFile The property file to load.</em>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em class="jxr_javadoccomment"> * @param baseProps Properties containing the initial values to substitute into the properties file.</em>
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em class="jxr_javadoccomment"> * @return Properties object containing the properties in the file with their values fully resolved.</em>
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propFile, Properties baseProps )
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> {
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong class="jxr_keyword">return</strong> loadPropertyFile( propFile, baseProps, <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> }
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables, using the supplied base properties.</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em class="jxr_javadoccomment"> * <p></em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em class="jxr_javadoccomment"> * The properties are resolved iteratively, so if the value of property A refers to property B, then after</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em class="jxr_javadoccomment"> * resolution the value of property B will contain the value of property B.</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em class="jxr_javadoccomment"> * </p></em>
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em class="jxr_javadoccomment"> * @param propFile The property file to load.</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> <em class="jxr_javadoccomment"> * @param baseProps Properties containing the initial values to substitute into the properties file.</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <em class="jxr_javadoccomment"> * @return Properties object containing the properties in the file with their values fully resolved.</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a> <em class="jxr_javadoccomment"> * @since 3.1.2</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propFile, Properties baseProps, Logger logger )
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> {
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong class="jxr_keyword">if</strong> ( !propFile.exists() )
+<a class="jxr_linenumber" name="L86" href="#L86">86</a> {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> FileNotFoundException( propFile.toString() );
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> }
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> <strong class="jxr_keyword">final</strong> Properties fileProps = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong class="jxr_keyword">try</strong> ( InputStream inStream = Files.newInputStream( propFile.toPath() ) )
+<a class="jxr_linenumber" name="L93" href="#L93">93</a> {
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> fileProps.load( inStream );
+<a class="jxr_linenumber" name="L95" href="#L95">95</a> }
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong class="jxr_keyword">final</strong> Properties combinedProps = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> combinedProps.putAll( baseProps == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">new</strong> Properties() : baseProps );
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> combinedProps.putAll( fileProps );
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_comment">// The algorithm iterates only over the fileProps which is all that is required to resolve</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_comment">// the properties defined within the file. This is slightly different to current, however</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em class="jxr_comment">// I suspect that this was the actual original intent.</em>
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <em class="jxr_comment">// The difference is that #loadPropertyFile(File, boolean, boolean) also resolves System properties</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_comment">// whose values contain expressions. I believe this is unexpected and is not validated by the test cases,</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_comment">// as can be verified by replacing the implementation of #loadPropertyFile(File, boolean, boolean)</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_comment">// with the commented variant I have provided that reuses this method.</em>
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>
+<a class="jxr_linenumber" name="L110" href="#L110">110</a> <strong class="jxr_keyword">for</strong> ( Object o : fileProps.keySet() )
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> {
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong class="jxr_keyword">final</strong> String k = (String) o;
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong class="jxr_keyword">final</strong> String propValue = getPropertyValue( k, combinedProps, logger );
+<a class="jxr_linenumber" name="L114" href="#L114">114</a> fileProps.setProperty( k, propValue );
+<a class="jxr_linenumber" name="L115" href="#L115">115</a> }
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong class="jxr_keyword">return</strong> fileProps;
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> }
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables.</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment"> * @param propfile The property file to load</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment"> * @param fail whether to throw an exception when the file cannot be loaded or to return null</em>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <em class="jxr_javadoccomment"> * @param useSystemProps whether to incorporate System.getProperties settings into the returned Properties object.</em>
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <em class="jxr_javadoccomment"> * @return the loaded and fully resolved Properties object</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propfile, <strong class="jxr_keyword">boolean</strong> fail, <strong class="jxr_keyword">boolean</strong> useSystemProps )
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L131" href="#L131">131</a> {
+<a class="jxr_linenumber" name="L132" href="#L132">132</a> <strong class="jxr_keyword">return</strong> loadPropertyFile( propfile, fail, useSystemProps, <strong class="jxr_keyword">null</strong> );
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> }
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <em class="jxr_javadoccomment"> * Reads a property file, resolving all internal variables.</em>
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em class="jxr_javadoccomment"> * @param propfile The property file to load</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <em class="jxr_javadoccomment"> * @param fail whether to throw an exception when the file cannot be loaded or to return null</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment"> * @param useSystemProps whether to incorporate System.getProperties settings into the returned Properties object.</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a> <em class="jxr_javadoccomment"> * @return the loaded and fully resolved Properties object</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment"> * @throws IOException if profile does not exist, or cannot be read.</em>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em class="jxr_javadoccomment"> * @since 3.1.2</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Properties loadPropertyFile( File propfile, <strong class="jxr_keyword">boolean</strong> fail, <strong class="jxr_keyword">boolean</strong> useSystemProps, Logger logger )
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong class="jxr_keyword">throws</strong> IOException
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> {
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong class="jxr_keyword">final</strong> Properties baseProps = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <strong class="jxr_keyword">if</strong> ( useSystemProps )
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> {
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> baseProps.putAll( System.getProperties() );
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> }
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong class="jxr_keyword">final</strong> Properties resolvedProps = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> {
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> resolvedProps.putAll( loadPropertyFile( propfile, baseProps, logger ) );
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> }
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> <strong class="jxr_keyword">catch</strong> ( FileNotFoundException e )
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> {
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> <strong class="jxr_keyword">if</strong> ( fail )
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> {
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> FileNotFoundException( propfile.toString() );
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> }
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> }
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> <strong class="jxr_keyword">if</strong> ( useSystemProps )
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> {
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> resolvedProps.putAll( baseProps );
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> }
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <strong class="jxr_keyword">return</strong> resolvedProps;
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> }
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em class="jxr_javadoccomment"> * Retrieves a property value, replacing values like ${token} using the Properties to look them up. It will leave</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em class="jxr_javadoccomment"> * unresolved properties alone, trying for System properties, and implements reparsing (in the case that the value</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a> <em class="jxr_javadoccomment"> * of a property contains a key), and will not loop endlessly on a pair like test = ${test}.</em>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L184" href="#L184">184</a> <em class="jxr_javadoccomment"> * @param k</em>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_javadoccomment"> * @param p</em>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> <em class="jxr_javadoccomment"> * @return The filtered property value.</em>
+<a class="jxr_linenumber" name="L188" href="#L188">188</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> String getPropertyValue( String k, Properties p, Logger logger )
+<a class="jxr_linenumber" name="L190" href="#L190">190</a> {
+<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_comment">// This can also be done using InterpolationFilterReader,</em>
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> <em class="jxr_comment">// but it requires reparsing the file over and over until</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a> <em class="jxr_comment">// it doesn't change.</em>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> <em class="jxr_comment">// for cycle detection</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> List<String> valueChain = <strong class="jxr_keyword">new</strong> LinkedList<>();
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> valueChain.add( k );
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> String v = p.getProperty( k );
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> String defaultValue = v;
+<a class="jxr_linenumber" name="L201" href="#L201">201</a> String ret = <span class="jxr_string">""</span>;
+<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong class="jxr_keyword">int</strong> idx, idx2;
+<a class="jxr_linenumber" name="L203" href="#L203">203</a>
+<a class="jxr_linenumber" name="L204" href="#L204">204</a> <strong class="jxr_keyword">while</strong> ( ( idx = v.indexOf( <span class="jxr_string">"${"</span> ) ) >= 0 )
+<a class="jxr_linenumber" name="L205" href="#L205">205</a> {
+<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_comment">// append prefix to result</em>
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> ret += v.substring( 0, idx );
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>
+<a class="jxr_linenumber" name="L209" href="#L209">209</a> <em class="jxr_comment">// strip prefix from original</em>
+<a class="jxr_linenumber" name="L210" href="#L210">210</a> v = v.substring( idx + 2 );
+<a class="jxr_linenumber" name="L211" href="#L211">211</a>
+<a class="jxr_linenumber" name="L212" href="#L212">212</a> <em class="jxr_comment">// if no matching } then bail</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> idx2 = v.indexOf( '}' );
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <strong class="jxr_keyword">if</strong> ( idx2 < 0 )
+<a class="jxr_linenumber" name="L215" href="#L215">215</a> {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L217" href="#L217">217</a> }
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>
+<a class="jxr_linenumber" name="L219" href="#L219">219</a> <em class="jxr_comment">// strip out the key and resolve it</em>
+<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em class="jxr_comment">// resolve the key/value for the ${statement}</em>
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> String nk = v.substring( 0, idx2 );
+<a class="jxr_linenumber" name="L222" href="#L222">222</a> v = v.substring( idx2 + 1 );
+<a class="jxr_linenumber" name="L223" href="#L223">223</a> String nv = p.getProperty( nk );
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>
+<a class="jxr_linenumber" name="L225" href="#L225">225</a> <strong class="jxr_keyword">if</strong> ( valueChain.contains( nk ) )
+<a class="jxr_linenumber" name="L226" href="#L226">226</a> {
+<a class="jxr_linenumber" name="L227" href="#L227">227</a> <strong class="jxr_keyword">if</strong> ( logger != <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> {
+<a class="jxr_linenumber" name="L229" href="#L229">229</a> logCircularDetection( valueChain, nk, logger );
+<a class="jxr_linenumber" name="L230" href="#L230">230</a> }
+<a class="jxr_linenumber" name="L231" href="#L231">231</a> <strong class="jxr_keyword">return</strong> defaultValue;
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> }
+<a class="jxr_linenumber" name="L233" href="#L233">233</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> {
+<a class="jxr_linenumber" name="L235" href="#L235">235</a> valueChain.add( nk );
+<a class="jxr_linenumber" name="L236" href="#L236">236</a>
+<a class="jxr_linenumber" name="L237" href="#L237">237</a> <em class="jxr_comment">// try global environment..</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <strong class="jxr_keyword">if</strong> ( nv == <strong class="jxr_keyword">null</strong> && !isEmpty( nk ) )
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> {
+<a class="jxr_linenumber" name="L240" href="#L240">240</a> nv = System.getProperty( nk );
+<a class="jxr_linenumber" name="L241" href="#L241">241</a> }
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> <em class="jxr_comment">// if the key cannot be resolved,</em>
+<a class="jxr_linenumber" name="L244" href="#L244">244</a> <em class="jxr_comment">// leave it alone ( and don't parse again )</em>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_comment">// else prefix the original string with the</em>
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_comment">// resolved property ( so it can be parsed further )</em>
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> <em class="jxr_comment">// taking recursion into account.</em>
+<a class="jxr_linenumber" name="L248" href="#L248">248</a> <strong class="jxr_keyword">if</strong> ( nv == <strong class="jxr_keyword">null</strong> || nv.equals( k ) || k.equals( nk ) )
+<a class="jxr_linenumber" name="L249" href="#L249">249</a> {
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> ret += <span class="jxr_string">"${"</span> + nk + <span class="jxr_string">"}"</span>;
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> }
+<a class="jxr_linenumber" name="L252" href="#L252">252</a> <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="L253" href="#L253">253</a> {
+<a class="jxr_linenumber" name="L254" href="#L254">254</a> v = nv + v;
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> }
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> }
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> }
+<a class="jxr_linenumber" name="L258" href="#L258">258</a>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> <strong class="jxr_keyword">return</strong> ret + v;
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> }
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L263" href="#L263">263</a> <em class="jxr_javadoccomment"> * Logs the detected cycle in properties resolution</em>
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment"> * @param valueChain the sequence of properties resolved so far</em>
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em class="jxr_javadoccomment"> * @param nk the key the closes the cycle</em>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em class="jxr_javadoccomment"> * @param logger Logger instance</em>
+<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> logCircularDetection( List<String> valueChain, String nk, Logger logger )
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> {
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> StringBuilder sb = <strong class="jxr_keyword">new</strong> StringBuilder( <span class="jxr_string">"Circular reference between properties detected: "</span> );
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> <strong class="jxr_keyword">for</strong> ( String key : valueChain )
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> {
+<a class="jxr_linenumber" name="L273" href="#L273">273</a> sb.append( key ).append( <span class="jxr_string">" => "</span> );
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> }
+<a class="jxr_linenumber" name="L275" href="#L275">275</a> sb.append( nk );
+<a class="jxr_linenumber" name="L276" href="#L276">276</a> logger.warn( sb.toString() );
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> }
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> }
</pre>
<hr/>
-<div id="footer">Copyright © 2002–2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
+<div id="footer">Copyright © 2002–2022 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>
</body>
</html>
\ No newline at end of file
Modified: maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/package-frame.html
==============================================================================
--- maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/package-frame.html (original)
+++ maven/website/components/shared-archives/maven-filtering-LATEST/xref/org/apache/maven/shared/filtering/package-frame.html Sat Jun 11 13:43:37 2022
@@ -1,81 +1,81 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xml:lang="en" lang="en">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Apache Maven Filtering 3.2.0 Reference Package org.apache.maven.shared.filtering</title>
- <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
- </head>
- <body>
-
- <h3>
- <a href="package-summary.html" target="classFrame">org.apache.maven.shared.filtering</a>
- </h3>
-
- <h3>Classes</h3>
-
- <ul>
- <li>
- <a href="AbstractFilterReaderLineEnding.html" target="classFrame">AbstractFilterReaderLineEnding</a>
- </li>
- <li>
- <a href="AbstractMavenFilteringRequest.html" target="classFrame">AbstractMavenFilteringRequest</a>
- </li>
- <li>
- <a href="BaseFilter.html" target="classFrame">BaseFilter</a>
- </li>
- <li>
- <a href="BoundedReader.html" target="classFrame">BoundedReader</a>
- </li>
- <li>
- <a href="DefaultFilterInfo.html" target="classFrame">DefaultFilterInfo</a>
- </li>
- <li>
- <a href="DefaultMavenFileFilter.html" target="classFrame">DefaultMavenFileFilter</a>
- </li>
- <li>
- <a href="DefaultMavenReaderFilter.html" target="classFrame">DefaultMavenReaderFilter</a>
- </li>
- <li>
- <a href="DefaultMavenResourcesFiltering.html" target="classFrame">DefaultMavenResourcesFiltering</a>
- </li>
- <li>
- <a href="FilteringUtils.html" target="classFrame">FilteringUtils</a>
- </li>
- <li>
- <a href="InterpolatorFilterReaderLineEnding.html" target="classFrame">InterpolatorFilterReaderLineEnding</a>
- </li>
- <li>
- <a href="MavenFileFilter.html" target="classFrame">MavenFileFilter</a>
- </li>
- <li>
- <a href="MavenFileFilterRequest.html" target="classFrame">MavenFileFilterRequest</a>
- </li>
- <li>
- <a href="MavenFilteringException.html" target="classFrame">MavenFilteringException</a>
- </li>
- <li>
- <a href="MavenReaderFilter.html" target="classFrame">MavenReaderFilter</a>
- </li>
- <li>
- <a href="MavenReaderFilterRequest.html" target="classFrame">MavenReaderFilterRequest</a>
- </li>
- <li>
- <a href="MavenResourcesExecution.html" target="classFrame">MavenResourcesExecution</a>
- </li>
- <li>
- <a href="MavenResourcesFiltering.html" target="classFrame">MavenResourcesFiltering</a>
- </li>
- <li>
- <a href="MultiDelimiterInterpolatorFilterReaderLineEnding.html" target="classFrame">MultiDelimiterInterpolatorFilterReaderLineEnding</a>
- </li>
- <li>
- <a href="PropertyUtils.html" target="classFrame">PropertyUtils</a>
- </li>
- <li>
- <a href="BaseFilter.html" target="classFrame">Wrapper</a>
- </li>
- </ul>
-
- </body>
+ <!-- generated by Apache Maven JXR (jdk8) -->
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <title>Apache Maven Filtering 3.3.0 Reference Package org.apache.maven.shared.filtering</title>
+ <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
+ </head>
+ <body>
+ <h1 class="bar"><a href="package-summary.html" target="classFrame">org.apache.maven.shared.filtering</a></h1>
+ <div class="indexContainer">
+ <h2 title="Classes">Classes</h2>
+ <ul title="Classes">
+ <li>
+ <a href="AbstractFilterReaderLineEnding.html#AbstractFilterReaderLineEnding" target="classFrame">AbstractFilterReaderLineEnding</a>
+ </li>
+ <li>
+ <a href="AbstractMavenFilteringRequest.html#AbstractMavenFilteringRequest" target="classFrame">AbstractMavenFilteringRequest</a>
+ </li>
+ <li>
+ <a href="BaseFilter.html#BaseFilter" target="classFrame">BaseFilter</a>
+ </li>
+ <li>
+ <a href="BaseFilter.html#BaseFilter.Wrapper" target="classFrame">BaseFilter.Wrapper</a>
+ </li>
+ <li>
+ <a href="BoundedReader.html#BoundedReader" target="classFrame">BoundedReader</a>
+ </li>
+ <li>
+ <a href="DefaultFilterInfo.html#DefaultFilterInfo" target="classFrame">DefaultFilterInfo</a>
+ </li>
+ <li>
+ <a href="DefaultMavenFileFilter.html#DefaultMavenFileFilter" target="classFrame">DefaultMavenFileFilter</a>
+ </li>
+ <li>
+ <a href="DefaultMavenReaderFilter.html#DefaultMavenReaderFilter" target="classFrame">DefaultMavenReaderFilter</a>
+ </li>
+ <li>
+ <a href="DefaultMavenResourcesFiltering.html#DefaultMavenResourcesFiltering" target="classFrame">DefaultMavenResourcesFiltering</a>
+ </li>
+ <li>
+ <a href="FilterWrapper.html#FilterWrapper" target="classFrame">FilterWrapper</a>
+ </li>
+ <li>
+ <a href="FilteringUtils.html#FilteringUtils" target="classFrame">FilteringUtils</a>
+ </li>
+ <li>
+ <a href="InterpolatorFilterReaderLineEnding.html#InterpolatorFilterReaderLineEnding" target="classFrame">InterpolatorFilterReaderLineEnding</a>
+ </li>
+ <li>
+ <a href="MavenFileFilter.html#MavenFileFilter" target="classFrame">MavenFileFilter</a>
+ </li>
+ <li>
+ <a href="MavenFileFilterRequest.html#MavenFileFilterRequest" target="classFrame">MavenFileFilterRequest</a>
+ </li>
+ <li>
+ <a href="MavenFilteringException.html#MavenFilteringException" target="classFrame">MavenFilteringException</a>
+ </li>
+ <li>
+ <a href="MavenReaderFilter.html#MavenReaderFilter" target="classFrame">MavenReaderFilter</a>
+ </li>
+ <li>
+ <a href="MavenReaderFilterRequest.html#MavenReaderFilterRequest" target="classFrame">MavenReaderFilterRequest</a>
+ </li>
+ <li>
+ <a href="MavenResourcesExecution.html#MavenResourcesExecution" target="classFrame">MavenResourcesExecution</a>
+ </li>
+ <li>
+ <a href="MavenResourcesFiltering.html#MavenResourcesFiltering" target="classFrame">MavenResourcesFiltering</a>
+ </li>
+ <li>
+ <a href="MultiDelimiterInterpolatorFilterReaderLineEnding.html#MultiDelimiterInterpolatorFilterReaderLineEnding" target="classFrame">MultiDelimiterInterpolatorFilterReaderLineEnding</a>
+ </li>
+ <li>
+ <a href="PropertyUtils.html#PropertyUtils" target="classFrame">PropertyUtils</a>
+ </li>
+ </ul>
+ </div>
+ </body>
</html>
\ No newline at end of file