svn commit: r1339314 - /ofbiz/branches/release11.04/mergefromtrunk.sh

[erwan]

Author: erwan
Date: Wed May 16 19:18:27 2012
New Revision: 1339314

URL: http://svn.apache.org/viewvc?rev=1339314&view=rev
Log:
using internal ant and the right target load-demo

Modified:
    ofbiz/branches/release11.04/mergefromtrunk.sh

Modified: ofbiz/branches/release11.04/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/mergefromtrunk.sh?rev=1339314&r1=1339313&r2=1339314&view=diff
==============================================================================
--- ofbiz/branches/release11.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release11.04/mergefromtrunk.sh Wed May 16 19:18:27 2012
@@ -93,9 +93,9 @@ case "$cmd" in
  svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
  ;;
  (test)
- ant clean-all
- ant run-install
- ant run-tests
+ ./ant clean-all
+ ./ant load-demo
+ ./ant run-tests
  ;;
  (commit)
  svn commit -F runtime/merge-state/log-message