Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/org/apache/commons/daemon/support/package-tree.html
==============================================================================
---
websites/production/commons/content/proper/commons-daemon/apidocs/org/apache/commons/daemon/support/package-tree.html
(original)
+++
websites/production/commons/content/proper/commons-daemon/apidocs/org/apache/commons/daemon/support/package-tree.html
Mon Oct 10 13:43:06 2022
@@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
-<title>org.apache.commons.daemon.support Class Hierarchy (Apache Commons
Daemon 1.3.1 API)</title>
+<title>org.apache.commons.daemon.support Class Hierarchy (Apache Commons
Daemon 1.3.2 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css"
title="Style">
<link rel="stylesheet" type="text/css"
href="../../../../../jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="org.apache.commons.daemon.support Class
Hierarchy (Apache Commons Daemon 1.3.1 API)";
+ parent.document.title="org.apache.commons.daemon.support Class
Hierarchy (Apache Commons Daemon 1.3.2 API)";
}
}
catch(err) {
Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/org/apache/commons/daemon/support/package-use.html
==============================================================================
---
websites/production/commons/content/proper/commons-daemon/apidocs/org/apache/commons/daemon/support/package-use.html
(original)
+++
websites/production/commons/content/proper/commons-daemon/apidocs/org/apache/commons/daemon/support/package-use.html
Mon Oct 10 13:43:06 2022
@@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
-<title>Uses of Package org.apache.commons.daemon.support (Apache Commons
Daemon 1.3.1 API)</title>
+<title>Uses of Package org.apache.commons.daemon.support (Apache Commons
Daemon 1.3.2 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css"
title="Style">
<link rel="stylesheet" type="text/css"
href="../../../../../jquery/jquery-ui.css" title="Style">
@@ -20,7 +20,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Uses of Package
org.apache.commons.daemon.support (Apache Commons Daemon 1.3.1 API)";
+ parent.document.title="Uses of Package
org.apache.commons.daemon.support (Apache Commons Daemon 1.3.2 API)";
}
}
catch(err) {
Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/overview-summary.html
==============================================================================
---
websites/production/commons/content/proper/commons-daemon/apidocs/overview-summary.html
(original)
+++
websites/production/commons/content/proper/commons-daemon/apidocs/overview-summary.html
Mon Oct 10 13:43:06 2022
@@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
-<title>Apache Commons Daemon 1.3.1 API</title>
+<title>Apache Commons Daemon 1.3.2 API</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<script type="text/javascript">window.location.replace('index.html')</script>
<noscript>
Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/overview-tree.html
==============================================================================
---
websites/production/commons/content/proper/commons-daemon/apidocs/overview-tree.html
(original)
+++
websites/production/commons/content/proper/commons-daemon/apidocs/overview-tree.html
Mon Oct 10 13:43:06 2022
@@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
-<title>Class Hierarchy (Apache Commons Daemon 1.3.1 API)</title>
+<title>Class Hierarchy (Apache Commons Daemon 1.3.2 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css"
title="Style">
@@ -20,7 +20,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Class Hierarchy (Apache Commons Daemon
1.3.1 API)";
+ parent.document.title="Class Hierarchy (Apache Commons Daemon
1.3.2 API)";
}
}
catch(err) {
Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/package-search-index.zip
==============================================================================
Binary files - no diff available.
Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/serialized-form.html
==============================================================================
---
websites/production/commons/content/proper/commons-daemon/apidocs/serialized-form.html
(original)
+++
websites/production/commons/content/proper/commons-daemon/apidocs/serialized-form.html
Mon Oct 10 13:43:06 2022
@@ -3,7 +3,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc -->
-<title>Serialized Form (Apache Commons Daemon 1.3.1 API)</title>
+<title>Serialized Form (Apache Commons Daemon 1.3.2 API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css"
title="Style">
@@ -20,7 +20,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="Serialized Form (Apache Commons Daemon
1.3.1 API)";
+ parent.document.title="Serialized Form (Apache Commons Daemon
1.3.2 API)";
}
}
catch(err) {
Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/src-html/org/apache/commons/daemon/DaemonPermission.html
==============================================================================
---
websites/production/commons/content/proper/commons-daemon/apidocs/src-html/org/apache/commons/daemon/DaemonPermission.html
(original)
+++
websites/production/commons/content/proper/commons-daemon/apidocs/src-html/org/apache/commons/daemon/DaemonPermission.html
Mon Oct 10 13:43:06 2022
@@ -193,7 +193,7 @@
<span class="sourceLineNo">184</span><a id="line.184"> public
DaemonPermission(final String target)</a>
<span class="sourceLineNo">185</span><a id="line.185"> throws
IllegalArgumentException</a>
<span class="sourceLineNo">186</span><a id="line.186"> {</a>
-<span class="sourceLineNo">187</span><a id="line.187"> // Setup the
target name of this permission object.</a>
+<span class="sourceLineNo">187</span><a id="line.187"> // Set up the
target name of this permission object.</a>
<span class="sourceLineNo">188</span><a id="line.188">
super(target);</a>
<span class="sourceLineNo">189</span><a id="line.189"></a>
<span class="sourceLineNo">190</span><a id="line.190"> // Check if the
permission target name was specified</a>
@@ -268,7 +268,7 @@
<span class="sourceLineNo">259</span><a id="line.259"> /**</a>
<span class="sourceLineNo">260</span><a id="line.260"> * Checks if a
specified object equals {@code DaemonPermission}.</a>
<span class="sourceLineNo">261</span><a id="line.261"> *</a>
-<span class="sourceLineNo">262</span><a id="line.262"> * @return
<b>true</b> or <b>false</b> wether the specified object
equals</a>
+<span class="sourceLineNo">262</span><a id="line.262"> * @return
<b>true</b> or <b>false</b> whether the specified
object equals</a>
<span class="sourceLineNo">263</span><a id="line.263"> * this
{@code DaemonPermission} instance or not.</a>
<span class="sourceLineNo">264</span><a id="line.264"> */</a>
<span class="sourceLineNo">265</span><a id="line.265"> @Override</a>
@@ -294,7 +294,7 @@
<span class="sourceLineNo">285</span><a id="line.285"> * Checks if this
{@code DaemonPermission} implies another</a>
<span class="sourceLineNo">286</span><a id="line.286"> * {@code
Permission}.</a>
<span class="sourceLineNo">287</span><a id="line.287"> *</a>
-<span class="sourceLineNo">288</span><a id="line.288"> * @return
<b>true</b> or <b>false</b> wether the specified
permission</a>
+<span class="sourceLineNo">288</span><a id="line.288"> * @return
<b>true</b> or <b>false</b> whether the specified
permission</a>
<span class="sourceLineNo">289</span><a id="line.289"> * is
implied by this {@code DaemonPermission} instance or</a>
<span class="sourceLineNo">290</span><a id="line.290"> * not.</a>
<span class="sourceLineNo">291</span><a id="line.291"> */</a>
@@ -401,7 +401,7 @@
<span class="sourceLineNo">392</span><a id="line.392"> return mask;</a>
<span class="sourceLineNo">393</span><a id="line.393"> }</a>
<span class="sourceLineNo">394</span><a id="line.394"></a>
-<span class="sourceLineNo">395</span><a id="line.395"> /** Creates a
actions list for a given control permission mask. */</a>
+<span class="sourceLineNo">395</span><a id="line.395"> /** Creates an
actions list for a given control permission mask. */</a>
<span class="sourceLineNo">396</span><a id="line.396"> private String
createControlActions(final int mask)</a>
<span class="sourceLineNo">397</span><a id="line.397"> {</a>
<span class="sourceLineNo">398</span><a id="line.398"> final
StringBuilder buf = new StringBuilder();</a>
Modified:
websites/production/commons/content/proper/commons-daemon/apidocs/src-html/org/apache/commons/daemon/support/DaemonConfiguration.html
==============================================================================
---
websites/production/commons/content/proper/commons-daemon/apidocs/src-html/org/apache/commons/daemon/support/DaemonConfiguration.html
(original)
+++
websites/production/commons/content/proper/commons-daemon/apidocs/src-html/org/apache/commons/daemon/support/DaemonConfiguration.html
Mon Oct 10 13:43:06 2022
@@ -28,191 +28,182 @@
<span class="sourceLineNo">019</span><a id="line.19"></a>
<span class="sourceLineNo">020</span><a id="line.20">import
java.io.FileInputStream;</a>
<span class="sourceLineNo">021</span><a id="line.21">import
java.io.IOException;</a>
-<span class="sourceLineNo">022</span><a id="line.22">import
java.util.ArrayList;</a>
-<span class="sourceLineNo">023</span><a id="line.23">import
java.util.Properties;</a>
-<span class="sourceLineNo">024</span><a id="line.24">import
java.text.ParseException;</a>
-<span class="sourceLineNo">025</span><a id="line.25"></a>
-<span class="sourceLineNo">026</span><a id="line.26">/**</a>
-<span class="sourceLineNo">027</span><a id="line.27"> * Used by jsvc for
Daemon configuration.</a>
-<span class="sourceLineNo">028</span><a id="line.28"> * <p></a>
-<span class="sourceLineNo">029</span><a id="line.29"> * Configuration is read
from properties file.</a>
-<span class="sourceLineNo">030</span><a id="line.30"> * If no properties file
is given the {@code daemon.properties}</a>
-<span class="sourceLineNo">031</span><a id="line.31"> * is used from the
current directory.</a>
-<span class="sourceLineNo">032</span><a id="line.32"> * </p></a>
-<span class="sourceLineNo">033</span><a id="line.33"> * <p></a>
-<span class="sourceLineNo">034</span><a id="line.34"> * The properties file
can have property values expanded at runtime</a>
-<span class="sourceLineNo">035</span><a id="line.35"> * by using System
properties or execution environment. The part</a>
-<span class="sourceLineNo">036</span><a id="line.36"> * of the property value
between {@code ${} and {@code }}</a>
-<span class="sourceLineNo">037</span><a id="line.37"> * will be used as System
property or environment key. If found then</a>
-<span class="sourceLineNo">038</span><a id="line.38"> * the entire {@code
${foo}} will be replaced by the value of</a>
-<span class="sourceLineNo">039</span><a id="line.39"> * either system property
or environment variable named {@code foo}.</a>
-<span class="sourceLineNo">040</span><a id="line.40"> * </p></a>
-<span class="sourceLineNo">041</span><a id="line.41"> * <p></a>
-<span class="sourceLineNo">042</span><a id="line.42"> * If no variable is
found the {@code ${foo}} will be passed as is.</a>
-<span class="sourceLineNo">043</span><a id="line.43"> * In case of {@code
$${foo}} this will be unescaped and resulting</a>
-<span class="sourceLineNo">044</span><a id="line.44"> * value will be {@code
${foo}}.</a>
-<span class="sourceLineNo">045</span><a id="line.45"> * </p></a>
-<span class="sourceLineNo">046</span><a id="line.46"> *</a>
-<span class="sourceLineNo">047</span><a id="line.47"> */</a>
-<span class="sourceLineNo">048</span><a id="line.48">public final class
DaemonConfiguration</a>
-<span class="sourceLineNo">049</span><a id="line.49">{</a>
-<span class="sourceLineNo">050</span><a id="line.50"> /**</a>
-<span class="sourceLineNo">051</span><a id="line.51"> * Default
configuration file name.</a>
-<span class="sourceLineNo">052</span><a id="line.52"> */</a>
-<span class="sourceLineNo">053</span><a id="line.53"> protected final
static String DEFAULT_CONFIG = "daemon.properties";</a>
-<span class="sourceLineNo">054</span><a id="line.54"> /**</a>
-<span class="sourceLineNo">055</span><a id="line.55"> * Property prefix</a>
-<span class="sourceLineNo">056</span><a id="line.56"> */</a>
-<span class="sourceLineNo">057</span><a id="line.57"> protected final
static String PREFIX = "daemon.";</a>
-<span class="sourceLineNo">058</span><a id="line.58"> private final
static String BTOKEN = "${";</a>
-<span class="sourceLineNo">059</span><a id="line.59"> private final
static String ETOKEN = "}";</a>
-<span class="sourceLineNo">060</span><a id="line.60"></a>
+<span class="sourceLineNo">022</span><a id="line.22">import
java.io.InputStream;</a>
+<span class="sourceLineNo">023</span><a id="line.23">import
java.util.ArrayList;</a>
+<span class="sourceLineNo">024</span><a id="line.24">import
java.util.Properties;</a>
+<span class="sourceLineNo">025</span><a id="line.25">import
java.text.ParseException;</a>
+<span class="sourceLineNo">026</span><a id="line.26"></a>
+<span class="sourceLineNo">027</span><a id="line.27">/**</a>
+<span class="sourceLineNo">028</span><a id="line.28"> * Used by jsvc for
Daemon configuration.</a>
+<span class="sourceLineNo">029</span><a id="line.29"> * <p></a>
+<span class="sourceLineNo">030</span><a id="line.30"> * Configuration is read
from properties file.</a>
+<span class="sourceLineNo">031</span><a id="line.31"> * If no properties file
is given the {@code daemon.properties}</a>
+<span class="sourceLineNo">032</span><a id="line.32"> * is used from the
current directory.</a>
+<span class="sourceLineNo">033</span><a id="line.33"> * </p></a>
+<span class="sourceLineNo">034</span><a id="line.34"> * <p></a>
+<span class="sourceLineNo">035</span><a id="line.35"> * The properties file
can have property values expanded at runtime</a>
+<span class="sourceLineNo">036</span><a id="line.36"> * by using System
properties or execution environment. The part</a>
+<span class="sourceLineNo">037</span><a id="line.37"> * of the property value
between {@code ${} and {@code }}</a>
+<span class="sourceLineNo">038</span><a id="line.38"> * will be used as System
property or environment key. If found then</a>
+<span class="sourceLineNo">039</span><a id="line.39"> * the entire {@code
${foo}} will be replaced by the value of</a>
+<span class="sourceLineNo">040</span><a id="line.40"> * either system property
or environment variable named {@code foo}.</a>
+<span class="sourceLineNo">041</span><a id="line.41"> * </p></a>
+<span class="sourceLineNo">042</span><a id="line.42"> * <p></a>
+<span class="sourceLineNo">043</span><a id="line.43"> * If no variable is
found the {@code ${foo}} will be passed as is.</a>
+<span class="sourceLineNo">044</span><a id="line.44"> * In case of {@code
$${foo}} this will be unescaped and resulting</a>
+<span class="sourceLineNo">045</span><a id="line.45"> * value will be {@code
${foo}}.</a>
+<span class="sourceLineNo">046</span><a id="line.46"> * </p></a>
+<span class="sourceLineNo">047</span><a id="line.47"> *</a>
+<span class="sourceLineNo">048</span><a id="line.48"> */</a>
+<span class="sourceLineNo">049</span><a id="line.49">public final class
DaemonConfiguration</a>
+<span class="sourceLineNo">050</span><a id="line.50">{</a>
+<span class="sourceLineNo">051</span><a id="line.51"> /**</a>
+<span class="sourceLineNo">052</span><a id="line.52"> * Default
configuration file name.</a>
+<span class="sourceLineNo">053</span><a id="line.53"> */</a>
+<span class="sourceLineNo">054</span><a id="line.54"> protected final
static String DEFAULT_CONFIG = "daemon.properties";</a>
+<span class="sourceLineNo">055</span><a id="line.55"> /**</a>
+<span class="sourceLineNo">056</span><a id="line.56"> * Property prefix</a>
+<span class="sourceLineNo">057</span><a id="line.57"> */</a>
+<span class="sourceLineNo">058</span><a id="line.58"> protected final
static String PREFIX = "daemon.";</a>
+<span class="sourceLineNo">059</span><a id="line.59"> private final
static String BTOKEN = "${";</a>
+<span class="sourceLineNo">060</span><a id="line.60"> private final
static String ETOKEN = "}";</a>
<span class="sourceLineNo">061</span><a id="line.61"></a>
-<span class="sourceLineNo">062</span><a id="line.62"> private final
Properties configurationProperties;</a>
-<span class="sourceLineNo">063</span><a id="line.63"> private final
Properties systemProperties;</a>
-<span class="sourceLineNo">064</span><a id="line.64"></a>
-<span class="sourceLineNo">065</span><a id="line.65"> /**</a>
-<span class="sourceLineNo">066</span><a id="line.66"> * An empty immutable
{@code String} array.</a>
-<span class="sourceLineNo">067</span><a id="line.67"> */</a>
-<span class="sourceLineNo">068</span><a id="line.68"> static final String[]
EMPTY_STRING_ARRAY = {};</a>
-<span class="sourceLineNo">069</span><a id="line.69"></a>
-<span class="sourceLineNo">070</span><a id="line.70"> /**</a>
-<span class="sourceLineNo">071</span><a id="line.71"> * Default
constructor</a>
-<span class="sourceLineNo">072</span><a id="line.72"> */</a>
-<span class="sourceLineNo">073</span><a id="line.73"> public
DaemonConfiguration()</a>
-<span class="sourceLineNo">074</span><a id="line.74"> {</a>
-<span class="sourceLineNo">075</span><a id="line.75">
configurationProperties = new Properties();</a>
-<span class="sourceLineNo">076</span><a id="line.76"> systemProperties
= System.getProperties();</a>
-<span class="sourceLineNo">077</span><a id="line.77"> }</a>
-<span class="sourceLineNo">078</span><a id="line.78"></a>
-<span class="sourceLineNo">079</span><a id="line.79"> /**</a>
-<span class="sourceLineNo">080</span><a id="line.80"> * Loads the
configuration properties file.</a>
-<span class="sourceLineNo">081</span><a id="line.81"> *</a>
-<span class="sourceLineNo">082</span><a id="line.82"> * @param fileName
The properties file to load.</a>
-<span class="sourceLineNo">083</span><a id="line.83"> * @return {@code
true} if the file was loaded.</a>
-<span class="sourceLineNo">084</span><a id="line.84"> */</a>
-<span class="sourceLineNo">085</span><a id="line.85"> public boolean
load(String fileName)</a>
-<span class="sourceLineNo">086</span><a id="line.86"> {</a>
-<span class="sourceLineNo">087</span><a id="line.87"> boolean ok =
false;</a>
-<span class="sourceLineNo">088</span><a id="line.88"> FileInputStream
file = null;</a>
-<span class="sourceLineNo">089</span><a id="line.89"> try {</a>
-<span class="sourceLineNo">090</span><a id="line.90"> if (fileName
== null) {</a>
-<span class="sourceLineNo">091</span><a id="line.91"> fileName
= DEFAULT_CONFIG;</a>
-<span class="sourceLineNo">092</span><a id="line.92"> }</a>
-<span class="sourceLineNo">093</span><a id="line.93"> file = new
FileInputStream(fileName);</a>
-<span class="sourceLineNo">094</span><a id="line.94">
configurationProperties.clear();</a>
-<span class="sourceLineNo">095</span><a id="line.95">
configurationProperties.load(file);</a>
-<span class="sourceLineNo">096</span><a id="line.96"> ok = true;</a>
-<span class="sourceLineNo">097</span><a id="line.97"> }</a>
-<span class="sourceLineNo">098</span><a id="line.98"> catch (final
IOException ex) {</a>
-<span class="sourceLineNo">099</span><a id="line.99"> // Error
reading properties file</a>
-<span class="sourceLineNo">100</span><a id="line.100"> } finally {</a>
-<span class="sourceLineNo">101</span><a id="line.101"> try {</a>
-<span class="sourceLineNo">102</span><a id="line.102"> if (file
!= null) {</a>
-<span class="sourceLineNo">103</span><a id="line.103">
file.close();</a>
-<span class="sourceLineNo">104</span><a id="line.104"> }</a>
-<span class="sourceLineNo">105</span><a id="line.105"> } catch
(final IOException ex) {</a>
-<span class="sourceLineNo">106</span><a id="line.106"> }</a>
-<span class="sourceLineNo">107</span><a id="line.107"> }</a>
-<span class="sourceLineNo">108</span><a id="line.108"> return ok;</a>
-<span class="sourceLineNo">109</span><a id="line.109"> }</a>
-<span class="sourceLineNo">110</span><a id="line.110"></a>
-<span class="sourceLineNo">111</span><a id="line.111"> private String
expandProperty(final String propValue)</a>
-<span class="sourceLineNo">112</span><a id="line.112"> throws
ParseException</a>
-<span class="sourceLineNo">113</span><a id="line.113"> {</a>
-<span class="sourceLineNo">114</span><a id="line.114"> final
StringBuilder expanded;</a>
-<span class="sourceLineNo">115</span><a id="line.115"> int btoken;</a>
-<span class="sourceLineNo">116</span><a id="line.116"> int ctoken =
0;</a>
-<span class="sourceLineNo">117</span><a id="line.117"></a>
-<span class="sourceLineNo">118</span><a id="line.118"> if (propValue ==
null) {</a>
-<span class="sourceLineNo">119</span><a id="line.119"> return
null;</a>
-<span class="sourceLineNo">120</span><a id="line.120"> }</a>
-<span class="sourceLineNo">121</span><a id="line.121"> expanded = new
StringBuilder();</a>
-<span class="sourceLineNo">122</span><a id="line.122"> btoken =
propValue.indexOf(BTOKEN);</a>
-<span class="sourceLineNo">123</span><a id="line.123"> while (btoken !=
-1) {</a>
-<span class="sourceLineNo">124</span><a id="line.124"> if (btoken
> 0 && propValue.charAt(btoken - 1) == BTOKEN.charAt(0)) {</a>
-<span class="sourceLineNo">125</span><a id="line.125"> // Skip
and unquote.</a>
-<span class="sourceLineNo">126</span><a id="line.126">
expanded.append(propValue.substring(ctoken, btoken));</a>
-<span class="sourceLineNo">127</span><a id="line.127"> ctoken =
btoken + 1;</a>
-<span class="sourceLineNo">128</span><a id="line.128"> btoken =
propValue.indexOf(BTOKEN, btoken + BTOKEN.length());</a>
-<span class="sourceLineNo">129</span><a id="line.129">
continue;</a>
-<span class="sourceLineNo">130</span><a id="line.130"> }</a>
-<span class="sourceLineNo">131</span><a id="line.131"> final int
etoken = propValue.indexOf(ETOKEN, btoken);</a>
-<span class="sourceLineNo">132</span><a id="line.132"> if (etoken
== -1) {</a>
-<span class="sourceLineNo">133</span><a id="line.133"> // We
have "${" without "}"</a>
-<span class="sourceLineNo">134</span><a id="line.134"> throw
new ParseException("Error while looking for teminating '" +</a>
-<span class="sourceLineNo">135</span><a id="line.135">
ETOKEN + "'", btoken);</a>
-<span class="sourceLineNo">136</span><a id="line.136"> }</a>
-<span class="sourceLineNo">137</span><a id="line.137"> final String
variable = propValue.substring(btoken + BTOKEN.length(), etoken);</a>
-<span class="sourceLineNo">138</span><a id="line.138"> String
sysvalue = systemProperties.getProperty(variable);</a>
-<span class="sourceLineNo">139</span><a id="line.139"> if (sysvalue
== null) {</a>
-<span class="sourceLineNo">140</span><a id="line.140"> // Try
with the environment if there was no</a>
-<span class="sourceLineNo">141</span><a id="line.141"> //
property by that name.</a>
-<span class="sourceLineNo">142</span><a id="line.142"> sysvalue
= System.getenv(variable);</a>
-<span class="sourceLineNo">143</span><a id="line.143"> }</a>
-<span class="sourceLineNo">144</span><a id="line.144"> if (sysvalue
!= null) {</a>
-<span class="sourceLineNo">145</span><a id="line.145"> final
String strtoken = propValue.substring(ctoken, btoken);</a>
-<span class="sourceLineNo">146</span><a id="line.146">
expanded.append(strtoken);</a>
-<span class="sourceLineNo">147</span><a id="line.147">
expanded.append(sysvalue);</a>
-<span class="sourceLineNo">148</span><a id="line.148"> ctoken =
etoken + ETOKEN.length();</a>
-<span class="sourceLineNo">149</span><a id="line.149"> }</a>
-<span class="sourceLineNo">150</span><a id="line.150"> btoken =
propValue.indexOf(BTOKEN, etoken + ETOKEN.length());</a>
-<span class="sourceLineNo">151</span><a id="line.151"> }</a>
-<span class="sourceLineNo">152</span><a id="line.152"> // Add what's
left.</a>
-<span class="sourceLineNo">153</span><a id="line.153">
expanded.append(propValue.substring(ctoken));</a>
-<span class="sourceLineNo">154</span><a id="line.154"> return
expanded.toString();</a>
-<span class="sourceLineNo">155</span><a id="line.155"> }</a>
-<span class="sourceLineNo">156</span><a id="line.156"></a>
-<span class="sourceLineNo">157</span><a id="line.157"> /**</a>
-<span class="sourceLineNo">158</span><a id="line.158"> * Gets the
configuration property.</a>
-<span class="sourceLineNo">159</span><a id="line.159"> *</a>
-<span class="sourceLineNo">160</span><a id="line.160"> * @param name The
name of the property to get.</a>
-<span class="sourceLineNo">161</span><a id="line.161"> *</a>
-<span class="sourceLineNo">162</span><a id="line.162"> * @throws
ParseException if the property is wrongly formatted.</a>
-<span class="sourceLineNo">163</span><a id="line.163"> *</a>
-<span class="sourceLineNo">164</span><a id="line.164"> * @return
Configuration property including any expansion/replacement</a>
-<span class="sourceLineNo">165</span><a id="line.165"> */</a>
-<span class="sourceLineNo">166</span><a id="line.166"> public String
getProperty(final String name)</a>
-<span class="sourceLineNo">167</span><a id="line.167"> throws
ParseException</a>
-<span class="sourceLineNo">168</span><a id="line.168"> {</a>
-<span class="sourceLineNo">169</span><a id="line.169"> if (name ==
null) {</a>
-<span class="sourceLineNo">170</span><a id="line.170"> return
null;</a>
-<span class="sourceLineNo">171</span><a id="line.171"> }</a>
-<span class="sourceLineNo">172</span><a id="line.172"> return
expandProperty(configurationProperties.getProperty(PREFIX + name));</a>
-<span class="sourceLineNo">173</span><a id="line.173"> }</a>
-<span class="sourceLineNo">174</span><a id="line.174"></a>
-<span class="sourceLineNo">175</span><a id="line.175"> /**</a>
-<span class="sourceLineNo">176</span><a id="line.176"> * Gets the
configuration property array.</a>
-<span class="sourceLineNo">177</span><a id="line.177"> * <p></a>
-<span class="sourceLineNo">178</span><a id="line.178"> * Property array is
constructed form the list of properties</a>
-<span class="sourceLineNo">179</span><a id="line.179"> * which end with
{@code [index]}</a>
-<span class="sourceLineNo">180</span><a id="line.180"> * </p></a>
-<span class="sourceLineNo">181</span><a id="line.181"> * <pre></a>
-<span class="sourceLineNo">182</span><a id="line.182"> * daemon.arg[0] =
argument 1</a>
-<span class="sourceLineNo">183</span><a id="line.183"> * daemon.arg[1] =
argument 2</a>
-<span class="sourceLineNo">184</span><a id="line.184"> * daemon.arg[2] =
argument 3</a>
-<span class="sourceLineNo">185</span><a id="line.185"> * </pre></a>
-<span class="sourceLineNo">186</span><a id="line.186"> * @param name The
name of the property array to get.</a>
-<span class="sourceLineNo">187</span><a id="line.187"> *</a>
-<span class="sourceLineNo">188</span><a id="line.188"> * @throws
ParseException if the property is wrongly formatted.</a>
-<span class="sourceLineNo">189</span><a id="line.189"> *</a>
-<span class="sourceLineNo">190</span><a id="line.190"> * @return
Configuration property array including any expansion/replacement</a>
-<span class="sourceLineNo">191</span><a id="line.191"> */</a>
-<span class="sourceLineNo">192</span><a id="line.192"> public String[]
getPropertyArray(final String name)</a>
-<span class="sourceLineNo">193</span><a id="line.193"> throws
ParseException</a>
-<span class="sourceLineNo">194</span><a id="line.194"> {</a>
-<span class="sourceLineNo">195</span><a id="line.195"> final
ArrayList<String> list = new ArrayList<>();</a>
-<span class="sourceLineNo">196</span><a id="line.196"> String
args;</a>
+<span class="sourceLineNo">062</span><a id="line.62"></a>
+<span class="sourceLineNo">063</span><a id="line.63"> private final
Properties configurationProperties;</a>
+<span class="sourceLineNo">064</span><a id="line.64"> private final
Properties systemProperties;</a>
+<span class="sourceLineNo">065</span><a id="line.65"></a>
+<span class="sourceLineNo">066</span><a id="line.66"> /**</a>
+<span class="sourceLineNo">067</span><a id="line.67"> * An empty immutable
{@code String} array.</a>
+<span class="sourceLineNo">068</span><a id="line.68"> */</a>
+<span class="sourceLineNo">069</span><a id="line.69"> static final String[]
EMPTY_STRING_ARRAY = {};</a>
+<span class="sourceLineNo">070</span><a id="line.70"></a>
+<span class="sourceLineNo">071</span><a id="line.71"> /**</a>
+<span class="sourceLineNo">072</span><a id="line.72"> * Default
constructor</a>
+<span class="sourceLineNo">073</span><a id="line.73"> */</a>
+<span class="sourceLineNo">074</span><a id="line.74"> public
DaemonConfiguration()</a>
+<span class="sourceLineNo">075</span><a id="line.75"> {</a>
+<span class="sourceLineNo">076</span><a id="line.76">
configurationProperties = new Properties();</a>
+<span class="sourceLineNo">077</span><a id="line.77"> systemProperties
= System.getProperties();</a>
+<span class="sourceLineNo">078</span><a id="line.78"> }</a>
+<span class="sourceLineNo">079</span><a id="line.79"></a>
+<span class="sourceLineNo">080</span><a id="line.80"> /**</a>
+<span class="sourceLineNo">081</span><a id="line.81"> * Loads the
configuration properties file.</a>
+<span class="sourceLineNo">082</span><a id="line.82"> *</a>
+<span class="sourceLineNo">083</span><a id="line.83"> * @param fileName
The properties file to load.</a>
+<span class="sourceLineNo">084</span><a id="line.84"> * @return {@code
true} if the file was loaded.</a>
+<span class="sourceLineNo">085</span><a id="line.85"> */</a>
+<span class="sourceLineNo">086</span><a id="line.86"> public boolean
load(String fileName)</a>
+<span class="sourceLineNo">087</span><a id="line.87"> {</a>
+<span class="sourceLineNo">088</span><a id="line.88"> if (fileName ==
null) {</a>
+<span class="sourceLineNo">089</span><a id="line.89"> fileName =
DEFAULT_CONFIG;</a>
+<span class="sourceLineNo">090</span><a id="line.90"> }</a>
+<span class="sourceLineNo">091</span><a id="line.91"> </a>
+<span class="sourceLineNo">092</span><a id="line.92"> try (InputStream
inputStream = new FileInputStream(fileName)) {</a>
+<span class="sourceLineNo">093</span><a id="line.93">
configurationProperties.clear();</a>
+<span class="sourceLineNo">094</span><a id="line.94">
configurationProperties.load(inputStream);</a>
+<span class="sourceLineNo">095</span><a id="line.95"> return
true;</a>
+<span class="sourceLineNo">096</span><a id="line.96"> } catch (final
IOException ex) {</a>
+<span class="sourceLineNo">097</span><a id="line.97"> // Error
reading properties file</a>
+<span class="sourceLineNo">098</span><a id="line.98"> return
false;</a>
+<span class="sourceLineNo">099</span><a id="line.99"> }</a>
+<span class="sourceLineNo">100</span><a id="line.100"> }</a>
+<span class="sourceLineNo">101</span><a id="line.101"></a>
+<span class="sourceLineNo">102</span><a id="line.102"> private String
expandProperty(final String propValue)</a>
+<span class="sourceLineNo">103</span><a id="line.103"> throws
ParseException</a>
+<span class="sourceLineNo">104</span><a id="line.104"> {</a>
+<span class="sourceLineNo">105</span><a id="line.105"> final
StringBuilder expanded;</a>
+<span class="sourceLineNo">106</span><a id="line.106"> int btoken;</a>
+<span class="sourceLineNo">107</span><a id="line.107"> int ctoken =
0;</a>
+<span class="sourceLineNo">108</span><a id="line.108"></a>
+<span class="sourceLineNo">109</span><a id="line.109"> if (propValue ==
null) {</a>
+<span class="sourceLineNo">110</span><a id="line.110"> return
null;</a>
+<span class="sourceLineNo">111</span><a id="line.111"> }</a>
+<span class="sourceLineNo">112</span><a id="line.112"> expanded = new
StringBuilder();</a>
+<span class="sourceLineNo">113</span><a id="line.113"> btoken =
propValue.indexOf(BTOKEN);</a>
+<span class="sourceLineNo">114</span><a id="line.114"> while (btoken !=
-1) {</a>
+<span class="sourceLineNo">115</span><a id="line.115"> if (btoken
> 0 && propValue.charAt(btoken - 1) == BTOKEN.charAt(0)) {</a>
+<span class="sourceLineNo">116</span><a id="line.116"> // Skip
and unquote.</a>
+<span class="sourceLineNo">117</span><a id="line.117">
expanded.append(propValue.substring(ctoken, btoken));</a>
+<span class="sourceLineNo">118</span><a id="line.118"> ctoken =
btoken + 1;</a>
+<span class="sourceLineNo">119</span><a id="line.119"> btoken =
propValue.indexOf(BTOKEN, btoken + BTOKEN.length());</a>
+<span class="sourceLineNo">120</span><a id="line.120">
continue;</a>
+<span class="sourceLineNo">121</span><a id="line.121"> }</a>
+<span class="sourceLineNo">122</span><a id="line.122"> final int
etoken = propValue.indexOf(ETOKEN, btoken);</a>
+<span class="sourceLineNo">123</span><a id="line.123"> if (etoken
== -1) {</a>
+<span class="sourceLineNo">124</span><a id="line.124"> // We
have "${" without "}"</a>
+<span class="sourceLineNo">125</span><a id="line.125"> throw
new ParseException("Error while looking for teminating '" +</a>
+<span class="sourceLineNo">126</span><a id="line.126">
ETOKEN + "'", btoken);</a>
+<span class="sourceLineNo">127</span><a id="line.127"> }</a>
+<span class="sourceLineNo">128</span><a id="line.128"> final String
variable = propValue.substring(btoken + BTOKEN.length(), etoken);</a>
+<span class="sourceLineNo">129</span><a id="line.129"> String
sysvalue = systemProperties.getProperty(variable);</a>
+<span class="sourceLineNo">130</span><a id="line.130"> if (sysvalue
== null) {</a>
+<span class="sourceLineNo">131</span><a id="line.131"> // Try
with the environment if there was no</a>
+<span class="sourceLineNo">132</span><a id="line.132"> //
property by that name.</a>
+<span class="sourceLineNo">133</span><a id="line.133"> sysvalue
= System.getenv(variable);</a>
+<span class="sourceLineNo">134</span><a id="line.134"> }</a>
+<span class="sourceLineNo">135</span><a id="line.135"> if (sysvalue
!= null) {</a>
+<span class="sourceLineNo">136</span><a id="line.136"> final
String strtoken = propValue.substring(ctoken, btoken);</a>
+<span class="sourceLineNo">137</span><a id="line.137">
expanded.append(strtoken);</a>
+<span class="sourceLineNo">138</span><a id="line.138">
expanded.append(sysvalue);</a>
+<span class="sourceLineNo">139</span><a id="line.139"> ctoken =
etoken + ETOKEN.length();</a>
+<span class="sourceLineNo">140</span><a id="line.140"> }</a>
+<span class="sourceLineNo">141</span><a id="line.141"> btoken =
propValue.indexOf(BTOKEN, etoken + ETOKEN.length());</a>
+<span class="sourceLineNo">142</span><a id="line.142"> }</a>
+<span class="sourceLineNo">143</span><a id="line.143"> // Add what's
left.</a>
+<span class="sourceLineNo">144</span><a id="line.144">
expanded.append(propValue.substring(ctoken));</a>
+<span class="sourceLineNo">145</span><a id="line.145"> return
expanded.toString();</a>
+<span class="sourceLineNo">146</span><a id="line.146"> }</a>
+<span class="sourceLineNo">147</span><a id="line.147"></a>
+<span class="sourceLineNo">148</span><a id="line.148"> /**</a>
+<span class="sourceLineNo">149</span><a id="line.149"> * Gets the
configuration property.</a>
+<span class="sourceLineNo">150</span><a id="line.150"> *</a>
+<span class="sourceLineNo">151</span><a id="line.151"> * @param name The
name of the property to get.</a>
+<span class="sourceLineNo">152</span><a id="line.152"> *</a>
+<span class="sourceLineNo">153</span><a id="line.153"> * @throws
ParseException if the property is wrongly formatted.</a>
+<span class="sourceLineNo">154</span><a id="line.154"> *</a>
+<span class="sourceLineNo">155</span><a id="line.155"> * @return
Configuration property including any expansion/replacement</a>
+<span class="sourceLineNo">156</span><a id="line.156"> */</a>
+<span class="sourceLineNo">157</span><a id="line.157"> public String
getProperty(final String name)</a>
+<span class="sourceLineNo">158</span><a id="line.158"> throws
ParseException</a>
+<span class="sourceLineNo">159</span><a id="line.159"> {</a>
+<span class="sourceLineNo">160</span><a id="line.160"> if (name ==
null) {</a>
+<span class="sourceLineNo">161</span><a id="line.161"> return
null;</a>
+<span class="sourceLineNo">162</span><a id="line.162"> }</a>
+<span class="sourceLineNo">163</span><a id="line.163"> return
expandProperty(configurationProperties.getProperty(PREFIX + name));</a>
+<span class="sourceLineNo">164</span><a id="line.164"> }</a>
+<span class="sourceLineNo">165</span><a id="line.165"></a>
+<span class="sourceLineNo">166</span><a id="line.166"> /**</a>
+<span class="sourceLineNo">167</span><a id="line.167"> * Gets the
configuration property array.</a>
+<span class="sourceLineNo">168</span><a id="line.168"> * <p></a>
+<span class="sourceLineNo">169</span><a id="line.169"> * Property array is
constructed form the list of properties</a>
+<span class="sourceLineNo">170</span><a id="line.170"> * which end with
{@code [index]}</a>
+<span class="sourceLineNo">171</span><a id="line.171"> * </p></a>
+<span class="sourceLineNo">172</span><a id="line.172"> * <pre></a>
+<span class="sourceLineNo">173</span><a id="line.173"> * daemon.arg[0] =
argument 1</a>
+<span class="sourceLineNo">174</span><a id="line.174"> * daemon.arg[1] =
argument 2</a>
+<span class="sourceLineNo">175</span><a id="line.175"> * daemon.arg[2] =
argument 3</a>
+<span class="sourceLineNo">176</span><a id="line.176"> * </pre></a>
+<span class="sourceLineNo">177</span><a id="line.177"> * @param name The
name of the property array to get.</a>
+<span class="sourceLineNo">178</span><a id="line.178"> *</a>
+<span class="sourceLineNo">179</span><a id="line.179"> * @throws
ParseException if the property is wrongly formatted.</a>
+<span class="sourceLineNo">180</span><a id="line.180"> *</a>
+<span class="sourceLineNo">181</span><a id="line.181"> * @return
Configuration property array including any expansion/replacement</a>
+<span class="sourceLineNo">182</span><a id="line.182"> */</a>
+<span class="sourceLineNo">183</span><a id="line.183"> public String[]
getPropertyArray(final String name)</a>
+<span class="sourceLineNo">184</span><a id="line.184"> throws
ParseException</a>
+<span class="sourceLineNo">185</span><a id="line.185"> {</a>
+<span class="sourceLineNo">186</span><a id="line.186"> final
ArrayList<String> list = new ArrayList<>();</a>
+<span class="sourceLineNo">187</span><a id="line.187"> String
args;</a>
+<span class="sourceLineNo">188</span><a id="line.188"></a>
+<span class="sourceLineNo">189</span><a id="line.189"> // Load
daemon.arg[0] ... daemon.arg[n] into the String array.</a>
+<span class="sourceLineNo">190</span><a id="line.190"> //</a>
+<span class="sourceLineNo">191</span><a id="line.191"> while ((args =
getProperty(name + "[" + list.size() + "]")) != null) {</a>
+<span class="sourceLineNo">192</span><a id="line.192">
list.add(args);</a>
+<span class="sourceLineNo">193</span><a id="line.193"> }</a>
+<span class="sourceLineNo">194</span><a id="line.194"> return
list.toArray(EMPTY_STRING_ARRAY);</a>
+<span class="sourceLineNo">195</span><a id="line.195"> }</a>
+<span class="sourceLineNo">196</span><a id="line.196">}</a>
<span class="sourceLineNo">197</span><a id="line.197"></a>
-<span class="sourceLineNo">198</span><a id="line.198"> // Load
daemon.arg[0] ... daemon.arg[n] into the String array.</a>
-<span class="sourceLineNo">199</span><a id="line.199"> //</a>
-<span class="sourceLineNo">200</span><a id="line.200"> while ((args =
getProperty(name + "[" + list.size() + "]")) != null) {</a>
-<span class="sourceLineNo">201</span><a id="line.201">
list.add(args);</a>
-<span class="sourceLineNo">202</span><a id="line.202"> }</a>
-<span class="sourceLineNo">203</span><a id="line.203"> return
list.toArray(EMPTY_STRING_ARRAY);</a>
-<span class="sourceLineNo">204</span><a id="line.204"> }</a>
-<span class="sourceLineNo">205</span><a id="line.205">}</a>
-<span class="sourceLineNo">206</span><a id="line.206"></a>
