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/07/09 17:19:10 UTC

svn commit: r1501329 [2/8] - in /onami/site/configuration: ./ apidocs/assets/ apidocs/reference/ apidocs/reference/org/apache/onami/configuration/ cobertura/ xref-test/ xref-test/org/apache/onami/configuration/ xref-test/org/apache/onami/configuration/...

Modified: onami/site/configuration/cobertura/coverage.xml
URL: http://svn.apache.org/viewvc/onami/site/configuration/cobertura/coverage.xml?rev=1501329&r1=1501328&r2=1501329&view=diff
==============================================================================
--- onami/site/configuration/cobertura/coverage.xml (original)
+++ onami/site/configuration/cobertura/coverage.xml Tue Jul  9 15:19:08 2013
@@ -1,29 +1,27 @@
 <?xml version="1.0"?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
 
-<coverage line-rate="0.8151658767772512" branch-rate="0.7052631578947368" lines-covered="344" lines-valid="422" branches-covered="134" branches-valid="190" complexity="2.108910891089109" version="1.9.4.1" timestamp="1363290957825">
+<coverage line-rate="0.8142493638676844" branch-rate="0.7052631578947368" lines-covered="320" lines-valid="393" branches-covered="134" branches-valid="190" complexity="2.087378640776699" version="1.9.4.1" timestamp="1373383109999">
 	<sources>
 		<source>/Users/stripodi/Documents/apache-workspace/onami/trunk/configuration/src/main/java</source>
 		<source>--source</source>
 	</sources>
 	<packages>
-		<package name="org.apache.onami.configuration" line-rate="0.8266666666666667" branch-rate="0.6666666666666666" complexity="1.9142857142857144">
+		<package name="org.apache.onami.configuration" line-rate="0.8478260869565217" branch-rate="0.6666666666666666" complexity="1.864864864864865">
 			<classes>
-				<class name="org.apache.onami.configuration.ConfigurationModule" filename="org/apache/onami/configuration/ConfigurationModule.java" line-rate="0.7611940298507462" branch-rate="0.7857142857142857" complexity="1.875">
+				<class name="org.apache.onami.configuration.ConfigurationModule" filename="org/apache/onami/configuration/ConfigurationModule.java" line-rate="0.7868852459016393" branch-rate="0.7857142857142857" complexity="1.875">
 					<methods>
 						<method name="&lt;init&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="46" hits="2" branch="false"/>
 							</lines>
 						</method>
-						<method name="access$0" signature="(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V" line-rate="1.0" branch-rate="1.0">
+						<method name="access$000" signature="(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="282" hits="478" branch="false"/>
 							</lines>
 						</method>
-						<method name="access$1" signature="(Lorg/apache/onami/configuration/ConfigurationModule;)Lcom/google/inject/binder/AnnotatedConstantBindingBuilder;" line-rate="1.0" branch-rate="1.0">
+						<method name="access$100" signature="(Lorg/apache/onami/configuration/ConfigurationModule;)Lcom/google/inject/binder/AnnotatedConstantBindingBuilder;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="1" hits="478" branch="false"/>
+								<line number="46" hits="962" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindEnvironmentVariables" signature="()V" line-rate="1.0" branch-rate="1.0">
@@ -62,9 +60,7 @@
 								</line>
 								<line number="257" hits="4" branch="false"/>
 								<line number="260" hits="8" branch="false"/>
-								<line number="261" hits="16" branch="false"/>
-								<line number="262" hits="8" branch="false"/>
-								<line number="263" hits="8" branch="false"/>
+								<line number="261" hits="8" branch="false"/>
 								<line number="265" hits="8" branch="false"/>
 							</lines>
 						</method>
@@ -100,13 +96,14 @@
 						<method name="bindProperties" signature="(Ljava/util/Iterator;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
 								<line number="152" hits="28" branch="false"/>
-								<line number="154" hits="530" branch="true" condition-coverage="100% (2/2)">
+								<line number="154" hits="504" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="156" hits="474" branch="false"/>
-								<line number="157" hits="474" branch="false"/>
+								<line number="156" hits="476" branch="false"/>
+								<line number="157" hits="476" branch="false"/>
+								<line number="158" hits="476" branch="false"/>
 								<line number="159" hits="28" branch="false"/>
 							</lines>
 						</method>
@@ -126,8 +123,8 @@
 						</method>
 						<method name="bindProperty" signature="(Ljava/lang/String;)Lorg/apache/onami/configuration/binder/PropertyValueBindingBuilder;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="108" hits="478" branch="false"/>
-								<line number="110" hits="478" branch="false"/>
+								<line number="108" hits="480" branch="false"/>
+								<line number="110" hits="480" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindSystemProperties" signature="()V" line-rate="1.0" branch-rate="1.0">
@@ -138,16 +135,16 @@
 						</method>
 						<method name="checkNotNull" signature="(Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)V" line-rate="0.6666666666666666" branch-rate="0.5">
 							<lines>
-								<line number="284" hits="1080" branch="true" condition-coverage="50% (1/2)">
+								<line number="284" hits="1084" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="286" hits="0" branch="false"/>
-								<line number="288" hits="1080" branch="false"/>
+								<line number="288" hits="1084" branch="false"/>
 							</lines>
 						</method>
-						<method name="configure" signature="()V" line-rate="0.6" branch-rate="0.75">
+						<method name="configure" signature="()V" line-rate="0.75" branch-rate="0.75">
 							<lines>
 								<line number="65" hits="4" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
@@ -157,27 +154,23 @@
 								<line number="67" hits="0" branch="false"/>
 								<line number="70" hits="4" branch="false"/>
 								<line number="72" hits="4" branch="false"/>
-								<line number="76" hits="28" branch="true" condition-coverage="100% (2/2)">
+								<line number="76" hits="4" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
 								<line number="80" hits="20" branch="false"/>
-								<line number="81" hits="20" branch="false"/>
 								<line number="82" hits="0" branch="false"/>
 								<line number="84" hits="0" branch="false"/>
-								<line number="85" hits="0" branch="false"/>
-								<line number="88" hits="4" branch="false"/>
-								<line number="90" hits="0" branch="false"/>
+								<line number="86" hits="40" branch="false"/>
 								<line number="91" hits="4" branch="false"/>
-								<line number="92" hits="0" branch="false"/>
+								<line number="92" hits="4" branch="false"/>
 								<line number="93" hits="4" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="478" branch="false"/>
-						<line number="46" hits="2" branch="false"/>
+						<line number="46" hits="962" branch="false"/>
 						<line number="65" hits="4" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
@@ -186,23 +179,20 @@
 						<line number="67" hits="0" branch="false"/>
 						<line number="70" hits="4" branch="false"/>
 						<line number="72" hits="4" branch="false"/>
-						<line number="76" hits="28" branch="true" condition-coverage="100% (2/2)">
+						<line number="76" hits="4" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
 						<line number="80" hits="20" branch="false"/>
-						<line number="81" hits="20" branch="false"/>
 						<line number="82" hits="0" branch="false"/>
 						<line number="84" hits="0" branch="false"/>
-						<line number="85" hits="0" branch="false"/>
-						<line number="88" hits="4" branch="false"/>
-						<line number="90" hits="0" branch="false"/>
+						<line number="86" hits="40" branch="false"/>
 						<line number="91" hits="4" branch="false"/>
-						<line number="92" hits="0" branch="false"/>
+						<line number="92" hits="4" branch="false"/>
 						<line number="93" hits="4" branch="false"/>
-						<line number="108" hits="478" branch="false"/>
-						<line number="110" hits="478" branch="false"/>
+						<line number="108" hits="480" branch="false"/>
+						<line number="110" hits="480" branch="false"/>
 						<line number="130" hits="24" branch="false"/>
 						<line number="132" hits="24" branch="false"/>
 						<line number="133" hits="24" branch="false"/>
@@ -210,13 +200,14 @@
 						<line number="143" hits="0" branch="false"/>
 						<line number="144" hits="0" branch="false"/>
 						<line number="152" hits="28" branch="false"/>
-						<line number="154" hits="530" branch="true" condition-coverage="100% (2/2)">
+						<line number="154" hits="504" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="156" hits="474" branch="false"/>
-						<line number="157" hits="474" branch="false"/>
+						<line number="156" hits="476" branch="false"/>
+						<line number="157" hits="476" branch="false"/>
+						<line number="158" hits="476" branch="false"/>
 						<line number="159" hits="28" branch="false"/>
 						<line number="166" hits="4" branch="false"/>
 						<line number="167" hits="4" branch="false"/>
@@ -255,65 +246,61 @@
 						</line>
 						<line number="257" hits="4" branch="false"/>
 						<line number="260" hits="8" branch="false"/>
