You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2020/02/27 17:40:12 UTC
[ofbiz-tools] branch master updated (dbf6214 -> c229e42)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git.
from dbf6214 Updates Wiki
new 6dec385 Update README.html on wiki
new c229e42 Removes now useless scripts, related to Svn or Ant
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
desktop.ini | 6 ---
git-rebase-runner.sh | 63 --------------------------
mergefromplugins.bat | 64 ---------------------------
mergefromplugins.sh | 117 -------------------------------------------------
mergefromtrunk.bat | 64 ---------------------------
mergefromtrunk.sh | 117 -------------------------------------------------
wiki-files/README.html | 4 +-
7 files changed, 2 insertions(+), 433 deletions(-)
delete mode 100644 desktop.ini
delete mode 100755 git-rebase-runner.sh
delete mode 100755 mergefromplugins.bat
delete mode 100755 mergefromplugins.sh
delete mode 100755 mergefromtrunk.bat
delete mode 100755 mergefromtrunk.sh
[ofbiz-tools] 02/02: Removes now useless scripts,
related to Svn or Ant
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
commit c229e42ecfcdf970b9fcf0002fc2ab478489b853
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Feb 27 18:40:15 2020 +0100
Removes now useless scripts, related to Svn or Ant
---
desktop.ini | 6 ---
git-rebase-runner.sh | 63 ---------------------------
mergefromplugins.bat | 64 ----------------------------
mergefromplugins.sh | 117 ---------------------------------------------------
mergefromtrunk.bat | 64 ----------------------------
mergefromtrunk.sh | 117 ---------------------------------------------------
6 files changed, 431 deletions(-)
diff --git a/desktop.ini b/desktop.ini
deleted file mode 100644
index 2237e22..0000000
--- a/desktop.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[ViewState]
-Mode=
-Vid=
-FolderType=Generic
-[.ShellClassInfo]
-IconResource=C:\Windows\system32\SHELL32.dll,90
diff --git a/git-rebase-runner.sh b/git-rebase-runner.sh
deleted file mode 100755
index 0781989..0000000
--- a/git-rebase-runner.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#####################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#####################################################################
-
-# args:
-# $1 = loop count
-# $2 = loop type
-
-# example:
-# git rebase -i $most_recent_git_svn_commit_hash
-# # select commits to work on/test with 'edit'
-# tools/git-rebase-runner.sh 5 all-tests
-#
-# this will do:
-# ant clean
-# ant load-demo
-# ant run-tests
-# ant clean
-# git rebase --continue
-# in a loop 5 times, storing the output into runtime/git-rebase/logs.
-# You can use this to verify a series of commits before commiting
-# upstream in bulk with git svn dcommit $hash
-
-top_dir="$(cd "$0/../..";echo "$PWD")"
-. "$top_dir/tools/functions.sh"
-
-cd "$top_dir"
-
-loops="$1"
-shift
-cleanup_worker=""
-loop_worker=""
-case "$1" in
- (all-tests)
- cleanup_worker=standard_cleanup
- loop_worker=fulltestsuite_worker
- ;;
- (install)
- cleanup_worker=standard_cleanup
- loop_worker=install_worker
- ;;
- (*)
- echo "Invalid loop type given($1)!" 1>&2
- exit 1
- ;;
-esac
-git_rebase_runner $loops $cleanup_worker $loop_worker
diff --git a/mergefromplugins.bat b/mergefromplugins.bat
deleted file mode 100755
index 0018ac2..0000000
--- a/mergefromplugins.bat
+++ /dev/null
@@ -1,64 +0,0 @@
-@echo off
-rem #####################################################################
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements. See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership. The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied. See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-rem #####################################################################
-rem interactive DOS version of mergefromtrunk.sh.
-rem to use : launch and pass the trunk version number to merge in release
-
-rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
-svn up
-
-rem version to merge
-set /p version=version to merge :
-set /a prevRev=%version% - 1
-
-rem build the comment
-echo "Applied fix from plugins for revision: %version%" > comment.tmp
-svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk -r %version% > log.tmp
-copy /b 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/ofbiz-plugins/trunk
-echo off
-
-:menu
-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
-if errorlevel = 2 goto commit
-if errorlevel = 1 goto tests
-
-:commit
-echo on
-svn commit -F comment.tmp
-goto exit
-
-:tests
-echo on
-gradlew cleanAll loadAll testIntegration
-echo off
-
-echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root
-
-:exit
-pause
diff --git a/mergefromplugins.sh b/mergefromplugins.sh
deleted file mode 100755
index c61725c..0000000
--- a/mergefromplugins.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-#####################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#####################################################################
-set -e
-
-# this script requires a posix shell; namely, $(( math evaluation.
-
-help() {
- cat << _EOF_
-$0 [options]
-
-mergefromtrunk.sh merge \$rev Apply revision \$rev from trunk.
-mergefromtrunk.sh test Run test suite(clean-all, load-demo, run-tests).
-mergefromtrunk.sh commit Commit current fix to svn.
-mergefromtrunk.sh abort Abort current merge session.
-
--h | --help Show this help.
-_EOF_
-}
-
-cmd=""
-rev=""
-while [ $# -gt 0 ]; do
- case "$1" in
- (-h|--help)
- help
- exit 0
- ;;
- (-*)
- echo "Unknown arg ($1)." 1>&2
- help 1>&2
- exit 1
- ;;
- (*)
- if [ z = "z$cmd" ]; then
- cmd="$1"
- else
- case "$cmd" in
- (merge)
- rev="$1"
- ;;
- (*)
- echo "Too many arguments." 1>&2
- help 1>&2
- exit 1
- ;;
- esac
- fi
- ;;
- esac
- shift
-done
-case "$cmd" in
- (merge)
- if [ z = "z$rev" ]; then
- echo "Need a revision." 1>&2
- help 1>&2
- exit 1
- fi
- if [ -d runtime/merge-state ]; then
- echo "Merge session already started." 1>&2
- help 1>&2
- exit 1
- fi
- mkdir -p runtime/merge-state
- echo "$rev" > runtime/merge-state/revision
- # do not run any of the following commands in a complex
- # 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/ofbiz-plugins/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/ofbiz-plugins/trunk
- ;;
- (test)
- ./gradlew cleanAll loadAll testIntegration
- ;;
- (commit)
- svn commit -F runtime/merge-state/log-message
- rm -rf runtime/merge-state
- ;;
- (abort)
- svn resolved . -R
- svn revert . -R
- rm -rf runtime/merge-state
- ;;
- ("")
- echo "Need a command and a revision." 1>&2
- help 1>&2
- exit 1
- ;;
- (*)
- echo "Unknown command($cmd)." 1>&2
- help 1>&2
- exit 1
- ;;
-esac
diff --git a/mergefromtrunk.bat b/mergefromtrunk.bat
deleted file mode 100755
index 144075b..0000000
--- a/mergefromtrunk.bat
+++ /dev/null
@@ -1,64 +0,0 @@
-@echo off
-rem #####################################################################
-rem Licensed to the Apache Software Foundation (ASF) under one
-rem or more contributor license agreements. See the NOTICE file
-rem distributed with this work for additional information
-rem regarding copyright ownership. The ASF licenses this file
-rem to you under the Apache License, Version 2.0 (the
-rem "License"); you may not use this file except in compliance
-rem with the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing,
-rem software distributed under the License is distributed on an
-rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-rem KIND, either express or implied. See the License for the
-rem specific language governing permissions and limitations
-rem under the License.
-rem #####################################################################
-rem interactive DOS version of mergefromtrunk.sh.
-rem to use : launch and pass the trunk version number to merge in release
-
-rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
-svn up
-
-rem version to merge
-set /p version=version to merge :
-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/ofbiz-framework/trunk -r %version% > log.tmp
-copy /b 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/ofbiz-framework/trunk
-echo off
-
-:menu
-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
-if errorlevel = 2 goto commit
-if errorlevel = 1 goto tests
-
-:commit
-echo on
-svn commit -F comment.tmp
-goto exit
-
-:tests
-echo on
-gradlew cleanAll loadAll testIntegration
-echo off
-
-echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root
-
-:exit
-pause
diff --git a/mergefromtrunk.sh b/mergefromtrunk.sh
deleted file mode 100755
index a399234..0000000
--- a/mergefromtrunk.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-#####################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#####################################################################
-set -e
-
-# this script requires a posix shell; namely, $(( math evaluation.
-
-help() {
- cat << _EOF_
-$0 [options]
-
-mergefromtrunk.sh merge \$rev Apply revision \$rev from trunk.
-mergefromtrunk.sh test Run test suite(clean-all, load-demo, run-tests).
-mergefromtrunk.sh commit Commit current fix to svn.
-mergefromtrunk.sh abort Abort current merge session.
-
--h | --help Show this help.
-_EOF_
-}
-
-cmd=""
-rev=""
-while [ $# -gt 0 ]; do
- case "$1" in
- (-h|--help)
- help
- exit 0
- ;;
- (-*)
- echo "Unknown arg ($1)." 1>&2
- help 1>&2
- exit 1
- ;;
- (*)
- if [ z = "z$cmd" ]; then
- cmd="$1"
- else
- case "$cmd" in
- (merge)
- rev="$1"
- ;;
- (*)
- echo "Too many arguments." 1>&2
- help 1>&2
- exit 1
- ;;
- esac
- fi
- ;;
- esac
- shift
-done
-case "$cmd" in
- (merge)
- if [ z = "z$rev" ]; then
- echo "Need a revision." 1>&2
- help 1>&2
- exit 1
- fi
- if [ -d runtime/merge-state ]; then
- echo "Merge session already started." 1>&2
- help 1>&2
- exit 1
- fi
- mkdir -p runtime/merge-state
- echo "$rev" > runtime/merge-state/revision
- # do not run any of the following commands in a complex
- # 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/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/ofbiz-framework/trunk
- ;;
- (test)
- ./gradlew cleanAll loadAll testIntegration
- ;;
- (commit)
- svn commit -F runtime/merge-state/log-message
- rm -rf runtime/merge-state
- ;;
- (abort)
- svn resolved . -R
- svn revert . -R
- rm -rf runtime/merge-state
- ;;
- ("")
- echo "Need a command and a revision." 1>&2
- help 1>&2
- exit 1
- ;;
- (*)
- echo "Unknown command($cmd)." 1>&2
- help 1>&2
- exit 1
- ;;
-esac
[ofbiz-tools] 01/02: Update README.html on wiki
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
commit 6dec38527886a18b80511685596b8835f43a3060
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Sun Feb 9 14:19:54 2020 +0100
Update README.html on wiki
---
wiki-files/README.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wiki-files/README.html b/wiki-files/README.html
index ee8bac4..7bd9637 100644
--- a/wiki-files/README.html
+++ b/wiki-files/README.html
@@ -1519,7 +1519,7 @@ ${pluginId}"</p>
<div class="ulist">
<ul>
<li>
-<p><a href="https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-Tips-Tricks-Cookbook-+HowTo#FAQ-Tips-Tricks-Cookbook-HowTo-Knownissues">Known
+<p><a href="https://cwiki.apache.org/confluence/display/OFBIZ/FAQ%2B-%2BTips%2B-%2BTricks%2B-%2BCookbook%2B-%2BHowTo#FAQ-Tips-Tricks-Cookbook-HowTo-Knownissues">Known
issues</a></p>
</li>
</ul>
@@ -1672,7 +1672,7 @@ Secure Sockets Extension) API</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2019-12-02 16:40:13 +0100
+Last updated 2020-02-08 14:03:05 +0100
</div>
</div>
</body>