Revert "Make AclObjectIdentity immutable (but not their entries)"

This reverts commit 86aa3d2.

Author: arteymix

gsec/src/main/resources/gemma/gsec/model/AclObjectIdentity.hbm.xml

@@ -3,8 +3,8 @@
    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-   <class name="gemma.gsec.acl.domain.AclObjectIdentity" table="ACLOBJECTIDENTITY" mutable="false">
-      <cache usage="read-only"/>
+   <class name="gemma.gsec.acl.domain.AclObjectIdentity" table="ACLOBJECTIDENTITY">
+      <cache usage="read-write"/>
       <id name="id" type="java.lang.Long" unsaved-value="null">
          <column name="ID" sql-type="BIGINT"/>
          <generator class="native">
@@ -25,7 +25,6 @@
       <many-to-one name="parentObject" class="gemma.gsec.acl.domain.AclObjectIdentity" lazy="false" fetch="select">
          <column name="PARENT_OBJECT_FK" not-null="false" sql-type="BIGINT"/>
       </many-to-one>
-      <!-- this is the only mutable part -->
       <set name="entries" lazy="false" fetch="select" cascade="all" order-by="ACE_ORDER">
          <cache usage="read-write"/>
          <key foreign-key="ACL_ENTRY_OBJECTIDENTITY_FKC">

gsec/src/test/resources/ehcache.xml

@@ -8,9 +8,9 @@
     <cache name="gemma.gsec.acl.domain.AclSid"
            maxElementsInMemory="100" eternal="true" overflowToDisk="false"/>
     <cache name="gemma.gsec.acl.domain.AclObjectIdentity"
-           maxElementsInMemory="10000" eternal="true" overflowToDisk="false"/>
+           maxElementsInMemory="10000" timeToIdleSeconds="1200" timeToLiveSeconds="1200" overflowToDisk="false"/>
     <cache name="gemma.gsec.acl.domain.AclObjectIdentity.entries"
-           maxElementsInMemory="10000" timeToIdleSeconds="1200" overflowToDisk="false"/>
+           maxElementsInMemory="10000" timeToIdleSeconds="1200" timeToLiveSeconds="1200" overflowToDisk="false"/>
     <cache name="gemma.gsec.acl.domain.AclEntry"
-           maxElementsInMemory="100000" timeToIdleSeconds="1200" overflowToDisk="false"/>
+           maxElementsInMemory="100000" timeToIdleSeconds="1200" timeToLiveSeconds="1200" overflowToDisk="false"/>
 </ehcache>