# HG changeset patch
# User smith@nwoca.org
# Date 1304780986 14400
# Node ID 7df554d8c4c1ccfd49185e46b0abaa0410913e85
# Parent  2704c479a05f3707cdc2f85f90151a948a2e0a32
CM-125: correct error in bundlor property mapping

diff -r 2704c479a05f -r 7df554d8c4c1 osgi-ant-bundlor.xml
--- a/osgi-ant-bundlor.xml	Tue Apr 26 11:29:03 2011 -0400
+++ b/osgi-ant-bundlor.xml	Sat May 07 11:09:46 2011 -0400
@@ -39,7 +39,7 @@
                     <property name="bundle.name" value="@{name}"/>
                     <propertyset>
                         <propertyref prefix="ivy"/>
-                        <mapper type="glob" from="ivydeps." to="*"/>
+                        <mapper type="glob" from="ivydeps.*" to="*"/>
                     </propertyset>
                 </bundlor:bundlor>
             </sequential>
diff -r 2704c479a05f -r 7df554d8c4c1 sonar-ant.xml
--- a/sonar-ant.xml	Tue Apr 26 11:29:03 2011 -0400
+++ b/sonar-ant.xml	Sat May 07 11:09:46 2011 -0400
@@ -16,10 +16,17 @@
     <ssdtant:add-dependency target="init" depends="-sonar-init"/>
 
     <target name="-sonar-init">
-        <echo message="Sonar: Active"/>
+        <if>
+            <isset property="sonar.enabled"/>
+            <then>
+                <echo message="Sonar: Active"/>
+            </then>
+        </if>
         <if>
             <contains string="${ant.project.invoked-targets}" substring="sonar"/>
-            <then> <property name="ignore.failing.tests" value="true"/> </then>
+            <then>
+                <property name="ignore.failing.tests" value="true"/>
+            </then>
         </if>
         <property name="sonar.active" value="true"/>
     </target>