-						<line number="261" hits="16" branch="false"/>
-						<line number="262" hits="8" branch="false"/>
-						<line number="263" hits="8" branch="false"/>
+						<line number="261" hits="8" branch="false"/>
 						<line number="265" hits="8" branch="false"/>
 						<line number="275" hits="20" branch="false"/>
 						<line number="277" hits="20" branch="false"/>
 						<line number="278" hits="20" branch="false"/>
 						<line number="279" hits="20" branch="false"/>
-						<line number="282" hits="478" branch="false"/>
-						<line number="284" hits="1080" branch="true" condition-coverage="50% (1/2)">
+						<line number="284" hits="1084" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="286" hits="0" branch="false"/>
-						<line number="288" hits="1080" branch="false"/>
+						<line number="288" hits="1084" branch="false"/>
 					</lines>
 				</class>
 				<class name="org.apache.onami.configuration.ConfigurationModule$1" filename="org/apache/onami/configuration/ConfigurationModule.java" line-rate="1.0" branch-rate="1.0" complexity="1.875">
 					<methods>
 						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/ConfigurationModule;Ljava/lang/String;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="1" hits="478" branch="false"/>
-								<line number="110" hits="478" branch="false"/>
+								<line number="111" hits="480" branch="false"/>
 							</lines>
 						</method>
 						<method name="toValue" signature="(Ljava/lang/String;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="115" hits="478" branch="false"/>
-								<line number="117" hits="478" branch="false"/>
-								<line number="118" hits="478" branch="false"/>
+								<line number="115" hits="480" branch="false"/>
+								<line number="117" hits="480" branch="false"/>
+								<line number="118" hits="480" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="478" branch="false"/>
-						<line number="110" hits="478" branch="false"/>
-						<line number="115" hits="478" branch="false"/>
-						<line number="117" hits="478" branch="false"/>
-						<line number="118" hits="478" branch="false"/>
+						<line number="111" hits="480" branch="false"/>
+						<line number="115" hits="480" branch="false"/>
+						<line number="117" hits="480" branch="false"/>
+						<line number="118" hits="480" branch="false"/>
 					</lines>
 				</class>
 				<class name="org.apache.onami.configuration.KeyValue" filename="org/apache/onami/configuration/KeyValue.java" line-rate="0.875" branch-rate="1.0" complexity="1.25">
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/String;Ljava/lang/String;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="47" hits="474" branch="false"/>
-								<line number="49" hits="474" branch="false"/>
-								<line number="50" hits="474" branch="false"/>
-								<line number="51" hits="474" branch="false"/>
+								<line number="48" hits="476" branch="false"/>
+								<line number="49" hits="476" branch="false"/>
+								<line number="50" hits="476" branch="false"/>
+								<line number="51" hits="476" branch="false"/>
 							</lines>
 						</method>
 						<method name="getKey" signature="()Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
 							<lines>
+								<line number="27" hits="952" branch="false"/>
 							</lines>
 						</method>
 						<method name="getKey" signature="()Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="58" hits="474" branch="false"/>
+								<line number="58" hits="476" branch="false"/>
 							</lines>
 						</method>
 						<method name="getValue" signature="()Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
@@ -322,12 +309,11 @@
 						</method>
 						<method name="getValue" signature="()Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="66" hits="474" branch="false"/>
+								<line number="66" hits="476" branch="false"/>
 							</lines>
 						</method>
 						<method name="setValue" signature="(Ljava/lang/Object;)Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="1" hits="948" branch="false"/>
 							</lines>
 						</method>
 						<method name="setValue" signature="(Ljava/lang/String;)Ljava/lang/String;" line-rate="0.0" branch-rate="1.0">
@@ -337,21 +323,173 @@
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="948" branch="false"/>
-						<line number="47" hits="474" branch="false"/>
-						<line number="49" hits="474" branch="false"/>
-						<line number="50" hits="474" branch="false"/>
-						<line number="51" hits="474" branch="false"/>
-						<line number="58" hits="474" branch="false"/>
-						<line number="66" hits="474" branch="false"/>
+						<line number="27" hits="952" branch="false"/>
+						<line number="48" hits="476" branch="false"/>
+						<line number="49" hits="476" branch="false"/>
+						<line number="50" hits="476" branch="false"/>
+						<line number="51" hits="476" branch="false"/>
+						<line number="58" hits="476" branch="false"/>
+						<line number="66" hits="476" branch="false"/>
 						<line number="74" hits="0" branch="false"/>
 					</lines>
 				</class>
+				<class name="org.apache.onami.configuration.OnamiVariablesExpander" filename="org/apache/onami/configuration/OnamiVariablesExpander.java" line-rate="0.9375" branch-rate="1.0" complexity="2.0">
+					<methods>
+						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/variables/Parser;Ljava/util/List;)V" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="84" hits="2" branch="false"/>
+								<line number="94" hits="2" branch="false"/>
+								<line number="95" hits="2" branch="false"/>
+								<line number="96" hits="2" branch="false"/>
+								<line number="97" hits="2" branch="false"/>
+							</lines>
+						</method>
+						<method name="access$000" signature="(Lorg/apache/onami/configuration/OnamiVariablesExpander;)Lcom/google/inject/TypeLiteral;" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="46" hits="240" branch="false"/>
+							</lines>
+						</method>
+						<method name="configure" signature="()V" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="102" hits="2" branch="false"/>
+								<line number="104" hits="2" branch="true" condition-coverage="100% (2/2)">
+									<conditions>
+										<condition number="0" type="jump" coverage="100%"/>
+									</conditions>
+								</line>
+								<line number="106" hits="240" branch="false"/>
+								<line number="141" hits="2" branch="true" condition-coverage="100% (2/2)">
+									<conditions>
+										<condition number="0" type="jump" coverage="100%"/>
+									</conditions>
+								</line>
+								<line number="143" hits="240" branch="false"/>
+								<line number="145" hits="2" branch="false"/>
+							</lines>
+						</method>
+						<method name="expandVariables" signature="(Ljava/lang/Iterable;)Lcom/google/inject/Module;" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="69" hits="2" branch="false"/>
+							</lines>
+						</method>
+						<method name="expandVariables" signature="(Lorg/apache/onami/configuration/variables/Parser;Ljava/lang/Iterable;)Lcom/google/inject/Module;" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="81" hits="2" branch="false"/>
+							</lines>
+						</method>
+						<method name="expandVariables" signature="(Lorg/apache/onami/configuration/variables/Parser;[Lcom/google/inject/Module;)Lcom/google/inject/Module;" line-rate="0.0" branch-rate="1.0">
+							<lines>
+								<line number="64" hits="0" branch="false"/>
+							</lines>
+						</method>
+						<method name="expandVariables" signature="([Lcom/google/inject/Module;)Lcom/google/inject/Module;" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="52" hits="2" branch="false"/>
+							</lines>
+						</method>
+					</methods>
+					<lines>
+						<line number="46" hits="240" branch="false"/>
+						<line number="52" hits="2" branch="false"/>
+						<line number="64" hits="0" branch="false"/>
+						<line number="69" hits="2" branch="false"/>
+						<line number="81" hits="2" branch="false"/>
+						<line number="84" hits="2" branch="false"/>
+						<line number="94" hits="2" branch="false"/>
+						<line number="95" hits="2" branch="false"/>
+						<line number="96" hits="2" branch="false"/>
+						<line number="97" hits="2" branch="false"/>
+						<line number="102" hits="2" branch="false"/>
+						<line number="104" hits="2" branch="true" condition-coverage="100% (2/2)">
+							<conditions>
+								<condition number="0" type="jump" coverage="100%"/>
+							</conditions>
+						</line>
+						<line number="106" hits="240" branch="false"/>
+						<line number="141" hits="2" branch="true" condition-coverage="100% (2/2)">
+							<conditions>
+								<condition number="0" type="jump" coverage="100%"/>
+							</conditions>
+						</line>
+						<line number="143" hits="240" branch="false"/>
+						<line number="145" hits="2" branch="false"/>
+					</lines>
+				</class>
+				<class name="org.apache.onami.configuration.OnamiVariablesExpander$1" filename="org/apache/onami/configuration/OnamiVariablesExpander.java" line-rate="1.0" branch-rate="1.0" complexity="2.0">
+					<methods>
+						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/OnamiVariablesExpander;)V" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="84" hits="2" branch="false"/>
+							</lines>
+						</method>
+					</methods>
+					<lines>
+						<line number="84" hits="2" branch="false"/>
+					</lines>
+				</class>
+				<class name="org.apache.onami.configuration.OnamiVariablesExpander$2" filename="org/apache/onami/configuration/OnamiVariablesExpander.java" line-rate="0.8888888888888888" branch-rate="0.4" complexity="2.0">
+					<methods>
+						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/OnamiVariablesExpander;Lorg/apache/onami/configuration/variables/VariablesMap;)V" line-rate="1.0" branch-rate="1.0">
+							<lines>
+							</lines>
+						</method>
+						<method name="visit" signature="(Lcom/google/inject/Binding;)Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
+							<lines>
+								<line number="107" hits="480" branch="false"/>
+							</lines>
+						</method>
+						<method name="visit" signature="(Lcom/google/inject/Binding;)Ljava/lang/Void;" line-rate="0.875" branch-rate="0.4">
+							<lines>
+								<line number="112" hits="240" branch="false"/>
+								<line number="114" hits="240" branch="true" condition-coverage="37% (3/8)">
+									<conditions>
+										<condition number="0" type="jump" coverage="50%"/>
+										<condition number="1" type="jump" coverage="50%"/>
+										<condition number="2" type="jump" coverage="50%"/>
+										<condition number="3" type="jump" coverage="0%"/>
+									</conditions>
+								</line>
+								<line number="121" hits="240" branch="true" condition-coverage="50% (1/2)">
+									<conditions>
+										<condition number="0" type="jump" coverage="50%"/>
+									</conditions>
+								</line>
+								<line number="123" hits="240" branch="false"/>
+								<line number="127" hits="0" branch="false"/>
+								<line number="130" hits="240" branch="false"/>
+								<line number="132" hits="240" branch="false"/>
+								<line number="135" hits="240" branch="false"/>
+							</lines>
+						</method>
+					</methods>
+					<lines>
+						<line number="107" hits="480" branch="false"/>
+						<line number="112" hits="240" branch="false"/>
+						<line number="114" hits="240" branch="true" condition-coverage="37% (3/8)">
+							<conditions>
+								<condition number="0" type="jump" coverage="50%"/>
+								<condition number="1" type="jump" coverage="50%"/>
+								<condition number="2" type="jump" coverage="50%"/>
+								<condition number="3" type="jump" coverage="0%"/>
+							</conditions>
+						</line>
+						<line number="121" hits="240" branch="true" condition-coverage="50% (1/2)">
+							<conditions>
+								<condition number="0" type="jump" coverage="50%"/>
+							</conditions>
+						</line>
+						<line number="123" hits="240" branch="false"/>
+						<line number="127" hits="0" branch="false"/>
+						<line number="130" hits="240" branch="false"/>
+						<line number="132" hits="240" branch="false"/>
+						<line number="135" hits="240" branch="false"/>
+					</lines>
+				</class>
 				<class name="org.apache.onami.configuration.PropertiesIterator" filename="org/apache/onami/configuration/PropertiesIterator.java" line-rate="0.9285714285714286" branch-rate="0.75" complexity="1.3333333333333333">
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/String;Ljava/util/Map;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="78" hits="28" branch="false"/>
+								<line number="79" hits="28" branch="false"/>
 								<line number="80" hits="28" branch="false"/>
 								<line number="81" hits="28" branch="false"/>
 								<line number="82" hits="28" branch="false"/>
