From be72ed13503f86bafb9d68525b60df85aa635116 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 6 Jan 2010 22:21:34 +0000
Subject: [PATCH] Remove commented out beans from contacts sample app context.

These were left when the app was updated to use Spring MVC @Controller syntax and scanning.
---
 .../main/webapp/WEB-INF/contacts-servlet.xml  | 61 -------------------
 1 file changed, 61 deletions(-)

diff --git a/samples/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml b/samples/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml
index 9a3bfb604f..936f16d246 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml
@@ -11,68 +11,7 @@
     <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
         <property name="basename" value="messages"/>
     </bean>
-<!--
-  <bean id="publicIndexController" class="sample.contact.PublicIndexController">
-    <property name="contactManager" ref="contactManager"/>
-  </bean>
 
-  <bean id="secureIndexController" class="sample.contact.SecureIndexController">
-    <property name="contactManager" ref="contactManager"/>
-    <property name="permissionEvaluator" ref="permissionEvaluator" />
-  </bean>
-
-  <bean id="secureDeleteController" class="sample.contact.DeleteController">
-    <property name="contactManager" ref="contactManager"/>
-  </bean>
-
-  <bean id="adminPermissionController" class="sample.contact.AdmnPermissionController">
-    <property name="contactManager" ref="contactManager"/>
-    <property name="aclService" ref="aclService"/>
-  </bean>
-
-  <bean id="deletePermissionController" class="sample.contact.DeletePermissionController">
-    <property name="contactManager" ref="contactManager"/>
-    <property name="aclService" ref="aclService"/>
-  </bean>
-
-  <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-    <property name="mappings">
-      <props>
-        <prop key="/hello.htm">publicIndexController</prop>
-        <prop key="/secure/add.htm">secureAddForm</prop>
-        <prop key="/secure/index.htm">secureIndexController</prop>
-        <prop key="/secure/del.htm">secureDeleteController</prop>
-        <prop key="/secure/adminPermission.htm">adminPermissionController</prop>
-        <prop key="/secure/deletePermission.htm">deletePermissionController</prop>
-        <prop key="/secure/addPermission.htm">addPermissionForm</prop>
-      </props>
-    </property>
-  </bean>
-
-  <bean id="secureAddForm" class="sample.contact.WebContactAddController">
-    <property name="sessionForm" value="true"/>
-    <property name="commandName" value="webContact"/>
-    <property name="commandClass" value="sample.contact.WebContact"/>
-    <property name="validator">
-      <bean id="addValidator" class="sample.contact.WebContactValidator"/>
-    </property>
-    <property name="formView" value="add"/>
-    <property name="successView" value="index.htm"/>
-    <property name="contactManager" ref="contactManager"/>
-  </bean>
-
-  <bean id="addPermissionForm" class="sample.contact.AddPermissionController">
-    <property name="sessionForm" value="true"/>
-    <property name="commandName" value="addPermission"/>
-    <property name="commandClass" value="sample.contact.AddPermission"/>
-    <property name="validator">
-      <bean id="addPermissionValidator" class="sample.contact.AddPermissionValidator"/>
-    </property>
-    <property name="formView" value="addPermission"/>
-    <property name="successView" value="index.htm"/>
-    <property name="contactManager" ref="contactManager"/>
-  </bean>
- -->
     <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="prefix" value="/WEB-INF/jsp/"/>
         <property name="suffix" value=".jsp"/>