1. 13 May, 2013 1 commit
  2. 18 Apr, 2013 1 commit
    • Marvin S. Addison's avatar
      Merge branch 'master' of github.com:Jasig/cas into feature-new-authn-api · 1c6eddbe
      Marvin S. Addison authored
      Conflicts:
      	cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationService.java
      	cas-server-core/src/main/java/org/jasig/cas/CentralAuthenticationServiceImpl.java
      	cas-server-core/src/main/java/org/jasig/cas/authentication/AbstractAuthenticationManager.java
      	cas-server-core/src/main/java/org/jasig/cas/authentication/AuthenticationManagerImpl.java
      	cas-server-core/src/main/java/org/jasig/cas/authentication/DirectMappingAuthenticationManagerImpl.java
      	cas-server-core/src/main/java/org/jasig/cas/authentication/LinkedAuthenticationHandlerAndCredentialsToPrincipalResolverAuthenticationManager.java
      	cas-server-core/src/main/java/org/jasig/cas/authentication/handler/AuthenticationHandler.java
      	cas-server-core/src/main/java/org/jasig/cas/remoting/server/RemoteCentralAuthenticationService.java
      	cas-server-core/src/main/java/org/jasig/cas/web/flow/AuthenticationViaFormAction.java
      	cas-server-core/src/test/java/org/jasig/cas/CentralAuthenticationServiceImplTests.java
      	cas-server-core/src/test/java/org/jasig/cas/authentication/AuthenticationManagerImplTests.java
      	cas-server-core/src/test/java/org/jasig/cas/authentication/handler/support/SimpleTestUsernamePasswordAuthenticationHandler.java
      	cas-server-core/src/test/java/org/jasig/cas/authentication/handler/support/SimpleTestUsernamePasswordHandlerTests.java
      	cas-server-core/src/test/java/org/jasig/cas/remoting/server/RemoteCentralAuthenticationServiceTests.java
      	cas-server-core/src/test/resources/core-context.xml
      	cas-server-integration-restlet/src/main/java/org/jasig/cas/integration/restlet/TicketResource.java
      	cas-server-support-ldap/src/main/resources/deployerConfigContext.xml
      	cas-server-support-openid/src/test/java/org/jasig/cas/support/openid/web/flow/OpenIdSingleSignOnActionTests.java
      	cas-server-support-trusted/src/test/java/org/jasig/cas/adaptors/trusted/web/flow/PrincipalFromRequestRemoteUserNonInteractiveCredentialsActionTests.java
      	cas-server-support-trusted/src/test/java/org/jasig/cas/adaptors/trusted/web/flow/PrincipalFromRequestUserPrincipalNonInteractiveCredentialsActionTests.java
      	cas-server-support-x509/src/main/resources/deployerConfigContext.xml
      	cas-server-support-x509/src/test/java/org/jasig/cas/adaptors/x509/web/flow/X509CertificateCredentialsNonInteractiveActionTests.java
      	cas-server-webapp/src/main/webapp/WEB-INF/deployerConfigContext.xml
      1c6eddbe
  3. 15 Apr, 2013 4 commits
  4. 13 Apr, 2013 5 commits
  5. 11 Apr, 2013 1 commit
  6. 10 Apr, 2013 1 commit
  7. 09 Apr, 2013 1 commit
  8. 08 Apr, 2013 2 commits
  9. 07 Apr, 2013 4 commits
  10. 06 Apr, 2013 2 commits
  11. 04 Apr, 2013 9 commits
  12. 01 Apr, 2013 1 commit
  13. 31 Mar, 2013 2 commits
  14. 28 Mar, 2013 1 commit
  15. 26 Mar, 2013 3 commits
  16. 20 Mar, 2013 2 commits