commit 38399dfca099251a5c1044e2ba28e707dac97203
author Michael Hanl <hanl@ids-mannheim.de> Fri Nov 13 16:32:19 2015 +0100
committer Michael Hanl <hanl@ids-mannheim.de> Fri Nov 13 16:32:19 2015 +0100
tree b260f896ab84a222ee1723cc54490d84a0fe6ee9
parent 48700a734fad2b015127fc46e8b7a59ef7dda86c

config updates

.gitignore

diff --git a/.gitignore b/.gitignore
index 3e67cec..97c429a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 .*
 !/.gitignore
-**/*.*
\ No newline at end of file

src/main/resources/default-config.xml

diff --git a/src/main/resources/default-config.xml b/src/main/resources/default-config.xml
index db14aab..4117b76 100644
--- a/src/main/resources/default-config.xml
+++ b/src/main/resources/default-config.xml
@@ -29,7 +29,7 @@
         <property name="locations">
             <array>
                 <value>classpath:kustvakt.conf</value>
-                <value>file:./config/kustvakt.conf</value>
+                <value>file:./kustvakt.conf</value>
             </array>
         </property>
     </bean>
@@ -40,7 +40,7 @@
         <property name="locations">
             <array>
                 <value>classpath:jdbc.properties</value>
-                <value>file:./config/jdbc.properties</value>
+                <value>file:./jdbc.properties</value>
             </array>
         </property>
     </bean>

src/main/resources/light-config.xml

diff --git a/src/main/resources/light-config.xml b/src/main/resources/light-config.xml
index 5548189..5ac341a 100644
--- a/src/main/resources/light-config.xml
+++ b/src/main/resources/light-config.xml
@@ -16,7 +16,7 @@
         <property name="locations">
             <array>
                 <value>classpath:kustvakt.conf</value>
-                <value>file:./config/kustvakt.conf</value>
+                <value>file:./kustvakt.conf</value>
             </array>
         </property>
     </bean>