Added log4j dependency

acl/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-acl</artifactId>
     <name>Spring Security - ACL module</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
 
     <dependencies>
         <dependency>

adapters/catalina/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
   </parent>
   <artifactId>spring-security-catalina</artifactId>
   <name>Spring Security - Catalina adapter</name>

adapters/jboss/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
   </parent>
   <artifactId>spring-security-jboss</artifactId>
   <name>Spring Security - JBoss adapter</name>

adapters/jetty/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
   </parent>
   <artifactId>spring-security-jetty</artifactId>
   <name>Spring Security - Jetty adapter</name>

adapters/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
   </parent>
   <artifactId>spring-security-adapters</artifactId>
   <name>Spring Security - Adapters</name>

adapters/resin/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
   </parent>
   <artifactId>spring-security-resin</artifactId>
   <name>Spring Security - Resin adapter</name>

cas/pom.xml

@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <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>
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <artifactId>spring-security-cas-client</artifactId>
     <name>Spring Security - CAS support</name>
@@ -19,25 +18,25 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-dao</artifactId>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
-        </dependency>        
+        </dependency>        
-        <dependency>
+        <dependency>
-            <groupId>org.springframework</groupId>
+            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-mock</artifactId>
-            <optional>true</optional>
+            <optional>true</optional>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>org.jasig.cas</groupId>
+            <groupId>org.jasig.cas</groupId>
-            <artifactId>cas-client-core</artifactId>
+            <artifactId>cas-client-core</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.1</version>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>net.sf.ehcache</groupId>
+            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
+            <artifactId>ehcache</artifactId>
-            <optional>true</optional>
+            <optional>true</optional>
         </dependency>
     </dependencies>
-</project>
+</project>

core-tiger/pom.xml

@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <packaging>bundle</packaging>    
     <artifactId>spring-security-core-tiger</artifactId>
@@ -79,6 +78,7 @@
                             *;resolution:=optional
                         </Import-Package>
                     </instructions>
+                    <excludeDependencies>true</excludeDependencies>
                 </configuration>
             </plugin>
         </plugins>

core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <packaging>bundle</packaging>
     <artifactId>spring-security-core</artifactId>

core/src/main/java/org/springframework/security/config/PasswordEncoderParser.java