@@ -359,7 +497,7 @@
 						</method>
 						<method name="hasNext" signature="()Z" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="89" hits="502" branch="false"/>
+								<line number="89" hits="504" branch="false"/>
 							</lines>
 						</method>
 						<method name="newPropertiesIterator" signature="(Ljava/lang/String;Ljava/util/Map;)Lorg/apache/onami/configuration/PropertiesIterator;" line-rate="1.0" branch-rate="1.0">
@@ -374,21 +512,21 @@
 						</method>
 						<method name="next" signature="()Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="1" hits="474" branch="false"/>
+								<line number="31" hits="476" branch="false"/>
 							</lines>
 						</method>
 						<method name="next" signature="()Ljava/util/Map$Entry;" line-rate="1.0" branch-rate="0.75">
 							<lines>
-								<line number="97" hits="474" branch="false"/>
-								<line number="98" hits="474" branch="false"/>
-								<line number="99" hits="474" branch="true" condition-coverage="75% (3/4)">
+								<line number="97" hits="476" branch="false"/>
+								<line number="98" hits="476" branch="false"/>
+								<line number="99" hits="476" branch="true" condition-coverage="75% (3/4)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
-								<line number="101" hits="150" branch="false"/>
-								<line number="103" hits="474" branch="false"/>
+								<line number="101" hits="152" branch="false"/>
+								<line number="103" hits="476" branch="false"/>
 							</lines>
 						</method>
 						<method name="remove" signature="()V" line-rate="0.0" branch-rate="1.0">
@@ -398,33 +536,33 @@
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="474" branch="false"/>
+						<line number="31" hits="476" branch="false"/>
 						<line number="45" hits="24" branch="false"/>
 						<line number="59" hits="4" branch="false"/>
-						<line number="78" hits="28" branch="false"/>
+						<line number="79" hits="28" branch="false"/>
 						<line number="80" hits="28" branch="false"/>
 						<line number="81" hits="28" branch="false"/>
 						<line number="82" hits="28" branch="false"/>
-						<line number="89" hits="502" branch="false"/>
-						<line number="97" hits="474" branch="false"/>
-						<line number="98" hits="474" branch="false"/>
-						<line number="99" hits="474" branch="true" condition-coverage="75% (3/4)">
+						<line number="89" hits="504" branch="false"/>
+						<line number="97" hits="476" branch="false"/>
+						<line number="98" hits="476" branch="false"/>
+						<line number="99" hits="476" branch="true" condition-coverage="75% (3/4)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
-						<line number="101" hits="150" branch="false"/>
-						<line number="103" hits="474" branch="false"/>
+						<line number="101" hits="152" branch="false"/>
+						<line number="103" hits="476" branch="false"/>
 						<line number="111" hits="0" branch="false"/>
 					</lines>
 				</class>
-				<class name="org.apache.onami.configuration.PropertiesURLReader" filename="org/apache/onami/configuration/PropertiesURLReader.java" line-rate="0.7857142857142857" branch-rate="0.6" complexity="3.0">
+				<class name="org.apache.onami.configuration.PropertiesURLReader" filename="org/apache/onami/configuration/PropertiesURLReader.java" line-rate="0.84" branch-rate="0.6" complexity="3.0">
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/net/URL;)V" line-rate="0.8333333333333334" branch-rate="0.5">
 							<lines>
 								<line number="48" hits="20" branch="false"/>
-								<line number="56" hits="20" branch="false"/>
+								<line number="57" hits="20" branch="false"/>
 								<line number="58" hits="20" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
@@ -446,7 +584,7 @@
 								<line number="72" hits="8" branch="false"/>
 							</lines>
 						</method>
-						<method name="readConfiguration" signature="()Ljava/util/Properties;" line-rate="0.7894736842105263" branch-rate="0.625">
+						<method name="readConfiguration" signature="()Ljava/util/Properties;" line-rate="0.875" branch-rate="0.625">
 							<lines>
 								<line number="92" hits="20" branch="false"/>
 								<line number="93" hits="20" branch="false"/>
@@ -460,10 +598,8 @@
 									</conditions>
 								</line>
 								<line number="103" hits="8" branch="false"/>
-								<line number="104" hits="8" branch="false"/>
 								<line number="107" hits="12" branch="false"/>
-								<line number="110" hits="40" branch="false"/>
-								<line number="113" hits="0" branch="false"/>
+								<line number="110" hits="20" branch="false"/>
 								<line number="114" hits="20" branch="true" condition-coverage="50% (2/4)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
@@ -477,15 +613,14 @@
 									</conditions>
 								</line>
 								<line number="122" hits="20" branch="false"/>
-								<line number="123" hits="20" branch="false"/>
 								<line number="124" hits="0" branch="false"/>
-								<line number="129" hits="0" branch="false"/>
+								<line number="127" hits="40" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
 						<line number="48" hits="20" branch="false"/>
-						<line number="56" hits="20" branch="false"/>
+						<line number="57" hits="20" branch="false"/>
 						<line number="58" hits="20" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
@@ -509,10 +644,8 @@
 							</conditions>
 						</line>
 						<line number="103" hits="8" branch="false"/>
-						<line number="104" hits="8" branch="false"/>
 						<line number="107" hits="12" branch="false"/>
-						<line number="110" hits="40" branch="false"/>
-						<line number="113" hits="0" branch="false"/>
+						<line number="110" hits="20" branch="false"/>
 						<line number="114" hits="20" branch="true" condition-coverage="50% (2/4)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
@@ -526,181 +659,8 @@
 							</conditions>
 						</line>
 						<line number="122" hits="20" branch="false"/>
-						<line number="123" hits="20" branch="false"/>
 						<line number="124" hits="0" branch="false"/>
