onami-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1456628 [3/9] - 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/con...
Date Thu, 14 Mar 2013 19:55:40 GMT
Modified: incubator/onami/site/configuration/cobertura/coverage.xml
URL: http://svn.apache.org/viewvc/incubator/onami/site/configuration/cobertura/coverage.xml?rev=1456628&r1=1456627&r2=1456628&view=diff
==============================================================================
--- incubator/onami/site/configuration/cobertura/coverage.xml (original)
+++ incubator/onami/site/configuration/cobertura/coverage.xml Thu Mar 14 19:55:38 2013
@@ -1,7 +1,7 @@
 <?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="1361565375731">
+<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">
 	<sources>
 		<source>/Users/stripodi/Documents/apache-workspace/onami/trunk/configuration/src/main/java</source>
 		<source>--source</source>
@@ -13,29 +13,29 @@
 					<methods>
 						<method name="&lt;init&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="46" hits="1" branch="false"/>
+								<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">
 							<lines>
-								<line number="282" hits="238" branch="false"/>
+								<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">
 							<lines>
-								<line number="1" hits="238" branch="false"/>
+								<line number="1" hits="478" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindEnvironmentVariables" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="186" hits="2" branch="false"/>
-								<line number="187" hits="2" branch="false"/>
+								<line number="186" hits="4" branch="false"/>
+								<line number="187" hits="4" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindProperties" signature="(Ljava/io/File;)Lorg/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="197" hits="6" branch="false"/>
-								<line number="199" hits="6" branch="false"/>
+								<line number="197" hits="12" branch="false"/>
+								<line number="199" hits="12" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindProperties" signature="(Ljava/lang/Iterable;)V" line-rate="0.0" branch-rate="1.0">
@@ -47,67 +47,67 @@
 						</method>
 						<method name="bindProperties" signature="(Ljava/lang/String;)Lorg/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="239" hits="4" branch="false"/>
+								<line number="239" hits="8" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindProperties" signature="(Ljava/lang/String;Ljava/lang/ClassLoader;)Lorg/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="251" hits="4" branch="false"/>
-								<line number="252" hits="4" branch="false"/>
-								<line number="254" hits="4" branch="false"/>
-								<line number="255" hits="4" branch="true" condition-coverage="100% (2/2)">
+								<line number="251" hits="8" branch="false"/>
+								<line number="252" hits="8" branch="false"/>
+								<line number="254" hits="8" branch="false"/>
+								<line number="255" hits="8" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="257" hits="2" branch="false"/>
-								<line number="260" hits="4" branch="false"/>
-								<line number="261" hits="8" branch="false"/>
-								<line number="262" hits="4" branch="false"/>
-								<line number="263" hits="4" branch="false"/>
-								<line number="265" hits="4" branch="false"/>
+								<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="265" hits="8" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindProperties" signature="(Ljava/net/URI;)Lorg/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder;" line-rate="0.6666666666666666" branch-rate="0.75">
 							<lines>
-								<line number="210" hits="8" branch="false"/>
-								<line number="212" hits="8" branch="true" condition-coverage="100% (2/2)">
+								<line number="210" hits="16" branch="false"/>
+								<line number="212" hits="16" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="214" hits="2" branch="false"/>
-								<line number="215" hits="2" branch="true" condition-coverage="50% (1/2)">
+								<line number="214" hits="4" branch="false"/>
+								<line number="215" hits="4" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="217" hits="0" branch="false"/>
-								<line number="219" hits="2" branch="false"/>
-								<line number="224" hits="6" branch="false"/>
+								<line number="219" hits="4" branch="false"/>
+								<line number="224" hits="12" branch="false"/>
 								<line number="226" hits="0" branch="false"/>
 								<line number="228" hits="0" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindProperties" signature="(Ljava/net/URL;)Lorg/apache/onami/configuration/binder/XMLPropertiesFormatBindingBuilder;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="275" hits="10" branch="false"/>
-								<line number="277" hits="10" branch="false"/>
-								<line number="278" hits="10" branch="false"/>
-								<line number="279" hits="10" 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"/>
 							</lines>
 						</method>
 						<method name="bindProperties" signature="(Ljava/util/Iterator;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="152" hits="14" branch="false"/>
-								<line number="154" hits="264" branch="true" condition-coverage="100% (2/2)">
+								<line number="152" hits="28" branch="false"/>
+								<line number="154" hits="530" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="156" hits="236" branch="false"/>
-								<line number="157" hits="236" branch="false"/>
-								<line number="159" hits="14" branch="false"/>
+								<line number="156" hits="474" branch="false"/>
+								<line number="157" hits="474" branch="false"/>
+								<line number="159" hits="28" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindProperties" signature="(Ljava/util/Map;)V" line-rate="0.0" branch-rate="1.0">
@@ -119,192 +119,192 @@
 						</method>
 						<method name="bindProperties" signature="(Ljava/util/Properties;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="130" hits="12" branch="false"/>
-								<line number="132" hits="12" branch="false"/>
-								<line number="133" hits="12" branch="false"/>
+								<line number="130" hits="24" branch="false"/>
+								<line number="132" hits="24" branch="false"/>
+								<line number="133" hits="24" branch="false"/>
 							</lines>
 						</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="238" branch="false"/>
-								<line number="110" hits="238" branch="false"/>
+								<line number="108" hits="478" branch="false"/>
+								<line number="110" hits="478" branch="false"/>
 							</lines>
 						</method>
 						<method name="bindSystemProperties" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="166" hits="2" branch="false"/>
-								<line number="167" hits="2" branch="false"/>
+								<line number="166" hits="4" branch="false"/>
+								<line number="167" hits="4" branch="false"/>
 							</lines>
 						</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="538" branch="true" condition-coverage="50% (1/2)">
+								<line number="284" hits="1080" 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="538" branch="false"/>
+								<line number="288" hits="1080" branch="false"/>
 							</lines>
 						</method>
 						<method name="configure" signature="()V" line-rate="0.6" branch-rate="0.75">
 							<lines>
