svn commit: r997446 - in /ofbiz/branches/release10.04: ./ build.xml common.xml macros.xml tools/If-ant.py tools/src/org/ofbiz/tools/ant/IfTask.java

[doogie-3]

Author: doogie
Date: Wed Sep 15 18:36:12 2010
New Revision: 997446

URL: http://svn.apache.org/viewvc?rev=997446&view=rev
Log:
Applied fix from trunk for revision: 997425
===


Added:
    ofbiz/branches/release10.04/tools/If-ant.py
      - copied unchanged from r997425, ofbiz/trunk/tools/If-ant.py
Removed:
    ofbiz/branches/release10.04/tools/src/org/ofbiz/tools/ant/IfTask.java
Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/build.xml
    ofbiz/branches/release10.04/common.xml
    ofbiz/branches/release10.04/macros.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 18:36:12 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,997423-997424,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-997425,997440

Modified: ofbiz/branches/release10.04/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/build.xml?rev=997446&r1=997445&r2=997446&view=diff
==============================================================================
--- ofbiz/branches/release10.04/build.xml (original)
+++ ofbiz/branches/release10.04/build.xml Wed Sep 15 18:36:12 2010
@@ -35,10 +35,6 @@ under the License.
 
     <target name="ofbiz-init">
         <property environment="env"/>
-        <mkdir dir="tools/build/classes"/>
-        <javac srcdir="tools/src" debug="on" deprecation="off" destdir="tools/build/classes" compiler="javac1.5" target="1.5" source="1.5"/>
-        <mkdir dir="tools/build/lib"/>
-        <jar jarfile="tools/build/lib/ofbiz-tools.jar" basedir="tools/build/classes"/>
     </target>
 
     <!-- ================================================================== -->
@@ -61,7 +57,6 @@ under the License.
         <antcall target="clean-cache"/>
         <antcall target="clean-tempfiles"/>
         <antcall target="clean"/>
-        <antcall target="clean-tools"/>
     </target>
 
     <target name="clean-data"
@@ -157,10 +152,6 @@ under the License.
         <echo message="[clean] ========== Done Cleaning =========="/>
     </target>
 
-    <target name="clean-tools">
-        <delete dir="tools/build"/>
-    </target>
-
     <target name="svninfo"
         description="Update the Release-revision info in the footer. Note that you need a valid Internet connection and Subversion connected to the OFBiz repository for that ">
         <echo message="Creating svninfo..."/>

Modified: ofbiz/branches/release10.04/common.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/common.xml?rev=997446&r1=997445&r2=997446&view=diff
==============================================================================
--- ofbiz/branches/release10.04/common.xml (original)
+++ ofbiz/branches/release10.04/common.xml Wed Sep 15 18:36:12 2010
@@ -26,7 +26,6 @@ under the License.
     <property name="dtd.dir" value="dtd"/>
     <property name="lib.dir" value="lib"/>
     <property name="build.dir" value="build"/>
-    <taskdef name="if" classname="org.ofbiz.tools.ant.IfTask" classpath="${ofbiz.home.dir}/tools/build/classes"/>
 
     <path id="test.class.path">
         <path refid="local.class.path"/>

Modified: ofbiz/branches/release10.04/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/macros.xml?rev=997446&r1=997445&r2=997446&view=diff
==============================================================================
--- ofbiz/branches/release10.04/macros.xml (original)
+++ ofbiz/branches/release10.04/macros.xml Wed Sep 15 18:36:12 2010
@@ -47,6 +47,9 @@ under the License.
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/asm-3.2.jar"/>
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-1.7-rc-2.jar"/>
  </path>
+ <path id="rhino.class.path">
+  <pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/>
+ </path>
  <path id="ant.lib.class.path">
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  </path>
@@ -147,6 +150,12 @@ under the License.
   </groovyc>
  </presetdef>
 
+ <scriptdef name="if" language="javascript" classpathref="rhino.class.path" loaderref="rhino.class.path.loader" src="${ofbiz.home.dir}/tools/If-ant.py">
+  <element name="condition" classname="org.apache.tools.ant.taskdefs.condition.And"/>
+  <element name="commands" classname="org.apache.tools.ant.taskdefs.Sequential"/>
+  <element name="else" classname="org.apache.tools.ant.taskdefs.Sequential"/>
+ </scriptdef>
+
  <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
  <macrodef name="ofbiz-javacc">