Modified: 
websites/production/commons/content/proper/commons-daemon/xref/org/apache/commons/daemon/support/DaemonConfiguration.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-daemon/xref/org/apache/commons/daemon/support/DaemonConfiguration.html
 (original)
+++ 
websites/production/commons/content/proper/commons-daemon/xref/org/apache/commons/daemon/support/DaemonConfiguration.html
 Fri May 12 13:32:29 2023
@@ -52,159 +52,158 @@
 <a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em 
class="jxr_javadoccomment"> * In case of {@code $${foo}} this will be unescaped 
and resulting</em>
 <a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em 
class="jxr_javadoccomment"> * value will be {@code ${foo}}.</em>
 <a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em 
class="jxr_javadoccomment"> * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em 
class="jxr_javadoccomment"> *</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">public</strong> <strong class="jxr_keyword">final</strong> 
<strong class="jxr_keyword">class</strong> <a name="DaemonConfiguration" 
href="../../../../../org/apache/commons/daemon/support/DaemonConfiguration.html#DaemonConfiguration">DaemonConfiguration</a>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>  {
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>      <em 
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em 
class="jxr_javadoccomment">     * Default configuration file name.</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  <em 
class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>      <strong 
class="jxr_keyword">protected</strong> <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String DEFAULT_CONFIG        = <span 
class="jxr_string">"daemon.properties"</span>;
-<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">     * Property prefix</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>  <em 
class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>      <strong 
class="jxr_keyword">protected</strong> <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String PREFIX                = <span class="jxr_string">"daemon."</span>;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>      <strong 
class="jxr_keyword">private</strong>   <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String BTOKEN                = <span class="jxr_string">"${"</span>;
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>      <strong 
class="jxr_keyword">private</strong>   <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String ETOKEN                = <span class="jxr_string">"}"</span>;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em 
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <strong 
class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> 
<strong class="jxr_keyword">class</strong> <a name="DaemonConfiguration" 
href="../../../../../org/apache/commons/daemon/support/DaemonConfiguration.html#DaemonConfiguration">DaemonConfiguration</a>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  {
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>      <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em 
class="jxr_javadoccomment">     * Default configuration file name.</em>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <em 
class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>      <strong 
class="jxr_keyword">protected</strong> <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String DEFAULT_CONFIG        = <span 
class="jxr_string">"daemon.properties"</span>;
+<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">     * Property prefix</em>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em 
class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>      <strong 
class="jxr_keyword">protected</strong> <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String PREFIX                = <span class="jxr_string">"daemon."</span>;
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>      <strong 
class="jxr_keyword">private</strong>   <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String BTOKEN                = <span class="jxr_string">"${"</span>;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>      <strong 
class="jxr_keyword">private</strong>   <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">static</strong> 
String ETOKEN                = <span class="jxr_string">"}"</span>;
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>  
 <a class="jxr_linenumber" name="L61" href="#L61">61</a>  
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>      <strong 
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> 
Properties configurationProperties;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>      <strong 
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> 
Properties systemProperties;
-<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">     * An empty immutable {@code String} array.</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  <em 
class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>      <strong 
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> 
String[] EMPTY_STRING_ARRAY = {};
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>  
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>      <em 
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>  <em 
class="jxr_javadoccomment">     * Default constructor</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>      <strong 
class="jxr_keyword">public</strong> <a name="DaemonConfiguration" 
href="../../../../../org/apache/commons/daemon/support/DaemonConfiguration.html#DaemonConfiguration">DaemonConfiguration</a>()
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>      {
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>          
configurationProperties = <strong class="jxr_keyword">new</strong> Properties();
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>          
systemProperties        = System.getProperties();
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>      }
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>  
-<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>  <em 
class="jxr_javadoccomment">     * Loads the configuration properties file.</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>  <em 
class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em 
class="jxr_javadoccomment">     * @param fileName The properties file to 
load.</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em 
class="jxr_javadoccomment">     * @return {@code true} if the file was 
loaded.</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em 
class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>      <strong 
class="jxr_keyword">public</strong> <strong 
class="jxr_keyword">boolean</strong> load(String fileName)
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>      {
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>          <strong 
class="jxr_keyword">if</strong> (fileName == <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>              fileName 
= DEFAULT_CONFIG;
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>          }
-<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 inputStream = <strong 
class="jxr_keyword">new</strong> FileInputStream(fileName)) {
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>              
configurationProperties.clear();
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>              
configurationProperties.load(inputStream);
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>              <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>          } <strong 
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> 
IOException ex) {
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>              <em 
class="jxr_comment">// Error reading properties file</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>              <strong 
class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>          }
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>     }
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> 
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>     <strong 
class="jxr_keyword">private</strong> String expandProperty(<strong 
class="jxr_keyword">final</strong> String propValue)
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>         <strong 
class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>     {
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <strong 
class="jxr_keyword">final</strong> StringBuilder expanded;
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <strong 
class="jxr_keyword">int</strong> btoken;
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>         <strong 
class="jxr_keyword">int</strong> ctoken = 0;
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> 
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>         <strong 
class="jxr_keyword">if</strong> (propValue == <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>             <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>         }
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>         expanded = 
<strong class="jxr_keyword">new</strong> StringBuilder();
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>         btoken   = 
propValue.indexOf(BTOKEN);
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>         <strong 
class="jxr_keyword">while</strong> (btoken != -1) {
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>             <strong 
class="jxr_keyword">if</strong> (btoken &gt; 0 &amp;&amp; 
propValue.charAt(btoken - 1) == BTOKEN.charAt(0)) {
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>                 <em 
class="jxr_comment">// Skip and unquote.</em>
-<a class="jxr_linenumber" name="L117" href="#L117">117</a>                 
expanded.append(propValue.substring(ctoken, btoken));
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>                 
ctoken = btoken + 1;
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>                 
btoken = propValue.indexOf(BTOKEN, btoken + BTOKEN.length());
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>                 
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>             }
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>             <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> 
etoken = propValue.indexOf(ETOKEN, btoken);
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>             <strong 
class="jxr_keyword">if</strong> (etoken == -1) {
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>                 <em 
class="jxr_comment">// We have "${" without "}"</em>
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> ParseException(<span class="jxr_string">"Error 
while looking for teminating '"</span> +
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>                     
                     ETOKEN + <span class="jxr_string">"'"</span>, btoken);
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>             }
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>             <strong 
class="jxr_keyword">final</strong> String variable = propValue.substring(btoken 
+ BTOKEN.length(), etoken);
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>             String 
sysvalue = systemProperties.getProperty(variable);
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>             <strong 
class="jxr_keyword">if</strong> (sysvalue == <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>                 <em 
class="jxr_comment">// Try with the environment if there was no</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>                 <em 
class="jxr_comment">// property by that name.</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>                 
sysvalue = System.getenv(variable);
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>             }
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>             <strong 
class="jxr_keyword">if</strong> (sysvalue != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>                 
<strong class="jxr_keyword">final</strong> String strtoken = 
propValue.substring(ctoken, btoken);
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>                 
expanded.append(strtoken);
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>                 
expanded.append(sysvalue);
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>                 
ctoken = etoken + ETOKEN.length();
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>             }
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>             btoken 
= propValue.indexOf(BTOKEN, etoken + ETOKEN.length());
-<a class="jxr_linenumber" name="L142" href="#L142">142</a>         }
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>         <em 
class="jxr_comment">// Add what's left.</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>         
expanded.append(propValue.substring(ctoken));
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>         <strong 
class="jxr_keyword">return</strong> expanded.toString();
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>     }
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>     <em 
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em 
class="jxr_javadoccomment">     * Gets the configuration property.</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em 
class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em 
class="jxr_javadoccomment">     * @param name The name of the property to 
get.</em>
-<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em 
class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em 
class="jxr_javadoccomment">     * @throws ParseException if the property is 
wrongly formatted.</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em 
class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em 
class="jxr_javadoccomment">     * @return  Configuration property including any 
expansion/replacement</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em 
class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>     <strong 
class="jxr_keyword">public</strong> String getProperty(<strong 
class="jxr_keyword">final</strong> String name)
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>         <strong 
class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>     {
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>         <strong 
class="jxr_keyword">if</strong> (name == <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>             <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>         }
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>         <strong 
class="jxr_keyword">return</strong> 
expandProperty(configurationProperties.getProperty(PREFIX + name));
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>     }
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>     <em 
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em 
class="jxr_javadoccomment">     * Gets the configuration property array.</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em 
class="jxr_javadoccomment">     * &lt;p&gt;</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em 
class="jxr_javadoccomment">     * Property array is constructed form the list 
of properties</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em 
class="jxr_javadoccomment">     * which end with {@code [index]}</em>
-<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em 
class="jxr_javadoccomment">     * &lt;/p&gt;</em>
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em 
class="jxr_javadoccomment">     * &lt;pre&gt;</em>
-<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em 
class="jxr_javadoccomment">     * daemon.arg[0] = argument 1</em>
-<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em 
class="jxr_javadoccomment">     * daemon.arg[1] = argument 2</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em 
class="jxr_javadoccomment">     * daemon.arg[2] = argument 3</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em 
class="jxr_javadoccomment">     * &lt;/pre&gt;</em>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em 
class="jxr_javadoccomment">     * @param name The name of the property array to 
get.</em>
-<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">     * @throws ParseException if the property is 
wrongly formatted.</em>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a> <em 
class="jxr_javadoccomment">     *</em>
-<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em 
class="jxr_javadoccomment">     * @return  Configuration property array 
including any expansion/replacement</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>     <strong 
class="jxr_keyword">public</strong> String[] getPropertyArray(<strong 
class="jxr_keyword">final</strong> String name)
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <strong 
class="jxr_keyword">throws</strong> ParseException
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>     {
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>         <strong 
class="jxr_keyword">final</strong> ArrayList&lt;String&gt; list = <strong 
class="jxr_keyword">new</strong> ArrayList&lt;&gt;();
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>         String    
args;
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>         <em 
class="jxr_comment">// Load daemon.arg[0] ... daemon.arg[n] into the String 
array.</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>         <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>         <strong 
class="jxr_keyword">while</strong> ((args = getProperty(name + <span 
class="jxr_string">"["</span> + list.size() + <span 
class="jxr_string">"]"</span>)) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>             
list.add(args);
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>         }
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>         <strong 
class="jxr_keyword">return</strong> list.toArray(EMPTY_STRING_ARRAY);
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>     }
-<a class="jxr_linenumber" name="L196" href="#L196">196</a> }
-<a class="jxr_linenumber" name="L197" href="#L197">197</a> 
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>      <strong 
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> 
Properties configurationProperties;
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>      <strong 
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> 
Properties systemProperties;
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>      <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>  <em 
class="jxr_javadoccomment">     * An empty immutable {@code String} array.</em>
+<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>      <strong 
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> 
String[] EMPTY_STRING_ARRAY = {};
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>  
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>      <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em 
class="jxr_javadoccomment">     * Default constructor</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>      <strong 
class="jxr_keyword">public</strong> <a name="DaemonConfiguration" 
href="../../../../../org/apache/commons/daemon/support/DaemonConfiguration.html#DaemonConfiguration">DaemonConfiguration</a>()
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>      {
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>          
configurationProperties = <strong class="jxr_keyword">new</strong> Properties();
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>          
systemProperties        = System.getProperties();
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>      }
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  
+<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">     * Loads the configuration properties file.</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>  <em 
class="jxr_javadoccomment">     * @param fileName The properties file to 
load.</em>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>  <em 
class="jxr_javadoccomment">     * @return {@code true} if the file was 
loaded.</em>
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em 
class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>      <strong 
class="jxr_keyword">public</strong> <strong 
class="jxr_keyword">boolean</strong> load(String fileName)
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>      {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>          <strong 
class="jxr_keyword">if</strong> (fileName == <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>              fileName 
= DEFAULT_CONFIG;
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>          }
+<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 inputStream = <strong 
class="jxr_keyword">new</strong> FileInputStream(fileName)) {
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>              
configurationProperties.clear();
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>              
configurationProperties.load(inputStream);
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>              <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>          } <strong 
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> 
IOException ex) {
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>              <em 
class="jxr_comment">// Error reading properties file</em>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>              <strong 
class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>          }
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>      }
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> 
+<a class="jxr_linenumber" name="L101" href="#L101">101</a>     <strong 
class="jxr_keyword">private</strong> String expandProperty(<strong 
class="jxr_keyword">final</strong> String propValue)
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>         <strong 
class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>     {
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>         <strong 
class="jxr_keyword">final</strong> StringBuilder expanded;
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <strong 
class="jxr_keyword">int</strong> btoken;
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <strong 
class="jxr_keyword">int</strong> ctoken = 0;
+<a class="jxr_linenumber" name="L107" href="#L107">107</a> 
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>         <strong 
class="jxr_keyword">if</strong> (propValue == <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>             <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>         }
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>         expanded = 
<strong class="jxr_keyword">new</strong> StringBuilder();
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>         btoken   = 
propValue.indexOf(BTOKEN);
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>         <strong 
class="jxr_keyword">while</strong> (btoken != -1) {
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>             <strong 
class="jxr_keyword">if</strong> (btoken &gt; 0 &amp;&amp; 
propValue.charAt(btoken - 1) == BTOKEN.charAt(0)) {
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>                 <em 
class="jxr_comment">// Skip and unquote.</em>
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>                 
expanded.append(propValue.substring(ctoken, btoken));
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>                 
ctoken = btoken + 1;
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>                 
btoken = propValue.indexOf(BTOKEN, btoken + BTOKEN.length());
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>                 
<strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>             }
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>             <strong 
class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> 
etoken = propValue.indexOf(ETOKEN, btoken);
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>             <strong 
class="jxr_keyword">if</strong> (etoken == -1) {
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>                 <em 
class="jxr_comment">// We have "${" without "}"</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> ParseException(<span class="jxr_string">"Error 
while looking for teminating '"</span> +
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>                     
                     ETOKEN + <span class="jxr_string">"'"</span>, btoken);
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>             }
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>             <strong 
class="jxr_keyword">final</strong> String variable = propValue.substring(btoken 
+ BTOKEN.length(), etoken);
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>             String 
sysvalue = systemProperties.getProperty(variable);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>             <strong 
class="jxr_keyword">if</strong> (sysvalue == <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>                 <em 
class="jxr_comment">// Try with the environment if there was no</em>
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>                 <em 
class="jxr_comment">// property by that name.</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>                 
sysvalue = System.getenv(variable);
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>             }
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>             <strong 
class="jxr_keyword">if</strong> (sysvalue != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>                 
<strong class="jxr_keyword">final</strong> String strtoken = 
propValue.substring(ctoken, btoken);
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>                 
expanded.append(strtoken);
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>                 
expanded.append(sysvalue);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>                 
ctoken = etoken + ETOKEN.length();
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>             }
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>             btoken 
= propValue.indexOf(BTOKEN, etoken + ETOKEN.length());
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>         }
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>         <em 
class="jxr_comment">// Add what's left.</em>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>         
expanded.append(propValue.substring(ctoken));
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>         <strong 
class="jxr_keyword">return</strong> expanded.toString();
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>     }
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> 
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>     <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L148" href="#L148">148</a> <em 
class="jxr_javadoccomment">     * Gets the configuration property.</em>
+<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em 
class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em 
class="jxr_javadoccomment">     * @param name The name of the property to 
get.</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em 
class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a> <em 
class="jxr_javadoccomment">     * @throws ParseException if the property is 
wrongly formatted.</em>
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> <em 
class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L154" href="#L154">154</a> <em 
class="jxr_javadoccomment">     * @return  Configuration property including any 
expansion/replacement</em>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em 
class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>     <strong 
class="jxr_keyword">public</strong> String getProperty(<strong 
class="jxr_keyword">final</strong> String name)
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>         <strong 
class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>     {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>         <strong 
class="jxr_keyword">if</strong> (name == <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>             <strong 
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>         }
+<a class="jxr_linenumber" name="L162" href="#L162">162</a>         <strong 
class="jxr_keyword">return</strong> 
expandProperty(configurationProperties.getProperty(PREFIX + name));
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>     }
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> 
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>     <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <em 
class="jxr_javadoccomment">     * Gets the configuration property array.</em>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em 
class="jxr_javadoccomment">     * &lt;p&gt;</em>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em 
class="jxr_javadoccomment">     * Property array is constructed form the list 
of properties</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> <em 
class="jxr_javadoccomment">     * which end with {@code [index]}</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a> <em 
class="jxr_javadoccomment">     * &lt;/p&gt;</em>
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> <em 
class="jxr_javadoccomment">     * &lt;pre&gt;</em>
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> <em 
class="jxr_javadoccomment">     * daemon.arg[0] = argument 1</em>
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <em 
class="jxr_javadoccomment">     * daemon.arg[1] = argument 2</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em 
class="jxr_javadoccomment">     * daemon.arg[2] = argument 3</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em 
class="jxr_javadoccomment">     * &lt;/pre&gt;</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a> <em 
class="jxr_javadoccomment">     * @param name The name of the property array to 
get.</em>
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> <em 
class="jxr_javadoccomment">     *</em>
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em 
class="jxr_javadoccomment">     * @throws ParseException if the property is 
wrongly formatted.</em>
+<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">     * @return  Configuration property array 
including any expansion/replacement</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a> <em 
class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>     <strong 
class="jxr_keyword">public</strong> String[] getPropertyArray(<strong 
class="jxr_keyword">final</strong> String name)
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>         <strong 
class="jxr_keyword">throws</strong> ParseException
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>     {
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>         <strong 
class="jxr_keyword">final</strong> ArrayList&lt;String&gt; list = <strong 
class="jxr_keyword">new</strong> ArrayList&lt;&gt;();
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>         String    
args;
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> 
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>         <em 
class="jxr_comment">// Load daemon.arg[0] ... daemon.arg[n] into the String 
array.</em>
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>         <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>         <strong 
class="jxr_keyword">while</strong> ((args = getProperty(name + <span 
class="jxr_string">"["</span> + list.size() + <span 
class="jxr_string">"]"</span>)) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>             
list.add(args);
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>         }
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>         <strong 
class="jxr_keyword">return</strong> list.toArray(EMPTY_STRING_ARRAY);
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>     }
+<a class="jxr_linenumber" name="L195" href="#L195">195</a> }
+<a class="jxr_linenumber" name="L196" href="#L196">196</a> 
 </pre>
 <hr/>
-<div id="footer">Copyright &#169; 2002&#x2013;2022 <a 
href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</div>
+<div id="footer">Copyright &#169; 2002&#x2013;2023 <a 
href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</div>
 </body>
 </html>
\ No newline at end of file

Modified: 
websites/production/commons/content/proper/commons-daemon/xref/org/apache/commons/daemon/support/DaemonLoader.html
==============================================================================
--- 
websites/production/commons/content/proper/commons-daemon/xref/org/apache/commons/daemon/support/DaemonLoader.html
 (original)
+++ 
websites/production/commons/content/proper/commons-daemon/xref/org/apache/commons/daemon/support/DaemonLoader.html
 Fri May 12 13:32:29 2023
@@ -422,6 +422,6 @@
 <a class="jxr_linenumber" name="L414" href="#L414">414</a> }
 </pre>
 <hr/>
-<div id="footer">Copyright &#169; 2002&#x2013;2022 <a 
href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</div>
+<div id="footer">Copyright &#169; 2002&#x2013;2023 <a 
href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</div>
 </body>
 </html>
\ No newline at end of file



Reply via email to