-								<line number="65" hits="2" branch="true" condition-coverage="50% (1/2)">
+								<line number="65" hits="4" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="67" hits="0" branch="false"/>
-								<line number="70" hits="2" branch="false"/>
-								<line number="72" hits="2" branch="false"/>
-								<line number="76" hits="14" branch="true" condition-coverage="100% (2/2)">
+								<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)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="80" hits="10" branch="false"/>
-								<line number="81" hits="10" branch="false"/>
+								<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="2" branch="false"/>
+								<line number="88" hits="4" branch="false"/>
 								<line number="90" hits="0" branch="false"/>
-								<line number="91" hits="2" branch="false"/>
+								<line number="91" hits="4" branch="false"/>
 								<line number="92" hits="0" branch="false"/>
-								<line number="93" hits="2" branch="false"/>
+								<line number="93" hits="4" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="238" branch="false"/>
-						<line number="46" hits="1" branch="false"/>
-						<line number="65" hits="2" branch="true" condition-coverage="50% (1/2)">
+						<line number="1" hits="478" branch="false"/>
+						<line number="46" hits="2" branch="false"/>
+						<line number="65" hits="4" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="67" hits="0" branch="false"/>
-						<line number="70" hits="2" branch="false"/>
-						<line number="72" hits="2" branch="false"/>
-						<line number="76" hits="14" branch="true" condition-coverage="100% (2/2)">
+						<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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="80" hits="10" branch="false"/>
-						<line number="81" hits="10" branch="false"/>
+						<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="2" branch="false"/>
+						<line number="88" hits="4" branch="false"/>
 						<line number="90" hits="0" branch="false"/>
-						<line number="91" hits="2" branch="false"/>
+						<line number="91" hits="4" branch="false"/>
 						<line number="92" hits="0" branch="false"/>
-						<line number="93" hits="2" branch="false"/>
-						<line number="108" hits="238" branch="false"/>
-						<line number="110" hits="238" branch="false"/>
-						<line number="130" hits="12" branch="false"/>
-						<line number="132" hits="12" branch="false"/>
-						<line number="133" hits="12" 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="130" hits="24" branch="false"/>
+						<line number="132" hits="24" branch="false"/>
+						<line number="133" hits="24" branch="false"/>
 						<line number="141" hits="0" branch="false"/>
 						<line number="143" hits="0" branch="false"/>
 						<line number="144" hits="0" branch="false"/>
-						<line number="152" hits="14" branch="false"/>
-						<line number="154" hits="264" branch="true" condition-coverage="100% (2/2)">
+						<line number="152" hits="28" branch="false"/>
+						<line number="154" hits="530" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="156" hits="236" branch="false"/>
-						<line number="157" hits="236" branch="false"/>
-						<line number="159" hits="14" branch="false"/>
-						<line number="166" hits="2" branch="false"/>
-						<line number="167" hits="2" branch="false"/>
+						<line number="156" hits="474" branch="false"/>
+						<line number="157" hits="474" branch="false"/>
+						<line number="159" hits="28" branch="false"/>
+						<line number="166" hits="4" branch="false"/>
+						<line number="167" hits="4" branch="false"/>
 						<line number="176" hits="0" branch="false"/>
 						<line number="178" hits="0" branch="false"/>
 						<line number="179" hits="0" branch="false"/>
-						<line number="186" hits="2" branch="false"/>
-						<line number="187" hits="2" branch="false"/>
-						<line number="197" hits="6" branch="false"/>
-						<line number="199" hits="6" branch="false"/>
-						<line number="210" hits="8" branch="false"/>
-						<line number="212" hits="8" branch="true" condition-coverage="100% (2/2)">
+						<line number="186" hits="4" branch="false"/>
+						<line number="187" hits="4" branch="false"/>
+						<line number="197" hits="12" branch="false"/>
+						<line number="199" hits="12" branch="false"/>
+						<line number="210" hits="16" branch="false"/>
+						<line number="212" hits="16" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="214" hits="2" branch="false"/>
-						<line number="215" hits="2" branch="true" condition-coverage="50% (1/2)">
+						<line number="214" hits="4" branch="false"/>
+						<line number="215" hits="4" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="217" hits="0" branch="false"/>
-						<line number="219" hits="2" branch="false"/>
-						<line number="224" hits="6" branch="false"/>
+						<line number="219" hits="4" branch="false"/>
+						<line number="224" hits="12" branch="false"/>
 						<line number="226" hits="0" branch="false"/>
 						<line number="228" hits="0" branch="false"/>
-						<line number="239" hits="4" branch="false"/>
-						<line number="251" hits="4" branch="false"/>
-						<line number="252" hits="4" branch="false"/>
-						<line number="254" hits="4" branch="false"/>
-						<line number="255" hits="4" branch="true" condition-coverage="100% (2/2)">
+						<line number="239" hits="8" branch="false"/>
+						<line number="251" hits="8" branch="false"/>
+						<line number="252" hits="8" branch="false"/>
+						<line number="254" hits="8" branch="false"/>
+						<line number="255" hits="8" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="257" hits="2" branch="false"/>
-						<line number="260" hits="4" branch="false"/>
-						<line number="261" hits="8" branch="false"/>
-						<line number="262" hits="4" branch="false"/>
-						<line number="263" hits="4" branch="false"/>
-						<line number="265" hits="4" branch="false"/>
-						<line number="275" hits="10" branch="false"/>
-						<line number="277" hits="10" branch="false"/>
-						<line number="278" hits="10" branch="false"/>
-						<line number="279" hits="10" branch="false"/>
-						<line number="282" hits="238" branch="false"/>
-						<line number="284" hits="538" branch="true" condition-coverage="50% (1/2)">
+						<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="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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="286" hits="0" branch="false"/>
-						<line number="288" hits="538" branch="false"/>
+						<line number="288" hits="1080" 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="238" branch="false"/>
-								<line number="110" hits="238" branch="false"/>
+								<line number="1" hits="478" branch="false"/>
+								<line number="110" hits="478" 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="238" branch="false"/>
-								<line number="117" hits="238" branch="false"/>
-								<line number="118" hits="238" branch="false"/>
+								<line number="115" hits="478" branch="false"/>
+								<line number="117" hits="478" branch="false"/>
+								<line number="118" hits="478" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="238" branch="false"/>
-						<line number="110" hits="238" branch="false"/>
-						<line number="115" hits="238" branch="false"/>
-						<line number="117" hits="238" branch="false"/>
-						<line number="118" hits="238" branch="false"/>
+						<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"/>
 					</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="236" branch="false"/>