-						<line number="129" hits="0" branch="false"/>
-					</lines>
-				</class>
-				<class name="org.apache.onami.configuration.Rocoto" filename="org/apache/onami/configuration/Rocoto.java" line-rate="1.0" branch-rate="1.0" complexity="2.4">
-					<methods>
-						<method name="&lt;init&gt;" signature="(Ljava/util/List;)V" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="65" hits="2" branch="false"/>
-								<line number="67" hits="2" branch="false"/>
-								<line number="68" hits="2" branch="false"/>
-							</lines>
-						</method>
-						<method name="access$0" signature="(Lorg/apache/onami/configuration/Rocoto;)Lcom/google/inject/TypeLiteral;" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="58" hits="241" branch="false"/>
-							</lines>
-						</method>
-						<method name="configure" signature="()V" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="73" hits="2" branch="false"/>
-								<line number="75" hits="243" branch="true" condition-coverage="100% (2/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="100%"/>
-									</conditions>
-								</line>
-								<line number="77" hits="239" branch="false"/>
-								<line number="112" hits="243" branch="true" condition-coverage="100% (2/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="100%"/>
-									</conditions>
-								</line>
-								<line number="114" hits="239" branch="false"/>
-								<line number="116" hits="2" branch="false"/>
-							</lines>
-						</method>
-						<method name="expandVariables" signature="(Ljava/lang/Iterable;)Lcom/google/inject/Module;" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="55" hits="2" branch="false"/>
-							</lines>
-						</method>
-						<method name="expandVariables" signature="([Lcom/google/inject/Module;)Lcom/google/inject/Module;" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="50" hits="2" branch="false"/>
-							</lines>
-						</method>
-					</methods>
-					<lines>
-						<line number="50" hits="2" branch="false"/>
-						<line number="55" hits="2" branch="false"/>
-						<line number="58" hits="241" branch="false"/>
-						<line number="65" hits="2" branch="false"/>
-						<line number="67" hits="2" branch="false"/>
-						<line number="68" hits="2" branch="false"/>
-						<line number="73" hits="2" branch="false"/>
-						<line number="75" hits="243" branch="true" condition-coverage="100% (2/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="100%"/>
-							</conditions>
-						</line>
-						<line number="77" hits="239" branch="false"/>
-						<line number="112" hits="243" branch="true" condition-coverage="100% (2/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="100%"/>
-							</conditions>
-						</line>
-						<line number="114" hits="239" branch="false"/>
-						<line number="116" hits="2" branch="false"/>
-					</lines>
-				</class>
-				<class name="org.apache.onami.configuration.Rocoto$1" filename="org/apache/onami/configuration/Rocoto.java" line-rate="1.0" branch-rate="1.0" complexity="2.4">
-					<methods>
-						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/Rocoto;)V" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="1" hits="2" branch="false"/>
-								<line number="58" hits="2" branch="false"/>
-							</lines>
-						</method>
-					</methods>
-					<lines>
-						<line number="1" hits="2" branch="false"/>
-						<line number="58" hits="2" branch="false"/>
-					</lines>
-				</class>
-				<class name="org.apache.onami.configuration.Rocoto$2" filename="org/apache/onami/configuration/Rocoto.java" line-rate="0.8571428571428571" branch-rate="0.4" complexity="2.4">
-					<methods>
-						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/Rocoto;Lorg/apache/onami/configuration/variables/VariablesMap;)V" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="77" hits="239" branch="false"/>
-							</lines>
-						</method>
-						<method name="visit" signature="(Lcom/google/inject/Binding;)Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
-							<lines>
-								<line number="1" hits="478" branch="false"/>
-							</lines>
-						</method>
-						<method name="visit" signature="(Lcom/google/inject/Binding;)Ljava/lang/Void;" line-rate="0.8333333333333334" branch-rate="0.4">
-							<lines>
-								<line number="83" hits="239" branch="false"/>
-								<line number="85" hits="239" branch="true" condition-coverage="50% (1/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="50%"/>
-									</conditions>
-								</line>
-								<line number="86" hits="239" branch="true" condition-coverage="50% (1/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="50%"/>
-									</conditions>
-								</line>
-								<line number="87" hits="239" branch="true" condition-coverage="50% (1/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="50%"/>
-									</conditions>
-								</line>
-								<line number="88" hits="0" branch="true" condition-coverage="0% (0/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="0%"/>
-									</conditions>
-								</line>
-								<line number="92" hits="239" branch="true" condition-coverage="50% (1/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="50%"/>
-									</conditions>
-								</line>
-								<line number="94" hits="239" branch="false"/>
-								<line number="95" hits="239" branch="false"/>
-								<line number="98" hits="0" branch="false"/>
-								<line number="101" hits="239" branch="false"/>
-								<line number="103" hits="239" branch="false"/>
-								<line number="106" hits="239" branch="false"/>
-							</lines>
-						</method>
-					</methods>
-					<lines>
-						<line number="1" hits="478" branch="false"/>
-						<line number="77" hits="239" branch="false"/>
-						<line number="83" hits="239" branch="false"/>
-						<line number="85" hits="239" branch="true" condition-coverage="50% (1/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="50%"/>
-							</conditions>
-						</line>
-						<line number="86" hits="239" branch="true" condition-coverage="50% (1/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="50%"/>
-							</conditions>
-						</line>
-						<line number="87" hits="239" branch="true" condition-coverage="50% (1/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="50%"/>
-							</conditions>
-						</line>
-						<line number="88" hits="0" branch="true" condition-coverage="0% (0/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="0%"/>
-							</conditions>
-						</line>
-						<line number="92" hits="239" branch="true" condition-coverage="50% (1/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="50%"/>
-							</conditions>
-						</line>
-						<line number="94" hits="239" branch="false"/>
-						<line number="95" hits="239" branch="false"/>
-						<line number="98" hits="0" branch="false"/>
-						<line number="101" hits="239" branch="false"/>
-						<line number="103" hits="239" branch="false"/>
-						<line number="106" hits="239" branch="false"/>
-					</lines>
-				</class>
-				<class name="org.apache.onami.configuration.package-info" filename="org/apache/onami/configuration/package-info.java" line-rate="1.0" branch-rate="1.0" complexity="0.0">
-					<methods>
-					</methods>
-					<lines>
+						<line number="127" hits="40" branch="false"/>
 					</lines>
 				</class>
 			</classes>
@@ -719,17 +679,11 @@
 					<lines>
 					</lines>
 				</class>
-				<class name="org.apache.onami.configuration.binder.package-info" filename="org/apache/onami/configuration/binder/package-info.java" line-rate="1.0" branch-rate="1.0" complexity="0.0">
-					<methods>
-					</methods>
-					<lines>
-					</lines>
-				</class>
 			</classes>
 		</package>
-		<package name="org.apache.onami.configuration.variables" line-rate="0.8088235294117647" branch-rate="0.7162162162162162" complexity="2.25">
+		<package name="org.apache.onami.configuration.variables" line-rate="0.796078431372549" branch-rate="0.7162162162162162" complexity="2.25">
 			<classes>
-				<class name="org.apache.onami.configuration.variables.AbstractAppender" filename="org/apache/onami/configuration/variables/AbstractAppender.java" line-rate="0.9411764705882353" branch-rate="0.875" complexity="1.5714285714285714">
+				<class name="org.apache.onami.configuration.variables.AbstractAppender" filename="org/apache/onami/configuration/variables/AbstractAppender.java" line-rate="0.9375" branch-rate="0.875" complexity="1.5714285714285714">
 					<methods>
 						<method name="&lt;clinit&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
@@ -738,12 +692,12 @@
 						</method>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/String;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="49" hits="26525" branch="false"/>
-								<line number="51" hits="26525" branch="false"/>
-								<line number="52" hits="26525" branch="false"/>
+								<line number="50" hits="26526" branch="false"/>
+								<line number="51" hits="26526" branch="false"/>
+								<line number="52" hits="26526" branch="false"/>
 							</lines>
 						</method>
-						<method name="append" signature="(Ljava/lang/StringBuilder;Ljava/util/Map;Lorg/apache/onami/configuration/variables/Tree;)V" line-rate="0.8888888888888888" branch-rate="0.875">
+						<method name="append" signature="(Ljava/lang/StringBuilder;Ljava/util/Map;Lorg/apache/onami/configuration/variables/Tree;)V" line-rate="0.875" branch-rate="0.875">
 							<lines>
 								<line number="64" hits="89372" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
@@ -757,7 +711,6 @@
 								</line>
 								<line number="70" hits="18" branch="false"/>
 								<line number="72" hits="18" branch="false"/>
-								<line number="73" hits="18" branch="false"/>
 								<line number="77" hits="89354" branch="false"/>
 								<line number="79" hits="89354" branch="true" condition-coverage="75% (3/4)">
 									<conditions>
@@ -784,9 +737,9 @@
 					</methods>
 					<lines>
 						<line number="39" hits="2" branch="false"/>
