You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/11/26 19:46:13 UTC
[04/51] [partial] juneau-website git commit: New
Security-Best-Practices section in javadocs.
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileBuilder.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileBuilder.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileBuilder.html
index 1836d2f..7f4e4b7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileBuilder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileBuilder.html
@@ -28,310 +28,311 @@
<span class="sourceLineNo">020</span>import java.util.*;<a name="line.20"></a>
<span class="sourceLineNo">021</span><a name="line.21"></a>
<span class="sourceLineNo">022</span>import org.apache.juneau.*;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.juneau.json.*;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.juneau.parser.*;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.juneau.serializer.*;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.juneau.utils.*;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>/**<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * Builder for creating instances of {@link ConfigFile ConfigFiles}.<a name="line.29"></a>
-<span class="sourceLineNo">030</span> *<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * <h5 class='section'>Example:</h5><a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <p class='bcode'><a name="line.32"></a>
-<span class="sourceLineNo">033</span> * ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * String setting = cf.get(<js>"MySection/mysetting"</js>);<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * </p><a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>public class ConfigFileBuilder {<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span> private WriterSerializer serializer = JsonSerializer.DEFAULT_LAX;<a name="line.39"></a>
-<span class="sourceLineNo">040</span> private ReaderParser parser = JsonParser.DEFAULT;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> private Encoder encoder = new XorEncoder();<a name="line.41"></a>
-<span class="sourceLineNo">042</span> private boolean readOnly = false, createIfNotExists = false;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> private Charset charset = Charset.defaultCharset();<a name="line.43"></a>
-<span class="sourceLineNo">044</span> private List<File> searchPaths = new AList<File>().append(new File("."));<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> /**<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * Specify the encoder to use for encoded config file entries (e.g. <js>"mySecret*={...}"</js>).<a name="line.47"></a>
-<span class="sourceLineNo">048</span> *<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * <p><a name="line.49"></a>
-<span class="sourceLineNo">050</span> * The default value for this setting is an instance of {@link XorEncoder}.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> *<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * @param encoder The new value for this setting.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * @return This object (for method chaining).<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span> public ConfigFileBuilder encoder(Encoder encoder) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> this.encoder = encoder;<a name="line.56"></a>
-<span class="sourceLineNo">057</span> return this;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * Specify the serializer to use for serializing POJOs when using {@link ConfigFile#put(String, Object)}.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> *<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * The default value for this setting is {@link JsonSerializer#DEFAULT_LAX}.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> *<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * @param serializer The new value for this setting.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * @return This object (for method chaining).<a name="line.67"></a>
-<span class="sourceLineNo">068</span> */<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public ConfigFileBuilder serializer(WriterSerializer serializer) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> this.serializer = serializer;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> return this;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * Specify the parser to use for parsing POJOs when using {@link ConfigFile#getObject(String,Class)}.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> *<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <p><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * The default value for this setting is {@link JsonParser#DEFAULT}<a name="line.78"></a>
-<span class="sourceLineNo">079</span> *<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * @param parser The new value for this setting.<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * @return This object (for method chaining).<a name="line.81"></a>
-<span class="sourceLineNo">082</span> */<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public ConfigFileBuilder parser(ReaderParser parser) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> this.parser = parser;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> return this;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * Specify the config file character encoding.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> *<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * <p><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * The default value for this setting is {@link Charset#defaultCharset()}.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> *<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @param charset The new value for this setting.<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @return This object (for method chaining).<a name="line.95"></a>
-<span class="sourceLineNo">096</span> */<a name="line.96"></a>
-<span class="sourceLineNo">097</span> public ConfigFileBuilder charset(Charset charset) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> this.charset = charset;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> return this;<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * Specify the search paths for config files.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> *<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * <p><a name="line.105"></a>
-<span class="sourceLineNo">106</span> * Can contain relative or absolute paths.<a name="line.106"></a>
-<span class="sourceLineNo">107</span> *<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <p><a name="line.108"></a>
-<span class="sourceLineNo">109</span> * The default value for this setting is <code>[<js>"."</js>]</code>.<a name="line.109"></a>
-<span class="sourceLineNo">110</span> *<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @param searchPaths The new value for this setting.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * @return This object (for method chaining).<a name="line.112"></a>
-<span class="sourceLineNo">113</span> */<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public ConfigFileBuilder paths(String...searchPaths) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> this.searchPaths = new LinkedList<>();<a name="line.115"></a>
-<span class="sourceLineNo">116</span> for (String p : searchPaths)<a name="line.116"></a>
-<span class="sourceLineNo">117</span> this.searchPaths.add(new File(p));<a name="line.117"></a>
-<span class="sourceLineNo">118</span> return this;<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> /**<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * Make {@link ConfigFile ConfigFiles} read-only.<a name="line.122"></a>
-<span class="sourceLineNo">123</span> *<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * <p><a name="line.124"></a>
-<span class="sourceLineNo">125</span> * The default value of this setting is <jk>false</jk>.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> *<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * @return This object (for method chaining).<a name="line.127"></a>
-<span class="sourceLineNo">128</span> */<a name="line.128"></a>
-<span class="sourceLineNo">129</span> public ConfigFileBuilder readOnly() {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> this.readOnly = true;<a name="line.130"></a>
-<span class="sourceLineNo">131</span> return this;<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> /**<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * Create config files if they cannot be found on the file system.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> *<a name="line.136"></a>
-<span class="sourceLineNo">137</span> * <p><a name="line.137"></a>
-<span class="sourceLineNo">138</span> * The default value for this setting is <jk>false</jk>.<a name="line.138"></a>
-<span class="sourceLineNo">139</span> *<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * @return This object (for method chaining).<a name="line.140"></a>
-<span class="sourceLineNo">141</span> */<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public ConfigFileBuilder createIfNotExists() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> this.createIfNotExists = true;<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return this;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> /**<a name="line.147"></a>
-<span class="sourceLineNo">148</span> * Returns the config file with the specified absolute or relative path.<a name="line.148"></a>
-<span class="sourceLineNo">149</span> *<a name="line.149"></a>
-<span class="sourceLineNo">150</span> * @param path The absolute or relative path of the config file.<a name="line.150"></a>
-<span class="sourceLineNo">151</span> * @return The config file.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> * @throws IOException If config file could not be parsed.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * @throws FileNotFoundException If config file could not be found.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> */<a name="line.154"></a>
-<span class="sourceLineNo">155</span> public ConfigFile build(String path) throws IOException {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return new ConfigFileImpl(resolve(path), readOnly, encoder, serializer, parser, charset);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * Create a new empty config file not backed by any file.<a name="line.160"></a>
-<span class="sourceLineNo">161</span> *<a name="line.161"></a>
-<span class="sourceLineNo">162</span> * @return A new config file.<a name="line.162"></a>
-<span class="sourceLineNo">163</span> * @throws IOException<a name="line.163"></a>
-<span class="sourceLineNo">164</span> */<a name="line.164"></a>
-<span class="sourceLineNo">165</span> public ConfigFile build() throws IOException {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return new ConfigFileImpl(null, false, encoder, serializer, parser, charset);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * Create a new config file backed by the specified file.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> *<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * <p><a name="line.172"></a>
-<span class="sourceLineNo">173</span> * This method is provided primarily for testing purposes.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> *<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * @param f The file to create a config file from.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * @return A new config file.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * @throws IOException<a name="line.177"></a>
-<span class="sourceLineNo">178</span> */<a name="line.178"></a>
-<span class="sourceLineNo">179</span> public ConfigFile build(File f) throws IOException {<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return new ConfigFileImpl(f, false, encoder, serializer, parser, charset);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> /**<a name="line.183"></a>
-<span class="sourceLineNo">184</span> * Create a new config file not backed by a file.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> *<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @param r The reader containing an INI-formatted file to initialize the config file from.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * @return A new config file.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> * @throws IOException<a name="line.188"></a>
-<span class="sourceLineNo">189</span> */<a name="line.189"></a>
-<span class="sourceLineNo">190</span> public ConfigFile build(Reader r) throws IOException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> return new ConfigFileImpl(null, false, encoder, serializer, parser, charset).load(r);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> private File resolve(String path) throws IOException {<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> // Handle absolute file.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> File f = new File(path);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (f.isAbsolute()) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> if (createIfNotExists)<a name="line.199"></a>
-<span class="sourceLineNo">200</span> create(f);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> if (f.exists())<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return f;<a name="line.202"></a>
-<span class="sourceLineNo">203</span> throw new FileNotFoundException("Could not find config file '"+path+"'");<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span> if (searchPaths.isEmpty())<a name="line.206"></a>
-<span class="sourceLineNo">207</span> throw new FileNotFoundException("No search paths specified in ConfigFileBuilder.");<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> // Handle paths relative to search paths.<a name="line.209"></a>
-<span class="sourceLineNo">210</span> for (File sf : searchPaths) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> f = new File(sf.getAbsolutePath() + "/" + path);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> if (f.exists())<a name="line.212"></a>
-<span class="sourceLineNo">213</span> return f;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (createIfNotExists) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> f = new File(searchPaths.get(0).getAbsolutePath() + "/" + path);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> create(f);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> return f;<a name="line.219"></a>
-<span class="sourceLineNo">220</span> }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> throw new FileNotFoundException("Could not find config file '"+path+"'");<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * Implements command-line features for working with INI configuration files.<a name="line.226"></a>
-<span class="sourceLineNo">227</span> *<a name="line.227"></a>
-<span class="sourceLineNo">228</span> * <p><a name="line.228"></a>
-<span class="sourceLineNo">229</span> * Invoke as a normal Java program...<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * <p class='bcode'><a name="line.230"></a>
-<span class="sourceLineNo">231</span> * java org.apache.juneau.ini.ConfigFileBuilder [args]<a name="line.231"></a>
-<span class="sourceLineNo">232</span> * </p><a name="line.232"></a>
-<span class="sourceLineNo">233</span> *<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * <p><a name="line.234"></a>
-<span class="sourceLineNo">235</span> * Arguments can be any of the following...<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * <ul class='spaced-list'><a name="line.236"></a>
-<span class="sourceLineNo">237</span> * <li><a name="line.237"></a>
-<span class="sourceLineNo">238</span> * No arguments<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * <br>Prints usage message.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <li><a name="line.240"></a>
-<span class="sourceLineNo">241</span> * <code>createBatchEnvFile -configfile &lt;configFile&gt; -envfile &lt;batchFile&gt; [-verbose]</code><a name="line.241"></a>
-<span class="sourceLineNo">242</span> * <br>Creates a batch file that will set each config file entry as an environment variable.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * <br>Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * will be converted to underscores.<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * <li><a name="line.245"></a>
-<span class="sourceLineNo">246</span> * <code>createShellEnvFile -configFile &lt;configFile&gt; -envFile &lt;configFile&gt; [-verbose]</code><a name="line.246"></a>
-<span class="sourceLineNo">247</span> * Creates a shell script that will set each config file entry as an environment variable.<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * <br>Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * will be converted to underscores.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * <li><a name="line.250"></a>
-<span class="sourceLineNo">251</span> * <code>setVals -configFile &lt;configFile&gt; -vals [var1=val1 [var2=val2...]] [-verbose]</code><a name="line.251"></a>
-<span class="sourceLineNo">252</span> * Sets values in config files.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * </ul><a name="line.253"></a>
-<span class="sourceLineNo">254</span> *<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * <p><a name="line.255"></a>
-<span class="sourceLineNo">256</span> * For example, the following command will create the file <code>'MyConfig.bat'</code> from the contents of the<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * file <code>'MyConfig.cfg'</code>.<a name="line.257"></a>
-<span class="sourceLineNo">258</span> * <p class='bcode'><a name="line.258"></a>
-<span class="sourceLineNo">259</span> * java org.apache.juneau.ini.ConfigFileBuilder createBatchEnvFile -configfile C:\foo\MyConfig.cfg<a name="line.259"></a>
-<span class="sourceLineNo">260</span> * -batchfile C:\foo\MyConfig.bat<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * </p><a name="line.261"></a>
-<span class="sourceLineNo">262</span> *<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * @param args Command-line arguments<a name="line.263"></a>
-<span class="sourceLineNo">264</span> */<a name="line.264"></a>
-<span class="sourceLineNo">265</span> public static void main(String[] args) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> Args a = new Args(args);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> String command = a.getArg(0);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> String configFile = a.getArg("configFile");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> String envFile = a.getArg("envFile");<a name="line.270"></a>
-<span class="sourceLineNo">271</span> List<String> vals = a.getArgs("vals");<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (command == null || ! (command.equals("createBatchEnvFile") || command.equals("createShellEnvFile") || command.equals("setVals")))<a name="line.273"></a>
-<span class="sourceLineNo">274</span> printUsageAndExit();<a name="line.274"></a>
-<span class="sourceLineNo">275</span> else if (configFile.isEmpty())<a name="line.275"></a>
-<span class="sourceLineNo">276</span> printUsageAndExit();<a name="line.276"></a>
-<span class="sourceLineNo">277</span> else if (command.equals("setVals") && vals.isEmpty())<a name="line.277"></a>
-<span class="sourceLineNo">278</span> printUsageAndExit();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> else if ((command.equals("createBatchEnvFile") || command.equals("createShellEnvFile")) && envFile.isEmpty())<a name="line.279"></a>
-<span class="sourceLineNo">280</span> printUsageAndExit();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> else {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> try {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> ConfigFile cf = new ConfigFileBuilder().build(configFile);<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> if (command.equalsIgnoreCase("setVals")) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> for (String val : vals) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> String[] x = val.split("\\=");<a name="line.287"></a>
-<span class="sourceLineNo">288</span> if (x.length != 2)<a name="line.288"></a>
-<span class="sourceLineNo">289</span> throw new FormattedRuntimeException(<a name="line.289"></a>
-<span class="sourceLineNo">290</span> "Invalid format for value: ''{0}''. Must be in the format 'key=value'",<a name="line.290"></a>
-<span class="sourceLineNo">291</span> val<a name="line.291"></a>
-<span class="sourceLineNo">292</span> );<a name="line.292"></a>
-<span class="sourceLineNo">293</span> cf.put(x[0], x[1]);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> cf.save();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> return;<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> } else if (command.equalsIgnoreCase("createBatchEnvFile")) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> try (Writer fw = new OutputStreamWriter(new FileOutputStream(envFile), Charset.defaultCharset())) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> cf.serializeTo(fw, BATCH);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span> return;<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> } else if (command.equalsIgnoreCase("createShellEnvFile")) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> try (Writer fw = new OutputStreamWriter(new FileOutputStream(envFile), Charset.defaultCharset())) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> cf.serializeTo(fw, SHELL);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span> return;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> } catch (Exception e) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> e.printStackTrace();<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> private static void printUsageAndExit() {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> System.err.println("---Usage---"); // NOT DEBUG<a name="line.318"></a>
-<span class="sourceLineNo">319</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile createBatchEnvFile -configFile <configFile> -envFile <envFile> [-verbose]"); // NOT DEBUG<a name="line.319"></a>
-<span class="sourceLineNo">320</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile createShellEnvFile -configFile <configFile> -envFile <envFile> [-verbose]"); // NOT DEBUG<a name="line.320"></a>
-<span class="sourceLineNo">321</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile setVals -configFile <configFile> -vals [var1 val1 [var2 val2...]] [-verbose]"); // NOT DEBUG<a name="line.321"></a>
-<span class="sourceLineNo">322</span> int rc = Integer.getInteger("exit.2", 2);<a name="line.322"></a>
-<span class="sourceLineNo">323</span> if (rc != 0)<a name="line.323"></a>
-<span class="sourceLineNo">324</span> System.exit(rc);<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>}<a name="line.326"></a>
+<span class="sourceLineNo">023</span>import org.apache.juneau.internal.FileWriterBuilder;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.juneau.json.*;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.juneau.parser.*;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.juneau.serializer.*;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.juneau.utils.*;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>/**<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * Builder for creating instances of {@link ConfigFile ConfigFiles}.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> *<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * <h5 class='section'>Example:</h5><a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <p class='bcode'><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * ConfigFile cf = <jk>new</jk> ConfigFileBuilder().build(<js>"MyConfig.cfg"</js>);<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * String setting = cf.get(<js>"MySection/mysetting"</js>);<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * </p><a name="line.36"></a>
+<span class="sourceLineNo">037</span> */<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public class ConfigFileBuilder {<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> private WriterSerializer serializer = JsonSerializer.DEFAULT_LAX;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> private ReaderParser parser = JsonParser.DEFAULT;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> private Encoder encoder = new XorEncoder();<a name="line.42"></a>
+<span class="sourceLineNo">043</span> private boolean readOnly = false, createIfNotExists = false;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> private Charset charset = Charset.defaultCharset();<a name="line.44"></a>
+<span class="sourceLineNo">045</span> private List<File> searchPaths = new AList<File>().append(new File("."));<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> /**<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * Specify the encoder to use for encoded config file entries (e.g. <js>"mySecret*={...}"</js>).<a name="line.48"></a>
+<span class="sourceLineNo">049</span> *<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * <p><a name="line.50"></a>
+<span class="sourceLineNo">051</span> * The default value for this setting is an instance of {@link XorEncoder}.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> *<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @param encoder The new value for this setting.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * @return This object (for method chaining).<a name="line.54"></a>
+<span class="sourceLineNo">055</span> */<a name="line.55"></a>
+<span class="sourceLineNo">056</span> public ConfigFileBuilder encoder(Encoder encoder) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> this.encoder = encoder;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> return this;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Specify the serializer to use for serializing POJOs when using {@link ConfigFile#put(String, Object)}.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> *<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * <p><a name="line.64"></a>
+<span class="sourceLineNo">065</span> * The default value for this setting is {@link JsonSerializer#DEFAULT_LAX}.<a name="line.65"></a>
+<span class="sourceLineNo">066</span> *<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * @param serializer The new value for this setting.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * @return This object (for method chaining).<a name="line.68"></a>
+<span class="sourceLineNo">069</span> */<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public ConfigFileBuilder serializer(WriterSerializer serializer) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> this.serializer = serializer;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> return this;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * Specify the parser to use for parsing POJOs when using {@link ConfigFile#getObject(String,Class)}.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <p><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * The default value for this setting is {@link JsonParser#DEFAULT}<a name="line.79"></a>
+<span class="sourceLineNo">080</span> *<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * @param parser The new value for this setting.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @return This object (for method chaining).<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public ConfigFileBuilder parser(ReaderParser parser) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> this.parser = parser;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return this;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> /**<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * Specify the config file character encoding.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> *<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * <p><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * The default value for this setting is {@link Charset#defaultCharset()}.<a name="line.93"></a>
+<span class="sourceLineNo">094</span> *<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * @param charset The new value for this setting.<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @return This object (for method chaining).<a name="line.96"></a>
+<span class="sourceLineNo">097</span> */<a name="line.97"></a>
+<span class="sourceLineNo">098</span> public ConfigFileBuilder charset(Charset charset) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> this.charset = charset;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> return this;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * Specify the search paths for config files.<a name="line.104"></a>
+<span class="sourceLineNo">105</span> *<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * <p><a name="line.106"></a>
+<span class="sourceLineNo">107</span> * Can contain relative or absolute paths.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> *<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * <p><a name="line.109"></a>
+<span class="sourceLineNo">110</span> * The default value for this setting is <code>[<js>"."</js>]</code>.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> *<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @param searchPaths The new value for this setting.<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @return This object (for method chaining).<a name="line.113"></a>
+<span class="sourceLineNo">114</span> */<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public ConfigFileBuilder paths(String...searchPaths) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> this.searchPaths = new LinkedList<>();<a name="line.116"></a>
+<span class="sourceLineNo">117</span> for (String p : searchPaths)<a name="line.117"></a>
+<span class="sourceLineNo">118</span> this.searchPaths.add(new File(p));<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return this;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * Make {@link ConfigFile ConfigFiles} read-only.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> *<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * <p><a name="line.125"></a>
+<span class="sourceLineNo">126</span> * The default value of this setting is <jk>false</jk>.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> *<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @return This object (for method chaining).<a name="line.128"></a>
+<span class="sourceLineNo">129</span> */<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public ConfigFileBuilder readOnly() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> this.readOnly = true;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> return this;<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * Create config files if they cannot be found on the file system.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> *<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * <p><a name="line.138"></a>
+<span class="sourceLineNo">139</span> * The default value for this setting is <jk>false</jk>.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> *<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * @return This object (for method chaining).<a name="line.141"></a>
+<span class="sourceLineNo">142</span> */<a name="line.142"></a>
+<span class="sourceLineNo">143</span> public ConfigFileBuilder createIfNotExists() {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> this.createIfNotExists = true;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return this;<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> /**<a name="line.148"></a>
+<span class="sourceLineNo">149</span> * Returns the config file with the specified absolute or relative path.<a name="line.149"></a>
+<span class="sourceLineNo">150</span> *<a name="line.150"></a>
+<span class="sourceLineNo">151</span> * @param path The absolute or relative path of the config file.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * @return The config file.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> * @throws IOException If config file could not be parsed.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> * @throws FileNotFoundException If config file could not be found.<a name="line.154"></a>
+<span class="sourceLineNo">155</span> */<a name="line.155"></a>
+<span class="sourceLineNo">156</span> public ConfigFile build(String path) throws IOException {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return new ConfigFileImpl(resolve(path), readOnly, encoder, serializer, parser, charset);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Create a new empty config file not backed by any file.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> *<a name="line.162"></a>
+<span class="sourceLineNo">163</span> * @return A new config file.<a name="line.163"></a>
+<span class="sourceLineNo">164</span> * @throws IOException<a name="line.164"></a>
+<span class="sourceLineNo">165</span> */<a name="line.165"></a>
+<span class="sourceLineNo">166</span> public ConfigFile build() throws IOException {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> return new ConfigFileImpl(null, false, encoder, serializer, parser, charset);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> /**<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * Create a new config file backed by the specified file.<a name="line.171"></a>
+<span class="sourceLineNo">172</span> *<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * <p><a name="line.173"></a>
+<span class="sourceLineNo">174</span> * This method is provided primarily for testing purposes.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> *<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @param f The file to create a config file from.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * @return A new config file.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * @throws IOException<a name="line.178"></a>
+<span class="sourceLineNo">179</span> */<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public ConfigFile build(File f) throws IOException {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return new ConfigFileImpl(f, false, encoder, serializer, parser, charset);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Create a new config file not backed by a file.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> *<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * @param r The reader containing an INI-formatted file to initialize the config file from.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * @return A new config file.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * @throws IOException<a name="line.189"></a>
+<span class="sourceLineNo">190</span> */<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public ConfigFile build(Reader r) throws IOException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return new ConfigFileImpl(null, false, encoder, serializer, parser, charset).load(r);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span> private File resolve(String path) throws IOException {<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> // Handle absolute file.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> File f = new File(path);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> if (f.isAbsolute()) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> if (createIfNotExists)<a name="line.200"></a>
+<span class="sourceLineNo">201</span> create(f);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (f.exists())<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return f;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> throw new FileNotFoundException("Could not find config file '"+path+"'");<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> if (searchPaths.isEmpty())<a name="line.207"></a>
+<span class="sourceLineNo">208</span> throw new FileNotFoundException("No search paths specified in ConfigFileBuilder.");<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> // Handle paths relative to search paths.<a name="line.210"></a>
+<span class="sourceLineNo">211</span> for (File sf : searchPaths) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> f = new File(sf.getAbsolutePath() + "/" + path);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> if (f.exists())<a name="line.213"></a>
+<span class="sourceLineNo">214</span> return f;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (createIfNotExists) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> f = new File(searchPaths.get(0).getAbsolutePath() + "/" + path);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> create(f);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> return f;<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> throw new FileNotFoundException("Could not find config file '"+path+"'");<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> /**<a name="line.226"></a>
+<span class="sourceLineNo">227</span> * Implements command-line features for working with INI configuration files.<a name="line.227"></a>
+<span class="sourceLineNo">228</span> *<a name="line.228"></a>
+<span class="sourceLineNo">229</span> * <p><a name="line.229"></a>
+<span class="sourceLineNo">230</span> * Invoke as a normal Java program...<a name="line.230"></a>
+<span class="sourceLineNo">231</span> * <p class='bcode'><a name="line.231"></a>
+<span class="sourceLineNo">232</span> * java org.apache.juneau.ini.ConfigFileBuilder [args]<a name="line.232"></a>
+<span class="sourceLineNo">233</span> * </p><a name="line.233"></a>
+<span class="sourceLineNo">234</span> *<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * <p><a name="line.235"></a>
+<span class="sourceLineNo">236</span> * Arguments can be any of the following...<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * <ul class='spaced-list'><a name="line.237"></a>
+<span class="sourceLineNo">238</span> * <li><a name="line.238"></a>
+<span class="sourceLineNo">239</span> * No arguments<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * <br>Prints usage message.<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * <li><a name="line.241"></a>
+<span class="sourceLineNo">242</span> * <code>createBatchEnvFile -configfile &lt;configFile&gt; -envfile &lt;batchFile&gt; [-verbose]</code><a name="line.242"></a>
+<span class="sourceLineNo">243</span> * <br>Creates a batch file that will set each config file entry as an environment variable.<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * <br>Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * will be converted to underscores.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * <li><a name="line.246"></a>
+<span class="sourceLineNo">247</span> * <code>createShellEnvFile -configFile &lt;configFile&gt; -envFile &lt;configFile&gt; [-verbose]</code><a name="line.247"></a>
+<span class="sourceLineNo">248</span> * Creates a shell script that will set each config file entry as an environment variable.<a name="line.248"></a>
+<span class="sourceLineNo">249</span> * <br>Characters in the keys that are not valid as environment variable names (e.g. <js>'/'</js> and <js>'.'</js>)<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * will be converted to underscores.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * <li><a name="line.251"></a>
+<span class="sourceLineNo">252</span> * <code>setVals -configFile &lt;configFile&gt; -vals [var1=val1 [var2=val2...]] [-verbose]</code><a name="line.252"></a>
+<span class="sourceLineNo">253</span> * Sets values in config files.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * </ul><a name="line.254"></a>
+<span class="sourceLineNo">255</span> *<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * <p><a name="line.256"></a>
+<span class="sourceLineNo">257</span> * For example, the following command will create the file <code>'MyConfig.bat'</code> from the contents of the<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * file <code>'MyConfig.cfg'</code>.<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * <p class='bcode'><a name="line.259"></a>
+<span class="sourceLineNo">260</span> * java org.apache.juneau.ini.ConfigFileBuilder createBatchEnvFile -configfile C:\foo\MyConfig.cfg<a name="line.260"></a>
+<span class="sourceLineNo">261</span> * -batchfile C:\foo\MyConfig.bat<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * </p><a name="line.262"></a>
+<span class="sourceLineNo">263</span> *<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @param args Command-line arguments<a name="line.264"></a>
+<span class="sourceLineNo">265</span> */<a name="line.265"></a>
+<span class="sourceLineNo">266</span> public static void main(String[] args) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> Args a = new Args(args);<a name="line.268"></a>
+<span class="sourceLineNo">269</span> String command = a.getArg(0);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> String configFile = a.getArg("configFile");<a name="line.270"></a>
+<span class="sourceLineNo">271</span> String envFile = a.getArg("envFile");<a name="line.271"></a>
+<span class="sourceLineNo">272</span> List<String> vals = a.getArgs("vals");<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> if (command == null || ! (command.equals("createBatchEnvFile") || command.equals("createShellEnvFile") || command.equals("setVals")))<a name="line.274"></a>
+<span class="sourceLineNo">275</span> printUsageAndExit();<a name="line.275"></a>
+<span class="sourceLineNo">276</span> else if (configFile.isEmpty())<a name="line.276"></a>
+<span class="sourceLineNo">277</span> printUsageAndExit();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> else if (command.equals("setVals") && vals.isEmpty())<a name="line.278"></a>
+<span class="sourceLineNo">279</span> printUsageAndExit();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> else if ((command.equals("createBatchEnvFile") || command.equals("createShellEnvFile")) && envFile.isEmpty())<a name="line.280"></a>
+<span class="sourceLineNo">281</span> printUsageAndExit();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> else {<a name="line.282"></a>
+<span class="sourceLineNo">283</span> try {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> ConfigFile cf = new ConfigFileBuilder().build(configFile);<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> if (command.equalsIgnoreCase("setVals")) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> for (String val : vals) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> String[] x = val.split("\\=");<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (x.length != 2)<a name="line.289"></a>
+<span class="sourceLineNo">290</span> throw new FormattedRuntimeException(<a name="line.290"></a>
+<span class="sourceLineNo">291</span> "Invalid format for value: ''{0}''. Must be in the format 'key=value'",<a name="line.291"></a>
+<span class="sourceLineNo">292</span> val<a name="line.292"></a>
+<span class="sourceLineNo">293</span> );<a name="line.293"></a>
+<span class="sourceLineNo">294</span> cf.put(x[0], x[1]);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span> cf.save();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return;<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> } else if (command.equalsIgnoreCase("createBatchEnvFile")) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> try (Writer fw = FileWriterBuilder.create(envFile).build()) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> cf.serializeTo(fw, BATCH);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> return;<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> } else if (command.equalsIgnoreCase("createShellEnvFile")) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> try (Writer fw = FileWriterBuilder.create(envFile).build()) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> cf.serializeTo(fw, SHELL);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span> return;<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> } catch (Exception e) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> e.printStackTrace();<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span> private static void printUsageAndExit() {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> System.err.println("---Usage---"); // NOT DEBUG<a name="line.319"></a>
+<span class="sourceLineNo">320</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile createBatchEnvFile -configFile <configFile> -envFile <envFile> [-verbose]"); // NOT DEBUG<a name="line.320"></a>
+<span class="sourceLineNo">321</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile createShellEnvFile -configFile <configFile> -envFile <envFile> [-verbose]"); // NOT DEBUG<a name="line.321"></a>
+<span class="sourceLineNo">322</span> System.err.println("java -cp juneau.jar org.apache.juneau.ini.ConfigFile setVals -configFile <configFile> -vals [var1 val1 [var2 val2...]] [-verbose]"); // NOT DEBUG<a name="line.322"></a>
+<span class="sourceLineNo">323</span> int rc = Integer.getInteger("exit.2", 2);<a name="line.323"></a>
+<span class="sourceLineNo">324</span> if (rc != 0)<a name="line.324"></a>
+<span class="sourceLineNo">325</span> System.exit(rc);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>}<a name="line.327"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
index 3e540e1..bdcec10 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigFileImpl.html
@@ -51,7 +51,7 @@
<span class="sourceLineNo">043</span> private final Charset charset;<a name="line.43"></a>
<span class="sourceLineNo">044</span> final List<ConfigFileListener> listeners = Collections.synchronizedList(new ArrayList<ConfigFileListener>());<a name="line.44"></a>
<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> private Map<String,Section> sections; // The actual data.<a name="line.46"></a>
+<span class="sourceLineNo">046</span> Map<String,Section> sections; // The actual data.<a name="line.46"></a>
<span class="sourceLineNo">047</span><a name="line.47"></a>
<span class="sourceLineNo">048</span> private static final String DEFAULT = "default";<a name="line.48"></a>
<span class="sourceLineNo">049</span><a name="line.49"></a>
@@ -151,7 +151,7 @@
<span class="sourceLineNo">143</span><a name="line.143"></a>
<span class="sourceLineNo">144</span> @Override /* ConfigFile */<a name="line.144"></a>
<span class="sourceLineNo">145</span> public ConfigFileImpl load() throws IOException {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> try (Reader r = (file != null && file.exists()) ? new InputStreamReader(new FileInputStream(file), charset) : new StringReader("")) {<a name="line.146"></a>
+<span class="sourceLineNo">146</span> try (Reader r = FileReaderBuilder.create(file).charset(charset).allowNoFile().build()) {<a name="line.146"></a>
<span class="sourceLineNo">147</span> load(r);<a name="line.147"></a>
<span class="sourceLineNo">148</span> }<a name="line.148"></a>
<span class="sourceLineNo">149</span> return this;<a name="line.149"></a>
@@ -646,7 +646,7 @@
<span class="sourceLineNo">638</span> try {<a name="line.638"></a>
<span class="sourceLineNo">639</span> if (file == null)<a name="line.639"></a>
<span class="sourceLineNo">640</span> throw new UnsupportedOperationException("No backing file specified for config file.");<a name="line.640"></a>
-<span class="sourceLineNo">641</span> try (Writer out = new OutputStreamWriter(new FileOutputStream(file), charset);) {<a name="line.641"></a>
+<span class="sourceLineNo">641</span> try (Writer out = FileWriterBuilder.create(file).charset(charset).build()) {<a name="line.641"></a>
<span class="sourceLineNo">642</span> serializeTo(out);<a name="line.642"></a>
<span class="sourceLineNo">643</span> hasBeenModified = false;<a name="line.643"></a>
<span class="sourceLineNo">644</span> modifiedTimestamp = file.lastModified();<a name="line.644"></a>
@@ -788,7 +788,7 @@
<span class="sourceLineNo">780</span> * Finds the keys that are different between the two sections and adds it to<a name="line.780"></a>
<span class="sourceLineNo">781</span> * the specified set.<a name="line.781"></a>
<span class="sourceLineNo">782</span> */<a name="line.782"></a>
-<span class="sourceLineNo">783</span> private static void findChanges(Set<String> s, Section a, Section b) {<a name="line.783"></a>
+<span class="sourceLineNo">783</span> static final void findChanges(Set<String> s, Section a, Section b) {<a name="line.783"></a>
<span class="sourceLineNo">784</span> if (s == null)<a name="line.784"></a>
<span class="sourceLineNo">785</span> return;<a name="line.785"></a>
<span class="sourceLineNo">786</span> String sname = (a == null ? b.name : a.name);<a name="line.786"></a>
@@ -806,16 +806,16 @@
<span class="sourceLineNo">798</span> }<a name="line.798"></a>
<span class="sourceLineNo">799</span> }<a name="line.799"></a>
<span class="sourceLineNo">800</span><a name="line.800"></a>
-<span class="sourceLineNo">801</span> private static void addChange(Set<String> changes, String section, String key, String oldVal, String newVal) {<a name="line.801"></a>
+<span class="sourceLineNo">801</span> static final void addChange(Set<String> changes, String section, String key, String oldVal, String newVal) {<a name="line.801"></a>
<span class="sourceLineNo">802</span> if (! isEquals(oldVal, newVal))<a name="line.802"></a>
<span class="sourceLineNo">803</span> changes.add(getFullKey(section, key));<a name="line.803"></a>
<span class="sourceLineNo">804</span> }<a name="line.804"></a>
<span class="sourceLineNo">805</span><a name="line.805"></a>
-<span class="sourceLineNo">806</span> private Set<String> createChanges() {<a name="line.806"></a>
+<span class="sourceLineNo">806</span> final Set<String> createChanges() {<a name="line.806"></a>
<span class="sourceLineNo">807</span> return (listeners.size() > 0 ? new LinkedHashSet<String>() : null);<a name="line.807"></a>
<span class="sourceLineNo">808</span> }<a name="line.808"></a>
<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span> private void signalChanges(Set<String> changes) {<a name="line.810"></a>
+<span class="sourceLineNo">810</span> final void signalChanges(Set<String> changes) {<a name="line.810"></a>
<span class="sourceLineNo">811</span> if (changes != null && ! changes.isEmpty())<a name="line.811"></a>
<span class="sourceLineNo">812</span> for (ConfigFileListener l : listeners)<a name="line.812"></a>
<span class="sourceLineNo">813</span> l.onChange(this, changes);<a name="line.813"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceMemory.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceMemory.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceMemory.html
index 5c18483..0dd8efd 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceMemory.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceMemory.html
@@ -112,10 +112,10 @@
<span class="sourceLineNo">104</span> }<a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
<span class="sourceLineNo">106</span> private static class MemoryFile {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> private String contents;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> private long lastModified;<a name="line.108"></a>
+<span class="sourceLineNo">107</span> String contents;<a name="line.107"></a>
+<span class="sourceLineNo">108</span> long lastModified;<a name="line.108"></a>
<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> private MemoryFile(String contents) {<a name="line.110"></a>
+<span class="sourceLineNo">110</span> MemoryFile(String contents) {<a name="line.110"></a>
<span class="sourceLineNo">111</span> this.contents = contents;<a name="line.111"></a>
<span class="sourceLineNo">112</span> this.lastModified = System.currentTimeMillis();<a name="line.112"></a>
<span class="sourceLineNo">113</span> }<a name="line.113"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceSettings.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceSettings.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceSettings.html
index 8f91791..680f157 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceSettings.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigSourceSettings.html
@@ -32,10 +32,10 @@
<span class="sourceLineNo">024</span> private final Charset charset;<a name="line.24"></a>
<span class="sourceLineNo">025</span> private final boolean readonly, createIfNotExists;<a name="line.25"></a>
<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span> static class Builder {<a name="line.27"></a>
-<span class="sourceLineNo">028</span> private List<String> searchPaths = Arrays.asList(new String[]{"."});<a name="line.28"></a>
-<span class="sourceLineNo">029</span> private Charset charset = Charset.defaultCharset();<a name="line.29"></a>
-<span class="sourceLineNo">030</span> private boolean readonly = false, createIfNotExists = true;<a name="line.30"></a>
+<span class="sourceLineNo">027</span> static final class Builder {<a name="line.27"></a>
+<span class="sourceLineNo">028</span> List<String> searchPaths = Arrays.asList(new String[]{"."});<a name="line.28"></a>
+<span class="sourceLineNo">029</span> Charset charset = Charset.defaultCharset();<a name="line.29"></a>
+<span class="sourceLineNo">030</span> boolean readonly = false, createIfNotExists = true;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
<span class="sourceLineNo">032</span> Builder searchPaths(String[] searchPaths) {<a name="line.32"></a>
<span class="sourceLineNo">033</span> this.searchPaths = Arrays.asList(searchPaths);<a name="line.33"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/ini/Section.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/Section.html b/content/site/apidocs/src-html/org/apache/juneau/ini/Section.html
index 59b3120..fd9b471 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/ini/Section.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/ini/Section.html
@@ -33,7 +33,7 @@
<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
<span class="sourceLineNo">026</span> * Defines a section in a config file.<a name="line.26"></a>
<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>public class Section implements Map<String,String> {<a name="line.28"></a>
+<span class="sourceLineNo">028</span>public final class Section implements Map<String,String> {<a name="line.28"></a>
<span class="sourceLineNo">029</span><a name="line.29"></a>
<span class="sourceLineNo">030</span> private ConfigFileImpl configFile;<a name="line.30"></a>
<span class="sourceLineNo">031</span> String name; // The config section name, or "default" if the default section. Never null.<a name="line.31"></a>
@@ -42,7 +42,7 @@
<span class="sourceLineNo">034</span> // These must be kept synchronized.<a name="line.34"></a>
<span class="sourceLineNo">035</span> private LinkedList<String> lines = new LinkedList<>();<a name="line.35"></a>
<span class="sourceLineNo">036</span> private List<String> headerComments = new LinkedList<>();<a name="line.36"></a>
-<span class="sourceLineNo">037</span> private Map<String,String> entries;<a name="line.37"></a>
+<span class="sourceLineNo">037</span> Map<String,String> entries;<a name="line.37"></a>
<span class="sourceLineNo">038</span><a name="line.38"></a>
<span class="sourceLineNo">039</span> private ReadWriteLock lock = new ReentrantReadWriteLock();<a name="line.39"></a>
<span class="sourceLineNo">040</span> private boolean readOnly;<a name="line.40"></a>
@@ -290,7 +290,7 @@
<span class="sourceLineNo">282</span> }<a name="line.282"></a>
<span class="sourceLineNo">283</span> }<a name="line.283"></a>
<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> private void removeLine(String key) {<a name="line.285"></a>
+<span class="sourceLineNo">285</span> void removeLine(String key) {<a name="line.285"></a>
<span class="sourceLineNo">286</span> for (Iterator<String> i = lines.iterator(); i.hasNext();) {<a name="line.286"></a>
<span class="sourceLineNo">287</span> String k = i.next();<a name="line.287"></a>
<span class="sourceLineNo">288</span> if (k.startsWith("*") || k.startsWith(">")) {<a name="line.288"></a>
@@ -543,21 +543,21 @@
<span class="sourceLineNo">535</span> lines.add((encoded ? "*" : ">") + key);<a name="line.535"></a>
<span class="sourceLineNo">536</span> }<a name="line.536"></a>
<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span> private void readLock() {<a name="line.538"></a>
+<span class="sourceLineNo">538</span> void readLock() {<a name="line.538"></a>
<span class="sourceLineNo">539</span> lock.readLock().lock();<a name="line.539"></a>
<span class="sourceLineNo">540</span> }<a name="line.540"></a>
<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span> private void readUnlock() {<a name="line.542"></a>
+<span class="sourceLineNo">542</span> void readUnlock() {<a name="line.542"></a>
<span class="sourceLineNo">543</span> lock.readLock().unlock();<a name="line.543"></a>
<span class="sourceLineNo">544</span> }<a name="line.544"></a>
<span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span> private void writeLock() {<a name="line.546"></a>
+<span class="sourceLineNo">546</span> void writeLock() {<a name="line.546"></a>
<span class="sourceLineNo">547</span> if (readOnly)<a name="line.547"></a>
<span class="sourceLineNo">548</span> throw new UnsupportedOperationException("Cannot modify read-only ConfigFile.");<a name="line.548"></a>
<span class="sourceLineNo">549</span> lock.writeLock().lock();<a name="line.549"></a>
<span class="sourceLineNo">550</span> }<a name="line.550"></a>
<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span> private void writeUnlock() {<a name="line.552"></a>
+<span class="sourceLineNo">552</span> void writeUnlock() {<a name="line.552"></a>
<span class="sourceLineNo">553</span> lock.writeLock().unlock();<a name="line.553"></a>
<span class="sourceLineNo">554</span> }<a name="line.554"></a>
<span class="sourceLineNo">555</span><a name="line.555"></a>
@@ -565,17 +565,17 @@
<span class="sourceLineNo">557</span> return s.replaceAll("^\\s*\\#\\s*", "").trim();<a name="line.557"></a>
<span class="sourceLineNo">558</span> }<a name="line.558"></a>
<span class="sourceLineNo">559</span><a name="line.559"></a>
-<span class="sourceLineNo">560</span> private Set<String> createChanges() {<a name="line.560"></a>
+<span class="sourceLineNo">560</span> Set<String> createChanges() {<a name="line.560"></a>
<span class="sourceLineNo">561</span> return (configFile != null && configFile.getListeners().size() > 0 ? new LinkedHashSet<String>() : null);<a name="line.561"></a>
<span class="sourceLineNo">562</span> }<a name="line.562"></a>
<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span> private void signalChanges(Set<String> changes) {<a name="line.564"></a>
+<span class="sourceLineNo">564</span> void signalChanges(Set<String> changes) {<a name="line.564"></a>
<span class="sourceLineNo">565</span> if (changes != null && ! changes.isEmpty())<a name="line.565"></a>
<span class="sourceLineNo">566</span> for (ConfigFileListener l : configFile.getListeners())<a name="line.566"></a>
<span class="sourceLineNo">567</span> l.onChange(configFile, changes);<a name="line.567"></a>
<span class="sourceLineNo">568</span> }<a name="line.568"></a>
<span class="sourceLineNo">569</span><a name="line.569"></a>
-<span class="sourceLineNo">570</span> private void addChange(Set<String> changes, String key, String oldVal, String newVal) {<a name="line.570"></a>
+<span class="sourceLineNo">570</span> void addChange(Set<String> changes, String key, String oldVal, String newVal) {<a name="line.570"></a>
<span class="sourceLineNo">571</span> if (changes != null)<a name="line.571"></a>
<span class="sourceLineNo">572</span> if (! isEquals(oldVal, newVal))<a name="line.572"></a>
<span class="sourceLineNo">573</span> changes.add(getFullKey(name, key));<a name="line.573"></a>
http://git-wip-us.apache.org/repos/asf/juneau-website/blob/81ca4d4d/content/site/apidocs/src-html/org/apache/juneau/internal/ByteArrayCache.html
----------------------------------------------------------------------
diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/ByteArrayCache.html b/content/site/apidocs/src-html/org/apache/juneau/internal/ByteArrayCache.html
index a4863e2..6d9cfc7 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/internal/ByteArrayCache.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ByteArrayCache.html
@@ -81,11 +81,11 @@
<span class="sourceLineNo">073</span> return cache.size();<a name="line.73"></a>
<span class="sourceLineNo">074</span> }<a name="line.74"></a>
<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> private static class ByteArray {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> private int hashCode;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private byte[] contents;<a name="line.78"></a>
+<span class="sourceLineNo">076</span> static final class ByteArray {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> int hashCode;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> byte[] contents;<a name="line.78"></a>
<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> private ByteArray(byte[] contents) {<a name="line.80"></a>
+<span class="sourceLineNo">080</span> ByteArray(byte[] contents) {<a name="line.80"></a>
<span class="sourceLineNo">081</span> this.contents = contents;<a name="line.81"></a>
<span class="sourceLineNo">082</span> int multiplier = 1;<a name="line.82"></a>
<span class="sourceLineNo">083</span> for (int i = 0; i < contents.length; i++) {<a name="line.83"></a>