-								<line number="49" hits="236" branch="false"/>
-								<line number="50" hits="236" branch="false"/>
-								<line number="51" hits="236" 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"/>
 							</lines>
 						</method>
 						<method name="getKey" signature="()Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
@@ -313,7 +313,7 @@
 						</method>
 						<method name="getKey" signature="()Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="58" hits="236" branch="false"/>
+								<line number="58" hits="474" branch="false"/>
 							</lines>
 						</method>
 						<method name="getValue" signature="()Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
@@ -322,12 +322,12 @@
 						</method>
 						<method name="getValue" signature="()Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="66" hits="236" branch="false"/>
+								<line number="66" hits="474" 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="472" branch="false"/>
+								<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,13 +337,13 @@
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="472" branch="false"/>
-						<line number="47" hits="236" branch="false"/>
-						<line number="49" hits="236" branch="false"/>
-						<line number="50" hits="236" branch="false"/>
-						<line number="51" hits="236" branch="false"/>
-						<line number="58" hits="236" branch="false"/>
-						<line number="66" hits="236" branch="false"/>
+						<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="74" hits="0" branch="false"/>
 					</lines>
 				</class>
@@ -351,44 +351,44 @@
 					<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="14" branch="false"/>
-								<line number="80" hits="14" branch="false"/>
-								<line number="81" hits="14" branch="false"/>
-								<line number="82" hits="14" branch="false"/>
+								<line number="78" 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"/>
 							</lines>
 						</method>
 						<method name="hasNext" signature="()Z" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="89" hits="250" branch="false"/>
+								<line number="89" hits="502" 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">
 							<lines>
-								<line number="59" hits="2" branch="false"/>
+								<line number="59" hits="4" branch="false"/>
 							</lines>
 						</method>
 						<method name="newPropertiesIterator" signature="(Ljava/util/Map;)Lorg/apache/onami/configuration/PropertiesIterator;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="45" hits="12" branch="false"/>
+								<line number="45" hits="24" branch="false"/>
 							</lines>
 						</method>
 						<method name="next" signature="()Ljava/lang/Object;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="1" hits="236" branch="false"/>
+								<line number="1" hits="474" 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="236" branch="false"/>
-								<line number="98" hits="236" branch="false"/>
-								<line number="99" hits="236" branch="true" condition-coverage="75% (3/4)">
+								<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)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
-								<line number="101" hits="74" branch="false"/>
-								<line number="103" hits="236" branch="false"/>
+								<line number="101" hits="150" branch="false"/>
+								<line number="103" hits="474" branch="false"/>
 							</lines>
 						</method>
 						<method name="remove" signature="()V" line-rate="0.0" branch-rate="1.0">
@@ -398,24 +398,24 @@
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="236" branch="false"/>
-						<line number="45" hits="12" branch="false"/>
-						<line number="59" hits="2" branch="false"/>
-						<line number="78" hits="14" branch="false"/>
-						<line number="80" hits="14" branch="false"/>
-						<line number="81" hits="14" branch="false"/>
-						<line number="82" hits="14" branch="false"/>
-						<line number="89" hits="250" branch="false"/>
-						<line number="97" hits="236" branch="false"/>
-						<line number="98" hits="236" branch="false"/>
-						<line number="99" hits="236" branch="true" condition-coverage="75% (3/4)">
+						<line number="1" hits="474" 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="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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
-						<line number="101" hits="74" branch="false"/>
-						<line number="103" hits="236" branch="false"/>
+						<line number="101" hits="150" branch="false"/>
+						<line number="103" hits="474" branch="false"/>
 						<line number="111" hits="0" branch="false"/>
 					</lines>
 				</class>
@@ -423,16 +423,16 @@
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/net/URL;)V" line-rate="0.8333333333333334" branch-rate="0.5">
 							<lines>
-								<line number="48" hits="10" branch="false"/>
-								<line number="56" hits="10" branch="false"/>
-								<line number="58" hits="10" branch="true" condition-coverage="50% (1/2)">
+								<line number="48" hits="20" branch="false"/>
+								<line number="56" hits="20" branch="false"/>
+								<line number="58" hits="20" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="60" hits="0" branch="false"/>
-								<line number="63" hits="10" branch="false"/>
-								<line number="64" hits="10" branch="false"/>
+								<line number="63" hits="20" branch="false"/>
+								<line number="64" hits="20" branch="false"/>
 							</lines>
 						</method>
 						<method name="getUrl" signature="()Ljava/net/URL;" line-rate="0.0" branch-rate="1.0">
@@ -442,91 +442,91 @@
 						</method>
 						<method name="inXMLFormat" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="71" hits="4" branch="false"/>
-								<line number="72" hits="4" branch="false"/>
+								<line number="71" hits="8" branch="false"/>
+								<line number="72" hits="8" branch="false"/>
 							</lines>
 						</method>
 						<method name="readConfiguration" signature="()Ljava/util/Properties;" line-rate="0.7894736842105263" branch-rate="0.625">
 							<lines>
-								<line number="92" hits="10" branch="false"/>
-								<line number="93" hits="10" branch="false"/>
-								<line number="96" hits="10" branch="false"/>
-								<line number="97" hits="10" branch="false"/>
-								<line number="98" hits="10" branch="false"/>
-								<line number="100" hits="10" branch="false"/>
-								<line number="101" hits="10" branch="true" condition-coverage="100% (2/2)">
+								<line number="92" hits="20" branch="false"/>
+								<line number="93" hits="20" branch="false"/>
+								<line number="96" hits="20" branch="false"/>
+								<line number="97" hits="20" branch="false"/>
+								<line number="98" hits="20" branch="false"/>
+								<line number="100" hits="20" branch="false"/>
+								<line number="101" hits="20" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="103" hits="4" branch="false"/>
-								<line number="104" hits="4" branch="false"/>
-								<line number="107" hits="6" branch="false"/>
-								<line number="110" hits="20" branch="false"/>
+								<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="114" hits="10" branch="true" condition-coverage="50% (2/4)">
+								<line number="114" hits="20" branch="true" condition-coverage="50% (2/4)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 										<condition number="1" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="116" hits="0" branch="false"/>
-								<line number="118" hits="10" branch="true" condition-coverage="50% (1/2)">
+								<line number="118" hits="20" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
-								<line number="122" hits="10" branch="false"/>
-								<line number="123" hits="10" branch="false"/>
+								<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>
 						</method>
 					</methods>
 					<lines>
