diff --git a/sandbox/pom.xml b/sandbox/pom.xml index de5ee6c9ae..50a37d0739 100644 --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -49,6 +49,12 @@ 1.2.6 jar + + hsqldb + hsqldb + 1.8.0.4 + test + @@ -56,8 +62,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.4 + 1.4 diff --git a/sandbox/src/main/java/org/acegisecurity/acls/domain/AclImpl.java b/sandbox/src/main/java/org/acegisecurity/acls/domain/AclImpl.java index 43432aee74..ac1996e792 100644 --- a/sandbox/src/main/java/org/acegisecurity/acls/domain/AclImpl.java +++ b/sandbox/src/main/java/org/acegisecurity/acls/domain/AclImpl.java @@ -456,7 +456,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { } sb.append("inheriting: ").append(this.entriesInheriting).append("; "); - sb.append("parent: ").append((this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity()); + sb.append("parent: ").append((this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity().toString()); sb.append("]"); return sb.toString(); diff --git a/sandbox/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java b/sandbox/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java index b52995fb09..88e4266a46 100644 --- a/sandbox/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java +++ b/sandbox/src/test/java/org/acegisecurity/acls/jdbc/JdbcAclServiceTests.java @@ -47,12 +47,12 @@ public class JdbcAclServiceTests extends AbstractDependencyInjectionSpringContex } public void testStub() { - ObjectIdentity id1 = new ObjectIdentityImpl("sample.contact.Contact", new Long(1)); - ObjectIdentity id2 = new ObjectIdentityImpl("sample.contact.Contact", new Long(2)); - ObjectIdentity id3 = new ObjectIdentityImpl("sample.contact.Contact", new Long(3)); - ObjectIdentity id4 = new ObjectIdentityImpl("sample.contact.Contact", new Long(4)); - ObjectIdentity id5 = new ObjectIdentityImpl("sample.contact.Contact", new Long(5)); - ObjectIdentity id6 = new ObjectIdentityImpl("sample.contact.Contact", new Long(6)); + ObjectIdentity id1 = new ObjectIdentityImpl("java.lang.Object", new Long(1)); + ObjectIdentity id2 = new ObjectIdentityImpl("java.lang.Object", new Long(2)); + ObjectIdentity id3 = new ObjectIdentityImpl("java.lang.Object", new Long(3)); + ObjectIdentity id4 = new ObjectIdentityImpl("java.lang.Object", new Long(4)); + ObjectIdentity id5 = new ObjectIdentityImpl("java.lang.Object", new Long(5)); + ObjectIdentity id6 = new ObjectIdentityImpl("java.lang.Object", new Long(6)); Map map = jdbcAclService.readAclsById(new ObjectIdentity[] {id1, id2, id3, id4, id5, id6}); Iterator iterator = map.keySet().iterator();