Return-Path: 
 <commits-return-53193-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 71900 invoked from network); 11 Apr 2008 07:30:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Apr 2008 07:30:23 -0000
Received: (qmail 2633 invoked by uid 500); 11 Apr 2008 07:30:23 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 2609 invoked by uid 500); 11 Apr 2008 07:30:23 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 2600 invoked by uid 99); 11 Apr 2008 07:30:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2008 00:30:23 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2008 07:29:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C37C71A9832; Fri, 11 Apr 2008 00:30:00 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r647071 -
 /harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml
Date: Fri, 11 Apr 2008 07:29:54 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080411073000.C37C71A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Fri Apr 11 00:29:38 2008
New Revision: 647071

URL: http://svn.apache.org/viewvc?rev=647071&view=rev
Log:
Add workaround for ANT 1.7 XmlProperty task sets empty value
in case of xml file like:

<parameters>
  <schedule>
    <time description="description"/>
  </schedule>
</parameters>

And ANT 1.6.5 doesn't set 'parameters.schedule.time' property

Modified:
    harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml?rev=647071&r1=647070&r2=647071&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-project.xml Fri Apr 11 00:29:38 2008
@@ -25,6 +25,25 @@
         <basename file="${basedir}" property="suite.name" />
         <property file="${config.dir}/${suite.name}.properties" />
 
+        <condition property="is.schedule.time">
+            <!-- workaround: ANT 1.7 XmlProperty task sets empty value -->
+            <and>
+                <isset property="framework.parameters.schedule.time" />
+                <length string="${framework.parameters.schedule.time}"
+                        when="greater"
+                        length="0" />
+            </and>
+        </condition>
+        <condition property="is.schedule.day">
+            <!-- workaround: ANT 1.7 XmlProperty task sets empty value -->
+            <and>
+                <isset property="framework.parameters.schedule.day" />
+                <length string="${framework.parameters.schedule.day}"
+                        when="greater"
+                        length="0" />
+            </and>
+        </condition>
+
         <create-cc-configuration suite.name="${suite.name}" />
     </target>
     
@@ -69,7 +88,7 @@
                            value="false"
                            else="true">
                     <and>
-                        <isset property="framework.parameters.schedule.time"/>
+                        <isset property="is.schedule.time"/>
                         <isset property="@{suite.name}.independent"/>
                     </and>
                 </condition>
@@ -86,7 +105,7 @@
                         value="time='${framework.parameters.schedule.time}' "
                         else="">
                     <and>
-                        <isset property="framework.parameters.schedule.time"/>
+                        <isset property="is.schedule.time"/>
                         <isset property="@{suite.name}.independent"/>
                     </and>
                 </condition>
@@ -95,7 +114,7 @@
                         value="day='${framework.parameters.schedule.day}' "
                         else="">
                     <and>
-                        <isset property="framework.parameters.schedule.day"/>
+                        <isset property="is.schedule.day"/>
                         <isset property="@{suite.name}.independent"/>
                     </and>
                 </condition>
@@ -227,7 +246,7 @@
             <for list="${@{suite}.parameters.depends}" param="dependency">
             <sequential>
                 <if>
-                    <isset property="framework.parameters.schedule.time"/>
+                    <isset property="is.schedule.time"/>
                 <then>
                     <!-- veto on scheduled execution before superior one -->
                     <replace file="@{ccfile}">
@@ -336,7 +355,7 @@
                 <and>
                     <isset property="@{suite}.parameters.cc.trigger"/>
                     <!-- no need in triggers in scheduled execution mode -->
-                    <not><isset property="framework.parameters.schedule.time"/></not>
+                    <not><isset property="is.schedule.time"/></not>
                 </and>
             <then>
                 <insert-trigger