diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml index 25281d537f..83a823f657 100644 --- a/samples/dms/pom.xml +++ b/samples/dms/pom.xml @@ -8,18 +8,38 @@ spring-security-samples 2.0-SNAPSHOT - spring-security-sample-dms - Spring Security - dms sample + spring-security-samples-dms + Spring Security - DMS sample org.springframework.security spring-security-core ${project.version} + + org.springframework + spring-jdbc + + + org.springframework + spring-aop + runtime + org.springframework spring-mock ${spring.version} + + hsqldb + hsqldb + 1.8.0.4 + + + net.sf.ehcache + ehcache + 1.2.4 + runtime + diff --git a/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java b/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java index 26e2552493..975639b374 100755 --- a/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java +++ b/samples/dms/src/main/java/sample/dms/DataSourcePopulator.java @@ -2,13 +2,13 @@ package sample.dms; import javax.sql.DataSource; -import org.acegisecurity.Authentication; -import org.acegisecurity.GrantedAuthority; -import org.acegisecurity.GrantedAuthorityImpl; -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; import org.springframework.beans.factory.InitializingBean; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.security.Authentication; +import org.springframework.security.GrantedAuthority; +import org.springframework.security.GrantedAuthorityImpl; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; @@ -57,15 +57,15 @@ public class DataSourcePopulator implements InitializingBean { template.execute("CREATE TABLE FILE(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY, FILE_NAME VARCHAR_IGNORECASE(50) NOT NULL, CONTENT VARCHAR_IGNORECASE(1024), PARENT_DIRECTORY_ID BIGINT)"); // Populate the authentication and role tables - template.execute("INSERT INTO USERS VALUES('marissa','a564de63c2d0da68cf47586ee05984d7',TRUE);"); + template.execute("INSERT INTO USERS VALUES('rod','a564de63c2d0da68cf47586ee05984d7',TRUE);"); template.execute("INSERT INTO USERS VALUES('dianne','65d15fe9156f9c4bbffd98085992a44e',TRUE);"); template.execute("INSERT INTO USERS VALUES('scott','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); template.execute("INSERT INTO USERS VALUES('peter','22b5c9accc6e1ba628cedc63a72d57f8',FALSE);"); template.execute("INSERT INTO USERS VALUES('bill','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); template.execute("INSERT INTO USERS VALUES('bob','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); template.execute("INSERT INTO USERS VALUES('jane','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);"); - template.execute("INSERT INTO AUTHORITIES VALUES('marissa','ROLE_USER');"); - template.execute("INSERT INTO AUTHORITIES VALUES('marissa','ROLE_SUPERVISOR');"); + template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');"); + template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');"); template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');"); template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');"); template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');"); @@ -74,7 +74,7 @@ public class DataSourcePopulator implements InitializingBean { template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');"); // Now create an ACL entry for the root directory - SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("marissa", "ignored", new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_IGNORED")})); + SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("rod", "ignored", new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_IGNORED")})); tt.execute(new TransactionCallback() { public Object doInTransaction(TransactionStatus arg0) { addPermission(documentDao, Directory.ROOT_DIRECTORY, "ROLE_USER", LEVEL_GRANT_WRITE); @@ -83,7 +83,7 @@ public class DataSourcePopulator implements InitializingBean { }); // Now go off and create some directories and files for our users - createSampleData("marissa", "koala"); + createSampleData("rod", "koala"); createSampleData("dianne", "emu"); createSampleData("scott", "wombat"); } diff --git a/samples/dms/src/main/java/sample/dms/DocumentDaoImpl.java b/samples/dms/src/main/java/sample/dms/DocumentDaoImpl.java index 00e4eb474c..940f3322f7 100755 --- a/samples/dms/src/main/java/sample/dms/DocumentDaoImpl.java +++ b/samples/dms/src/main/java/sample/dms/DocumentDaoImpl.java @@ -4,9 +4,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.acegisecurity.util.FieldUtils; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.support.JdbcDaoSupport; +import org.springframework.security.util.FieldUtils; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; diff --git a/samples/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java b/samples/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java index 65137c8e69..98b6c97cf3 100755 --- a/samples/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java +++ b/samples/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java @@ -2,17 +2,17 @@ package sample.dms.secured; import javax.sql.DataSource; -import org.acegisecurity.acls.MutableAcl; -import org.acegisecurity.acls.MutableAclService; -import org.acegisecurity.acls.NotFoundException; -import org.acegisecurity.acls.Permission; -import org.acegisecurity.acls.domain.BasePermission; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.objectidentity.ObjectIdentityImpl; -import org.acegisecurity.acls.sid.GrantedAuthoritySid; -import org.acegisecurity.acls.sid.PrincipalSid; -import org.acegisecurity.acls.sid.Sid; -import org.acegisecurity.context.SecurityContextHolder; +import org.springframework.security.acls.MutableAcl; +import org.springframework.security.acls.MutableAclService; +import org.springframework.security.acls.NotFoundException; +import org.springframework.security.acls.Permission; +import org.springframework.security.acls.domain.BasePermission; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.objectidentity.ObjectIdentityImpl; +import org.springframework.security.acls.sid.GrantedAuthoritySid; +import org.springframework.security.acls.sid.PrincipalSid; +import org.springframework.security.acls.sid.Sid; +import org.springframework.security.context.SecurityContextHolder; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.util.Assert; diff --git a/samples/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java b/samples/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java index a6effdac99..1d33b0072e 100755 --- a/samples/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java +++ b/samples/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java @@ -3,14 +3,14 @@ package sample.dms.secured; import java.sql.ResultSet; import java.sql.SQLException; -import org.acegisecurity.acls.MutableAcl; -import org.acegisecurity.acls.MutableAclService; -import org.acegisecurity.acls.domain.BasePermission; -import org.acegisecurity.acls.objectidentity.ObjectIdentity; -import org.acegisecurity.acls.objectidentity.ObjectIdentityImpl; -import org.acegisecurity.acls.sid.PrincipalSid; -import org.acegisecurity.context.SecurityContextHolder; import org.springframework.jdbc.core.RowMapper; +import org.springframework.security.acls.MutableAcl; +import org.springframework.security.acls.MutableAclService; +import org.springframework.security.acls.domain.BasePermission; +import org.springframework.security.acls.objectidentity.ObjectIdentity; +import org.springframework.security.acls.objectidentity.ObjectIdentityImpl; +import org.springframework.security.acls.sid.PrincipalSid; +import org.springframework.security.context.SecurityContextHolder; import org.springframework.util.Assert; import sample.dms.AbstractElement; diff --git a/samples/dms/src/main/resources/applicationContext-dms-insecure.xml b/samples/dms/src/main/resources/applicationContext-dms-insecure.xml index a2c866b6e8..157cac802e 100755 --- a/samples/dms/src/main/resources/applicationContext-dms-insecure.xml +++ b/samples/dms/src/main/resources/applicationContext-dms-insecure.xml @@ -9,6 +9,13 @@ + + + + + + + diff --git a/samples/dms/src/main/resources/applicationContext-dms-secure.xml b/samples/dms/src/main/resources/applicationContext-dms-secure.xml index 2279907e02..7d13916f64 100755 --- a/samples/dms/src/main/resources/applicationContext-dms-secure.xml +++ b/samples/dms/src/main/resources/applicationContext-dms-secure.xml @@ -9,6 +9,13 @@ + + + + + + + diff --git a/samples/dms/src/main/resources/applicationContext-dms-shared.xml b/samples/dms/src/main/resources/applicationContext-dms-shared.xml index 27a14e910f..85b2a9971e 100755 --- a/samples/dms/src/main/resources/applicationContext-dms-shared.xml +++ b/samples/dms/src/main/resources/applicationContext-dms-shared.xml @@ -9,15 +9,8 @@ - - - - - - - - + diff --git a/samples/dms/src/test/java/DmsIntegrationTests.java b/samples/dms/src/test/java/DmsIntegrationTests.java index bafeaf09c0..51625cb9ea 100755 --- a/samples/dms/src/test/java/DmsIntegrationTests.java +++ b/samples/dms/src/test/java/DmsIntegrationTests.java @@ -1,5 +1,5 @@ -import org.acegisecurity.context.SecurityContextHolder; -import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.UsernamePasswordAuthenticationToken; import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; import sample.dms.AbstractElement; @@ -20,9 +20,9 @@ public class DmsIntegrationTests extends AbstractTransactionalDataSourceSpringCo return new String[] {"classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-insecure.xml"}; } - public void tearDown() { + protected void onTearDown() throws Exception { SecurityContextHolder.clearContext(); - } + } public void setDocumentDao(DocumentDao documentDao) { this.documentDao = documentDao; @@ -35,7 +35,7 @@ public class DmsIntegrationTests extends AbstractTransactionalDataSourceSpringCo } public void testMarissaRetrieval() { - process("marissa", "koala", false); + process("rod", "koala", false); } public void testScottRetrieval() { diff --git a/samples/dms/src/test/java/SecureDmsIntegrationTests.java b/samples/dms/src/test/java/SecureDmsIntegrationTests.java index 9ab387e145..d9d0c7df90 100755 --- a/samples/dms/src/test/java/SecureDmsIntegrationTests.java +++ b/samples/dms/src/test/java/SecureDmsIntegrationTests.java @@ -1,4 +1,4 @@ -import org.acegisecurity.acls.AclService; +import org.springframework.security.acls.AclService; @@ -31,7 +31,7 @@ public class SecureDmsIntegrationTests extends DmsIntegrationTests { } /* public void testItOut() { - SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("marissa", "password", new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_SUPERVISOR")})); + SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("rod", "password", new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_SUPERVISOR")})); AbstractElement[] elements = documentDao.findElements(Directory.ROOT_DIRECTORY); @@ -43,7 +43,7 @@ public class SecureDmsIntegrationTests extends DmsIntegrationTests { }*/ public void testMarissaRetrieval() { - process("marissa", "koala", true); + process("rod", "koala", true); }