@@ -64,7 +64,7 @@ public class PasswordEncoderParser {
         boolean useBase64 = false;
         
         if (StringUtils.hasText(element.getAttribute(ATT_BASE_64))) {
-            useBase64 = Boolean.parseBoolean(element.getAttribute(ATT_BASE_64));
+            useBase64 = new Boolean(element.getAttribute(ATT_BASE_64)).booleanValue();
         }
 
         String ref = element.getAttribute(ATT_REF);

core/src/main/java/org/springframework/security/intercept/method/ProtectPointcutPostProcessor.java

@@ -49,6 +49,7 @@ import org.springframework.util.Assert;
  *
  * @author Ben Alex
  * @verion $Id$
+ * @since 2.0
  *
  */
 public final class ProtectPointcutPostProcessor implements BeanPostProcessor {
@@ -88,7 +89,7 @@ public final class ProtectPointcutPostProcessor implements BeanPostProcessor {
 		try {
 			methods = bean.getClass().getMethods();
 		} catch (Exception e) {
-			throw new IllegalStateException(e);
+			throw new IllegalStateException(e.getMessage());
 		}
 		
 		// Check to see if any of those methods are compatible with our pointcut expressions

core/src/main/java/org/springframework/security/providers/encoding/Md4PasswordEncoder.java

@@ -51,7 +51,7 @@ public class Md4PasswordEncoder extends BaseDigestPasswordEncoder {
 		try {
 			passBytes = saltedPass.getBytes("UTF-8");
 		} catch (UnsupportedEncodingException e) {
-			throw new IllegalStateException("UTF-8 not supported!", e);
+			throw new IllegalStateException("UTF-8 not supported!");
 		}
 		
 		Md4 md4 = new Md4();

core/src/main/java/org/springframework/security/providers/ldap/authenticator/LdapShaPasswordEncoder.java

@@ -85,9 +85,9 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
             sha = MessageDigest.getInstance("SHA");
             sha.update(rawPass.getBytes("UTF-8"));
         } catch (java.security.NoSuchAlgorithmException e) {
-            throw new IllegalStateException("No SHA implementation available!", e);
+            throw new IllegalStateException("No SHA implementation available!");
 		} catch (UnsupportedEncodingException ue) {
-			throw new IllegalStateException("UTF-8 not supported!", ue);
+			throw new IllegalStateException("UTF-8 not supported!");
 		}
 
         if (salt != null) {

ntlm/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.springframework.security</groupId>
 		<artifactId>spring-security-parent</artifactId>
-		<version>2.0-SNAPSHOT</version>
+		<version>2.0.0-RC1</version>
 	</parent>
 	<packaging>jar</packaging>
 	<artifactId>spring-security-ntlm</artifactId>

openid/pom.xml

@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <artifactId>spring-security-openid</artifactId>
     <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
     <packaging>jar</packaging>
 
     <dependencies>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
     <name>Spring Security</name>
     <packaging>pom</packaging>
 
@@ -38,9 +38,9 @@
 
     <!-- Note when doing releases: tagBase is set in release plugin configuration below -->
     <scm>
-        <connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk</connection>
+        <connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/tags/release_2_0_0_RC1</connection>
-        <developerConnection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk</developerConnection>
+        <developerConnection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/tags/release_2_0_0_RC1</developerConnection>
-        <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/trunk/</url>
+        <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/tags/release_2_0_0_RC1</url>
     </scm>
 
     <issueManagement>
@@ -433,20 +433,19 @@
                     <postProcess>
                         <copy todir="target/site/reference">
                             <fileset dir="target/docbkx">
-                                <include name="**/*.html"/>
+                                <include name="**/*.html" />
-                                <include name="**/*.pdf"/>
+                                <include name="**/*.pdf" />
                             </fileset>
                         </copy>
                         <copy todir="target/site/reference/html">
                             <fileset dir="src/docbkx/resources">
-                                <include name="**/*.css"/>
+                                <include name="**/*.css" />
-                                <include name="**/*.png"/>
+                                <include name="**/*.png" />
-                                <include name="**/*.gif"/>
+                                <include name="**/*.gif" />
-                                <include name="**/*.jpg"/>
+                                <include name="**/*.jpg" />
                             </fileset>
                         </copy>
-                        <move file="target/site/reference/pdf/index.pdf"
+                        <move file="target/site/reference/pdf/index.pdf" tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false" />
-                              tofile="target/site/reference/pdf/spring-ws-reference.pdf" failonerror="false"/>
                     </postProcess>
                 </configuration>
                 

portlet/pom.xml

@@ -3,18 +3,18 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <artifactId>spring-security-portlet</artifactId>
     <name>Spring Security - Portlet support</name>
     <description>Spring Security - Support for JSR 168 Portlets</description>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <version>2.0.0-RC1</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

readme.txt

@@ -10,21 +10,16 @@ Spring Security provides security services for
 The Spring Framework (http://www.springframework.org).
 
 For a detailed list of features and access to the latest release, please visit
-http://acegisecurity.org.
+http://www.springframework.org/projects/.
 
--------------------------------------------------------------------------------
-SIGNED JAR FILES
--------------------------------------------------------------------------------
-
-JAR files are no longer signed. They were signed in releases 1.0.0 and earlier.
 
 -------------------------------------------------------------------------------
 BUILDING
 -------------------------------------------------------------------------------
 
 Spring Security is built using Maven. Please read the "Building" page
-at http://acegisecurity.org. This page is also included in the /docs directory
+at http://static.springframework.org/spring-security/site/building.html. 
-of official release ZIPs.
+This page is also included in the /docs directory of official release ZIPs.
 
 -------------------------------------------------------------------------------
 QUICK START

samples/contacts/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <artifactId>spring-security-samples-contacts</artifactId>
     <name>Spring Security - Contacts sample</name>
@@ -76,6 +76,11 @@
             <artifactId>hessian</artifactId>
             <version>3.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -100,4 +105,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

samples/dms/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <artifactId>spring-security-samples-dms</artifactId>
     <name>Spring Security - DMS sample</name>

samples/ldap/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-ldap</artifactId>

samples/openid/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-openid</artifactId>

samples/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples</artifactId>

samples/portlet/pom.xml

@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<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">
-<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>
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-portlet</artifactId>
@@ -106,4 +102,4 @@
 			-->
 		</plugins>
 	</build>
-</project>
+</project>

samples/preauth/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-preauth</artifactId>

samples/tutorial/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-tutorial</artifactId>

src/site/apt/svn-usage.apt

@@ -37,7 +37,7 @@ Subversion Usage
 
 * Nightly Snapshots
 
-    If you'd prefer not to use the subversion client directly, please see our {{{"downloads.html"}downloads page}} for
+    If you'd prefer not to use the subversion client directly, please see our {{{downloads.html}downloads page}} for
     nightly snapshots. Note that these are taken from the trunk and may not be suitable for new users.
 
 

taglibs/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.0.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-taglibs</artifactId>
     <name>Spring Security - JSP taglibs</name>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0.0-RC1</version>
     <packaging>jar</packaging>
 
     <dependencies>