Misc tidying up of old files and refactoring of tests

acl/src/main/resources/createAclSchema.sql

@@ -1,4 +1,4 @@
--- Injected into DatabaseSeeder via applicationContext-test.xml (see test case JdbcAclServiceTests)
+-- ACL Schema SQL
 
 -- DROP TABLE ACL_ENTRY;
 -- DROP TABLE ACL_OBJECT_IDENTITY;
@@ -17,8 +17,6 @@ ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,
 CLASS VARCHAR_IGNORECASE(100) NOT NULL,
 CONSTRAINT UNIQUE_UK_2 UNIQUE(CLASS));
 
---INSERT INTO ACL_CLASS VALUES (1, 'sample.contact.Contact');
-
 CREATE TABLE ACL_OBJECT_IDENTITY(
 ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,
 OBJECT_ID_CLASS BIGINT NOT NULL,

acl/src/main/resources/jdbcMutableAclServiceTests-context.xml

@@ -56,8 +56,11 @@
         <constructor-arg ref="aclCache"/>
     </bean>
 
-    <bean id="dataSource" class="org.springframework.security.TestDataSource">
-        <constructor-arg value="acltest" />
+    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+        <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+        <property name="url" value="jdbc:hsqldb:mem:acltest"/>
+        <property name="username" value="sa"/>
+        <property name="password" value=""/>
     </bean>
 
     <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">