You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/10/20 21:12:51 UTC
karaf git commit: [KARAF-4704] Unwanted variable interpolation in
shell scripts
Repository: karaf
Updated Branches:
refs/heads/master 40364ce57 -> be41010a3
[KARAF-4704] Unwanted variable interpolation in shell scripts
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/be41010a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/be41010a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/be41010a
Branch: refs/heads/master
Commit: be41010a39a66fb59b732950c2777f5b890298c4
Parents: 40364ce
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Oct 20 23:12:43 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Oct 20 23:12:43 2016 +0200
----------------------------------------------------------------------
assemblies/features/base/pom.xml | 2 +-
.../base/src/main/filtered-resources/resources/bin/client | 8 ++++----
.../src/main/filtered-resources/resources/bin/client.bat | 8 ++++----
.../src/main/filtered-resources/resources/bin/instance | 8 ++++----
.../main/filtered-resources/resources/bin/instance.bat | 8 ++++----
.../base/src/main/filtered-resources/resources/bin/shell | 6 +++---
.../src/main/filtered-resources/resources/bin/shell.bat | 6 +++---
.../filtered-resources/resources/etc/config.properties | 10 +++++-----
.../filtered-resources/resources/etc/distribution.info | 2 +-
9 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index cb62ad4..5a3ae1a 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -94,7 +94,7 @@
<configuration>
<useDefaultDelimiters>false</useDefaultDelimiters>
<delimiters>
- <delimiter>${*}</delimiter>
+ <delimiter>@@</delimiter>
</delimiters>
</configuration>
<executions>
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/client b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
index 0de9784..9f61925 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client
@@ -270,10 +270,10 @@ setupDefaults() {
fi
# Add the jars in the lib dir
- CLASSPATH="$KARAF_HOME/system/org/apache/karaf/org.apache.karaf.client/${project.version}/org.apache.karaf.client-${project.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jline/jline/${jline.version}/jline-${jline.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"
+ CLASSPATH="$KARAF_HOME/system/org/apache/karaf/org.apache.karaf.client/@@project.version@@/org.apache.karaf.client-@@project.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/sshd/sshd-core/@@sshd.version@@/sshd-core-@@sshd.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/slf4j/slf4j-api/@@slf4j.version@@/slf4j-api-@@slf4j.version@@.jar"
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
index ff914c8..44d2915 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/client.bat
@@ -115,10 +115,10 @@ if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END
set JAVA_OPTS=%JAVA_OPTS% %EXTRA_JAVA_OPTS%
:KARAF_EXTRA_JAVA_OPTS_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\org.apache.karaf.client\${project.version}\org.apache.karaf.client-${project.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\sshd\sshd-core\${sshd.version}\sshd-core-${sshd.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\${jline.version}\jline-${jline.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\slf4j\slf4j-api\${slf4j.version}\slf4j-api-${slf4j.version}.jar
+set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\org.apache.karaf.client\@@project.version@@\org.apache.karaf.client-@@project.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\sshd\sshd-core\@@sshd.version@@\sshd-core-@@sshd.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\slf4j\slf4j-api\@@slf4j.version@@\slf4j-api-@@slf4j.version@@.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8 %9
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
index e26668b..2daeb15 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance
@@ -292,10 +292,10 @@ setupDefaults() {
fi
# Setup classpath
- CLASSPATH="$KARAF_HOME/system/org/apache/karaf/instance/org.apache.karaf.instance.core/${project.version}/org.apache.karaf.instance.core-${project.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.core/${project.version}/org.apache.karaf.shell.core-${project.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/jline/jline/${jline.version}/jline-${jline.version}.jar"
+ CLASSPATH="$KARAF_HOME/system/org/apache/karaf/instance/org.apache.karaf.instance.core/@@project.version@@/org.apache.karaf.instance.core-@@project.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.core/@@project.version@@/org.apache.karaf.shell.core-@@project.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/@@pax.logging.version@@/pax-logging-api-@@pax.logging.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
DEFAULT_JAVA_DEBUG_PORT="5005"
if [ "x$JAVA_DEBUG_PORT" = "x" ]; then
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
index dcaa10f..ffdece2 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/instance.bat
@@ -139,10 +139,10 @@ goto :EOF
:CLASSPATH_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\${project.version}\org.apache.karaf.instance.core-${project.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.core\${project.version}\org.apache.karaf.shell.core-${project.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\jline\jline\${jline.version}\jline-${jline.version}.jar
+set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\instance\org.apache.karaf.instance.core\@@project.version@@\org.apache.karaf.instance.core-@@project.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.core\@@project.version@@\org.apache.karaf.shell.core-@@project.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\@@pax.logging.version@@\pax-logging-api-@@pax.logging.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
index fcd7062..b65e80b 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell
@@ -292,9 +292,9 @@ setupDefaults() {
fi
# Setup classpath
- CLASSPATH="$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.core/${project.version}/org.apache.karaf.shell.core-${project.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar"
- CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jline/jline/${jline.version}/jline-${jline.version}.jar"
+ CLASSPATH="$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.core/@@project.version@@/org.apache.karaf.shell.core-@@project.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/@@pax.logging.version@@/pax-logging-api-@@pax.logging.version@@.jar"
+ CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/jline/jline/@@jline.version@@/jline-@@jline.version@@.jar"
DEFAULT_JAVA_DEBUG_PORT="5005"
if [ "x$JAVA_DEBUG_PORT" = "x" ]; then
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
index 382bb7c..5ab9fe9 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/shell.bat
@@ -125,9 +125,9 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
:KARAF_DEBUG_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.core\${project.version}\org.apache.karaf.shell.core-${project.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar
-set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\${jline.version}\jline-${jline.version}.jar
+set CLASSPATH=%KARAF_HOME%\system\org\apache\karaf\shell\org.apache.karaf.shell.core\@@project.version@@\org.apache.karaf.shell.core-@@project.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\@@pax.logging.version@@\pax-logging-api-@@pax.logging.version@@.jar
+set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\jline\jline\@@jline.version@@\jline-@@jline.version@@.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index 5b36a2d..fa521c7 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -50,8 +50,8 @@ karaf.framework=felix
#
# Location of the OSGi frameworks
#
-karaf.framework.equinox=mvn\:${equinox.groupId}/${equinox.artifactId}/${equinox.version}
-karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/${felix.framework.version}
+karaf.framework.equinox=mvn\:@@equinox.groupId@@/@@equinox.artifactId@@/@@equinox.version@@
+karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/@@felix.framework.version@@
#
# Framework config properties.
@@ -78,9 +78,9 @@ org.osgi.framework.system.packages= \
org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",\
org.osgi.service.url;version="1.0",\
org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",\
- org.apache.karaf.version;version="${karaf.osgi.version}",\
- org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="${karaf.osgi.version}",\
- org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="${karaf.osgi.version}",\
+ org.apache.karaf.version;version="@@karaf.osgi.version@@",\
+ org.apache.karaf.jaas.boot.principal;uses:=javax.security.auth;version="@@karaf.osgi.version@@",\
+ org.apache.karaf.jaas.boot;uses:="javax.security.auth,javax.security.auth.callback,javax.security.auth.login,javax.security.auth.spi,org.osgi.framework";version="@@karaf.osgi.version@@",\
${jre-${java.specification.version}}
#
http://git-wip-us.apache.org/repos/asf/karaf/blob/be41010a/assemblies/features/base/src/main/filtered-resources/resources/etc/distribution.info
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/distribution.info b/assemblies/features/base/src/main/filtered-resources/resources/etc/distribution.info
index e287240..a58588a 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/distribution.info
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/distribution.info
@@ -21,6 +21,6 @@
# This file contains the general platform information required by the itests to find out
# about the current versions.
#
-karafVersion=${project.version}
+karafVersion=@@project.version@@
name=Apache Karaf