From 2584735ea184a9f771b9b75f67893513fb595d34 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Fri, 29 Mar 2013 02:03:42 +0100
Subject: [PATCH]  #3107 - Moving the relevant scripts and samples into the
 dist folder of the akka-kernel project

---
 .../generate_config_with_secure_cookie.sh        | 16 +++-------------
 scripts/samples/start                            | 13 -------------
 scripts/samples/start.bat                        |  8 --------
 3 files changed, 3 insertions(+), 34 deletions(-)
 rename {scripts => akka-kernel/src/main/dist/scripts}/generate_config_with_secure_cookie.sh (77%)
 delete mode 100755 scripts/samples/start
 delete mode 100644 scripts/samples/start.bat

diff --git a/scripts/generate_config_with_secure_cookie.sh b/akka-kernel/src/main/dist/scripts/generate_config_with_secure_cookie.sh
similarity index 77%
rename from scripts/generate_config_with_secure_cookie.sh
rename to akka-kernel/src/main/dist/scripts/generate_config_with_secure_cookie.sh
index a8ad406dc0..19b0ccde32 100755
--- a/scripts/generate_config_with_secure_cookie.sh
+++ b/akka-kernel/src/main/dist/scripts/generate_config_with_secure_cookie.sh
@@ -42,21 +42,11 @@ object Crypt {
 }
 
 print("""
-# This config imports the Akka reference configuration.
-include "akka-reference.conf"
-
-# In this file you can override any option defined in the 'akka-reference.conf' file.
-# Copy in all or parts of the 'akka-reference.conf' file and modify as you please.
-
 akka {
   remote {
-    netty {
-      secure-cookie = """")
-print(Crypt.generateSecureCookie)
-print(""""
-      require-cookie = on
-    }
+    secure-cookie = "%s"
+    require-cookie = on
   }
 }
-""")
+""".format(Crypt.generateSecureCookie))
 
diff --git a/scripts/samples/start b/scripts/samples/start
deleted file mode 100755
index 21563159f0..0000000000
--- a/scripts/samples/start
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-SAMPLE="$(cd "$(cd "$(dirname "$0")"; pwd -P)"/..; pwd)"
-
-AKKA_HOME="$(cd "$SAMPLE"/../../../..; pwd)"
-
-[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xms1536M -Xmx1536M -Xss1M -XX:MaxPermSize=256M -XX:+UseParallelGC"
-
-[ -n "$AKKA_CLASSPATH" ] || AKKA_CLASSPATH="$AKKA_HOME/lib/scala-library.jar:$AKKA_HOME/lib/akka/*"
-
-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
deleted file mode 100644
index a6a3ec5e33..0000000000
--- a/scripts/samples/start.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-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=%SAMPLE%\config;%AKKA_CLASSPATH%;%SAMPLE%\lib\*
-
-java %JAVA_OPTS% -cp "%SAMPLE_CLASSPATH%" -Dakka.home="%SAMPLE%" akka.kernel.Main