SEC-562: Other pepackaging (apart from adapters which are currently broken svn-wise).

pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.acegisecurity</groupId>
-	<artifactId>acegi-security-parent</artifactId>
+	<groupId>org.springframework.security</groupId>
+	<artifactId>spring-security-parent</artifactId>
 	<version>2.0-SNAPSHOT</version>
 	<name>Acegi Security</name>
 	<packaging>pom</packaging>
@@ -15,7 +15,7 @@
         <module>ntlm</module>
     </modules>
 
-	<description>Acegi Security System for Spring</description>
+	<description>Spring Security</description>
 	<organization>
 		<name>Interface21, Inc</name>
 		<url>http://sourceforge.net/projects/acegisecurity</url>

src/site/apt/petclinic-tutorial.apt

@@ -20,7 +20,7 @@ Tutorial: Adding Security to Spring Petclinic
     You will also need to download:
 
     * Spring 2.0 M4 with dependencies ZIP file
-    
+
     * Acegi Security 1.0.2
 
 
@@ -57,10 +57,10 @@ copy %acegi%\WEB-INF\lib\commons-codec-1.3.jar %spring%\samples\petclinic\war\WE
 
 <filter>
   <filter-name>Acegi Filter Chain Proxy</filter-name>
-  <filter-class>org.acegisecurity.util.FilterToBeanProxy</filter-class>
+  <filter-class>org.springframework.security.util.FilterToBeanProxy</filter-class>
   <init-param>
     <param-name>targetClass</param-name>
-    <param-value>org.acegisecurity.util.FilterChainProxy</param-value>
+    <param-value>org.springframework.security.util.FilterChainProxy</param-value>
   </init-param>
 </filter>
 
@@ -118,7 +118,7 @@ copy %acegi%\WEB-INF\lib\commons-codec-1.3.jar %spring%\samples\petclinic\war\WE
 * Start Petclinic's database
 
     Start the Hypersonic server (this is just normal Petclinic configuration):
-    
+
 +------------------------------------------------------
 cd %spring%\samples\petclinic\db\hsqldb
 server
@@ -164,15 +164,15 @@ copy dist\petclinic.war %TOMCAT_HOME%\webapps
 
 +------------------------------------------------------
 
-<bean id="methodSecurityInterceptor" class="org.acegisecurity.intercept.method.aopalliance.MethodSecurityInterceptor">
+<bean id="methodSecurityInterceptor" class="org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor">
   <property name="authenticationManager" ref bean="authenticationManager"/>
   <property name="accessDecisionManager">
-    <bean class="org.acegisecurity.vote.AffirmativeBased">
+    <bean class="org.springframework.security.vote.AffirmativeBased">
       <property name="allowIfAllAbstainDecisions" value="false"/>
       <property name="decisionVoters">
         <list>
-          <bean class="org.acegisecurity.vote.RoleVoter"/>
-          <bean class="org.acegisecurity.vote.AuthenticatedVoter"/>
+          <bean class="org.springframework.security.vote.RoleVoter"/>
+          <bean class="org.springframework.security.vote.AuthenticatedVoter"/>
         </list>
       </property>
     </bean>
@@ -203,7 +203,7 @@ copy dist\petclinic.war %TOMCAT_HOME%\webapps
 +------------------------------------------------------
 
     Next, scroll down and find the link to "add visit". Modify it as follows:
-    
+
 +------------------------------------------------------
 
 <authz:authorize ifAllGranted="ROLE_SUPERVISOR">

src/site/resources/dbinit.txt

