Removing $Id$ markers and stripping trailing whitespace from the codebase.

samples/contacts/src/main/java/sample/contact/AddDeleteContactController.java

@@ -14,7 +14,6 @@ import org.springframework.web.servlet.ModelAndView;
 /**
  *
  * @author Luke Taylor
- * @version $Id$
  * @since 3.0
  */
 @Controller

samples/contacts/src/main/java/sample/contact/AddPermission.java

@@ -21,7 +21,6 @@ import org.springframework.security.acls.domain.BasePermission;
  * Model object for add permission use case.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public class AddPermission {
     //~ Instance fields ================================================================================================

samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java

@@ -25,7 +25,6 @@ import org.springframework.validation.Validator;
  * Validates {@link AddPermission}.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public class AddPermissionValidator implements Validator {
     //~ Methods ========================================================================================================

samples/contacts/src/main/java/sample/contact/AdminPermissionController.java

@@ -35,7 +35,6 @@ import org.springframework.web.servlet.ModelAndView;
  * permissions for contacts.
  *
  * @author Luke Taylor
- * @version $Id$
  * @since 3.0
  */
 @Controller

samples/contacts/src/main/java/sample/contact/Contact.java

@@ -22,7 +22,6 @@ import java.io.Serializable;
  * Represents a contact.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public class Contact implements Serializable {
     //~ Instance fields ================================================================================================

samples/contacts/src/main/java/sample/contact/ContactDao.java

@@ -22,7 +22,6 @@ import java.util.List;
  * Provides access to the application's persistence layer.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public interface ContactDao {
     //~ Methods ========================================================================================================

samples/contacts/src/main/java/sample/contact/ContactDaoSpring.java

@@ -33,7 +33,6 @@ import javax.sql.DataSource;
  * Base implementation of {@link ContactDao} that uses Spring JDBC services.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public class ContactDaoSpring extends JdbcDaoSupport implements ContactDao {
     //~ Instance fields ================================================================================================

samples/contacts/src/main/java/sample/contact/ContactManager.java

@@ -26,7 +26,6 @@ import java.util.List;
  * Interface for the application's services layer.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public interface ContactManager {
     //~ Methods ========================================================================================================

samples/contacts/src/main/java/sample/contact/ContactManagerBackend.java

@@ -46,7 +46,6 @@ import java.util.Random;
  * Concrete implementation of {@link ContactManager}.
  *
  * @author Ben Alex
- * @version $Id$
  */
 @Transactional
 public class ContactManagerBackend extends ApplicationObjectSupport implements ContactManager, InitializingBean {

samples/contacts/src/main/java/sample/contact/DataSourcePopulator.java

@@ -43,7 +43,6 @@ import org.springframework.util.Assert;
  * Populates the Contacts in-memory database with contact and ACL information.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public class DataSourcePopulator implements InitializingBean {
     //~ Instance fields ================================================================================================

samples/contacts/src/main/java/sample/contact/IndexController.java

@@ -20,7 +20,6 @@ import org.springframework.web.servlet.ModelAndView;
  * Controller which handles simple, single request use cases such as index pages and contact deletion.
  *
  * @author Luke Taylor
- * @version $Id$
  * @since 3.0
  */
 @Controller

samples/contacts/src/main/java/sample/contact/WebContact.java

@@ -19,7 +19,6 @@ package sample.contact;
  * An object that represents user-editable sections of a {@link Contact}.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public class WebContact {
     //~ Instance fields ================================================================================================

samples/contacts/src/main/java/sample/contact/WebContactValidator.java

@@ -23,7 +23,6 @@ import org.springframework.validation.Validator;
  * Validates {@link WebContact}.
  *
  * @author Ben Alex
- * @version $Id$
  */
 public class WebContactValidator implements Validator {
     //~ Methods ========================================================================================================

samples/contacts/src/main/resources/applicationContext-common-authorization.xml

@@ -9,7 +9,6 @@
 <!--
   - Application context containing the ACL beans.
   -
-  - $Id$
   -->
 
   <!-- ========= ACL SERVICE  DEFINITIONS ========= -->

samples/contacts/src/main/resources/applicationContext-common-business.xml

@@ -5,7 +5,6 @@
   -
   - Used by all artifacts.
   -
-  - $Id$
   -->
 
 <beans xmlns="http://www.springframework.org/schema/beans"

samples/contacts/src/main/webapp/WEB-INF/applicationContext-security.xml

@@ -5,7 +5,6 @@
   -
   - Only used by "filter" artifact.
   -
-  - $Id: applicationContext-acegi-security.xml 1425 2006-04-28 06:43:50Z benalex $
   -->
 
 <b:beans xmlns="http://www.springframework.org/schema/security"

samples/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml

@@ -3,7 +3,6 @@
 
 <!--
   - Contacts web application
-  - $Id: remoting-servlet.xml 469 2004-11-20 05:28:20Z benalex $
   -->
 <beans>
 

samples/contacts/src/main/webapp/WEB-INF/web.xml

@@ -3,7 +3,6 @@
 <!--
   - Contacts web application
   -
-  - $Id: web.xml 1741 2006-11-14 03:18:42Z benalex $
   -->
 
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"

samples/contacts/src/test/resources/applicationContext-contacts-test.xml

@@ -4,7 +4,6 @@
   -
   - Only used by unit tests.
   -
-  - $Id$
   -->
 
 <b:beans xmlns="http://www.springframework.org/schema/security"