From cf4072c51700447ce22e5e4ae1b7870f9da2fad3 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sun, 25 May 2008 20:57:07 +0000
Subject: [PATCH] Context file improvements (based on sts suggestions)

---
 ...pplicationContext-common-authorization.xml |  3 +--
 .../applicationContext-common-business.xml    | 20 +++++++++----------
 .../main/webapp/WEB-INF/remoting-servlet.xml  | 17 ++++++----------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/samples/contacts/src/main/resources/applicationContext-common-authorization.xml b/samples/contacts/src/main/resources/applicationContext-common-authorization.xml
index 3d644d68c9..aa361bbc46 100644
--- a/samples/contacts/src/main/resources/applicationContext-common-authorization.xml
+++ b/samples/contacts/src/main/resources/applicationContext-common-authorization.xml
@@ -4,7 +4,7 @@
     xmlns:security="http://www.springframework.org/schema/security"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
+                        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.1.xsd">
 
 <!--
   - Application context containing authentication beans.
@@ -30,7 +30,6 @@
     <property name="staticField" value="org.springframework.security.acls.domain.BasePermission.DELETE"/>
   </bean>
 
-
   <!-- An access decision voter that reads ROLE_* configuration settings -->
   <bean id="roleVoter" class="org.springframework.security.vote.RoleVoter"/>
 
diff --git a/samples/contacts/src/main/resources/applicationContext-common-business.xml b/samples/contacts/src/main/resources/applicationContext-common-business.xml
index bfc10a313c..e26e9feda2 100644
--- a/samples/contacts/src/main/resources/applicationContext-common-business.xml
+++ b/samples/contacts/src/main/resources/applicationContext-common-business.xml
@@ -27,17 +27,17 @@
     </bean>
 
     <bean id="transactionInterceptor" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-    <property name="transactionManager"><ref local="transactionManager"/></property>
+        <property name="transactionManager" ref="transactionManager"/>
 		<property name="transactionAttributeSource">
-      <value>
-        sample.contact.ContactManager.create=PROPAGATION_REQUIRED
-        sample.contact.ContactManager.getAllRecipients=PROPAGATION_REQUIRED,readOnly
-        sample.contact.ContactManager.getAll=PROPAGATION_REQUIRED,readOnly
-        sample.contact.ContactManager.getById=PROPAGATION_REQUIRED,readOnly
-        sample.contact.ContactManager.delete=PROPAGATION_REQUIRED
-        sample.contact.ContactManager.deletePermission=PROPAGATION_REQUIRED
-        sample.contact.ContactManager.addPermission=PROPAGATION_REQUIRED
-      </value>
+	      <value>
+	        sample.contact.ContactManager.create=PROPAGATION_REQUIRED
+	        sample.contact.ContactManager.getAllRecipients=PROPAGATION_REQUIRED,readOnly
+	        sample.contact.ContactManager.getAll=PROPAGATION_REQUIRED,readOnly
+	        sample.contact.ContactManager.getById=PROPAGATION_REQUIRED,readOnly
+	        sample.contact.ContactManager.delete=PROPAGATION_REQUIRED
+	        sample.contact.ContactManager.deletePermission=PROPAGATION_REQUIRED
+	        sample.contact.ContactManager.addPermission=PROPAGATION_REQUIRED
+	      </value>
 		</property>
 	</bean>
 
diff --git a/samples/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml b/samples/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml
index 647b9b6a23..123e95d053 100644
--- a/samples/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml
+++ b/samples/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml
@@ -27,28 +27,23 @@
 	<!-- HTTP invoker exporter for the ContactManager -->
 	<!-- Spring's HTTP invoker uses Java serialization via HTTP  -->
 	<bean name="/ContactManager-httpinvoker" class="org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter">
-		<property name="service"><ref bean="contactManager"/></property>
-		<property name="serviceInterface">
-			<value>sample.contact.ContactManager</value>
-		</property>
+		<property name="service" ref="contactManager"/>
+		<property name="serviceInterface" value="sample.contact.ContactManager"/>
 	</bean>
 
 	<!-- Hessian exporter for the ContactManager -->
 	<!-- Hessian is a slim binary HTTP remoting protocol -->
 	<bean name="/ContactManager-hessian" class="org.springframework.remoting.caucho.HessianServiceExporter">
-		<property name="service"><ref bean="contactManager"/></property>
-		<property name="serviceInterface">
-			<value>sample.contact.ContactManager</value>
+		<property name="service" ref="contactManager"/>
+		<property name="serviceInterface" value="sample.contact.ContactManager"/>
 		</property>
 	</bean>
 
 	<!-- Burlap exporter for the ContactManager -->
 	<!-- Burlap is a slim XML-based HTTP remoting protocol -->
 	<bean name="/ContactManager-burlap" class="org.springframework.remoting.caucho.BurlapServiceExporter">
-		<property name="service"><ref bean="contactManager"/></property>
-		<property name="serviceInterface">
-			<value>sample.contact.ContactManager</value>
-		</property>
+		<property name="service" ref="contactManager"/>
+		<property name="serviceInterface" value="sample.contact.ContactManager"/>
 	</bean>
 
 </beans>