-						<line number="49" hits="26525" branch="false"/>
-						<line number="51" hits="26525" branch="false"/>
-						<line number="52" hits="26525" branch="false"/>
+						<line number="50" hits="26526" branch="false"/>
+						<line number="51" hits="26526" branch="false"/>
+						<line number="52" hits="26526" branch="false"/>
 						<line number="64" hits="89372" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
@@ -799,7 +752,6 @@
 						</line>
 						<line number="70" hits="18" branch="false"/>
 						<line number="72" hits="18" branch="false"/>
-						<line number="73" hits="18" branch="false"/>
 						<line number="77" hits="89354" branch="false"/>
 						<line number="79" hits="89354" branch="true" condition-coverage="75% (3/4)">
 							<conditions>
@@ -815,25 +767,23 @@
 						<line number="123" hits="126" branch="false"/>
 					</lines>
 				</class>
-				<class name="org.apache.onami.configuration.variables.AntStyleParser" filename="org/apache/onami/configuration/variables/AntStyleParser.java" line-rate="0.9722222222222222" branch-rate="0.9772727272727273" complexity="24.0">
+				<class name="org.apache.onami.configuration.variables.AntStyleParser" filename="org/apache/onami/configuration/variables/AntStyleParser.java" line-rate="0.9841269841269841" branch-rate="0.9772727272727273" complexity="24.0">
 					<methods>
 						<method name="&lt;clinit&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
 								<line number="57" hits="2" branch="false"/>
-								<line number="65" hits="2" branch="false"/>
 							</lines>
 						</method>
 						<method name="&lt;init&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="50" hits="52" branch="false"/>
 							</lines>
 						</method>
-						<method name="parse" signature="(Ljava/lang/String;)Lorg/apache/onami/configuration/variables/Appender;" line-rate="0.9705882352941176" branch-rate="0.9772727272727273">
+						<method name="parse" signature="(Ljava/lang/String;)Lorg/apache/onami/configuration/variables/Appender;" line-rate="0.9836065573770492" branch-rate="0.9772727272727273">
 							<lines>
-								<line number="72" hits="22595" branch="false"/>
-								<line number="73" hits="22595" branch="false"/>
-								<line number="74" hits="22595" branch="false"/>
-								<line number="75" hits="47672" branch="true" condition-coverage="100% (2/2)">
+								<line number="72" hits="22596" branch="false"/>
+								<line number="73" hits="22596" branch="false"/>
+								<line number="74" hits="22596" branch="false"/>
+								<line number="75" hits="25078" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
@@ -851,12 +801,11 @@
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="91" hits="12" branch="false"/>
-								<line number="92" hits="6" branch="false"/>
+								<line number="91" hits="6" branch="false"/>
 								<line number="96" hits="2488" branch="false"/>
 								<line number="98" hits="2488" branch="false"/>
 								<line number="99" hits="2488" branch="false"/>
-								<line number="100" hits="6536" branch="true" condition-coverage="100% (4/4)">
+								<line number="100" hits="4048" branch="true" condition-coverage="100% (4/4)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="100%"/>
@@ -869,8 +818,7 @@
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="107" hits="12" branch="false"/>
-								<line number="108" hits="6" branch="false"/>
+								<line number="107" hits="6" branch="false"/>
 								<line number="110" hits="1560" branch="false"/>
 								<line number="111" hits="1560" branch="false"/>
 								<line number="114" hits="2482" branch="false"/>
@@ -891,7 +839,6 @@
 								</line>
 								<line number="130" hits="460" branch="false"/>
 								<line number="131" hits="460" branch="false"/>
-								<line number="132" hits="460" branch="false"/>
 								<line number="138" hits="800" branch="false"/>
 								<line number="139" hits="800" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
@@ -905,7 +852,7 @@
 								</line>
 								<line number="143" hits="250" branch="false"/>
 								<line number="144" hits="250" branch="false"/>
-								<line number="145" hits="650" branch="true" condition-coverage="100% (4/4)">
+								<line number="145" hits="400" branch="true" condition-coverage="100% (4/4)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="100%"/>
@@ -926,7 +873,6 @@
 									</conditions>
 								</line>
 								<line number="157" hits="0" branch="false"/>
-								<line number="158" hits="0" branch="false"/>
 								<line number="165" hits="800" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
@@ -938,7 +884,7 @@
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="172" hits="650" branch="false"/>
+								<line number="171" hits="800" branch="false"/>
 								<line number="177" hits="1222" branch="false"/>
 								<line number="181" hits="2482" branch="false"/>
 								<line number="182" hits="2482" branch="false"/>
@@ -949,30 +895,24 @@
 								</line>
 								<line number="185" hits="1110" branch="false"/>
 								<line number="186" hits="1110" branch="false"/>
-								<line number="187" hits="1110" branch="false"/>
 								<line number="190" hits="1372" branch="false"/>
-								<line number="193" hits="4964" branch="false"/>
-								<line number="194" hits="2482" branch="false"/>
-								<line number="195" hits="2482" branch="true" condition-coverage="100% (2/2)">
-									<conditions>
-										<condition number="0" type="jump" coverage="100%"/>
-									</conditions>
-								</line>
-								<line number="196" hits="2482" branch="true" condition-coverage="100% (4/4)">
+								<line number="193" hits="2482" branch="true" condition-coverage="100% (6/6)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="100%"/>
+										<condition number="2" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
 								<line number="198" hits="2482" branch="false"/>
 								<line number="199" hits="2482" branch="false"/>
-								<line number="202" hits="22583" branch="true" condition-coverage="100% (2/2)">
+								<line number="200" hits="2482" branch="false"/>
+								<line number="202" hits="22584" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="204" hits="20585" branch="false"/>
-								<line number="207" hits="22583" branch="true" condition-coverage="100% (2/2)">
+								<line number="204" hits="20586" branch="false"/>
+								<line number="207" hits="22584" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
@@ -981,19 +921,17 @@
 						</method>
 						<method name="parse" signature="(Ljava/lang/String;)Lorg/apache/onami/configuration/variables/Resolver;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="1" hits="21585" branch="false"/>
+								<line number="50" hits="21638" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="21585" branch="false"/>
-						<line number="50" hits="52" branch="false"/>
+						<line number="50" hits="21638" branch="false"/>
 						<line number="57" hits="2" branch="false"/>
-						<line number="65" hits="2" branch="false"/>
-						<line number="72" hits="22595" branch="false"/>
-						<line number="73" hits="22595" branch="false"/>
-						<line number="74" hits="22595" branch="false"/>
-						<line number="75" hits="47672" branch="true" condition-coverage="100% (2/2)">
+						<line number="72" hits="22596" branch="false"/>
+						<line number="73" hits="22596" branch="false"/>
+						<line number="74" hits="22596" branch="false"/>
+						<line number="75" hits="25078" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
@@ -1011,12 +949,11 @@
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="91" hits="12" branch="false"/>
-						<line number="92" hits="6" branch="false"/>
+						<line number="91" hits="6" branch="false"/>
 						<line number="96" hits="2488" branch="false"/>
 						<line number="98" hits="2488" branch="false"/>
 						<line number="99" hits="2488" branch="false"/>
-						<line number="100" hits="6536" branch="true" condition-coverage="100% (4/4)">
+						<line number="100" hits="4048" branch="true" condition-coverage="100% (4/4)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="100%"/>
@@ -1029,8 +966,7 @@
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="107" hits="12" branch="false"/>
-						<line number="108" hits="6" branch="false"/>
+						<line number="107" hits="6" branch="false"/>
 						<line number="110" hits="1560" branch="false"/>
 						<line number="111" hits="1560" branch="false"/>
 						<line number="114" hits="2482" branch="false"/>
@@ -1051,7 +987,6 @@
 						</line>
 						<line number="130" hits="460" branch="false"/>
 						<line number="131" hits="460" branch="false"/>
-						<line number="132" hits="460" branch="false"/>
 						<line number="138" hits="800" branch="false"/>
 						<line number="139" hits="800" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
@@ -1065,7 +1000,7 @@
 						</line>
 						<line number="143" hits="250" branch="false"/>
 						<line number="144" hits="250" branch="false"/>
-						<line number="145" hits="650" branch="true" condition-coverage="100% (4/4)">
+						<line number="145" hits="400" branch="true" condition-coverage="100% (4/4)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="100%"/>
@@ -1086,7 +1021,6 @@
 							</conditions>
 						</line>
 						<line number="157" hits="0" branch="false"/>
-						<line number="158" hits="0" branch="false"/>
 						<line number="165" hits="800" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
@@ -1098,7 +1032,7 @@
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="172" hits="650" branch="false"/>
+						<line number="171" hits="800" branch="false"/>
 						<line number="177" hits="1222" branch="false"/>
 						<line number="181" hits="2482" branch="false"/>
 						<line number="182" hits="2482" branch="false"/>