-						<line number="48" hits="10" branch="false"/>
-						<line number="56" hits="10" branch="false"/>
-						<line number="58" hits="10" branch="true" condition-coverage="50% (1/2)">
+						<line number="48" hits="20" branch="false"/>
+						<line number="56" hits="20" branch="false"/>
+						<line number="58" hits="20" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="60" hits="0" branch="false"/>
-						<line number="63" hits="10" branch="false"/>
-						<line number="64" hits="10" branch="false"/>
-						<line number="71" hits="4" branch="false"/>
-						<line number="72" hits="4" branch="false"/>
+						<line number="63" hits="20" branch="false"/>
+						<line number="64" hits="20" branch="false"/>
+						<line number="71" hits="8" branch="false"/>
+						<line number="72" hits="8" branch="false"/>
 						<line number="80" hits="0" branch="false"/>
-						<line number="92" hits="10" branch="false"/>
-						<line number="93" hits="10" branch="false"/>
-						<line number="96" hits="10" branch="false"/>
-						<line number="97" hits="10" branch="false"/>
-						<line number="98" hits="10" branch="false"/>
-						<line number="100" hits="10" branch="false"/>
-						<line number="101" hits="10" branch="true" condition-coverage="100% (2/2)">
+						<line number="92" hits="20" branch="false"/>
+						<line number="93" hits="20" branch="false"/>
+						<line number="96" hits="20" branch="false"/>
+						<line number="97" hits="20" branch="false"/>
+						<line number="98" hits="20" branch="false"/>
+						<line number="100" hits="20" branch="false"/>
+						<line number="101" hits="20" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="103" hits="4" branch="false"/>
-						<line number="104" hits="4" branch="false"/>
-						<line number="107" hits="6" branch="false"/>
-						<line number="110" hits="20" branch="false"/>
+						<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="114" hits="10" branch="true" condition-coverage="50% (2/4)">
+						<line number="114" hits="20" branch="true" condition-coverage="50% (2/4)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 								<condition number="1" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="116" hits="0" branch="false"/>
-						<line number="118" hits="10" branch="true" condition-coverage="50% (1/2)">
+						<line number="118" hits="20" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
-						<line number="122" hits="10" branch="false"/>
-						<line number="123" hits="10" branch="false"/>
+						<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>
@@ -535,108 +535,108 @@
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/util/List;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="65" hits="1" branch="false"/>
-								<line number="67" hits="1" branch="false"/>
-								<line number="68" hits="1" branch="false"/>
+								<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="120" branch="false"/>
+								<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="1" branch="false"/>
-								<line number="75" hits="121" branch="true" condition-coverage="100% (2/2)">
+								<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="119" branch="false"/>
-								<line number="112" hits="121" branch="true" condition-coverage="100% (2/2)">
+								<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="119" branch="false"/>
-								<line number="116" hits="1" branch="false"/>
+								<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="1" branch="false"/>
+								<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="1" branch="false"/>
+								<line number="50" hits="2" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="50" hits="1" branch="false"/>
-						<line number="55" hits="1" branch="false"/>
-						<line number="58" hits="120" branch="false"/>
-						<line number="65" hits="1" branch="false"/>
-						<line number="67" hits="1" branch="false"/>
-						<line number="68" hits="1" branch="false"/>
-						<line number="73" hits="1" branch="false"/>
-						<line number="75" hits="121" branch="true" condition-coverage="100% (2/2)">
+						<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="119" branch="false"/>
-						<line number="112" hits="121" branch="true" condition-coverage="100% (2/2)">
+						<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="119" branch="false"/>
-						<line number="116" hits="1" branch="false"/>
+						<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="1" branch="false"/>
-								<line number="58" hits="1" branch="false"/>
+								<line number="1" hits="2" branch="false"/>
+								<line number="58" hits="2" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="1" branch="false"/>
-						<line number="58" hits="1" branch="false"/>
+						<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="119" branch="false"/>
+								<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="238" branch="false"/>
+								<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="119" branch="false"/>
-								<line number="85" hits="119" branch="true" condition-coverage="50% (1/2)">
+								<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="119" branch="true" condition-coverage="50% (1/2)">
+								<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="119" branch="true" condition-coverage="50% (1/2)">
+								<line number="87" hits="239" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
@@ -646,35 +646,35 @@
 										<condition number="0" type="jump" coverage="0%"/>
 									</conditions>
 								</line>
-								<line number="92" hits="119" branch="true" condition-coverage="50% (1/2)">
+								<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="119" branch="false"/>
-								<line number="95" hits="119" branch="false"/>
+								<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="119" branch="false"/>
-								<line number="103" hits="119" branch="false"/>
-								<line number="106" hits="119" 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="238" branch="false"/>
-						<line number="77" hits="119" branch="false"/>
-						<line number="83" hits="119" branch="false"/>
-						<line number="85" hits="119" branch="true" condition-coverage="50% (1/2)">
+						<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="119" branch="true" condition-coverage="50% (1/2)">
+						<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="119" branch="true" condition-coverage="50% (1/2)">
+						<line number="87" hits="239" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
@@ -684,17 +684,17 @@
 								<condition number="0" type="jump" coverage="0%"/>
 							</conditions>
 						</line>
-						<line number="92" hits="119" branch="true" condition-coverage="50% (1/2)">
+						<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="119" branch="false"/>
-						<line number="95" hits="119" branch="false"/>
+						<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="119" branch="false"/>
-						<line number="103" hits="119" branch="false"/>
-						<line number="106" hits="119" 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">
@@ -733,246 +733,246 @@
 					<methods>
 						<method name="&lt;clinit&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="39" hits="1" branch="false"/>
