Merge pull request sakaiproject#447 from jonespm/KNL-1351

KNL-1351 - Fix HikariCP startup errors under Oracle
marktriggs · May 6, 2015 · 981bf54 · 981bf54
2 parents 6768e77 + 66e2c57
commit 981bf54
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/kernel/component-manager/src/main/bundle/org/sakaiproject/config/kernel.properties b/kernel/component-manager/src/main/bundle/org/sakaiproject/config/kernel.properties
@@ -60,7 +60,7 @@ [email protected]=
 [email protected]=hsqldb
 [email protected]=org.hsqldb.jdbcDriver
 hibernate.dialect=org.hibernate.dialect.HSQLDialect
-[email protected]=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS
+#[email protected]=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS
 [email protected]=jdbc:hsqldb:mem:sakai
 
 ## SHORTENED URLs defaults

diff --git a/kernel/component-manager/src/main/bundle/org/sakaiproject/config/sakai-configuration.xml b/kernel/component-manager/src/main/bundle/org/sakaiproject/config/sakai-configuration.xml
@@ -65,6 +65,7 @@
 				<value>file:${sakai.home}sakai.properties</value>
 				<value>file:${sakai.home}local.properties</value>
 				<value>file:${sakai.security}security.properties</value>
+				<value>file:${sakai.test}test.properties</value>
 			</list>
 		</property>
 	</bean>

diff --git a/kernel/kernel-impl/src/test/java/org/sakaiproject/test/SakaiKernelTestBase.java b/kernel/kernel-impl/src/test/java/org/sakaiproject/test/SakaiKernelTestBase.java
@@ -79,6 +79,8 @@ protected static <T> T getService(Class<T> clazz) {
 	 * @throws IOException
 	 */
 	protected static void oneTimeSetup(String sakaiHomeResources, String additional, Properties properties) throws IOException {
+		//Set this property for testing
+		System.setProperty("sakai.test", "src/test/resources/");
 		if (sakaiHomeResources != null) {
 			// TODO Better to store existing sakai.home setting for restoration in the tear down? 
 			TestComponentManagerContainer.setSakaiHome("src/test/resources/" + sakaiHomeResources);

diff --git a/kernel/kernel-impl/src/test/resources/dynamic/sakai.properties b/kernel/kernel-impl/src/test/resources/dynamic/sakai.properties
@@ -6,6 +6,7 @@ [email protected]=org.hsqldb.jdbcDriver
 [email protected]=jdbc:hsqldb:mem:sakai
 [email protected]=sa
 [email protected]=
+[email protected]=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS
 
 # Don't really send email. Just log it.
 [email protected]=true

diff --git a/kernel/kernel-impl/src/test/resources/filesystem/sakai-configuration.xml b/kernel/kernel-impl/src/test/resources/filesystem/sakai-configuration.xml
@@ -10,6 +10,7 @@
 			<list merge="true">
 				<value>file:${sakai.home}sakai.properties</value>
 				<value>file:${sakai.home}some-peculiar.properties</value>
+				<value>file:${sakai.test}test.properties</value>
 				<!--  Wildcards work as well.... -->
 <!--
 				<value>file:${sakai.home}*.properties</value>

diff --git a/kernel/kernel-impl/src/test/resources/test.properties b/kernel/kernel-impl/src/test/resources/test.properties
@@ -0,0 +1,9 @@
+## DB DEFAULTS
+[email protected]=sa
+[email protected]=
+# HSQLDB settings (DEFAULT)
+[email protected]=hsqldb
+[email protected]=org.hsqldb.jdbcDriver
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+[email protected]=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS
+[email protected]=jdbc:hsqldb:mem:saka
diff --git a/kernel/pom.xml b/kernel/pom.xml
@@ -132,7 +132,7 @@
       <dependency>
         <groupId>com.zaxxer</groupId>
         <artifactId>HikariCP</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.7</version>
         <scope>compile</scope>
       </dependency>
       <!--