From e8de31445c68aa776cab8cc596e6da1e98b0756a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Sat, 26 Mar 2016 17:57:30 +0100
Subject: [PATCH 1/2] KARAF-4449 - Upgrade to Aries proxy.impl 1.0.5

(cherry picked from commit f234b6a53df3f045303b5ba06615d7c3800b920b)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 032c0b0bc28..6172f2bfab5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,7 +211,7 @@
         <aries.jndi.api.version>1.1.0</aries.jndi.api.version>
         <aries.jndi.core.version>1.0.2</aries.jndi.core.version>
         <aries.jndi.url.version>1.1.0</aries.jndi.url.version>
-        <aries.proxy.version>1.0.4</aries.proxy.version>
+        <aries.proxy.version>1.0.5</aries.proxy.version>
         <aries.proxy.api.version>1.0.1</aries.proxy.api.version>
         <aries.quiesce.api.version>1.0.0</aries.quiesce.api.version>
         <aries.transaction.manager.version>1.1.1</aries.transaction.manager.version>

From 4b868a76582d43aefe65f32fe1a85ee1f6a19b16 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@apache.org>
Date: Fri, 29 Jul 2016 09:08:03 +0200
Subject: [PATCH 2/2] [KARAF-4628] [KARAF-4564] Fix unix startup scripts
 (cherry picked from commit 5bbaf71814df514b112cbe8cd73ba57fefdc869f)

---
 .../filtered-resources/resources/bin/client   | 22 ++++++++++++++-----
 .../filtered-resources/resources/bin/instance | 22 ++++++++++++++-----
 .../filtered-resources/resources/bin/shell    | 22 ++++++++++++++-----
 .../filtered-resources/resources/bin/start    | 22 ++++++++++++++-----
 .../filtered-resources/resources/bin/status   | 22 ++++++++++++++-----
 .../filtered-resources/resources/bin/stop     | 22 ++++++++++++++-----
 .../src/main/resources/resources/bin/karaf    | 22 ++++++++++++++-----
 7 files changed, 112 insertions(+), 42 deletions(-)

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 93762663c87..3b60a9a8dc4 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
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 b173f7ddfc7..535c339ef51 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
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 ab02e37c725..5434a49e6d9 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
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 81e4e79ff71..b7000063baf 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 
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 5b19c6f2fdb..07fb50adb9a 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 
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 3efa7015c89..695884e6063 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 
diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf b/assemblies/features/framework/src/main/resources/resources/bin/karaf
index fd2d21e5a12..9ca0a42e940 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