From aa0b48a43b34f736869a6ed404c501ba3be8589f Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 1 Feb 2012 08:49:31 +0100
Subject: [PATCH] Config dir first in classpath. See #1761

---
 akka-docs/modules/microkernel.rst  | 2 +-
 akka-kernel/src/main/dist/bin/akka | 2 +-
 scripts/samples/start              | 2 +-
 scripts/samples/start.bat          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/akka-docs/modules/microkernel.rst b/akka-docs/modules/microkernel.rst
index ec6eabe3ef..7600e1ebd2 100644
--- a/akka-docs/modules/microkernel.rst
+++ b/akka-docs/modules/microkernel.rst
@@ -24,7 +24,7 @@ command (on a unix-based system):
 
 .. code-block:: none
 
-   bin/start sample.kernel.hello.HelloKernel
+   bin/akka sample.kernel.hello.HelloKernel
 
 Use ``Ctrl-C`` to interrupt and exit the microkernel.
 
diff --git a/akka-kernel/src/main/dist/bin/akka b/akka-kernel/src/main/dist/bin/akka
index 595bc6e34c..84ae2e5d78 100755
--- a/akka-kernel/src/main/dist/bin/akka
+++ b/akka-kernel/src/main/dist/bin/akka
@@ -19,6 +19,6 @@ declare AKKA_HOME="$(cd "$(cd "$(dirname "$0")"; pwd -P)"/..; pwd)"
 
 [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx1024M -Xms1024M -Xss1M -XX:MaxPermSize=256M -XX:+UseParallelGC -XX:OnOutOfMemoryError=\"kill -9 %p\""
 
-[ -n "$AKKA_CLASSPATH" ] || AKKA_CLASSPATH="$AKKA_HOME/lib/scala-library.jar:$AKKA_HOME/lib/akka/*:$AKKA_HOME/config"
+[ -n "$AKKA_CLASSPATH" ] || AKKA_CLASSPATH="$AKKA_HOME/lib/scala-library.jar:$AKKA_HOME/config:$AKKA_HOME/lib/akka/*"
 
 java "$JAVA_OPTS" -cp "$AKKA_CLASSPATH" -Dakka.home="$AKKA_HOME" -Dakka.kernel.quiet=$quiet akka.kernel.Main "$@"
diff --git a/scripts/samples/start b/scripts/samples/start
index 491c617db2..21563159f0 100755
--- a/scripts/samples/start
+++ b/scripts/samples/start
@@ -8,6 +8,6 @@ AKKA_HOME="$(cd "$SAMPLE"/../../../..; pwd)"
 
 [ -n "$AKKA_CLASSPATH" ] || AKKA_CLASSPATH="$AKKA_HOME/lib/scala-library.jar:$AKKA_HOME/lib/akka/*"
 
-SAMPLE_CLASSPATH="$AKKA_CLASSPATH:$SAMPLE/lib/*:$SAMPLE/config"
+SAMPLE_CLASSPATH="$SAMPLE/config:$AKKA_CLASSPATH:$SAMPLE/lib/*"
 
 java $JAVA_OPTS -cp "$SAMPLE_CLASSPATH" -Dakka.home="$SAMPLE" akka.kernel.Main
diff --git a/scripts/samples/start.bat b/scripts/samples/start.bat
index 1bffae4e5b..a6a3ec5e33 100644
--- a/scripts/samples/start.bat
+++ b/scripts/samples/start.bat
@@ -3,6 +3,6 @@ set SAMPLE=%~dp0..
 set AKKA_HOME=%SAMPLE%\..\..\..\..
 set JAVA_OPTS=-Xms1024M -Xmx1024M -Xss1M -XX:MaxPermSize=256M -XX:+UseParallelGC
 set AKKA_CLASSPATH=%AKKA_HOME%\lib\scala-library.jar;%AKKA_HOME%\lib\akka\*
-set SAMPLE_CLASSPATH=%AKKA_CLASSPATH%;%SAMPLE%\lib\*;%SAMPLE%\config
+set SAMPLE_CLASSPATH=%SAMPLE%\config;%AKKA_CLASSPATH%;%SAMPLE%\lib\*
 
 java %JAVA_OPTS% -cp "%SAMPLE_CLASSPATH%" -Dakka.home="%SAMPLE%" akka.kernel.Main