You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@onami.apache.org by si...@apache.org on 2013/01/19 17:32:11 UTC

svn commit: r1435587 [39/39] - in /incubator/onami/site/configuration: ./ apidocs/assets/ apidocs/reference/ apidocs/reference/org/apache/onami/configuration/ apidocs/reference/org/apache/onami/configuration/binder/ apidocs/reference/org/apache/onami/c...

Modified: incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/VariablesMap.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/VariablesMap.html?rev=1435587&r1=1435586&r2=1435587&view=diff
==============================================================================
--- incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/VariablesMap.html (original)
+++ incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/VariablesMap.html Sat Jan 19 16:32:07 2013
@@ -11,167 +11,173 @@
 <a class="jxr_linenumber" name="1" href="#1">1</a>   <strong class="jxr_keyword">package</strong> org.apache.onami.configuration.variables;
 <a class="jxr_linenumber" name="2" href="#2">2</a>   
 <a class="jxr_linenumber" name="3" href="#3">3</a>   <em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="4" href="#4">4</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one or more</em>
-<a class="jxr_linenumber" name="5" href="#5">5</a>   <em class="jxr_comment"> * contributor license agreements.  See the NOTICE file distributed with</em>
-<a class="jxr_linenumber" name="6" href="#6">6</a>   <em class="jxr_comment"> * this work for additional information regarding copyright ownership.</em>
-<a class="jxr_linenumber" name="7" href="#7">7</a>   <em class="jxr_comment"> * The ASF licenses this file to You under the Apache License, Version 2.0</em>
-<a class="jxr_linenumber" name="8" href="#8">8</a>   <em class="jxr_comment"> * (the "License"); you may not use this file except in compliance with</em>
-<a class="jxr_linenumber" name="9" href="#9">9</a>   <em class="jxr_comment"> * the License.  You may obtain a copy of the License at</em>
-<a class="jxr_linenumber" name="10" href="#10">10</a>  <em class="jxr_comment"> *</em>
-<a class="jxr_linenumber" name="11" href="#11">11</a>  <em class="jxr_comment"> *  <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
-<a class="jxr_linenumber" name="12" href="#12">12</a>  <em class="jxr_comment"> *</em>
-<a class="jxr_linenumber" name="13" href="#13">13</a>  <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing, software</em>
-<a class="jxr_linenumber" name="14" href="#14">14</a>  <em class="jxr_comment"> * distributed under the License is distributed on an "AS IS" BASIS,</em>
-<a class="jxr_linenumber" name="15" href="#15">15</a>  <em class="jxr_comment"> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</em>
-<a class="jxr_linenumber" name="16" href="#16">16</a>  <em class="jxr_comment"> * See the License for the specific language governing permissions and</em>
-<a class="jxr_linenumber" name="17" href="#17">17</a>  <em class="jxr_comment"> * limitations under the License.</em>
-<a class="jxr_linenumber" name="18" href="#18">18</a>  <em class="jxr_comment"> */</em>
-<a class="jxr_linenumber" name="19" href="#19">19</a>  
-<a class="jxr_linenumber" name="20" href="#20">20</a>  <strong class="jxr_keyword">import</strong> java.util.Collection;
-<a class="jxr_linenumber" name="21" href="#21">21</a>  <strong class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.util.Properties;
-<a class="jxr_linenumber" name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
-<a class="jxr_linenumber" name="25" href="#25">25</a>  
-<a class="jxr_linenumber" name="26" href="#26">26</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="27" href="#27">27</a>  <em class="jxr_javadoccomment"> * @since 6.0</em>
-<a class="jxr_linenumber" name="28" href="#28">28</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="29" href="#29">29</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/onami/configuration/variables/VariablesMap.html">VariablesMap</a> <strong class="jxr_keyword">implements</strong> Map&lt;String, String&gt;
-<a class="jxr_linenumber" name="30" href="#30">30</a>  {
-<a class="jxr_linenumber" name="31" href="#31">31</a>  
-<a class="jxr_linenumber" name="32" href="#32">32</a>      <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> <a href="../../../../../org/apache/onami/configuration/variables/Parser.html">Parser</a> to use for variables resolving */</em>
-<a class="jxr_linenumber" name="33" href="#33">33</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../../org/apache/onami/configuration/variables/Parser.html">Parser</a> parser;
-<a class="jxr_linenumber" name="34" href="#34">34</a>  
-<a class="jxr_linenumber" name="35" href="#35">35</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/onami/configuration/variables/VariablesMap.html">VariablesMap</a>( Parser parser )
-<a class="jxr_linenumber" name="36" href="#36">36</a>      {
-<a class="jxr_linenumber" name="37" href="#37">37</a>          <strong class="jxr_keyword">this</strong>.parser = parser;
-<a class="jxr_linenumber" name="38" href="#38">38</a>      }
-<a class="jxr_linenumber" name="39" href="#39">39</a>  
-<a class="jxr_linenumber" name="40" href="#40">40</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/onami/configuration/variables/VariablesMap.html">VariablesMap</a>()
-<a class="jxr_linenumber" name="41" href="#41">41</a>      {
-<a class="jxr_linenumber" name="42" href="#42">42</a>          <strong class="jxr_keyword">this</strong>( <strong class="jxr_keyword">new</strong> AntStyleParser() );
-<a class="jxr_linenumber" name="43" href="#43">43</a>      }
-<a class="jxr_linenumber" name="44" href="#44">44</a>  
-<a class="jxr_linenumber" name="45" href="#45">45</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, Resolver&gt; resolvers = <strong class="jxr_keyword">new</strong> HashMap&lt;String, Resolver&gt;();
-<a class="jxr_linenumber" name="46" href="#46">46</a>  
-<a class="jxr_linenumber" name="47" href="#47">47</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; data = <strong class="jxr_keyword">new</strong> HashMap&lt;String, String&gt;();
-<a class="jxr_linenumber" name="48" href="#48">48</a>  
-<a class="jxr_linenumber" name="49" href="#49">49</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> clear()
-<a class="jxr_linenumber" name="50" href="#50">50</a>      {
-<a class="jxr_linenumber" name="51" href="#51">51</a>          resolvers.clear();
-<a class="jxr_linenumber" name="52" href="#52">52</a>          data.clear();
+<a class="jxr_linenumber" name="4" href="#4">4</a>   <em class="jxr_comment"> * Licensed to the Apache Software Foundation (ASF) under one</em>
+<a class="jxr_linenumber" name="5" href="#5">5</a>   <em class="jxr_comment"> * or more contributor license agreements.  See the NOTICE file</em>
+<a class="jxr_linenumber" name="6" href="#6">6</a>   <em class="jxr_comment"> * distributed with this work for additional information</em>
+<a class="jxr_linenumber" name="7" href="#7">7</a>   <em class="jxr_comment"> * regarding copyright ownership.  The ASF licenses this file</em>
+<a class="jxr_linenumber" name="8" href="#8">8</a>   <em class="jxr_comment"> * to you under the Apache License, Version 2.0 (the</em>
+<a class="jxr_linenumber" name="9" href="#9">9</a>   <em class="jxr_comment"> * "License"); you may not use this file except in compliance</em>
+<a class="jxr_linenumber" name="10" href="#10">10</a>  <em class="jxr_comment"> * with the License.  You may obtain a copy of the License at</em>
+<a class="jxr_linenumber" name="11" href="#11">11</a>  <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="12" href="#12">12</a>  <em class="jxr_comment"> *   <a href="http://www.apache.org/licenses/LICENSE-2.0" target="alexandria_uri">http://www.apache.org/licenses/LICENSE-2.0</a></em>
+<a class="jxr_linenumber" name="13" href="#13">13</a>  <em class="jxr_comment"> *</em>
+<a class="jxr_linenumber" name="14" href="#14">14</a>  <em class="jxr_comment"> * Unless required by applicable law or agreed to in writing,</em>
+<a class="jxr_linenumber" name="15" href="#15">15</a>  <em class="jxr_comment"> * software distributed under the License is distributed on an</em>
+<a class="jxr_linenumber" name="16" href="#16">16</a>  <em class="jxr_comment"> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</em>
+<a class="jxr_linenumber" name="17" href="#17">17</a>  <em class="jxr_comment"> * KIND, either express or implied.  See the License for the</em>
+<a class="jxr_linenumber" name="18" href="#18">18</a>  <em class="jxr_comment"> * specific language governing permissions and limitations</em>
+<a class="jxr_linenumber" name="19" href="#19">19</a>  <em class="jxr_comment"> * under the License.</em>
+<a class="jxr_linenumber" name="20" href="#20">20</a>  <em class="jxr_comment"> */</em>
+<a class="jxr_linenumber" name="21" href="#21">21</a>  
+<a class="jxr_linenumber" name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.util.Collection;
+<a class="jxr_linenumber" name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> java.util.Properties;
+<a class="jxr_linenumber" name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> java.util.Set;
+<a class="jxr_linenumber" name="27" href="#27">27</a>  
+<a class="jxr_linenumber" name="28" href="#28">28</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="29" href="#29">29</a>  <em class="jxr_javadoccomment"> * @since 6.0</em>
+<a class="jxr_linenumber" name="30" href="#30">30</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="31" href="#31">31</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/onami/configuration/variables/VariablesMap.html">VariablesMap</a> <strong class="jxr_keyword">implements</strong> Map&lt;String, String&gt;
+<a class="jxr_linenumber" name="32" href="#32">32</a>  {
+<a class="jxr_linenumber" name="33" href="#33">33</a>  
+<a class="jxr_linenumber" name="34" href="#34">34</a>      <em class="jxr_javadoccomment">/**</em><em class="jxr_javadoccomment"> <a href="../../../../../org/apache/onami/configuration/variables/Parser.html">Parser</a> to use for variables resolving */</em>
+<a class="jxr_linenumber" name="35" href="#35">35</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/onami/configuration/variables/Parser.html">Parser</a> parser;
+<a class="jxr_linenumber" name="36" href="#36">36</a>  
+<a class="jxr_linenumber" name="37" href="#37">37</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, Resolver&gt; resolvers = <strong class="jxr_keyword">new</strong> HashMap&lt;String, Resolver&gt;();
+<a class="jxr_linenumber" name="38" href="#38">38</a>  
+<a class="jxr_linenumber" name="39" href="#39">39</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong> Map&lt;String, String&gt; data = <strong class="jxr_keyword">new</strong> HashMap&lt;String, String&gt;();
+<a class="jxr_linenumber" name="40" href="#40">40</a>  
+<a class="jxr_linenumber" name="41" href="#41">41</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/onami/configuration/variables/VariablesMap.html">VariablesMap</a>()
+<a class="jxr_linenumber" name="42" href="#42">42</a>      {
+<a class="jxr_linenumber" name="43" href="#43">43</a>          <strong class="jxr_keyword">this</strong>( <strong class="jxr_keyword">new</strong> AntStyleParser() );
+<a class="jxr_linenumber" name="44" href="#44">44</a>      }
+<a class="jxr_linenumber" name="45" href="#45">45</a>  
+<a class="jxr_linenumber" name="46" href="#46">46</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/onami/configuration/variables/VariablesMap.html">VariablesMap</a>( Parser parser )
+<a class="jxr_linenumber" name="47" href="#47">47</a>      {
+<a class="jxr_linenumber" name="48" href="#48">48</a>          <strong class="jxr_keyword">if</strong> ( parser == <strong class="jxr_keyword">null</strong> )
+<a class="jxr_linenumber" name="49" href="#49">49</a>          {
+<a class="jxr_linenumber" name="50" href="#50">50</a>              <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IllegalArgumentException( <span class="jxr_string">"Parser used to resolve input variables cannot be null."</span> );
+<a class="jxr_linenumber" name="51" href="#51">51</a>          }
+<a class="jxr_linenumber" name="52" href="#52">52</a>          <strong class="jxr_keyword">this</strong>.parser = parser;
 <a class="jxr_linenumber" name="53" href="#53">53</a>      }
 <a class="jxr_linenumber" name="54" href="#54">54</a>  
-<a class="jxr_linenumber" name="55" href="#55">55</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsKey( Object key )
+<a class="jxr_linenumber" name="55" href="#55">55</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> clear()
 <a class="jxr_linenumber" name="56" href="#56">56</a>      {
-<a class="jxr_linenumber" name="57" href="#57">57</a>          <strong class="jxr_keyword">return</strong> data.containsKey( key );
-<a class="jxr_linenumber" name="58" href="#58">58</a>      }
-<a class="jxr_linenumber" name="59" href="#59">59</a>  
-<a class="jxr_linenumber" name="60" href="#60">60</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsValue( Object value )
-<a class="jxr_linenumber" name="61" href="#61">61</a>      {
-<a class="jxr_linenumber" name="62" href="#62">62</a>          <strong class="jxr_keyword">return</strong> data.containsValue( value );
-<a class="jxr_linenumber" name="63" href="#63">63</a>      }
-<a class="jxr_linenumber" name="64" href="#64">64</a>  
-<a class="jxr_linenumber" name="65" href="#65">65</a>      <strong class="jxr_keyword">public</strong> Set&lt;Entry&lt;String, String&gt;&gt; entrySet()
-<a class="jxr_linenumber" name="66" href="#66">66</a>      {
-<a class="jxr_linenumber" name="67" href="#67">67</a>          <strong class="jxr_keyword">return</strong> data.entrySet();
-<a class="jxr_linenumber" name="68" href="#68">68</a>      }
-<a class="jxr_linenumber" name="69" href="#69">69</a>  
-<a class="jxr_linenumber" name="70" href="#70">70</a>      <strong class="jxr_keyword">public</strong> String get( Object key )
-<a class="jxr_linenumber" name="71" href="#71">71</a>      {
-<a class="jxr_linenumber" name="72" href="#72">72</a>          <strong class="jxr_keyword">return</strong> data.get( key );
-<a class="jxr_linenumber" name="73" href="#73">73</a>      }
-<a class="jxr_linenumber" name="74" href="#74">74</a>  
-<a class="jxr_linenumber" name="75" href="#75">75</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isEmpty()
-<a class="jxr_linenumber" name="76" href="#76">76</a>      {
-<a class="jxr_linenumber" name="77" href="#77">77</a>          <strong class="jxr_keyword">return</strong> data.isEmpty();
-<a class="jxr_linenumber" name="78" href="#78">78</a>      }
-<a class="jxr_linenumber" name="79" href="#79">79</a>  
-<a class="jxr_linenumber" name="80" href="#80">80</a>      <strong class="jxr_keyword">public</strong> Set&lt;String&gt; keySet()
-<a class="jxr_linenumber" name="81" href="#81">81</a>      {
-<a class="jxr_linenumber" name="82" href="#82">82</a>          <strong class="jxr_keyword">return</strong> data.keySet();
-<a class="jxr_linenumber" name="83" href="#83">83</a>      }
-<a class="jxr_linenumber" name="84" href="#84">84</a>  
-<a class="jxr_linenumber" name="85" href="#85">85</a>      <strong class="jxr_keyword">public</strong> String put( String key, String value )
-<a class="jxr_linenumber" name="86" href="#86">86</a>      {
-<a class="jxr_linenumber" name="87" href="#87">87</a>          putValue( key, value );
-<a class="jxr_linenumber" name="88" href="#88">88</a>          resolveVariables();
-<a class="jxr_linenumber" name="89" href="#89">89</a>          <strong class="jxr_keyword">return</strong> data.get( key );
-<a class="jxr_linenumber" name="90" href="#90">90</a>      }
-<a class="jxr_linenumber" name="91" href="#91">91</a>  
-<a class="jxr_linenumber" name="92" href="#92">92</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> putAll( Map&lt;? <strong class="jxr_keyword">extends</strong> String, ? <strong class="jxr_keyword">extends</strong> String&gt; t )
-<a class="jxr_linenumber" name="93" href="#93">93</a>      {
-<a class="jxr_linenumber" name="94" href="#94">94</a>          <strong class="jxr_keyword">for</strong> ( Entry&lt;? <strong class="jxr_keyword">extends</strong> String, ? <strong class="jxr_keyword">extends</strong> String&gt; entry : t.entrySet() )
-<a class="jxr_linenumber" name="95" href="#95">95</a>          {
-<a class="jxr_linenumber" name="96" href="#96">96</a>              putValue( entry.getKey(), entry.getValue() );
-<a class="jxr_linenumber" name="97" href="#97">97</a>          }
-<a class="jxr_linenumber" name="98" href="#98">98</a>          resolveVariables();
-<a class="jxr_linenumber" name="99" href="#99">99</a>      }
-<a class="jxr_linenumber" name="100" href="#100">100</a> 
-<a class="jxr_linenumber" name="101" href="#101">101</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> putAll( Properties properties )
-<a class="jxr_linenumber" name="102" href="#102">102</a>     {
-<a class="jxr_linenumber" name="103" href="#103">103</a>         <strong class="jxr_keyword">for</strong> ( Entry&lt;Object, Object&gt; entry : properties.entrySet() )
-<a class="jxr_linenumber" name="104" href="#104">104</a>         {
-<a class="jxr_linenumber" name="105" href="#105">105</a>             putValue( entry.getKey().toString(), entry.getValue().toString() );
-<a class="jxr_linenumber" name="106" href="#106">106</a>         }
-<a class="jxr_linenumber" name="107" href="#107">107</a>         resolveVariables();
-<a class="jxr_linenumber" name="108" href="#108">108</a>     }
-<a class="jxr_linenumber" name="109" href="#109">109</a> 
-<a class="jxr_linenumber" name="110" href="#110">110</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> putValue( String key, String value )
-<a class="jxr_linenumber" name="111" href="#111">111</a>     {
-<a class="jxr_linenumber" name="112" href="#112">112</a>         data.put( key, value );
-<a class="jxr_linenumber" name="113" href="#113">113</a> 
-<a class="jxr_linenumber" name="114" href="#114">114</a>         <a href="../../../../../org/apache/onami/configuration/variables/Resolver.html">Resolver</a> resolver = parser.parse( value );
-<a class="jxr_linenumber" name="115" href="#115">115</a>         <strong class="jxr_keyword">if</strong> ( resolver.needsResolving() )
-<a class="jxr_linenumber" name="116" href="#116">116</a>         {
-<a class="jxr_linenumber" name="117" href="#117">117</a>             resolvers.put( key, resolver );
-<a class="jxr_linenumber" name="118" href="#118">118</a>         }
-<a class="jxr_linenumber" name="119" href="#119">119</a>         <strong class="jxr_keyword">else</strong>
-<a class="jxr_linenumber" name="120" href="#120">120</a>         {
-<a class="jxr_linenumber" name="121" href="#121">121</a>             <strong class="jxr_keyword">if</strong> ( resolvers.containsKey( key ) )
-<a class="jxr_linenumber" name="122" href="#122">122</a>             {
-<a class="jxr_linenumber" name="123" href="#123">123</a>                 resolvers.remove( key );
-<a class="jxr_linenumber" name="124" href="#124">124</a>             }
-<a class="jxr_linenumber" name="125" href="#125">125</a>         }
-<a class="jxr_linenumber" name="126" href="#126">126</a>     }
-<a class="jxr_linenumber" name="127" href="#127">127</a> 
-<a class="jxr_linenumber" name="128" href="#128">128</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> resolveVariables()
-<a class="jxr_linenumber" name="129" href="#129">129</a>     {
-<a class="jxr_linenumber" name="130" href="#130">130</a>         <strong class="jxr_keyword">for</strong> ( Entry&lt;String, Resolver&gt; entry : resolvers.entrySet() )
-<a class="jxr_linenumber" name="131" href="#131">131</a>         {
-<a class="jxr_linenumber" name="132" href="#132">132</a>             data.put( entry.getKey(), entry.getValue().resolve( data ) );
-<a class="jxr_linenumber" name="133" href="#133">133</a>         }
-<a class="jxr_linenumber" name="134" href="#134">134</a>     }
-<a class="jxr_linenumber" name="135" href="#135">135</a> 
-<a class="jxr_linenumber" name="136" href="#136">136</a>     <strong class="jxr_keyword">public</strong> String remove( Object key )
-<a class="jxr_linenumber" name="137" href="#137">137</a>     {
-<a class="jxr_linenumber" name="138" href="#138">138</a>         String value = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="139" href="#139">139</a>         <strong class="jxr_keyword">if</strong> ( containsKey( key ) )
-<a class="jxr_linenumber" name="140" href="#140">140</a>         {
-<a class="jxr_linenumber" name="141" href="#141">141</a>             value = data.remove( key );
-<a class="jxr_linenumber" name="142" href="#142">142</a>             resolvers.remove( key );
-<a class="jxr_linenumber" name="143" href="#143">143</a>             resolveVariables();
-<a class="jxr_linenumber" name="144" href="#144">144</a>         }
-<a class="jxr_linenumber" name="145" href="#145">145</a>         <strong class="jxr_keyword">return</strong> value;
-<a class="jxr_linenumber" name="146" href="#146">146</a>     }
-<a class="jxr_linenumber" name="147" href="#147">147</a> 
-<a class="jxr_linenumber" name="148" href="#148">148</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size()
-<a class="jxr_linenumber" name="149" href="#149">149</a>     {
-<a class="jxr_linenumber" name="150" href="#150">150</a>         <strong class="jxr_keyword">return</strong> data.size();
-<a class="jxr_linenumber" name="151" href="#151">151</a>     }
-<a class="jxr_linenumber" name="152" href="#152">152</a> 
-<a class="jxr_linenumber" name="153" href="#153">153</a>     <strong class="jxr_keyword">public</strong> Collection&lt;String&gt; values()
-<a class="jxr_linenumber" name="154" href="#154">154</a>     {
-<a class="jxr_linenumber" name="155" href="#155">155</a>         <strong class="jxr_keyword">return</strong> data.values();
-<a class="jxr_linenumber" name="156" href="#156">156</a>     }
-<a class="jxr_linenumber" name="157" href="#157">157</a> 
-<a class="jxr_linenumber" name="158" href="#158">158</a>     @Override
-<a class="jxr_linenumber" name="159" href="#159">159</a>     <strong class="jxr_keyword">public</strong> String toString()
+<a class="jxr_linenumber" name="57" href="#57">57</a>          resolvers.clear();
+<a class="jxr_linenumber" name="58" href="#58">58</a>          data.clear();
+<a class="jxr_linenumber" name="59" href="#59">59</a>      }
+<a class="jxr_linenumber" name="60" href="#60">60</a>  
+<a class="jxr_linenumber" name="61" href="#61">61</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsKey( Object key )
+<a class="jxr_linenumber" name="62" href="#62">62</a>      {
+<a class="jxr_linenumber" name="63" href="#63">63</a>          <strong class="jxr_keyword">return</strong> data.containsKey( key );
+<a class="jxr_linenumber" name="64" href="#64">64</a>      }
+<a class="jxr_linenumber" name="65" href="#65">65</a>  
+<a class="jxr_linenumber" name="66" href="#66">66</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> containsValue( Object value )
+<a class="jxr_linenumber" name="67" href="#67">67</a>      {
+<a class="jxr_linenumber" name="68" href="#68">68</a>          <strong class="jxr_keyword">return</strong> data.containsValue( value );
+<a class="jxr_linenumber" name="69" href="#69">69</a>      }
+<a class="jxr_linenumber" name="70" href="#70">70</a>  
+<a class="jxr_linenumber" name="71" href="#71">71</a>      <strong class="jxr_keyword">public</strong> Set&lt;Entry&lt;String, String&gt;&gt; entrySet()
+<a class="jxr_linenumber" name="72" href="#72">72</a>      {
+<a class="jxr_linenumber" name="73" href="#73">73</a>          <strong class="jxr_keyword">return</strong> data.entrySet();
+<a class="jxr_linenumber" name="74" href="#74">74</a>      }
+<a class="jxr_linenumber" name="75" href="#75">75</a>  
+<a class="jxr_linenumber" name="76" href="#76">76</a>      <strong class="jxr_keyword">public</strong> String get( Object key )
+<a class="jxr_linenumber" name="77" href="#77">77</a>      {
+<a class="jxr_linenumber" name="78" href="#78">78</a>          <strong class="jxr_keyword">return</strong> data.get( key );
+<a class="jxr_linenumber" name="79" href="#79">79</a>      }
+<a class="jxr_linenumber" name="80" href="#80">80</a>  
+<a class="jxr_linenumber" name="81" href="#81">81</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isEmpty()
+<a class="jxr_linenumber" name="82" href="#82">82</a>      {
+<a class="jxr_linenumber" name="83" href="#83">83</a>          <strong class="jxr_keyword">return</strong> data.isEmpty();
+<a class="jxr_linenumber" name="84" href="#84">84</a>      }
+<a class="jxr_linenumber" name="85" href="#85">85</a>  
+<a class="jxr_linenumber" name="86" href="#86">86</a>      <strong class="jxr_keyword">public</strong> Set&lt;String&gt; keySet()
+<a class="jxr_linenumber" name="87" href="#87">87</a>      {
+<a class="jxr_linenumber" name="88" href="#88">88</a>          <strong class="jxr_keyword">return</strong> data.keySet();
+<a class="jxr_linenumber" name="89" href="#89">89</a>      }
+<a class="jxr_linenumber" name="90" href="#90">90</a>  
+<a class="jxr_linenumber" name="91" href="#91">91</a>      <strong class="jxr_keyword">public</strong> String put( String key, String value )
+<a class="jxr_linenumber" name="92" href="#92">92</a>      {
+<a class="jxr_linenumber" name="93" href="#93">93</a>          putValue( key, value );
+<a class="jxr_linenumber" name="94" href="#94">94</a>          resolveVariables();
+<a class="jxr_linenumber" name="95" href="#95">95</a>          <strong class="jxr_keyword">return</strong> data.get( key );
+<a class="jxr_linenumber" name="96" href="#96">96</a>      }
+<a class="jxr_linenumber" name="97" href="#97">97</a>  
+<a class="jxr_linenumber" name="98" href="#98">98</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> putAll( Map&lt;? <strong class="jxr_keyword">extends</strong> String, ? <strong class="jxr_keyword">extends</strong> String&gt; t )
+<a class="jxr_linenumber" name="99" href="#99">99</a>      {
+<a class="jxr_linenumber" name="100" href="#100">100</a>         <strong class="jxr_keyword">for</strong> ( Entry&lt;? <strong class="jxr_keyword">extends</strong> String, ? <strong class="jxr_keyword">extends</strong> String&gt; entry : t.entrySet() )
+<a class="jxr_linenumber" name="101" href="#101">101</a>         {
+<a class="jxr_linenumber" name="102" href="#102">102</a>             putValue( entry.getKey(), entry.getValue() );
+<a class="jxr_linenumber" name="103" href="#103">103</a>         }
+<a class="jxr_linenumber" name="104" href="#104">104</a>         resolveVariables();
+<a class="jxr_linenumber" name="105" href="#105">105</a>     }
+<a class="jxr_linenumber" name="106" href="#106">106</a> 
+<a class="jxr_linenumber" name="107" href="#107">107</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> putAll( Properties properties )
+<a class="jxr_linenumber" name="108" href="#108">108</a>     {
+<a class="jxr_linenumber" name="109" href="#109">109</a>         <strong class="jxr_keyword">for</strong> ( Entry&lt;Object, Object&gt; entry : properties.entrySet() )
+<a class="jxr_linenumber" name="110" href="#110">110</a>         {
+<a class="jxr_linenumber" name="111" href="#111">111</a>             putValue( entry.getKey().toString(), entry.getValue().toString() );
+<a class="jxr_linenumber" name="112" href="#112">112</a>         }
+<a class="jxr_linenumber" name="113" href="#113">113</a>         resolveVariables();
+<a class="jxr_linenumber" name="114" href="#114">114</a>     }
+<a class="jxr_linenumber" name="115" href="#115">115</a> 
+<a class="jxr_linenumber" name="116" href="#116">116</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> putValue( String key, String value )
+<a class="jxr_linenumber" name="117" href="#117">117</a>     {
+<a class="jxr_linenumber" name="118" href="#118">118</a>         data.put( key, value );
+<a class="jxr_linenumber" name="119" href="#119">119</a> 
+<a class="jxr_linenumber" name="120" href="#120">120</a>         <a href="../../../../../org/apache/onami/configuration/variables/Resolver.html">Resolver</a> resolver = parser.parse( value );
+<a class="jxr_linenumber" name="121" href="#121">121</a>         <strong class="jxr_keyword">if</strong> ( resolver.needsResolving() )
+<a class="jxr_linenumber" name="122" href="#122">122</a>         {
+<a class="jxr_linenumber" name="123" href="#123">123</a>             resolvers.put( key, resolver );
+<a class="jxr_linenumber" name="124" href="#124">124</a>         }
+<a class="jxr_linenumber" name="125" href="#125">125</a>         <strong class="jxr_keyword">else</strong>
+<a class="jxr_linenumber" name="126" href="#126">126</a>         {
+<a class="jxr_linenumber" name="127" href="#127">127</a>             <strong class="jxr_keyword">if</strong> ( resolvers.containsKey( key ) )
+<a class="jxr_linenumber" name="128" href="#128">128</a>             {
+<a class="jxr_linenumber" name="129" href="#129">129</a>                 resolvers.remove( key );
+<a class="jxr_linenumber" name="130" href="#130">130</a>             }
+<a class="jxr_linenumber" name="131" href="#131">131</a>         }
+<a class="jxr_linenumber" name="132" href="#132">132</a>     }
+<a class="jxr_linenumber" name="133" href="#133">133</a> 
+<a class="jxr_linenumber" name="134" href="#134">134</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> resolveVariables()
+<a class="jxr_linenumber" name="135" href="#135">135</a>     {
+<a class="jxr_linenumber" name="136" href="#136">136</a>         <strong class="jxr_keyword">for</strong> ( Entry&lt;String, Resolver&gt; entry : resolvers.entrySet() )
+<a class="jxr_linenumber" name="137" href="#137">137</a>         {
+<a class="jxr_linenumber" name="138" href="#138">138</a>             data.put( entry.getKey(), entry.getValue().resolve( data ) );
+<a class="jxr_linenumber" name="139" href="#139">139</a>         }
+<a class="jxr_linenumber" name="140" href="#140">140</a>     }
+<a class="jxr_linenumber" name="141" href="#141">141</a> 
+<a class="jxr_linenumber" name="142" href="#142">142</a>     <strong class="jxr_keyword">public</strong> String remove( Object key )
+<a class="jxr_linenumber" name="143" href="#143">143</a>     {
+<a class="jxr_linenumber" name="144" href="#144">144</a>         String value = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="145" href="#145">145</a>         <strong class="jxr_keyword">if</strong> ( containsKey( key ) )
+<a class="jxr_linenumber" name="146" href="#146">146</a>         {
+<a class="jxr_linenumber" name="147" href="#147">147</a>             value = data.remove( key );
+<a class="jxr_linenumber" name="148" href="#148">148</a>             resolvers.remove( key );
+<a class="jxr_linenumber" name="149" href="#149">149</a>             resolveVariables();
+<a class="jxr_linenumber" name="150" href="#150">150</a>         }
+<a class="jxr_linenumber" name="151" href="#151">151</a>         <strong class="jxr_keyword">return</strong> value;
+<a class="jxr_linenumber" name="152" href="#152">152</a>     }
+<a class="jxr_linenumber" name="153" href="#153">153</a> 
+<a class="jxr_linenumber" name="154" href="#154">154</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">int</strong> size()
+<a class="jxr_linenumber" name="155" href="#155">155</a>     {
+<a class="jxr_linenumber" name="156" href="#156">156</a>         <strong class="jxr_keyword">return</strong> data.size();
+<a class="jxr_linenumber" name="157" href="#157">157</a>     }
+<a class="jxr_linenumber" name="158" href="#158">158</a> 
+<a class="jxr_linenumber" name="159" href="#159">159</a>     <strong class="jxr_keyword">public</strong> Collection&lt;String&gt; values()
 <a class="jxr_linenumber" name="160" href="#160">160</a>     {
-<a class="jxr_linenumber" name="161" href="#161">161</a>         <strong class="jxr_keyword">return</strong> data.toString();
+<a class="jxr_linenumber" name="161" href="#161">161</a>         <strong class="jxr_keyword">return</strong> data.values();
 <a class="jxr_linenumber" name="162" href="#162">162</a>     }
 <a class="jxr_linenumber" name="163" href="#163">163</a> 
-<a class="jxr_linenumber" name="164" href="#164">164</a> }
+<a class="jxr_linenumber" name="164" href="#164">164</a>     @Override
+<a class="jxr_linenumber" name="165" href="#165">165</a>     <strong class="jxr_keyword">public</strong> String toString()
+<a class="jxr_linenumber" name="166" href="#166">166</a>     {
+<a class="jxr_linenumber" name="167" href="#167">167</a>         <strong class="jxr_keyword">return</strong> data.toString();
+<a class="jxr_linenumber" name="168" href="#168">168</a>     }
+<a class="jxr_linenumber" name="169" href="#169">169</a> 
+<a class="jxr_linenumber" name="170" href="#170">170</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-frame.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-frame.html?rev=1435587&r1=1435586&r2=1435587&view=diff
==============================================================================
--- incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-frame.html (original)
+++ incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-frame.html Sat Jan 19 16:32:07 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-Configuration 6.3-SNAPSHOT-incubating Reference Package org.apache.onami.configuration.variables</title>
+		<title>Apache Onami-Configuration 6.3.0-incubating-SNAPSHOT Reference Package org.apache.onami.configuration.variables</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-summary.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-summary.html?rev=1435587&r1=1435586&r2=1435587&view=diff
==============================================================================
--- incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-summary.html (original)
+++ incubator/onami/site/configuration/xref/org/apache/onami/configuration/variables/package-summary.html Sat Jan 19 16:32:07 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-Configuration 6.3-SNAPSHOT-incubating Reference Package org.apache.onami.configuration.variables</title>
+		<title>Apache Onami-Configuration 6.3.0-incubating-SNAPSHOT Reference Package org.apache.onami.configuration.variables</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -107,6 +107,6 @@
         	</ul>
       	</div>
 				<hr />
-		Copyright &#169; 2012 The Apache Software Foundation. All Rights Reserved.
+		Copyright &#169; 2012-2013 The Apache Software Foundation. All Rights Reserved.
 	</body>
 </html>
\ No newline at end of file

Modified: incubator/onami/site/configuration/xref/overview-frame.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/configuration/xref/overview-frame.html?rev=1435587&r1=1435586&r2=1435587&view=diff
==============================================================================
--- incubator/onami/site/configuration/xref/overview-frame.html (original)
+++ incubator/onami/site/configuration/xref/overview-frame.html Sat Jan 19 16:32:07 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-Configuration 6.3-SNAPSHOT-incubating Reference</title>
+		<title>Apache Onami-Configuration 6.3.0-incubating-SNAPSHOT Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -19,10 +19,7 @@
 				<a href="org/apache/onami/configuration/package-frame.html" target="packageFrame">org.apache.onami.configuration</a>
 			</li>
 						<li>
-				<a href="org/apache/onami/configuration/configuration/package-frame.html" target="packageFrame">org.apache.onami.configuration.configuration</a>
-			</li>
-						<li>
-				<a href="org/apache/onami/configuration/configuration/binder/package-frame.html" target="packageFrame">org.apache.onami.configuration.configuration.binder</a>
+				<a href="org/apache/onami/configuration/binder/package-frame.html" target="packageFrame">org.apache.onami.configuration.binder</a>
 			</li>
 						<li>
 				<a href="org/apache/onami/configuration/converters/package-frame.html" target="packageFrame">org.apache.onami.configuration.converters</a>

Modified: incubator/onami/site/configuration/xref/overview-summary.html
URL: http://svn.apache.org/viewvc/incubator/onami/site/configuration/xref/overview-summary.html?rev=1435587&r1=1435586&r2=1435587&view=diff
==============================================================================
--- incubator/onami/site/configuration/xref/overview-summary.html (original)
+++ incubator/onami/site/configuration/xref/overview-summary.html Sat Jan 19 16:32:07 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		<title>Apache Onami-Configuration 6.3-SNAPSHOT-incubating Reference</title>
+		<title>Apache Onami-Configuration 6.3.0-incubating-SNAPSHOT Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -24,7 +24,7 @@
 	        </ul>
       	</div>
 		
-		      	<h2>Apache Onami-Configuration 6.3-SNAPSHOT-incubating Reference</h2>
+		      	<h2>Apache Onami-Configuration 6.3.0-incubating-SNAPSHOT Reference</h2>
 
 		<table class="summary">
         	<thead>
@@ -40,12 +40,7 @@
             	</tr>
 	          	            	<tr>
               		<td>
-                		<a href="org/apache/onami/configuration/configuration/package-summary.html">org.apache.onami.configuration.configuration</a>
-              		</td>
-            	</tr>
-	          	            	<tr>
-              		<td>
-                		<a href="org/apache/onami/configuration/configuration/binder/package-summary.html">org.apache.onami.configuration.configuration.binder</a>
+                		<a href="org/apache/onami/configuration/binder/package-summary.html">org.apache.onami.configuration.binder</a>
               		</td>
             	</tr>
 	          	            	<tr>
@@ -79,6 +74,6 @@
       	</div>
 		
 		<hr />
-		Copyright &#169; 2012 The Apache Software Foundation. All Rights Reserved.
+		Copyright &#169; 2012-2013 The Apache Software Foundation. All Rights Reserved.
 	</body>
 </html>
\ No newline at end of file