+								<line number="39" hits="2" branch="false"/>
 							</lines>
 						</method>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/String;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="49" hits="13262" branch="false"/>
-								<line number="51" hits="13262" branch="false"/>
-								<line number="52" hits="13262" branch="false"/>
+								<line number="49" hits="26525" branch="false"/>
+								<line number="51" hits="26525" branch="false"/>
+								<line number="52" hits="26525" 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">
 							<lines>
-								<line number="64" hits="44686" branch="true" condition-coverage="100% (2/2)">
+								<line number="64" hits="89372" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="67" hits="44686" branch="true" condition-coverage="100% (2/2)">
+								<line number="67" hits="89372" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="70" hits="9" branch="false"/>
-								<line number="72" hits="9" branch="false"/>
-								<line number="73" hits="9" branch="false"/>
-								<line number="77" hits="44677" branch="false"/>
-								<line number="79" hits="44677" branch="true" condition-coverage="75% (3/4)">
+								<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>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="81" hits="0" branch="false"/>
-								<line number="84" hits="44686" branch="false"/>
+								<line number="84" hits="89372" branch="false"/>
 							</lines>
 						</method>
 						<method name="resolve" signature="(Ljava/util/Map;)Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="91" hits="7903" branch="false"/>
-								<line number="92" hits="7903" branch="false"/>
-								<line number="93" hits="7903" branch="false"/>
+								<line number="91" hits="15806" branch="false"/>
+								<line number="92" hits="15806" branch="false"/>
+								<line number="93" hits="15806" branch="false"/>
 							</lines>
 						</method>
 						<method name="toString" signature="()Ljava/lang/String;" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="123" hits="63" branch="false"/>
+								<line number="123" hits="126" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="39" hits="1" branch="false"/>
-						<line number="49" hits="13262" branch="false"/>
-						<line number="51" hits="13262" branch="false"/>
-						<line number="52" hits="13262" branch="false"/>
-						<line number="64" hits="44686" branch="true" condition-coverage="100% (2/2)">
+						<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="64" hits="89372" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="67" hits="44686" branch="true" condition-coverage="100% (2/2)">
+						<line number="67" hits="89372" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="70" hits="9" branch="false"/>
-						<line number="72" hits="9" branch="false"/>
-						<line number="73" hits="9" branch="false"/>
-						<line number="77" hits="44677" branch="false"/>
-						<line number="79" hits="44677" branch="true" condition-coverage="75% (3/4)">
+						<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>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="81" hits="0" branch="false"/>
-						<line number="84" hits="44686" branch="false"/>
-						<line number="91" hits="7903" branch="false"/>
-						<line number="92" hits="7903" branch="false"/>
-						<line number="93" hits="7903" branch="false"/>
-						<line number="123" hits="63" branch="false"/>
+						<line number="84" hits="89372" branch="false"/>
+						<line number="91" hits="15806" branch="false"/>
+						<line number="92" hits="15806" branch="false"/>
+						<line number="93" hits="15806" branch="false"/>
+						<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">
 					<methods>
 						<method name="&lt;clinit&gt;" signature="()V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="57" hits="1" branch="false"/>
-								<line number="65" hits="1" branch="false"/>
+								<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="26" branch="false"/>
+								<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">
 							<lines>
-								<line number="72" hits="11297" branch="false"/>
-								<line number="73" hits="11297" branch="false"/>
-								<line number="74" hits="11297" branch="false"/>
-								<line number="75" hits="23835" branch="true" condition-coverage="100% (2/2)">
+								<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)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="78" hits="1247" branch="true" condition-coverage="100% (2/2)">
+								<line number="78" hits="2494" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="80" hits="217" branch="false"/>
-								<line number="84" hits="1247" branch="false"/>
-								<line number="88" hits="1247" branch="false"/>
-								<line number="89" hits="1247" branch="true" condition-coverage="100% (2/2)">
+								<line number="80" hits="434" branch="false"/>
+								<line number="84" hits="2494" branch="false"/>
+								<line number="88" hits="2494" branch="false"/>
+								<line number="89" hits="2494" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="91" hits="6" branch="false"/>
-								<line number="92" hits="3" branch="false"/>
-								<line number="96" hits="1244" branch="false"/>
-								<line number="98" hits="1244" branch="false"/>
-								<line number="99" hits="1244" branch="false"/>
-								<line number="100" hits="3268" branch="true" condition-coverage="100% (4/4)">
+								<line number="91" hits="12" branch="false"/>
+								<line number="92" 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)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="102" hits="783" branch="false"/>
-								<line number="103" hits="783" branch="false"/>
-								<line number="105" hits="783" branch="true" condition-coverage="100% (2/2)">
+								<line number="102" hits="1566" branch="false"/>
+								<line number="103" hits="1566" branch="false"/>
+								<line number="105" hits="1566" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="107" hits="6" branch="false"/>
-								<line number="108" hits="3" branch="false"/>
-								<line number="110" hits="780" branch="false"/>
-								<line number="111" hits="780" branch="false"/>
-								<line number="114" hits="1241" branch="false"/>
-								<line number="116" hits="1241" branch="false"/>
-								<line number="118" hits="1241" branch="false"/>
-								<line number="120" hits="1241" branch="false"/>
-								<line number="121" hits="1241" branch="false"/>
-								<line number="122" hits="1241" branch="false"/>
-								<line number="125" hits="1241" branch="true" condition-coverage="100% (2/2)">
+								<line number="107" hits="12" branch="false"/>
+								<line number="108" 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"/>
+								<line number="116" hits="2482" branch="false"/>
+								<line number="118" hits="2482" branch="false"/>
+								<line number="120" hits="2482" branch="false"/>
+								<line number="121" hits="2482" branch="false"/>
+								<line number="122" hits="2482" branch="false"/>
+								<line number="125" hits="2482" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="128" hits="630" branch="true" condition-coverage="100% (2/2)">
+								<line number="128" hits="1260" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="130" hits="230" branch="false"/>
-								<line number="131" hits="230" branch="false"/>
-								<line number="132" hits="230" branch="false"/>
-								<line number="138" hits="400" branch="false"/>
-								<line number="139" hits="400" branch="true" condition-coverage="100% (2/2)">
+								<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>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="140" hits="400" branch="true" condition-coverage="100% (2/2)">
+								<line number="140" hits="800" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="143" hits="125" branch="false"/>
-								<line number="144" hits="125" branch="false"/>
-								<line number="145" hits="325" branch="true" condition-coverage="100% (4/4)">
+								<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)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="147" hits="100" branch="false"/>
-								<line number="148" hits="100" branch="false"/>
-								<line number="150" hits="100" branch="true" condition-coverage="100% (2/2)">
+								<line number="147" hits="200" branch="false"/>
+								<line number="148" hits="200" branch="false"/>
+								<line number="150" hits="200" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="152" hits="25" branch="false"/>
-								<line number="154" hits="75" branch="false"/>
-								<line number="155" hits="75" branch="true" condition-coverage="50% (1/2)">
+								<line number="152" hits="50" branch="false"/>
+								<line number="154" hits="150" branch="false"/>
+								<line number="155" hits="150" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="157" hits="0" branch="false"/>
 								<line number="158" hits="0" branch="false"/>
