Tidying up.

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"/>

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();

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"));