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 @@
   
   <bean id="AllPropertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <property name="location" value="classpath:jdbc.properties"/>
-  </bean>
+  </bean>
 
   <tx:annotation-driven transaction-manager="transactionManager" />
 
   <bean id="userDAO" class="sample.dao.impl.UserDAOImpl"/>
   
-  <bean id="daoUserService" class="sample.service.impl.UserServiceImpl">
-    <property name="userDAO" ref="userDAO"/>
-  </bean>
+  <bean id="daoUserService" class="sample.service.impl.UserServiceImpl"/>
 
-  <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor">
-    <!--  property name="order" value="0"/ -->
+  <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor">
+    <!--  property name="order" value="0"/ -->
   </bean>
   
   <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
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 @@
 <b:beans xmlns="http://www.springframework.org/schema/security"
     xmlns:b="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+						http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
                         http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.2.xsd">
 
     <!--b:import resource="appContext-misc.xml"/-->
+	<context:component-scan base-package='sample'/>
     
-	<!-- global-method-security secured-annotations="enabled" access-decision-manager-ref="methodAccessMgr"/ -->
+	<global-method-security secured-annotations="enabled" access-decision-manager-ref="methodAccessMgr">
+		<protect-pointcut expression="execution(* sample.service.UserService+.*(..))"
+					access="ROLE_LOGGEDIN" />
+	</global-method-security>
 	
-	<b:bean id="methodAccessmanager" class="org.springframework.security.vote.AffirmativeBased">
+	<aop:aspectj-autoproxy/>
+	
+	<b:bean id="methodAccessMgr" class="org.springframework.security.vote.AffirmativeBased">
 	   <b:property name="decisionVoters">
 	       <b:list>
 	           <b:bean class="sample.TestVoter"/>
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