-								<line number="165" hits="400" branch="true" condition-coverage="100% (2/2)">
+								<line number="165" hits="800" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="167" hits="325" branch="false"/>
-								<line number="168" hits="325" branch="true" condition-coverage="100% (2/2)">
+								<line number="167" hits="650" branch="false"/>
+								<line number="168" hits="650" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="172" hits="325" branch="false"/>
-								<line number="177" hits="611" branch="false"/>
-								<line number="181" hits="1241" branch="false"/>
-								<line number="182" hits="1241" branch="false"/>
-								<line number="183" hits="1241" branch="true" condition-coverage="100% (2/2)">
+								<line number="172" hits="650" branch="false"/>
+								<line number="177" hits="1222" branch="false"/>
+								<line number="181" hits="2482" branch="false"/>
+								<line number="182" hits="2482" branch="false"/>
+								<line number="183" hits="2482" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="185" hits="555" branch="false"/>
-								<line number="186" hits="555" branch="false"/>
-								<line number="187" hits="555" branch="false"/>
-								<line number="190" hits="686" branch="false"/>
-								<line number="193" hits="2482" branch="false"/>
-								<line number="194" hits="1241" branch="false"/>
-								<line number="195" hits="1241" branch="true" condition-coverage="100% (2/2)">
+								<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="1241" branch="true" condition-coverage="100% (4/4)">
+								<line number="196" hits="2482" branch="true" condition-coverage="100% (4/4)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 										<condition number="1" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="198" hits="1241" branch="false"/>
-								<line number="199" hits="1241" branch="false"/>
-								<line number="202" hits="11291" branch="true" condition-coverage="100% (2/2)">
+								<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)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="204" hits="10292" branch="false"/>
-								<line number="207" hits="11291" branch="true" condition-coverage="100% (2/2)">
+								<line number="204" hits="20585" branch="false"/>
+								<line number="207" hits="22583" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
@@ -981,158 +981,158 @@
 						</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="10792" branch="false"/>
+								<line number="1" hits="21585" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
-						<line number="1" hits="10792" branch="false"/>
-						<line number="50" hits="26" branch="false"/>
-						<line number="57" hits="1" branch="false"/>
-						<line number="65" hits="1" branch="false"/>
-						<line number="72" hits="11297" branch="false"/>
-						<line number="73" hits="11297" branch="false"/>
-						<line number="74" hits="11297" branch="false"/>
-						<line number="75" hits="23835" branch="true" condition-coverage="100% (2/2)">
+						<line number="1" hits="21585" branch="false"/>
+						<line number="50" hits="52" 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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="78" hits="1247" branch="true" condition-coverage="100% (2/2)">
+						<line number="78" hits="2494" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="80" hits="217" branch="false"/>
-						<line number="84" hits="1247" branch="false"/>
-						<line number="88" hits="1247" branch="false"/>
-						<line number="89" hits="1247" branch="true" condition-coverage="100% (2/2)">
+						<line number="80" hits="434" branch="false"/>
+						<line number="84" hits="2494" branch="false"/>
+						<line number="88" hits="2494" branch="false"/>
+						<line number="89" hits="2494" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="91" hits="6" branch="false"/>
-						<line number="92" hits="3" branch="false"/>
-						<line number="96" hits="1244" branch="false"/>
-						<line number="98" hits="1244" branch="false"/>
-						<line number="99" hits="1244" branch="false"/>
-						<line number="100" hits="3268" branch="true" condition-coverage="100% (4/4)">
+						<line number="91" hits="12" branch="false"/>
+						<line number="92" 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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="102" hits="783" branch="false"/>
-						<line number="103" hits="783" branch="false"/>
-						<line number="105" hits="783" branch="true" condition-coverage="100% (2/2)">
+						<line number="102" hits="1566" branch="false"/>
+						<line number="103" hits="1566" branch="false"/>
+						<line number="105" hits="1566" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="107" hits="6" branch="false"/>
-						<line number="108" hits="3" branch="false"/>
-						<line number="110" hits="780" branch="false"/>
-						<line number="111" hits="780" branch="false"/>
-						<line number="114" hits="1241" branch="false"/>
-						<line number="116" hits="1241" branch="false"/>
-						<line number="118" hits="1241" branch="false"/>
-						<line number="120" hits="1241" branch="false"/>
-						<line number="121" hits="1241" branch="false"/>
-						<line number="122" hits="1241" branch="false"/>
-						<line number="125" hits="1241" branch="true" condition-coverage="100% (2/2)">
+						<line number="107" hits="12" branch="false"/>
+						<line number="108" 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"/>
+						<line number="116" hits="2482" branch="false"/>
+						<line number="118" hits="2482" branch="false"/>
+						<line number="120" hits="2482" branch="false"/>
+						<line number="121" hits="2482" branch="false"/>
+						<line number="122" hits="2482" branch="false"/>
+						<line number="125" hits="2482" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="128" hits="630" branch="true" condition-coverage="100% (2/2)">
+						<line number="128" hits="1260" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="130" hits="230" branch="false"/>
-						<line number="131" hits="230" branch="false"/>
-						<line number="132" hits="230" branch="false"/>
-						<line number="138" hits="400" branch="false"/>
-						<line number="139" hits="400" branch="true" condition-coverage="100% (2/2)">
+						<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>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="140" hits="400" branch="true" condition-coverage="100% (2/2)">
+						<line number="140" hits="800" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="143" hits="125" branch="false"/>
-						<line number="144" hits="125" branch="false"/>
-						<line number="145" hits="325" branch="true" condition-coverage="100% (4/4)">
+						<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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="147" hits="100" branch="false"/>
-						<line number="148" hits="100" branch="false"/>
-						<line number="150" hits="100" branch="true" condition-coverage="100% (2/2)">
+						<line number="147" hits="200" branch="false"/>
+						<line number="148" hits="200" branch="false"/>
+						<line number="150" hits="200" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="152" hits="25" branch="false"/>
-						<line number="154" hits="75" branch="false"/>
-						<line number="155" hits="75" branch="true" condition-coverage="50% (1/2)">
+						<line number="152" hits="50" branch="false"/>
+						<line number="154" hits="150" branch="false"/>
+						<line number="155" hits="150" branch="true" condition-coverage="50% (1/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="157" hits="0" branch="false"/>
 						<line number="158" hits="0" branch="false"/>