@@ -1109,30 +1043,24 @@
 						</line>
 						<line number="185" hits="1110" branch="false"/>
 						<line number="186" hits="1110" branch="false"/>
-						<line number="187" hits="1110" branch="false"/>
 						<line number="190" hits="1372" branch="false"/>
-						<line number="193" hits="4964" branch="false"/>
-						<line number="194" hits="2482" branch="false"/>
-						<line number="195" hits="2482" branch="true" condition-coverage="100% (2/2)">
-							<conditions>
-								<condition number="0" type="jump" coverage="100%"/>
-							</conditions>
-						</line>
-						<line number="196" hits="2482" branch="true" condition-coverage="100% (4/4)">
+						<line number="193" hits="2482" branch="true" condition-coverage="100% (6/6)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="100%"/>
+								<condition number="2" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
 						<line number="198" hits="2482" branch="false"/>
 						<line number="199" hits="2482" branch="false"/>
-						<line number="202" hits="22583" branch="true" condition-coverage="100% (2/2)">
+						<line number="200" hits="2482" branch="false"/>
+						<line number="202" hits="22584" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="204" hits="20585" branch="false"/>
-						<line number="207" hits="22583" branch="true" condition-coverage="100% (2/2)">
+						<line number="204" hits="20586" branch="false"/>
+						<line number="207" hits="22584" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
@@ -1145,7 +1073,7 @@
 					<lines>
 					</lines>
 				</class>
-				<class name="org.apache.onami.configuration.variables.KeyAppender" filename="org/apache/onami/configuration/variables/KeyAppender.java" line-rate="0.8461538461538461" branch-rate="0.5357142857142857" complexity="3.1666666666666665">
+				<class name="org.apache.onami.configuration.variables.KeyAppender" filename="org/apache/onami/configuration/variables/KeyAppender.java" line-rate="0.8571428571428571" branch-rate="0.5357142857142857" complexity="3.1666666666666665">
 					<methods>
 						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/variables/Parser;Ljava/lang/String;Lorg/apache/onami/configuration/variables/Appender;)V" line-rate="0.0" branch-rate="1.0">
 							<lines>
@@ -1162,7 +1090,7 @@
 								<line number="69" hits="2482" branch="false"/>
 							</lines>
 						</method>
-						<method name="doAppend" signature="(Ljava/lang/StringBuilder;Ljava/util/Map;Lorg/apache/onami/configuration/variables/Tree;)V" line-rate="0.9130434782608695" branch-rate="0.875">
+						<method name="doAppend" signature="(Ljava/lang/StringBuilder;Ljava/util/Map;Lorg/apache/onami/configuration/variables/Tree;)V" line-rate="0.95" branch-rate="0.875">
 							<lines>
 								<line number="78" hits="35364" branch="false"/>
 								<line number="79" hits="35364" branch="false"/>
@@ -1180,32 +1108,29 @@
 									</conditions>
 								</line>
 								<line number="90" hits="19690" branch="false"/>
-								<line number="92" hits="19690" branch="false"/>
 								<line number="96" hits="28" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="98" hits="0" branch="false"/>
-								<line number="99" hits="0" branch="false"/>
 								<line number="102" hits="28" branch="false"/>
 								<line number="103" hits="28" branch="false"/>
 								<line number="104" hits="28" branch="false"/>
 								<line number="107" hits="28" branch="false"/>
 								<line number="109" hits="28" branch="false"/>
-								<line number="111" hits="28" branch="false"/>
+								<line number="111" hits="19718" branch="false"/>
 								<line number="113" hits="15646" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
 								<line number="115" hits="14896" branch="false"/>
-								<line number="116" hits="14896" branch="false"/>
 								<line number="121" hits="750" branch="false"/>
 								<line number="123" hits="35364" branch="false"/>
 							</lines>
 						</method>
-						<method name="equals" signature="(Ljava/lang/Object;)Z" line-rate="0.8571428571428571" branch-rate="0.5">
+						<method name="equals" signature="(Ljava/lang/Object;)Z" line-rate="0.8333333333333334" branch-rate="0.5">
 							<lines>
 								<line number="128" hits="97796" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
@@ -1219,18 +1144,14 @@
 									</conditions>
 								</line>
 								<line number="134" hits="20824" branch="false"/>
-								<line number="135" hits="20848" branch="true" condition-coverage="50% (3/6)">
+								<line number="135" hits="20824" branch="true" condition-coverage="41% (5/12)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 										<condition number="1" type="jump" coverage="100%"/>
 										<condition number="2" type="jump" coverage="0%"/>
-									</conditions>
-								</line>
-								<line number="136" hits="24" branch="true" condition-coverage="33% (2/6)">
-									<conditions>
-										<condition number="0" type="jump" coverage="50%"/>
-										<condition number="1" type="jump" coverage="0%"/>
-										<condition number="2" type="jump" coverage="50%"/>
+										<condition number="3" type="jump" coverage="50%"/>
+										<condition number="4" type="jump" coverage="0%"/>
+										<condition number="5" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="138" hits="76972" branch="false"/>
@@ -1276,27 +1197,24 @@
 							</conditions>
 						</line>
 						<line number="90" hits="19690" branch="false"/>
-						<line number="92" hits="19690" branch="false"/>
 						<line number="96" hits="28" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="98" hits="0" branch="false"/>
-						<line number="99" hits="0" branch="false"/>
 						<line number="102" hits="28" branch="false"/>
 						<line number="103" hits="28" branch="false"/>
 						<line number="104" hits="28" branch="false"/>
 						<line number="107" hits="28" branch="false"/>
 						<line number="109" hits="28" branch="false"/>
-						<line number="111" hits="28" branch="false"/>
+						<line number="111" hits="19718" branch="false"/>
 						<line number="113" hits="15646" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
 						<line number="115" hits="14896" branch="false"/>
-						<line number="116" hits="14896" branch="false"/>
 						<line number="121" hits="750" branch="false"/>
 						<line number="123" hits="35364" branch="false"/>
 						<line number="128" hits="97796" branch="true" condition-coverage="50% (1/2)">
@@ -1311,18 +1229,14 @@
 							</conditions>
 						</line>
 						<line number="134" hits="20824" branch="false"/>
-						<line number="135" hits="20848" branch="true" condition-coverage="50% (3/6)">
+						<line number="135" hits="20824" branch="true" condition-coverage="41% (5/12)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 								<condition number="1" type="jump" coverage="100%"/>
 								<condition number="2" type="jump" coverage="0%"/>
-							</conditions>
-						</line>
-						<line number="136" hits="24" branch="true" condition-coverage="33% (2/6)">
-							<conditions>
-								<condition number="0" type="jump" coverage="50%"/>
-								<condition number="1" type="jump" coverage="0%"/>
-								<condition number="2" type="jump" coverage="50%"/>
+								<condition number="3" type="jump" coverage="50%"/>
+								<condition number="4" type="jump" coverage="0%"/>
+								<condition number="5" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="138" hits="76972" branch="false"/>
@@ -1353,7 +1267,7 @@
 						</method>
 						<method name="doAppend" signature="(Ljava/lang/StringBuilder;Ljava/util/Map;Lorg/apache/onami/configuration/variables/Tree;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="63" hits="37098" branch="true" condition-coverage="100% (2/2)">
+								<line number="63" hits="6910" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
@@ -1392,7 +1306,7 @@
 						</method>
 						<method name="needsResolving" signature="()Z" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="98" hits="508" branch="true" condition-coverage="100% (2/2)">
+								<line number="98" hits="192" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
@@ -1414,7 +1328,7 @@
 						<line number="56" hits="442" branch="false"/>
 						<line number="57" hits="442" branch="false"/>
 						<line number="58" hits="442" branch="false"/>
-						<line number="63" hits="37098" branch="true" condition-coverage="100% (2/2)">
+						<line number="63" hits="6910" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
@@ -1441,7 +1355,7 @@
 						<line number="81" hits="12" branch="false"/>
 						<line number="84" hits="44004" branch="false"/>
 						<line number="90" hits="0" branch="false"/>
-						<line number="98" hits="508" branch="true" condition-coverage="100% (2/2)">
+						<line number="98" hits="192" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
@@ -1471,8 +1385,8 @@
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/String;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="34" hits="23601" branch="false"/>
-								<line number="35" hits="23601" branch="false"/>
+								<line number="34" hits="23602" branch="false"/>
+								<line number="35" hits="23602" branch="false"/>
 							</lines>
 						</method>
 						<method name="doAppend" signature="(Ljava/lang/StringBuilder;Ljava/util/Map;Lorg/apache/onami/configuration/variables/Tree;)V" line-rate="1.0" branch-rate="1.0">
