Updates for HSQL during tests

pom.xml

@@ -31,7 +31,7 @@
 
 		<hibernate.version>4.2.7.SP1</hibernate.version>
 		<hibernate.annotations.version>4.0.4.Final</hibernate.annotations.version>
-		<hsqldb.version>2.2.9</hsqldb.version>
+		<hsqldb.version>2.3.1</hsqldb.version>
 		<ehcache.version>2.7.0</ehcache.version>
 
 		<slf4j.version>1.7.5</slf4j.version>

src/main/resources/ehcache.xml

@@ -45,7 +45,7 @@
     <!--ACL in-memory cache-->
     <cache name="acl"
            maxElementsInMemory="0"
-           maxBytesLocalHeap="512M"
+           maxBytesLocalHeap="64M"
            eternal="false"
            timeToIdleSeconds="1800"
            timeToLiveSeconds="3600"

src/test/java/org/genesys2/server/test/HtmlSanitizerTest.java

@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-
 package org.genesys2.server.test;
 
 import static org.junit.Assert.assertEquals;
@@ -29,8 +28,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath:spring/servlet.xml", "classpath:spring/spring-common.xml", "classpath:spring/spring-db.xml",
-		"classpath:spring/spring-security.xml", "classpath:spring/spring-security-acl.xml", "classpath:spring/spring-cache.xml" })
+@ContextConfiguration(locations = { "classpath:spring/servlet.xml", "classpath:spring/application-context.xml" })
 public class HtmlSanitizerTest {
 
 	@Autowired

src/test/resources/spring/spring.properties

@@ -15,7 +15,7 @@
 #-------------------------------------------------------------------------------
 #DB connection properties
 #In-memory HSQLDB
-db.url=jdbc:hsqldb:mem:test
+db.url=jdbc:hsqldb:mem:test;sql.syntax_mys=true
 db.driverClassName = org.hsqldb.jdbc.JDBCDriver
 db.username = sa
 db.password =
@@ -29,4 +29,15 @@ captcha.publicKey=B
 lucene.indexDir=./lucene/
 
 # paths
-download.files.dir=/Users/mobreza/Downloads
\ No newline at end of file
+download.files.dir=./data/
+
+# ITPGRFA Easy-SMTA account (if you have one)
+itpgrfa.easysmta.username=
+itpgrfa.easysmta.password=
+
+# GA Account
+google.analytics.account=
+
+# CDN
+cdn.base=http://cdn.sandbox.genesys-pgr.org
+cdn.flags.url=${cdn.base}/flags