From 02d335ca1f1c2a93d387b669ef844417e7bb887c Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 6 Jul 2013 06:53:26 +0200
Subject: [PATCH] move env variables to config files

---
 README.md       | 5 ++---
 conf/setenv.bat | 1 +
 conf/setenv.sh  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 conf/setenv.bat
 create mode 100644 conf/setenv.sh

diff --git a/README.md b/README.md
index 3efb9878..ef6690ba 100644
--- a/README.md
+++ b/README.md
@@ -70,12 +70,11 @@ It will generate a zip file at `target/commafeed.zip` with everything you need t
 
 * Create a directory somewhere (e.g. `/opt/commafeed/`) and extract the generated zip inside this directory.
 * Create a directory called `logs` (e.g. `/opt/commafeed/logs`)
-* On Linux, create the file `bin/setenv.sh` and put the following in it : `export JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xmx1024m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"`
-* On Windows, create the file `bin/setenv.bat` and put the following in it : `set JAVA_OPTS=-Djava.net.preferIPv4Stack=true -Xmx1024m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC`
+* Copy the file `conf/setenv.sh` (Linux) or `conf/setenv.bat` (Windows) to `bin/`
 * If you don't use the embedded database, create a database in your external database instance, then uncomment the `Resource` element corresponding to the database engine you use from `conf/tomee.xml` and edit the default credentials.
 * If you'd like to change the default port (8082), edit `conf/server.xml` and look for `<Connector port="8082" protocol="HTTP/1.1"`. Change the port to the value you'd like to use.
 * CommaFeed will run on the `/commafeed` context. If you'd like to change the context, go to `webapps` and rename `commafeed.war`. Use the special name `ROOT.war` to deploy to the root context.
-* To start and stop the application, use `bin/startup.sh` and `bin/shutdown.sh` on Linux (you may need to `chmod +x bin/*.sh`) or `bin\startup.bat` and `bin\shutdown.bat` on Windows.
+* To start and stop the application, use `bin/startup.sh` and `bin/shutdown.sh` on Linux (you need to `chmod +x bin/*.sh`) or `bin\startup.bat` and `bin\shutdown.bat` on Windows.
 * To update the application with a newer version, pull the latest changes and use the same command you used to build the complete TomEE package, but without the `tomee:build` part (keep `-Pprod -P<database>`). 
 This will generate the file `target/commafeed.war`. Copy this file to your tomee `webapps/` directory.
 * The application is online at [http://localhost:8082/commafeed](http://localhost:8082/commafeed). Don't forget to set the public URL in the admin settings.
diff --git a/conf/setenv.bat b/conf/setenv.bat
new file mode 100644
index 00000000..cc52d9c5
--- /dev/null
+++ b/conf/setenv.bat
@@ -0,0 +1 @@
+set JAVA_OPTS=-Djava.net.preferIPv4Stack=true -Xmx1024m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
\ No newline at end of file
diff --git a/conf/setenv.sh b/conf/setenv.sh
new file mode 100644
index 00000000..36b176d7
--- /dev/null
+++ b/conf/setenv.sh
@@ -0,0 +1 @@
+export JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xmx1024m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
\ No newline at end of file