From cb643f73ded4f3b262fa703db7812f9569aa3338 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 7 Oct 2009 21:08:57 +0000
Subject: [PATCH] Tidying up.

---
 .../applicationContext-common-business.xml    | 28 +------------------
 .../src/test/java/DmsIntegrationTests.java    |  4 ---
 .../test/java/SecureDmsIntegrationTests.java  |  4 ---
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/samples/contacts/src/main/resources/applicationContext-common-business.xml b/samples/contacts/src/main/resources/applicationContext-common-business.xml
index f5d36e5b5c..ed5c8cce9e 100644
--- a/samples/contacts/src/main/resources/applicationContext-common-business.xml
+++ b/samples/contacts/src/main/resources/applicationContext-common-business.xml
@@ -27,22 +27,7 @@
     </bean>
 
     <tx:annotation-driven transaction-manager="transactionManager" />
-<!--
-    <bean id="transactionInterceptor" class="org.springframework.transaction.interceptor.TransactionInterceptor">
-        <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>
-        </property>
-    </bean>
- -->
+
     <bean id="dataSourcePopulator" class="sample.contact.DataSourcePopulator">
         <property name="dataSource" ref="dataSource"/>
         <property name="mutableAclService" ref="aclService"/>
@@ -50,17 +35,6 @@
     </bean>
 
     <bean id="contactManager" class="sample.contact.ContactManagerBackend">
-<!--
-       <sec:intercept-methods access-decision-manager-ref="businessAccessDecisionManager">
-           <sec:protect method="sample.contact.ContactManager.create" access="ROLE_USER"/>
-           <sec:protect method="sample.contact.ContactManager.getAllRecipients" access="ROLE_USER"/>
-           <sec:protect method="sample.contact.ContactManager.getAll" access="ROLE_USER,AFTER_ACL_COLLECTION_READ"/>
-           <sec:protect method="sample.contact.ContactManager.getById" access="ROLE_USER,AFTER_ACL_READ"/>
-           <sec:protect method="sample.contact.ContactManager.delete" access="ACL_CONTACT_DELETE"/>
-           <sec:protect method="sample.contact.ContactManager.deletePermission" access="ACL_CONTACT_ADMIN"/>
-           <sec:protect method="sample.contact.ContactManager.addPermission" access="ACL_CONTACT_ADMIN"/>
-       </sec:intercept-methods>
- -->
        <property name="contactDao">
             <bean class="sample.contact.ContactDaoSpring">
                <property name="dataSource" ref="dataSource"/>
diff --git a/samples/dms/src/test/java/DmsIntegrationTests.java b/samples/dms/src/test/java/DmsIntegrationTests.java
index 12f14bb214..ead85272fc 100755
--- a/samples/dms/src/test/java/DmsIntegrationTests.java
+++ b/samples/dms/src/test/java/DmsIntegrationTests.java
@@ -29,10 +29,6 @@ public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContex
     @Autowired
     protected DocumentDao documentDao;
 
-    protected String[] getConfigLocations() {
-        return new String[] {"classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-insecure.xml"};
-    }
-
     @After
     public void clearContext() {
         SecurityContextHolder.clearContext();
diff --git a/samples/dms/src/test/java/SecureDmsIntegrationTests.java b/samples/dms/src/test/java/SecureDmsIntegrationTests.java
index e1d334d9d7..f562ecdfc5 100755
--- a/samples/dms/src/test/java/SecureDmsIntegrationTests.java
+++ b/samples/dms/src/test/java/SecureDmsIntegrationTests.java
@@ -18,10 +18,6 @@ public class SecureDmsIntegrationTests extends DmsIntegrationTests {
 //    @Autowired
 //    private AclService aclService;
 
-    protected String[] getConfigLocations() {
-        return new String[] {"classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-secure.xml"};
-    }
-
     @Test
     public void testBasePopulation() {
         assertEquals(9, jdbcTemplate.queryForInt("select count(id) from DIRECTORY"));