svn commit: r1783210 - in /ofbiz/branches: release09.04/ release10.04/ release11.04/ release12.04/ release13.07/tools/ release14.12/tools/ release15.12/tools/ release16.11/tools/ release4.0/

Author: jleroux
Date: Thu Feb 16 13:49:10 2017
New Revision: 1783210

URL: http://svn.apache.org/viewvc?rev=1783210&view=rev
Log:
No functional change, updates files with new svn url

Even includes R4.0 :D

Modified:
    ofbiz/branches/release09.04/mergefromtrunk.bat
    ofbiz/branches/release09.04/mergefromtrunk.sh
    ofbiz/branches/release10.04/mergefromtrunk.bat
    ofbiz/branches/release10.04/mergefromtrunk.sh
    ofbiz/branches/release11.04/mergefromtrunk.bat
    ofbiz/branches/release11.04/mergefromtrunk.sh
    ofbiz/branches/release12.04/mergefromtrunk.bat
    ofbiz/branches/release12.04/mergefromtrunk.sh
    ofbiz/branches/release13.07/tools/mergefromtrunk.bat
    ofbiz/branches/release13.07/tools/mergefromtrunk.sh
    ofbiz/branches/release14.12/tools/mergefromtrunk.bat
    ofbiz/branches/release14.12/tools/mergefromtrunk.sh
    ofbiz/branches/release14.12/tools/revert.bat
    ofbiz/branches/release15.12/tools/mergefromtrunk.bat
    ofbiz/branches/release15.12/tools/mergefromtrunk.sh
    ofbiz/branches/release15.12/tools/revert.bat
    ofbiz/branches/release16.11/tools/mergefromtrunk.bat
    ofbiz/branches/release16.11/tools/mergefromtrunk.sh
    ofbiz/branches/release16.11/tools/revert.bat
    ofbiz/branches/release4.0/mergefromtrunk.bat
    ofbiz/branches/release4.0/mergefromtrunk.sh

Modified: ofbiz/branches/release09.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -29,14 +29,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -44,7 +44,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release09.04/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ant clean-all

Modified: ofbiz/branches/release10.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -29,14 +29,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -44,7 +44,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release10.04/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ant clean-all

Modified: ofbiz/branches/release11.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release11.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release11.04/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -29,14 +29,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -44,7 +44,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release11.04/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release11.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release11.04/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ./ant clean-all

Modified: ofbiz/branches/release12.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release12.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release12.04/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -29,14 +29,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -44,7 +44,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release12.04/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release12.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release12.04/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ./ant clean-all

Modified: ofbiz/branches/release13.07/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/tools/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release13.07/tools/mergefromtrunk.bat (original)
+++ ofbiz/branches/release13.07/tools/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -30,14 +30,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -45,7 +45,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release13.07/tools/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/tools/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release13.07/tools/mergefromtrunk.sh (original)
+++ ofbiz/branches/release13.07/tools/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ./ant clean-all

Modified: ofbiz/branches/release14.12/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/tools/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release14.12/tools/mergefromtrunk.bat (original)
+++ ofbiz/branches/release14.12/tools/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -30,14 +30,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -45,7 +45,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release14.12/tools/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/tools/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release14.12/tools/mergefromtrunk.sh (original)
+++ ofbiz/branches/release14.12/tools/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ./ant clean-all

Modified: ofbiz/branches/release14.12/tools/revert.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/tools/revert.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release14.12/tools/revert.bat (original)
+++ ofbiz/branches/release14.12/tools/revert.bat Thu Feb 16 13:49:10 2017
@@ -20,4 +20,4 @@ rem ####################################
 
 rem to revert back a revision in local copy.
 echo on
-svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk

Modified: ofbiz/branches/release15.12/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/tools/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release15.12/tools/mergefromtrunk.bat (original)
+++ ofbiz/branches/release15.12/tools/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -30,14 +30,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -45,7 +45,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release15.12/tools/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/tools/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release15.12/tools/mergefromtrunk.sh (original)
+++ ofbiz/branches/release15.12/tools/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ./ant clean-all

Modified: ofbiz/branches/release15.12/tools/revert.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/tools/revert.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release15.12/tools/revert.bat (original)
+++ ofbiz/branches/release15.12/tools/revert.bat Thu Feb 16 13:49:10 2017
@@ -20,4 +20,4 @@ rem ####################################
 
 rem to revert back a revision in local copy.
 echo on
-svn up && svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/trunk
+svn up && svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk

Modified: ofbiz/branches/release16.11/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/tools/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release16.11/tools/mergefromtrunk.bat (original)
+++ ofbiz/branches/release16.11/tools/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -30,14 +30,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu

Modified: ofbiz/branches/release16.11/tools/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/tools/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release16.11/tools/mergefromtrunk.sh (original)
+++ ofbiz/branches/release16.11/tools/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
         # chained pipe; if one of the commands in the pipe fails,
         # it isn't possible to detect the failure.
         printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
-        svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+        svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
         set -- $(wc -l runtime/merge-state/log.txt)
         head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
         tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
         prevRev=$(($rev - 1))
         svn up
-        svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk
+        svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
         ;;
     (test)
         ./gradlew cleanAll loadDefault testIntegration

Modified: ofbiz/branches/release16.11/tools/revert.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/tools/revert.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release16.11/tools/revert.bat (original)
+++ ofbiz/branches/release16.11/tools/revert.bat Thu Feb 16 13:49:10 2017
@@ -20,4 +20,4 @@ rem ####################################
 
 rem to revert back a revision in local copy.
 echo on
-svn up && svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/trunk
+svn up && svn merge -c -%1 https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk

Modified: ofbiz/branches/release4.0/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.bat?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.bat (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.bat Thu Feb 16 13:49:10 2017
@@ -29,14 +29,14 @@ set /a prevRev=%version% - 1
 
 rem build the comment
 echo "Applied fix from trunk for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r %version% > log.tmp
+svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r %version% > log.tmp
 copy comment.tmp + log.tmp = comment.tmp
 del log.tmp
 rem keep the comment.tmp file svn ignored. In case of trouble always happier to keep trace.  It will be overidden in next backport.
 
 rem commit the backport to release with comment fom file
 echo on
-svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
+svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
 echo off
 
 :menu
@@ -44,7 +44,7 @@ echo y) tests
 echo n) exit
 
 echo Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
-choice /c:yn
+choice /c:yn
 if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 

Modified: ofbiz/branches/release4.0/mergefromtrunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.sh?rev=1783210&r1=1783209&r2=1783210&view=diff
==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.sh (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.sh Thu Feb 16 13:49:10 2017
@@ -84,13 +84,13 @@ case "$cmd" in
  # chained pipe; if one of the commands in the pipe fails,
  # it isn't possible to detect the failure.
  printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
- svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
+ svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r "$rev" > runtime/merge-state/log.txt
  set -- $(wc -l runtime/merge-state/log.txt)
  head -n $(($1 - 2)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
  tail -n $(($1 - 5)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
  prevRev=$(($rev - 1))
  svn up
- svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk 
+ svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk
  ;;
  (test)
  ant clean-all