SEC-709

cleaned up remains of CAS2 component

cas/cas-adapter/pom.xml

@@ -88,20 +88,11 @@
 		</exclusion>
 	</exclusions>
     </dependency>
-    <dependency>
-      <groupId>cas</groupId>
-      <artifactId>cas</artifactId>
-      <version>2.0.12</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-    </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-jdbc</artifactId>

cas/cas-adapter/src/main/resources/org/springframework/security/adapters/cas/applicationContext.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Demonstration of the applicationContext.xml that should be placed in
- * CAS' WEB-INF directory. Note the CasPasswordHandler bean.
- * 
- * $Id$
--->
-
-<beans>
-
-	<!-- Data access object which stores authentication information -->
-	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				rod=koala,ROLES_IGNORED_BY_CAS
-				dianne=emu,ROLES_IGNORED_BY_CAS
-				scott=wombat,ROLES_IGNORED_BY_CAS
-				peter=opal,disabled,ROLES_IGNORED_BY_CAS
-			</value>
-		</property>
-	</bean>
-	
-	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
-     	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
-	</bean>
-
-	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
-		<property name="providers">
-		  <list>
-		    <ref bean="daoAuthenticationProvider"/>
-		  </list>
-		</property>
-	</bean>
-
-	<bean id="casPasswordHandler" class="org.springframework.security.adapters.cas.CasPasswordHandler">
-		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
-	</bean>
-</beans>

cas/cas-adapter/src/test/java/org/springframework/security/adapters/cas3/CasAuthenticationHandlerTests.java

@@ -38,7 +38,7 @@ public class CasAuthenticationHandlerTests extends AbstractDependencyInjectionSp
     //~ Methods ========================================================================================================
 
     protected String[] getConfigLocations() {
-        return new String[] {"/org/springframework/security/adapters/cas/applicationContext-valid.xml"};
+        return new String[] {"/org/springframework/security/adapters/cas3/applicationContext-valid.xml"};
     }
 
     private UsernamePasswordCredentials getCredentialsFor(final String username, final String password) {

cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas/applicationContext-invalid.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- * Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Id$
--->
-
-<beans>
-
-	<bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl">
-  		<property name="userMap">
-			<value>
-				rod=koala,ROLE_TELLER,ROLE_SUPERVISOR
-				dianne=emu,ROLE_TELLER
-				scott=wombat,ROLE_TELLER
-				peter=opal,disabled,ROLE_TELLER
-			</value>
-		</property>
-	</bean>
-	
-	<bean id="daoAuthenticationProvider" class="org.springframework.security.providers.dao.DaoAuthenticationProvider">
-     	<property name="userDetailsService"><ref bean="inMemoryDaoImpl"/></property>
- 	</bean>
-
-	<bean id="authenticationManager" class="org.springframework.security.providers.ProviderManager">
-		<property name="providers">
-		  <list>
-		    <ref bean="daoAuthenticationProvider"/>
-		  </list>
-		</property>
-	</bean>
-
-	<!-- No CasPasswordHandler -->
-</beans>

cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas/applicationContext-valid.xml → cas/cas-adapter/src/test/resources/org/springframework/security/adapters/cas3/applicationContext-valid.xml

@@ -42,8 +42,4 @@
 		  </list>
 		</property>
 	</bean>
-
-	<bean id="casPasswordHandler" class="org.springframework.security.adapters.cas.CasPasswordHandler">
-		<property name="authenticationManager"><ref bean="authenticationManager"/></property>
-	</bean>
 </beans>