diff --git a/sandbox/portlet/pom.xml b/portlet/pom.xml
similarity index 100%
rename from sandbox/portlet/pom.xml
rename to portlet/pom.xml
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java b/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java
rename to portlet/src/main/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptor.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationProvider.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthenticationToken.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/PortletAuthoritiesPopulator.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/UserCache.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCache.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/cache/NullUserCache.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/package.html b/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/package.html
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/cache/package.html
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/cache/package.html
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/package.html b/portlet/src/main/java/org/acegisecurity/providers/portlet/package.html
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/package.html
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/package.html
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulator.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java b/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulator.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/package.html b/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/package.html
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/providers/portlet/populator/package.html
rename to portlet/src/main/java/org/acegisecurity/providers/portlet/populator/package.html
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java b/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java
rename to portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPoint.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java b/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java
rename to portlet/src/main/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptor.java
diff --git a/sandbox/portlet/src/main/java/org/acegisecurity/ui/portlet/package.html b/portlet/src/main/java/org/acegisecurity/ui/portlet/package.html
similarity index 100%
rename from sandbox/portlet/src/main/java/org/acegisecurity/ui/portlet/package.html
rename to portlet/src/main/java/org/acegisecurity/ui/portlet/package.html
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java b/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java
rename to portlet/src/test/java/org/acegisecurity/context/PortletSessionContextIntegrationInterceptorTests.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java
rename to portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationProviderTests.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java
rename to portlet/src/test/java/org/acegisecurity/providers/portlet/PortletAuthenticationTokenTests.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java
rename to portlet/src/test/java/org/acegisecurity/providers/portlet/PortletTestUtils.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java
rename to portlet/src/test/java/org/acegisecurity/providers/portlet/cache/EhCacheBasedUserCacheTests.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java
rename to portlet/src/test/java/org/acegisecurity/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java b/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java
rename to portlet/src/test/java/org/acegisecurity/providers/portlet/populator/DaoPortletAuthoritiesPopulatorTests.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java b/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java
rename to portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingFilterEntryPointTests.java
diff --git a/sandbox/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java b/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java
similarity index 100%
rename from sandbox/portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java
rename to portlet/src/test/java/org/acegisecurity/ui/portlet/PortletProcessingInterceptorTests.java