You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2016/08/04 12:47:14 UTC
[1/2] karaf git commit: [KARAF-4628] [KARAF-4564] Fix unix startup
scripts (cherry picked from commit 5bbaf71814df514b112cbe8cd73ba57fefdc869f)
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 5a32d3627 -> 77b8adcbc
[KARAF-4628] [KARAF-4564] Fix unix startup scripts
(cherry picked from commit 5bbaf71814df514b112cbe8cd73ba57fefdc869f)
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4740bb96
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4740bb96
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4740bb96
Branch: refs/heads/karaf-3.0.x
Commit: 4740bb96597cde61357bd3ba843d1345f255e4d7
Parents: f72a527
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Jul 29 09:08:03 2016 +0200
Committer: Stephen Kitt <sk...@redhat.com>
Committed: Thu Aug 4 13:38:51 2016 +0200
----------------------------------------------------------------------
.../filtered-resources/resources/bin/client | 22 ++++++++++++++------
.../filtered-resources/resources/bin/instance | 22 ++++++++++++++------
.../main/filtered-resources/resources/bin/shell | 22 ++++++++++++++------
.../main/filtered-resources/resources/bin/start | 22 ++++++++++++++------
.../filtered-resources/resources/bin/status | 22 ++++++++++++++------
.../main/filtered-resources/resources/bin/stop | 22 ++++++++++++++------
.../src/main/resources/resources/bin/karaf | 22 ++++++++++++++------
7 files changed, 112 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/4740bb96/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
index 9376266..3b60a9a 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
@@ -16,12 +16,22 @@
# limitations under the License.
#
-REALNAME=`readlink -e "$0" > /dev/null 2>&1`
-if [ $? != 0 ]; then
- REALNAME=$0
-fi
-DIRNAME=`dirname "$REALNAME"`
-PROGNAME=`basename "$REALNAME"`
+realpath() {
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")"
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ cd "$(dirname "${LINK}")"
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}"
+ echo "${REALPATH}"
+}
+
+REALNAME=$(realpath "$0")
+DIRNAME=$(dirname "${REALNAME}")
+PROGNAME=$(basename "${REALNAME}")
#
# Sourcing environment settings for karaf similar to tomcats setenv
http://git-wip-us.apache.org/repos/asf/karaf/blob/4740bb96/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
index b173f7d..535c339 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
@@ -16,12 +16,22 @@
# limitations under the License.
#
-REALNAME=`readlink -e "$0" > /dev/null 2>&1`
-if [ $? != 0 ]; then
- REALNAME=$0
-fi
-DIRNAME=`dirname "$REALNAME"`
-PROGNAME=`basename "$REALNAME"`
+realpath() {
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")"
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ cd "$(dirname "${LINK}")"
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}"
+ echo "${REALPATH}"
+}
+
+REALNAME=$(realpath "$0")
+DIRNAME=$(dirname "${REALNAME}")
+PROGNAME=$(basename "${REALNAME}")
#
# Sourcing environment settings for karaf similar to tomcats setenv
http://git-wip-us.apache.org/repos/asf/karaf/blob/4740bb96/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
index ab02e37..5434a49 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
@@ -16,12 +16,22 @@
# limitations under the License.
#
-REALNAME=`readlink -e "$0" > /dev/null 2>&1`
-if [ $? != 0 ]; then
- REALNAME=$0
-fi
-DIRNAME=`dirname "$REALNAME"`
-PROGNAME=`basename "$REALNAME"`
+realpath() {
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")"
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ cd "$(dirname "${LINK}")"
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}"
+ echo "${REALPATH}"
+}
+
+REALNAME=$(realpath "$0")
+DIRNAME=$(dirname "${REALNAME}")
+PROGNAME=$(basename "${REALNAME}")
#
# Sourcing environment settings for karaf similar to tomcats setenv
http://git-wip-us.apache.org/repos/asf/karaf/blob/4740bb96/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/start b/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
index 81e4e79..b700006 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
@@ -16,12 +16,22 @@
# limitations under the License.
#
-REALNAME=`readlink -e "$0" > /dev/null 2>&1`
-if [ $? != 0 ]; then
- REALNAME=$0
-fi
-DIRNAME=`dirname "$REALNAME"`
-PROGNAME=`basename "$REALNAME"`
+realpath() {
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")"
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ cd "$(dirname "${LINK}")"
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}"
+ echo "${REALPATH}"
+}
+
+REALNAME=$(realpath "$0")
+DIRNAME=$(dirname "${REALNAME}")
+PROGNAME=$(basename "${REALNAME}")
#
# Sourcing environment settings for karaf similar to tomcats setenv
http://git-wip-us.apache.org/repos/asf/karaf/blob/4740bb96/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/status b/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
index 5b19c6f..07fb50a 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
@@ -16,12 +16,22 @@
# limitations under the License.
#
-REALNAME=`readlink -e "$0" > /dev/null 2>&1`
-if [ $? != 0 ]; then
- REALNAME=$0
-fi
-DIRNAME=`dirname "$REALNAME"`
-PROGNAME=`basename "$REALNAME"`
+realpath() {
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")"
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ cd "$(dirname "${LINK}")"
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}"
+ echo "${REALPATH}"
+}
+
+REALNAME=$(realpath "$0")
+DIRNAME=$(dirname "${REALNAME}")
+PROGNAME=$(basename "${REALNAME}")
#
# Sourcing environment settings for karaf similar to tomcats setenv
http://git-wip-us.apache.org/repos/asf/karaf/blob/4740bb96/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop b/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
index 3efa701..695884e 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
@@ -16,12 +16,22 @@
# limitations under the License.
#
-REALNAME=`readlink -e "$0" > /dev/null 2>&1`
-if [ $? != 0 ]; then
- REALNAME=$0
-fi
-DIRNAME=`dirname "$REALNAME"`
-PROGNAME=`basename "$REALNAME"`
+realpath() {
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")"
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ cd "$(dirname "${LINK}")"
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}"
+ echo "${REALPATH}"
+}
+
+REALNAME=$(realpath "$0")
+DIRNAME=$(dirname "${REALNAME}")
+PROGNAME=$(basename "${REALNAME}")
#
# Sourcing environment settings for karaf similar to tomcats setenv
http://git-wip-us.apache.org/repos/asf/karaf/blob/4740bb96/assemblies/features/framework/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf b/assemblies/features/framework/src/main/resources/resources/bin/karaf
index fd2d21e..9ca0a42 100755
--- a/assemblies/features/framework/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/framework/src/main/resources/resources/bin/karaf
@@ -16,12 +16,22 @@
# limitations under the License.
#
-REALNAME=`readlink -e "$0" > /dev/null 2>&1`
-if [ $? != 0 ]; then
- REALNAME=$0
-fi
-DIRNAME=`dirname "$REALNAME"`
-PROGNAME=`basename "$REALNAME"`
+realpath() {
+ OURPWD=${PWD}
+ cd "$(dirname "${1}")"
+ LINK=$(readlink "$(basename "${1}")")
+ while [ "${LINK}" ]; do
+ cd "$(dirname "${LINK}")"
+ LINK=$(readlink "$(basename "${1}")")
+ done
+ REALPATH="${PWD}/$(basename "${1}")"
+ cd "${OURPWD}"
+ echo "${REALPATH}"
+}
+
+REALNAME=$(realpath "$0")
+DIRNAME=$(dirname "${REALNAME}")
+PROGNAME=$(basename "${REALNAME}")
#
# Sourcing environment settings for karaf similar to tomcats setenv
[2/2] karaf git commit: Merge branch 'karaf-3.0.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Posted by jg...@apache.org.
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/77b8adcb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/77b8adcb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/77b8adcb
Branch: refs/heads/karaf-3.0.x
Commit: 77b8adcbcac619f331571bc978698771b3339e97
Parents: 4740bb9 5a32d36
Author: jgoodyear <jg...@apache.org>
Authored: Thu Aug 4 10:02:22 2016 -0230
Committer: jgoodyear <jg...@apache.org>
Committed: Thu Aug 4 10:02:22 2016 -0230
----------------------------------------------------------------------
.../org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------