@@ -1515,13 +1429,13 @@
 						</method>
 						<method name="needsResolving" signature="()Z" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="69" hits="20529" branch="false"/>
+								<line number="69" hits="20530" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="34" hits="23601" branch="false"/>
-						<line number="35" hits="23601" branch="false"/>
+						<line number="34" hits="23602" branch="false"/>
+						<line number="35" hits="23602" branch="false"/>
 						<line number="40" hits="47080" branch="false"/>
 						<line number="41" hits="47080" branch="false"/>
 						<line number="46" hits="13648" branch="true" condition-coverage="50% (1/2)">
@@ -1548,16 +1462,16 @@
 								<condition number="0" type="jump" coverage="0%"/>
 							</conditions>
 						</line>
-						<line number="69" hits="20529" branch="false"/>
+						<line number="69" hits="20530" branch="false"/>
 					</lines>
 				</class>
-				<class name="org.apache.onami.configuration.variables.Tree" filename="org/apache/onami/configuration/variables/Tree.java" line-rate="0.6721311475409836" branch-rate="0.59375" complexity="2.0">
+				<class name="org.apache.onami.configuration.variables.Tree" filename="org/apache/onami/configuration/variables/Tree.java" line-rate="0.6610169491525424" branch-rate="0.59375" complexity="2.0">
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/Object;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
 								<line number="37" hits="89372" branch="false"/>
 								<line number="40" hits="89372" branch="false"/>
-								<line number="47" hits="89372" branch="false"/>
+								<line number="48" hits="89372" branch="false"/>
 								<line number="49" hits="89372" branch="false"/>
 								<line number="50" hits="89372" branch="false"/>
 							</lines>
@@ -1715,7 +1629,6 @@
 									</conditions>
 								</line>
 								<line number="231" hits="108" branch="false"/>
-								<line number="232" hits="108" branch="false"/>
 								<line number="235" hits="144" branch="false"/>
 								<line number="237" hits="144" branch="true" condition-coverage="75% (3/4)">
 									<conditions>
@@ -1724,11 +1637,10 @@
 									</conditions>
 								</line>
 								<line number="239" hits="4" branch="false"/>
-								<line number="240" hits="4" branch="false"/>
 								<line number="243" hits="140" branch="false"/>
 								<line number="247" hits="126" branch="false"/>
 								<line number="250" hits="126" branch="false"/>
-								<line number="253" hits="360" branch="true" condition-coverage="100% (2/2)">
+								<line number="253" hits="126" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
@@ -1741,7 +1653,7 @@
 					<lines>
 						<line number="37" hits="89372" branch="false"/>
 						<line number="40" hits="89372" branch="false"/>
-						<line number="47" hits="89372" branch="false"/>
+						<line number="48" hits="89372" branch="false"/>
 						<line number="49" hits="89372" branch="false"/>
 						<line number="50" hits="89372" branch="false"/>
 						<line number="57" hits="313382" branch="true" condition-coverage="100% (2/2)">
@@ -1835,7 +1747,6 @@
 							</conditions>
 						</line>
 						<line number="231" hits="108" branch="false"/>
-						<line number="232" hits="108" branch="false"/>
 						<line number="235" hits="144" branch="false"/>
 						<line number="237" hits="144" branch="true" condition-coverage="75% (3/4)">
 							<conditions>
@@ -1844,11 +1755,10 @@
 							</conditions>
 						</line>
 						<line number="239" hits="4" branch="false"/>
-						<line number="240" hits="4" branch="false"/>
 						<line number="243" hits="140" branch="false"/>
 						<line number="247" hits="126" branch="false"/>
 						<line number="250" hits="126" branch="false"/>
-						<line number="253" hits="360" branch="true" condition-coverage="100% (2/2)">
+						<line number="253" hits="126" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
@@ -1857,19 +1767,19 @@
 						<line number="257" hits="126" branch="false"/>
 					</lines>
 				</class>
-				<class name="org.apache.onami.configuration.variables.VariablesMap" filename="org/apache/onami/configuration/variables/VariablesMap.java" line-rate="0.66" branch-rate="0.5" complexity="1.4444444444444444">
+				<class name="org.apache.onami.configuration.variables.VariablesMap" filename="org/apache/onami/configuration/variables/VariablesMap.java" line-rate="0.6122448979591837" branch-rate="0.5" complexity="1.4444444444444444">
 					<methods>
-						<method name="&lt;init&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
+						<method name="&lt;init&gt;" signature="()V" line-rate="0.0" branch-rate="1.0">
 							<lines>
-								<line number="43" hits="2" branch="false"/>
-								<line number="44" hits="2" branch="false"/>
+								<line number="43" hits="0" branch="false"/>
+								<line number="44" hits="0" branch="false"/>
 							</lines>
 						</method>
 						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/variables/Parser;)V" line-rate="0.8571428571428571" branch-rate="0.5">
 							<lines>
 								<line number="37" hits="52" branch="false"/>
 								<line number="39" hits="52" branch="false"/>
-								<line number="46" hits="52" branch="false"/>
+								<line number="47" hits="52" branch="false"/>
 								<line number="48" hits="52" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
@@ -1902,8 +1812,9 @@
 								<line number="73" hits="2" branch="false"/>
 							</lines>
 						</method>
-						<method name="get" signature="(Ljava/lang/Object;)Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
+						<method name="get" signature="(Ljava/lang/Object;)Ljava/lang/Object;" line-rate="0.0" branch-rate="1.0">
 							<lines>
+								<line number="31" hits="0" branch="false"/>
 							</lines>
 						</method>
 						<method name="get" signature="(Ljava/lang/Object;)Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
@@ -1921,16 +1832,15 @@
 								<line number="88" hits="0" branch="false"/>
 							</lines>
 						</method>
-						<method name="put" signature="(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" line-rate="0.0" branch-rate="1.0">
+						<method name="put" signature="(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="1" hits="0" branch="false"/>
 							</lines>
 						</method>
 						<method name="put" signature="(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="93" hits="1867" branch="false"/>
-								<line number="94" hits="1855" branch="false"/>
-								<line number="95" hits="1855" branch="false"/>
+								<line number="93" hits="1868" branch="false"/>
+								<line number="94" hits="1856" branch="false"/>
+								<line number="95" hits="1856" branch="false"/>
 							</lines>
 						</method>
 						<method name="putAll" signature="(Ljava/util/Map;)V" line-rate="0.0" branch-rate="0.0">
@@ -1957,24 +1867,23 @@
 								<line number="114" hits="0" branch="false"/>
 							</lines>
 						</method>
-						<method name="putValue" signature="(Ljava/lang/String;Ljava/lang/String;)V" line-rate="0.875" branch-rate="0.75">
+						<method name="putValue" signature="(Ljava/lang/String;Ljava/lang/String;)V" line-rate="0.8571428571428571" branch-rate="0.75">
 							<lines>
-								<line number="118" hits="1867" branch="false"/>
-								<line number="120" hits="1867" branch="false"/>
-								<line number="121" hits="1855" branch="true" condition-coverage="100% (2/2)">
+								<line number="118" hits="1868" branch="false"/>
+								<line number="120" hits="1868" branch="false"/>
+								<line number="121" hits="1856" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
 								<line number="123" hits="1136" branch="false"/>
-								<line number="124" hits="1136" branch="false"/>
-								<line number="127" hits="719" branch="true" condition-coverage="50% (1/2)">
+								<line number="127" hits="720" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="129" hits="0" branch="false"/>
-								<line number="132" hits="1855" branch="false"/>
+								<line number="132" hits="1856" branch="false"/>
 							</lines>
 						</method>
 						<method name="remove" signature="(Ljava/lang/Object;)Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
@@ -1997,13 +1906,13 @@
 						</method>
 						<method name="resolveVariables" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="136" hits="19520" branch="true" condition-coverage="100% (2/2)">
+								<line number="136" hits="1858" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
 								<line number="138" hits="15806" branch="false"/>
-								<line number="140" hits="1857" branch="false"/>
+								<line number="140" hits="1858" branch="false"/>
 							</lines>
 						</method>
 						<method name="size" signature="()I" line-rate="0.0" branch-rate="1.0">
@@ -2023,12 +1932,12 @@
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="0" branch="false"/>
+						<line number="31" hits="0" branch="false"/>
 						<line number="37" hits="52" branch="false"/>
 						<line number="39" hits="52" branch="false"/>
-						<line number="43" hits="2" branch="false"/>
-						<line number="44" hits="2" branch="false"/>
-						<line number="46" hits="52" branch="false"/>
+						<line number="43" hits="0" branch="false"/>
+						<line number="44" hits="0" branch="false"/>
+						<line number="47" hits="52" branch="false"/>
 						<line number="48" hits="52" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
@@ -2046,9 +1955,9 @@
 						<line number="78" hits="152" branch="false"/>
 						<line number="83" hits="0" branch="false"/>
 						<line number="88" hits="0" branch="false"/>
