From 6a68a2531c503ba40a8fed7cff5777c84074bf57 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 16 Aug 2008 02:24:32 +0000 Subject: [PATCH] SEC-904: Moved test module out of sandbox --- {sandbox/itest => itest}/context/pom.xml | 0 .../integration/UserDetailsServiceImpl.java | 0 .../security/integration/UserRepository.java | 0 .../integration/SEC933ApplicationContextTests.java | 0 .../integration/SEC936ApplicationContextTests.java | 0 .../security/integration/StubUserRepository.java | 0 .../src/test/resources/sec-933-app-context.xml | 0 .../src/test/resources/sec-936-app-context.xml | 0 {sandbox/itest => itest}/misc/pom.xml | 0 .../misc/src/main/resources/log4j.properties | 0 .../concurrent/SessionRegistryImplMTTests.java | 0 .../context/SecurityContextHolderMTTests.java | 0 {sandbox/itest => itest}/pom.xml | 0 {sandbox/itest => itest}/web/pom.xml | 0 .../web/src/main/resources/log4j.properties | 0 .../web/src/main/resources/test-server.ldif | 0 .../web/src/main/webapp/META-INF/MANIFEST.MF | 0 .../web/src/main/webapp/WEB-INF/custom-filters.xml | 0 .../web/src/main/webapp/WEB-INF/http-security.xml | 0 .../src/main/webapp/WEB-INF/in-memory-provider.xml | 0 .../web/src/main/webapp/WEB-INF/ldap-provider.xml | 0 .../web/src/main/webapp/WEB-INF/web.xml | 0 .../itest => itest}/web/src/main/webapp/login.jsp | 0 .../web/src/main/webapp/secure/index.html | 0 .../web/src/main/webapp/secure/secure1.jsp | 0 .../web/src/main/webapp/secure/secure1body.jsp | 0 .../AbstractWebServerIntegrationTests.java | 0 .../integration/InMemoryProviderWebAppTests.java | 0 .../security/integration/LdapWebAppTests.java | 0 .../main/webapp/WEB-INF/appContext-persistence.xml | 10 ++++------ .../main/webapp/WEB-INF/appContext-security.xml | 14 ++++++++++++-- .../main/webapp/WEB-INF/classes/jdbc.properties | 2 +- 32 files changed, 17 insertions(+), 9 deletions(-) rename {sandbox/itest => itest}/context/pom.xml (100%) rename {sandbox/itest => itest}/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java (100%) rename {sandbox/itest => itest}/context/src/main/java/org/springframework/security/integration/UserRepository.java (100%) rename {sandbox/itest => itest}/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java (100%) rename {sandbox/itest => itest}/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java (100%) rename {sandbox/itest => itest}/context/src/test/java/org/springframework/security/integration/StubUserRepository.java (100%) rename {sandbox/itest => itest}/context/src/test/resources/sec-933-app-context.xml (100%) rename {sandbox/itest => itest}/context/src/test/resources/sec-936-app-context.xml (100%) rename {sandbox/itest => itest}/misc/pom.xml (100%) rename {sandbox/itest => itest}/misc/src/main/resources/log4j.properties (100%) rename {sandbox/itest => itest}/misc/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java (100%) rename {sandbox/itest => itest}/misc/src/test/java/org/springframework/security/context/SecurityContextHolderMTTests.java (100%) rename {sandbox/itest => itest}/pom.xml (100%) rename {sandbox/itest => itest}/web/pom.xml (100%) rename {sandbox/itest => itest}/web/src/main/resources/log4j.properties (100%) rename {sandbox/itest => itest}/web/src/main/resources/test-server.ldif (100%) rename {sandbox/itest => itest}/web/src/main/webapp/META-INF/MANIFEST.MF (100%) rename {sandbox/itest => itest}/web/src/main/webapp/WEB-INF/custom-filters.xml (100%) rename {sandbox/itest => itest}/web/src/main/webapp/WEB-INF/http-security.xml (100%) rename {sandbox/itest => itest}/web/src/main/webapp/WEB-INF/in-memory-provider.xml (100%) rename {sandbox/itest => itest}/web/src/main/webapp/WEB-INF/ldap-provider.xml (100%) rename {sandbox/itest => itest}/web/src/main/webapp/WEB-INF/web.xml (100%) rename {sandbox/itest => itest}/web/src/main/webapp/login.jsp (100%) rename {sandbox/itest => itest}/web/src/main/webapp/secure/index.html (100%) rename {sandbox/itest => itest}/web/src/main/webapp/secure/secure1.jsp (100%) rename {sandbox/itest => itest}/web/src/main/webapp/secure/secure1body.jsp (100%) rename {sandbox/itest => itest}/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java (100%) rename {sandbox/itest => itest}/web/src/test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java (100%) rename {sandbox/itest => itest}/web/src/test/java/org/springframework/security/integration/LdapWebAppTests.java (100%) diff --git a/sandbox/itest/context/pom.xml b/itest/context/pom.xml similarity index 100% rename from sandbox/itest/context/pom.xml rename to itest/context/pom.xml diff --git a/sandbox/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java b/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java similarity index 100% rename from sandbox/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java rename to itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java diff --git a/sandbox/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java b/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java similarity index 100% rename from sandbox/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java rename to itest/context/src/main/java/org/springframework/security/integration/UserRepository.java diff --git a/sandbox/itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java b/itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java similarity index 100% rename from sandbox/itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java rename to itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java diff --git a/sandbox/itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java b/itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java similarity index 100% rename from sandbox/itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java rename to itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java diff --git a/sandbox/itest/context/src/test/java/org/springframework/security/integration/StubUserRepository.java b/itest/context/src/test/java/org/springframework/security/integration/StubUserRepository.java similarity index 100% rename from sandbox/itest/context/src/test/java/org/springframework/security/integration/StubUserRepository.java rename to itest/context/src/test/java/org/springframework/security/integration/StubUserRepository.java diff --git a/sandbox/itest/context/src/test/resources/sec-933-app-context.xml b/itest/context/src/test/resources/sec-933-app-context.xml similarity index 100% rename from sandbox/itest/context/src/test/resources/sec-933-app-context.xml rename to itest/context/src/test/resources/sec-933-app-context.xml diff --git a/sandbox/itest/context/src/test/resources/sec-936-app-context.xml b/itest/context/src/test/resources/sec-936-app-context.xml similarity index 100% rename from sandbox/itest/context/src/test/resources/sec-936-app-context.xml rename to itest/context/src/test/resources/sec-936-app-context.xml diff --git a/sandbox/itest/misc/pom.xml b/itest/misc/pom.xml similarity index 100% rename from sandbox/itest/misc/pom.xml rename to itest/misc/pom.xml diff --git a/sandbox/itest/misc/src/main/resources/log4j.properties b/itest/misc/src/main/resources/log4j.properties similarity index 100% rename from sandbox/itest/misc/src/main/resources/log4j.properties rename to itest/misc/src/main/resources/log4j.properties diff --git a/sandbox/itest/misc/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java b/itest/misc/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java similarity index 100% rename from sandbox/itest/misc/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java rename to itest/misc/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java diff --git a/sandbox/itest/misc/src/test/java/org/springframework/security/context/SecurityContextHolderMTTests.java b/itest/misc/src/test/java/org/springframework/security/context/SecurityContextHolderMTTests.java similarity index 100% rename from sandbox/itest/misc/src/test/java/org/springframework/security/context/SecurityContextHolderMTTests.java rename to itest/misc/src/test/java/org/springframework/security/context/SecurityContextHolderMTTests.java diff --git a/sandbox/itest/pom.xml b/itest/pom.xml similarity index 100% rename from sandbox/itest/pom.xml rename to itest/pom.xml diff --git a/sandbox/itest/web/pom.xml b/itest/web/pom.xml similarity index 100% rename from sandbox/itest/web/pom.xml rename to itest/web/pom.xml diff --git a/sandbox/itest/web/src/main/resources/log4j.properties b/itest/web/src/main/resources/log4j.properties similarity index 100% rename from sandbox/itest/web/src/main/resources/log4j.properties rename to itest/web/src/main/resources/log4j.properties diff --git a/sandbox/itest/web/src/main/resources/test-server.ldif b/itest/web/src/main/resources/test-server.ldif similarity index 100% rename from sandbox/itest/web/src/main/resources/test-server.ldif rename to itest/web/src/main/resources/test-server.ldif diff --git a/sandbox/itest/web/src/main/webapp/META-INF/MANIFEST.MF b/itest/web/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from sandbox/itest/web/src/main/webapp/META-INF/MANIFEST.MF rename to itest/web/src/main/webapp/META-INF/MANIFEST.MF diff --git a/sandbox/itest/web/src/main/webapp/WEB-INF/custom-filters.xml b/itest/web/src/main/webapp/WEB-INF/custom-filters.xml similarity index 100% rename from sandbox/itest/web/src/main/webapp/WEB-INF/custom-filters.xml rename to itest/web/src/main/webapp/WEB-INF/custom-filters.xml diff --git a/sandbox/itest/web/src/main/webapp/WEB-INF/http-security.xml b/itest/web/src/main/webapp/WEB-INF/http-security.xml similarity index 100% rename from sandbox/itest/web/src/main/webapp/WEB-INF/http-security.xml rename to itest/web/src/main/webapp/WEB-INF/http-security.xml diff --git a/sandbox/itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml b/itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml similarity index 100% rename from sandbox/itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml rename to itest/web/src/main/webapp/WEB-INF/in-memory-provider.xml diff --git a/sandbox/itest/web/src/main/webapp/WEB-INF/ldap-provider.xml b/itest/web/src/main/webapp/WEB-INF/ldap-provider.xml similarity index 100% rename from sandbox/itest/web/src/main/webapp/WEB-INF/ldap-provider.xml rename to itest/web/src/main/webapp/WEB-INF/ldap-provider.xml diff --git a/sandbox/itest/web/src/main/webapp/WEB-INF/web.xml b/itest/web/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from sandbox/itest/web/src/main/webapp/WEB-INF/web.xml rename to itest/web/src/main/webapp/WEB-INF/web.xml diff --git a/sandbox/itest/web/src/main/webapp/login.jsp b/itest/web/src/main/webapp/login.jsp similarity index 100% rename from sandbox/itest/web/src/main/webapp/login.jsp rename to itest/web/src/main/webapp/login.jsp diff --git a/sandbox/itest/web/src/main/webapp/secure/index.html b/itest/web/src/main/webapp/secure/index.html similarity index 100% rename from sandbox/itest/web/src/main/webapp/secure/index.html rename to itest/web/src/main/webapp/secure/index.html diff --git a/sandbox/itest/web/src/main/webapp/secure/secure1.jsp b/itest/web/src/main/webapp/secure/secure1.jsp similarity index 100% rename from sandbox/itest/web/src/main/webapp/secure/secure1.jsp rename to itest/web/src/main/webapp/secure/secure1.jsp diff --git a/sandbox/itest/web/src/main/webapp/secure/secure1body.jsp b/itest/web/src/main/webapp/secure/secure1body.jsp similarity index 100% rename from sandbox/itest/web/src/main/webapp/secure/secure1body.jsp rename to itest/web/src/main/webapp/secure/secure1body.jsp diff --git a/sandbox/itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java b/itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java similarity index 100% rename from sandbox/itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java rename to itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java diff --git a/sandbox/itest/web/src/test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java b/itest/web/src/test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java similarity index 100% rename from sandbox/itest/web/src/test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java rename to itest/web/src/test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java diff --git a/sandbox/itest/web/src/test/java/org/springframework/security/integration/LdapWebAppTests.java b/itest/web/src/test/java/org/springframework/security/integration/LdapWebAppTests.java similarity index 100% rename from sandbox/itest/web/src/test/java/org/springframework/security/integration/LdapWebAppTests.java rename to itest/web/src/test/java/org/springframework/security/integration/LdapWebAppTests.java diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml index f72dbb83a4..d60db8031c 100755 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml @@ -16,18 +16,16 @@ - + - - - + - - + + diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml index 2c7059f88b..c7cc0c6d9b 100755 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml @@ -9,14 +9,24 @@ + - + + + - + + + diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/jdbc.properties b/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/jdbc.properties index 9a111d07db..94b3759502 100755 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/jdbc.properties +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/classes/jdbc.properties @@ -3,6 +3,6 @@ jpa.generateDdl=true jpa.showSql=true jdbc.driver=org.hsqldb.jdbcDriver -jdbc.url=jdbc:hsqldb:res:/database/heavyduty +jdbc.url=jdbc:hsqldb:mem:heavyduty jdbc.username=sa jdbc.password= \ No newline at end of file