-						<line number="165" hits="400" branch="true" condition-coverage="100% (2/2)">
+						<line number="165" hits="800" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="167" hits="325" branch="false"/>
-						<line number="168" hits="325" branch="true" condition-coverage="100% (2/2)">
+						<line number="167" hits="650" branch="false"/>
+						<line number="168" hits="650" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="172" hits="325" branch="false"/>
-						<line number="177" hits="611" branch="false"/>
-						<line number="181" hits="1241" branch="false"/>
-						<line number="182" hits="1241" branch="false"/>
-						<line number="183" hits="1241" branch="true" condition-coverage="100% (2/2)">
+						<line number="172" hits="650" branch="false"/>
+						<line number="177" hits="1222" branch="false"/>
+						<line number="181" hits="2482" branch="false"/>
+						<line number="182" hits="2482" branch="false"/>
+						<line number="183" hits="2482" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="185" hits="555" branch="false"/>
-						<line number="186" hits="555" branch="false"/>
-						<line number="187" hits="555" branch="false"/>
-						<line number="190" hits="686" branch="false"/>
-						<line number="193" hits="2482" branch="false"/>
-						<line number="194" hits="1241" branch="false"/>
-						<line number="195" hits="1241" branch="true" condition-coverage="100% (2/2)">
+						<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="1241" branch="true" condition-coverage="100% (4/4)">
+						<line number="196" hits="2482" branch="true" condition-coverage="100% (4/4)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 								<condition number="1" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="198" hits="1241" branch="false"/>
-						<line number="199" hits="1241" branch="false"/>
-						<line number="202" hits="11291" branch="true" condition-coverage="100% (2/2)">
+						<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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="204" hits="10292" branch="false"/>
-						<line number="207" hits="11291" branch="true" condition-coverage="100% (2/2)">
+						<line number="204" hits="20585" branch="false"/>
+						<line number="207" hits="22583" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
@@ -1155,85 +1155,85 @@
 						</method>
 						<method name="&lt;init&gt;" signature="(Lorg/apache/onami/configuration/variables/Parser;Ljava/lang/String;Lorg/apache/onami/configuration/variables/Appender;Lorg/apache/onami/configuration/variables/Appender;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="65" hits="1241" branch="false"/>
-								<line number="66" hits="1241" branch="false"/>
-								<line number="67" hits="1241" branch="false"/>
-								<line number="68" hits="1241" branch="false"/>
-								<line number="69" hits="1241" branch="false"/>
+								<line number="65" hits="2482" branch="false"/>
+								<line number="66" hits="2482" branch="false"/>
+								<line number="67" hits="2482" branch="false"/>
+								<line number="68" hits="2482" branch="false"/>
+								<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">
 							<lines>
-								<line number="78" hits="17682" branch="false"/>
-								<line number="79" hits="17682" branch="false"/>
-								<line number="80" hits="17682" branch="false"/>
-								<line number="82" hits="17682" branch="false"/>
-								<line number="83" hits="17682" branch="true" condition-coverage="100% (2/2)">
+								<line number="78" hits="35364" branch="false"/>
+								<line number="79" hits="35364" branch="false"/>
+								<line number="80" hits="35364" branch="false"/>
+								<line number="82" hits="35364" branch="false"/>
+								<line number="83" hits="35364" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="87" hits="9859" branch="false"/>
-								<line number="88" hits="9859" branch="true" condition-coverage="100% (2/2)">
+								<line number="87" hits="19718" branch="false"/>
+								<line number="88" hits="19718" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="90" hits="9845" branch="false"/>
-								<line number="92" hits="9845" branch="false"/>
-								<line number="96" hits="14" branch="true" condition-coverage="50% (1/2)">
+								<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="14" branch="false"/>
-								<line number="103" hits="14" branch="false"/>
-								<line number="104" hits="14" branch="false"/>
-								<line number="107" hits="14" branch="false"/>
-								<line number="109" hits="14" branch="false"/>
-								<line number="111" hits="14" branch="false"/>
-								<line number="113" hits="7823" branch="true" condition-coverage="100% (2/2)">
+								<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="113" hits="15646" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="115" hits="7448" branch="false"/>
-								<line number="116" hits="7448" branch="false"/>
-								<line number="121" hits="375" branch="false"/>
-								<line number="123" hits="17682" branch="false"/>
+								<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">
 							<lines>
-								<line number="128" hits="48898" branch="true" condition-coverage="50% (1/2)">
+								<line number="128" hits="97796" branch="true" condition-coverage="50% (1/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="50%"/>
 									</conditions>
 								</line>
 								<line number="130" hits="0" branch="false"/>