-						<line number="93" hits="1867" branch="false"/>
-						<line number="94" hits="1855" branch="false"/>
-						<line number="95" hits="1855" branch="false"/>
+						<line number="93" hits="1868" branch="false"/>
+						<line number="94" hits="1856" branch="false"/>
+						<line number="95" hits="1856" branch="false"/>
 						<line number="100" hits="0" branch="true" condition-coverage="0% (0/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="0%"/>
@@ -2065,29 +1974,28 @@
 						<line number="111" hits="0" branch="false"/>
 						<line number="113" hits="0" branch="false"/>
 						<line number="114" hits="0" branch="false"/>
-						<line number="118" hits="1867" branch="false"/>
-						<line number="120" hits="1867" branch="false"/>
-						<line number="121" hits="1855" branch="true" condition-coverage="100% (2/2)">
+						<line number="118" hits="1868" branch="false"/>
+						<line number="120" hits="1868" branch="false"/>
+						<line number="121" hits="1856" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
 						<line number="123" hits="1136" branch="false"/>
-						<line number="124" hits="1136" branch="false"/>
-						<line number="127" hits="719" branch="true" condition-coverage="50% (1/2)">
+						<line number="127" hits="720" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="129" hits="0" branch="false"/>
-						<line number="132" hits="1855" branch="false"/>
-						<line number="136" hits="19520" branch="true" condition-coverage="100% (2/2)">
+						<line number="132" hits="1856" branch="false"/>
+						<line number="136" hits="1858" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
 						<line number="138" hits="15806" branch="false"/>
-						<line number="140" hits="1857" branch="false"/>
+						<line number="140" hits="1858" branch="false"/>
 						<line number="144" hits="2" branch="false"/>
 						<line number="145" hits="2" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
@@ -2103,12 +2011,6 @@
 						<line number="167" hits="0" branch="false"/>
 					</lines>
 				</class>
-				<class name="org.apache.onami.configuration.variables.package-info" filename="org/apache/onami/configuration/variables/package-info.java" line-rate="1.0" branch-rate="1.0" complexity="0.0">
-					<methods>
-					</methods>
-					<lines>
-					</lines>
-				</class>
 			</classes>
 		</package>
 	</packages>

Modified: onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.binder.html
URL: http://svn.apache.org/viewvc/onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.binder.html?rev=1501329&r1=1501328&r2=1501329&view=diff
==============================================================================
--- onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.binder.html (original)
+++ onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.binder.html Tue Jul  9 15:19:08 2013
@@ -20,9 +20,6 @@ org.apache.onami.configuration.binder
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.binder.XMLPropertiesFormatBindingBuilder.html">XMLPropertiesFormatBindingBuilder</a> <i>(N/A)</i></td>
 </tr>
-<tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.binder.package-info.html">package-info</a> <i>(N/A)</i></td>
-</tr>
 </tbody>
 </table>
 </body>

Modified: onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.html
URL: http://svn.apache.org/viewvc/onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.html?rev=1501329&r1=1501328&r2=1501329&view=diff
==============================================================================
--- onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.html (original)
+++ onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.html Tue Jul  9 15:19:08 2013
@@ -15,22 +15,19 @@ org.apache.onami.configuration
 <table width="100%">
 <tbody>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.ConfigurationModule.html">ConfigurationModule</a> <i>(77%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.ConfigurationModule.html">ConfigurationModule</a> <i>(80%)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.KeyValue.html">KeyValue</a> <i>(87%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.PropertiesIterator.html">PropertiesIterator</a> <i>(92%)</i></td>
-</tr>
-<tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.PropertiesURLReader.html">PropertiesURLReader</a> <i>(78%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.OnamiVariablesExpander.html">OnamiVariablesExpander</a> <i>(92%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.Rocoto.html">Rocoto</a> <i>(92%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.PropertiesIterator.html">PropertiesIterator</a> <i>(92%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.package-info.html">package-info</a> <i>(N/A)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.PropertiesURLReader.html">PropertiesURLReader</a> <i>(84%)</i></td>
 </tr>
 </tbody>
 </table>

Modified: onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.variables.html
URL: http://svn.apache.org/viewvc/onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.variables.html?rev=1501329&r1=1501328&r2=1501329&view=diff
==============================================================================
--- onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.variables.html (original)
+++ onami/site/configuration/cobertura/frame-sourcefiles-org.apache.onami.configuration.variables.html Tue Jul  9 15:19:08 2013
@@ -15,16 +15,16 @@ org.apache.onami.configuration.variables
 <table width="100%">
 <tbody>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AbstractAppender.html">AbstractAppender</a> <i>(94%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AbstractAppender.html">AbstractAppender</a> <i>(93%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AntStyleParser.html">AntStyleParser</a> <i>(97%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AntStyleParser.html">AntStyleParser</a> <i>(98%)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Appender.html">Appender</a> <i>(N/A)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.KeyAppender.html">KeyAppender</a> <i>(84%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.KeyAppender.html">KeyAppender</a> <i>(85%)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.MixinAppender.html">MixinAppender</a> <i>(80%)</i></td>
@@ -39,13 +39,10 @@ org.apache.onami.configuration.variables
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.TextAppender.html">TextAppender</a> <i>(83%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Tree.html">Tree</a> <i>(67%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Tree.html">Tree</a> <i>(66%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.VariablesMap.html">VariablesMap</a> <i>(66%)</i></td>
-</tr>
-<tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.package-info.html">package-info</a> <i>(N/A)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.VariablesMap.html">VariablesMap</a> <i>(61%)</i></td>
 </tr>
 </tbody>
 </table>

Modified: onami/site/configuration/cobertura/frame-sourcefiles.html
URL: http://svn.apache.org/viewvc/onami/site/configuration/cobertura/frame-sourcefiles.html?rev=1501329&r1=1501328&r2=1501329&view=diff
==============================================================================
--- onami/site/configuration/cobertura/frame-sourcefiles.html (original)
+++ onami/site/configuration/cobertura/frame-sourcefiles.html Tue Jul  9 15:19:08 2013
@@ -15,19 +15,19 @@ All Packages
 <table width="100%">
 <tbody>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AbstractAppender.html">AbstractAppender</a> <i>(94%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AbstractAppender.html">AbstractAppender</a> <i>(93%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AntStyleParser.html">AntStyleParser</a> <i>(97%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.AntStyleParser.html">AntStyleParser</a> <i>(98%)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Appender.html">Appender</a> <i>(N/A)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.ConfigurationModule.html">ConfigurationModule</a> <i>(77%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.ConfigurationModule.html">ConfigurationModule</a> <i>(80%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.KeyAppender.html">KeyAppender</a> <i>(84%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.KeyAppender.html">KeyAppender</a> <i>(85%)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.KeyValue.html">KeyValue</a> <i>(87%)</i></td>
@@ -36,13 +36,16 @@ All Packages
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.MixinAppender.html">MixinAppender</a> <i>(80%)</i></td>
 </tr>
 <tr>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.OnamiVariablesExpander.html">OnamiVariablesExpander</a> <i>(92%)</i></td>
+</tr>
+<tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Parser.html">Parser</a> <i>(N/A)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.PropertiesIterator.html">PropertiesIterator</a> <i>(92%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.PropertiesURLReader.html">PropertiesURLReader</a> <i>(78%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.PropertiesURLReader.html">PropertiesURLReader</a> <i>(84%)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.binder.PropertyValueBindingBuilder.html">PropertyValueBindingBuilder</a> <i>(N/A)</i></td>
@@ -51,29 +54,17 @@ All Packages
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Resolver.html">Resolver</a> <i>(N/A)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.Rocoto.html">Rocoto</a> <i>(92%)</i></td>
-</tr>
-<tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.TextAppender.html">TextAppender</a> <i>(83%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Tree.html">Tree</a> <i>(67%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.Tree.html">Tree</a> <i>(66%)</i></td>
 </tr>
 <tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.VariablesMap.html">VariablesMap</a> <i>(66%)</i></td>
+<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.VariablesMap.html">VariablesMap</a> <i>(61%)</i></td>
 </tr>
 <tr>
 <td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.binder.XMLPropertiesFormatBindingBuilder.html">XMLPropertiesFormatBindingBuilder</a> <i>(N/A)</i></td>
 </tr>
-<tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.binder.package-info.html">package-info</a> <i>(N/A)</i></td>
-</tr>
-<tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.package-info.html">package-info</a> <i>(N/A)</i></td>
-</tr>
-<tr>
-<td nowrap="nowrap"><a target="summary" href="org.apache.onami.configuration.variables.package-info.html">package-info</a> <i>(N/A)</i></td>
-</tr>
 </tbody>
 </table>
 </body>