svn commit: r997444 - in /ofbiz/branches/release10.04: ./ common.xml macros.xml tools/src/org/ofbiz/tools/ant/
Locked
 
|
Author: doogie
Date: Wed Sep 15 18:30:28 2010 New Revision: 997444 URL: http://svn.apache.org/viewvc?rev=997444&view=rev Log: Applied fix from trunk for revision: 997423 === Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/common.xml ofbiz/branches/release10.04/macros.xml ofbiz/branches/release10.04/tools/src/org/ofbiz/tools/ant/IfTask.java Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 15 18:30:28 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997440 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423,997440 Modified: ofbiz/branches/release10.04/common.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/common.xml?rev=997444&r1=997443&r2=997444&view=diff ============================================================================== --- ofbiz/branches/release10.04/common.xml (original) +++ ofbiz/branches/release10.04/common.xml Wed Sep 15 18:30:28 2010 @@ -58,7 +58,9 @@ under the License. <target name="init"/> <if> - <available file="${src.dir}"/> + <condition> + <available file="${src.dir}"/> + </condition> <commands> <selector id="src-extra-set"> <or> Modified: ofbiz/branches/release10.04/macros.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/macros.xml?rev=997444&r1=997443&r2=997444&view=diff ============================================================================== --- ofbiz/branches/release10.04/macros.xml (original) +++ ofbiz/branches/release10.04/macros.xml Wed Sep 15 18:30:28 2010 @@ -155,11 +155,13 @@ under the License. <attribute name="prefix" default=""/> <sequential> <if> - <not> - <uptodate - srcfile="@{prefix}src/@{dir}/@{file}.jj" - targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> - </not> + <condition> + <not> + <uptodate + srcfile="@{prefix}src/@{dir}/@{file}.jj" + targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> + </not> + </condition> <commands> <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/> <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/> @@ -178,11 +180,13 @@ under the License. <attribute name="prefix" default=""/> <sequential> <if> - <not> - <uptodate - srcfile="@{prefix}src/@{dir}/@{file}.jjt" - targetfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"/> - </not> + <condition> + <not> + <uptodate + srcfile="@{prefix}src/@{dir}/@{file}.jjt" + targetfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"/> + </not> + </condition> <commands> <delete dir="@{prefix}build/gen-src/jjtree/@{dir}"/> <mkdir dir="@{prefix}build/gen-src/jjtree/@{dir}"/> @@ -192,11 +196,13 @@ under the License. </commands> </if> <if> - <not> - <uptodate - srcfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" - targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> - </not> + <condition> + <not> + <uptodate + srcfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" + targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> + </not> + </condition> <commands> <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/> <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/> Modified: ofbiz/branches/release10.04/tools/src/org/ofbiz/tools/ant/IfTask.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/tools/src/org/ofbiz/tools/ant/IfTask.java?rev=997444&r1=997443&r2=997444&view=diff ============================================================================== --- ofbiz/branches/release10.04/tools/src/org/ofbiz/tools/ant/IfTask.java (original) +++ ofbiz/branches/release10.04/tools/src/org/ofbiz/tools/ant/IfTask.java Wed Sep 15 18:30:28 2010 @@ -18,17 +18,21 @@ */ package org.ofbiz.tools.ant; -import java.util.Enumeration; - import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.ProjectComponent; import org.apache.tools.ant.taskdefs.Sequential; +import org.apache.tools.ant.taskdefs.condition.And; import org.apache.tools.ant.taskdefs.condition.Condition; -import org.apache.tools.ant.taskdefs.condition.ConditionBase; -public class IfTask extends ConditionBase { +public class IfTask extends ProjectComponent { + protected Condition condition; protected Sequential ifCommands; protected Sequential elseCommands; + public Condition createCondition() { + return condition = new And(); + } + public Object createCommands() { return ifCommands = new Sequential(); } @@ -38,13 +42,8 @@ public class IfTask extends ConditionBas } public void execute() throws BuildException { - Enumeration en = getConditions(); - if (!en.hasMoreElements()) throw new BuildException("No conditions defined"); - boolean result = true; - while (result && en.hasMoreElements()) { - result = ((Condition) en.nextElement()).eval(); - } - if (result) { + if (condition == null) throw new BuildException("No condition defined"); + if (condition.eval()) { if (ifCommands != null) ifCommands.execute(); } else { if (elseCommands != null) elseCommands.execute(); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |