Moved configuration files into a separate directory

Author: cboehme

src/main/assembly/assembly.xml

@@ -55,7 +55,7 @@
 		</fileSet>
 		<fileSet>
 			<directory>${project.basedir}/src/main/config/</directory>
-			<outputDirectory></outputDirectory>
+			<outputDirectory>config/</outputDirectory>
 			<includes>
 				<include>java-options.conf</include>
 				<include>log4j.xml</include>

src/main/config/java-options.conf

@@ -5,7 +5,7 @@
 # Undefined variables remain in the configuration. 
 
 -Xmx512m
--Dlog4j.configuration="file:///$METAFACTURE_HOME/log4j.xml"
+-Dlog4j.configuration="file:///$METAFACTURE_HOME/config/log4j.xml"
 
 # Append additional options defined in the 
 # environment (The start-up script ensures 

src/main/scripts/flux.bat

@@ -11,7 +11,7 @@ IF "x%FLUX_JAVA_BIN%" == "x" (
 	SET FLUX_JAVA_BIN=java
 )
 
-SET JAVA_OPTS_FILE="%METAFACTURE_HOME%java-options.conf"
+SET JAVA_OPTS_FILE="%METAFACTURE_HOME%/config/java-options.conf"
 SET JAR_FILE="%METAFACTURE_HOME%${project.build.finalName}.jar"
 
 REM Read JVM options from configuration file. Lines starting

src/main/scripts/flux.sh

@@ -14,7 +14,7 @@ if [ -z "$FLUX_JAVA_BIN" ] ; then
 	FLUX_JAVA_BIN=java
 fi
 
-java_opts_file="$METAFACTURE_HOME/java-options.conf"
+java_opts_file="$METAFACTURE_HOME/config/java-options.conf"
 jar_file="$METAFACTURE_HOME/${project.build.finalName}.jar"
 
 # Load java options from configuration file. Lines starting