Added application-context.xml to load xml files in order

src/main/resources/spring/application-context.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright 2013 Global Crop Diversity Trust
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/context
+       http://www.springframework.org/schema/context/spring-context-3.2.xsd
+       http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+       http://www.springframework.org/schema/aop
+       http://www.springframework.org/schema/aop/spring-aop-3.2.xsd">
+
+
+	<!-- This ensures things are loaded in correct order -->
+	<import resource="spring-common.xml" />
+	<import resource="spring-db.xml" />
+	<import resource="spring-cache.xml" />
+	<import resource="spring-security-oauth.xml" />
+	<import resource="spring-security-acl.xml" />
+	<import resource="spring-security.xml" />
+
+</beans>

src/main/resources/spring/spring.properties

@@ -20,12 +20,12 @@
 #db.username = sa
 #db.password =
 
-db.url=jdbc:mysql://127.0.0.1/oauth?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
+db.url=jdbc:mysql://127.0.0.1/pgrsys_genesys?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
 db.driverClassName = com.mysql.jdbc.Driver
 db.username = root
 db.password = 
 db.showSql=true
-db.hbm2ddl=update
+db.hbm2ddl=do-nothing
 
 c3p0.acquireIncrement=1
 c3p0.minPoolSize=5

src/main/webapp/WEB-INF/web.xml

@@ -7,7 +7,7 @@
 
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>classpath:spring/spring-*.xml</param-value>
+        <param-value>classpath:spring/application-context.xml</param-value>
     </context-param>
 
     <listener>