-								<line number="132" hits="48898" branch="true" condition-coverage="100% (2/2)">
+								<line number="132" hits="97796" branch="true" condition-coverage="100% (2/2)">
 									<conditions>
 										<condition number="0" type="jump" coverage="100%"/>
 									</conditions>
 								</line>
-								<line number="134" hits="10412" branch="false"/>
-								<line number="135" hits="10424" branch="true" condition-coverage="50% (3/6)">
+								<line number="134" hits="20824" branch="false"/>
+								<line number="135" hits="20848" branch="true" condition-coverage="50% (3/6)">
 									<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="12" branch="true" condition-coverage="33% (2/6)">
+								<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%"/>
 									</conditions>
 								</line>
-								<line number="138" hits="38486" branch="false"/>
+								<line number="138" hits="76972" branch="false"/>
 							</lines>
 						</method>
 						<method name="hashCode" signature="()I" line-rate="0.0" branch-rate="0.0">
@@ -1248,101 +1248,101 @@
 						</method>
 						<method name="needsResolving" signature="()Z" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="152" hits="582" branch="false"/>
+								<line number="152" hits="1164" branch="false"/>
 							</lines>
 						</method>
 					</methods>
 					<lines>
 						<line number="52" hits="0" branch="false"/>
 						<line number="53" hits="0" branch="false"/>
-						<line number="65" hits="1241" branch="false"/>
-						<line number="66" hits="1241" branch="false"/>
-						<line number="67" hits="1241" branch="false"/>
-						<line number="68" hits="1241" branch="false"/>
-						<line number="69" hits="1241" branch="false"/>
-						<line number="78" hits="17682" branch="false"/>
-						<line number="79" hits="17682" branch="false"/>
-						<line number="80" hits="17682" branch="false"/>
-						<line number="82" hits="17682" branch="false"/>
-						<line number="83" hits="17682" branch="true" condition-coverage="100% (2/2)">
+						<line number="65" hits="2482" branch="false"/>
+						<line number="66" hits="2482" branch="false"/>
+						<line number="67" hits="2482" branch="false"/>
+						<line number="68" hits="2482" branch="false"/>
+						<line number="69" hits="2482" branch="false"/>
+						<line number="78" hits="35364" branch="false"/>
+						<line number="79" hits="35364" branch="false"/>
+						<line number="80" hits="35364" branch="false"/>
+						<line number="82" hits="35364" branch="false"/>
+						<line number="83" hits="35364" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="87" hits="9859" branch="false"/>
-						<line number="88" hits="9859" branch="true" condition-coverage="100% (2/2)">
+						<line number="87" hits="19718" branch="false"/>
+						<line number="88" hits="19718" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="90" hits="9845" branch="false"/>
-						<line number="92" hits="9845" branch="false"/>
-						<line number="96" hits="14" branch="true" condition-coverage="50% (1/2)">
+						<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="14" branch="false"/>
-						<line number="103" hits="14" branch="false"/>
-						<line number="104" hits="14" branch="false"/>
-						<line number="107" hits="14" branch="false"/>
-						<line number="109" hits="14" branch="false"/>
-						<line number="111" hits="14" branch="false"/>
-						<line number="113" hits="7823" branch="true" condition-coverage="100% (2/2)">
+						<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="113" hits="15646" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="115" hits="7448" branch="false"/>
-						<line number="116" hits="7448" branch="false"/>
-						<line number="121" hits="375" branch="false"/>
-						<line number="123" hits="17682" branch="false"/>
-						<line number="128" hits="48898" branch="true" condition-coverage="50% (1/2)">
+						<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)">
 							<conditions>
 								<condition number="0" type="jump" coverage="50%"/>
 							</conditions>
 						</line>
 						<line number="130" hits="0" branch="false"/>
-						<line number="132" hits="48898" branch="true" condition-coverage="100% (2/2)">
+						<line number="132" hits="97796" branch="true" condition-coverage="100% (2/2)">
 							<conditions>
 								<condition number="0" type="jump" coverage="100%"/>
 							</conditions>
 						</line>
-						<line number="134" hits="10412" branch="false"/>
-						<line number="135" hits="10424" branch="true" condition-coverage="50% (3/6)">
+						<line number="134" hits="20824" branch="false"/>
+						<line number="135" hits="20848" branch="true" condition-coverage="50% (3/6)">
 							<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="12" branch="true" condition-coverage="33% (2/6)">
+						<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%"/>
 							</conditions>
 						</line>
-						<line number="138" hits="38486" branch="false"/>
+						<line number="138" hits="76972" branch="false"/>
 						<line number="144" hits="0" branch="true" condition-coverage="0% (0/4)">
 							<conditions>
 								<condition number="0" type="jump" coverage="0%"/>
 								<condition number="1" type="jump" coverage="0%"/>
 							</conditions>
 						</line>
-						<line number="152" hits="582" branch="false"/>
+						<line number="152" hits="1164" branch="false"/>
 					</lines>
 				</class>
 				<class name="org.apache.onami.configuration.variables.MixinAppender" filename="org/apache/onami/configuration/variables/MixinAppender.java" line-rate="0.8095238095238095" branch-rate="0.9166666666666666" complexity="2.5">
 					<methods>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/String;Ljava/util/List;)V" line-rate="1.0" branch-rate="1.0">
 							<lines>
-								<line number="35" hits="221" branch="false"/>
-								<line number="56" hits="221" branch="false"/>
-								<line number="57" hits="221" branch="false"/>
-								<line number="58" hits="221" branch="false"/>
+								<line number="35" hits="442" branch="false"/>
+								<line number="56" hits="442" branch="false"/>
+								<line number="57" hits="442" branch="false"/>
+								<line number="58" hits="442" branch="false"/>
 							</lines>
 						</method>
 						<method name="&lt;init&gt;" signature="(Ljava/lang/String;[Lorg/apache/onami/configuration/variables/Appender;)V" line-rate="0.0" branch-rate="1.0">
@@ -1353,36 +1353,36 @@
 						</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="18549" branch="true" condition-coverage="100% (2/2)">
+								<line number="63" hits="37098" branch="true" condition-coverage="100% (2/2)">
 									<conditions>

[... 793 lines stripped ...]


Mime
View raw message