@@ -76,12 +76,12 @@ CREATE TABLE acl_permission (
 ---           scott             Administer (overrides parent #3)
 ---------------------------------------------------------------------
 
-INSERT INTO acl_object_identity VALUES (1, 'org.acegisecurity.acl.DomainObject:1', null, 'org.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (2, 'org.acegisecurity.acl.DomainObject:2', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (3, 'org.acegisecurity.acl.DomainObject:3', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (4, 'org.acegisecurity.acl.DomainObject:4', 1, 'org.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (5, 'org.acegisecurity.acl.DomainObject:5', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
-INSERT INTO acl_object_identity VALUES (6, 'org.acegisecurity.acl.DomainObject:6', 3, 'org.acegisecurity.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (1, 'org.springframework.security.acl.DomainObject:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (2, 'org.springframework.security.acl.DomainObject:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (3, 'org.springframework.security.acl.DomainObject:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (4, 'org.springframework.security.acl.DomainObject:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (5, 'org.springframework.security.acl.DomainObject:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
+INSERT INTO acl_object_identity VALUES (6, 'org.springframework.security.acl.DomainObject:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');
 
 INSERT INTO acl_permission VALUES (null, 1, 'ROLE_SUPERVISOR', 1);
 INSERT INTO acl_permission VALUES (null, 2, 'ROLE_SUPERVISOR', 0);

src/site/site.xml

@@ -56,11 +56,11 @@
       <item name="Upgrading to 0.9.0" href="upgrade/upgrade-080-090.html"/>
       <item name="Upgrading to 0.8.0" href="upgrade/upgrade-070-080.html"/>
       <item name="Core JavaDocs" href="acegi-security/apidocs/index.html" target="_blank"/>
-      <item name="Contacts HTTPS" href="acegi-security-samples/acegi-security-samples-contacts/sslhowto.txt"/>
+      <item name="Contacts HTTPS" href="spring-security-samples/spring-security-samples-contacts/sslhowto.txt"/>
       <item name="Project Policies" href="policies.html"/>
       <item name="Acegi Security JIRA" href="http://opensource.atlassian.com/projects/spring/secure/BrowseProject.jspa?id=10040"/>
       <item name="Support Forum" href="http://forum.springframework.org/forumdisplay.php?f=33"/>
-      <item name="Core Reports" href="acegi-security/project-reports.html"/>
+      <item name="Core Reports" href="spring-security/project-reports.html"/>
     </menu>
 
     <menu name="Links" type="footer">

src/site/xdoc/upgrade/upgrade-090-100.xml

@@ -5,7 +5,8 @@ applications:
 </p></section><section name="Changes 0.9.0 to RC1"><ul>
 
 <li>The top level package name has changed. Simply find "net.sf.acegisecurity" and replace with
-"org.acegisecurity".</li>
+    "org.springframework.security".
+</li>
 
 <li>
 DaoAuthenticationProvider has a property, authenticationDao. This property should now be renamed to
@@ -17,8 +18,9 @@ In JSPs, each "authz" taglib prefix must be changed from uri="http://acegisecuri
 to uri="http://acegisecurity.org/authz".
 </li>
 
-<li>net.sf.acegisecurity.providers.dao.AuthenticationDao is now org.acegisecurity.userdetails.UserDetailsService.
-The interface signature has not changed. Similarly, User and UserDetails have moved into the latter's package as well.
+<li>net.sf.acegisecurity.providers.dao.AuthenticationDao is now
+    org.springframework.security.userdetails.UserDetailsService.
+    The interface signature has not changed. Similarly, User and UserDetails have moved into the latter's package as well.
 If you've implemented your own AuthenticationDao, you'll need to change the class it's implementing and quite likely
 the import packages for User and UserDetails. In addition, if using JdbcDaoImpl or InMemoryDaoImpl please
 note they have moved to this new package.</li>
@@ -35,18 +37,18 @@ so that we can include it in future Acegi Security releases.</li>
 </ul></section><section name="Changes RC1 to RC2"><ul>
 
 <li>
-org.acegisecurity.ui.rememberme.RememberMeProcessingFilter now requires an authenticationManager property. This will generally
-point to an implementation of org.acegisecurity.providers.ProviderManager.
+    org.springframework.security.ui.rememberme.RememberMeProcessingFilter now requires an authenticationManager property. This will generally
+point to an implementation of org.springframework.security.providers.ProviderManager.
 </li>
 
 <li>
-org.acegisecurity.intercept.web.AuthenticationEntryPoint has moved to a new location,
-org.acegisecurity.ui.AuthenticationEntryPoint.
+    org.springframework.security.intercept.web.AuthenticationEntryPoint has moved to a new location,
+    org.springframework.security.ui.AuthenticationEntryPoint.
 </li>
 
 <li>
-org.acegisecurity.intercept.web.SecurityEnforcementFilter has moved to a new location and name,
-org.acegisecurity.ui.ExceptionTranslationFilter. In addition, the "filterSecurityInterceptor"
+    org.springframework.security.intercept.web.SecurityEnforcementFilter has moved to a new location and name,
+    org.springframework.security.ui.ExceptionTranslationFilter. In addition, the "filterSecurityInterceptor"
 property on the old SecurityEnforcementFilter class has been removed. This is because
 SecurityEnforcementFilter will no longer delegate to FilterSecurityInterceptor as it has in the
 past. Because this delegation feature has been removed (see SEC-144 for a background as to why),
@@ -82,8 +84,9 @@ new AccessDeniedHandler instead if custom handling is required.
 There have been some changes to the LDAP provider APIs to allow for future improvements, as detailed in
 <a href="http://opensource.atlassian.com/projects/spring/browse/SEC-264">SEC-264</a>. These
 should only affect users who have written their own extensions to the provider. The general LDAP
-classes are now in the packages org.acegisecurity.ldap and the org.acegisecurity.userdetails.ldap
-package has been introduced. The search and authentication classes now return an
+classes are now in the packages org.springframework.security.ldap and the
+    org.springframework.security.userdetails.ldap
+    package has been introduced. The search and authentication classes now return an
 <a href="../multiproject/acegi-security/apidocs/org/acegisecurity/userdetails/ldap/LdapUserDetails.html">LdapUserDetails</a>
 instance. The LdapAuthoritiesPopulator interface and its default implementation now both make use of
 LdapUserDetails. Any customized versions should be updated to use the new method signatures.