From 7c3ff332350da8ec09b99c2647cc35dc6c15265c Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Tue, 10 Mar 2015 11:58:53 +0000 Subject: [PATCH] Remove old sample project --- build.gradle | 19 ----- settings.gradle | 1 - .../sample/DummyUserDetailsService.java | 46 ------------ .../src/main/resources/log4j.properties | 12 ---- .../main/webapp/WEB-INF/kerberos.properties | 22 ------ .../src/main/webapp/WEB-INF/sample-krb.conf | 6 -- .../webapp/WEB-INF/server-side-kerberos.xml | 45 ------------ .../webapp/WEB-INF/spnego-with-form-login.xml | 63 ----------------- ...pnego-with-server-side-kerberos-option.xml | 70 ------------------- .../src/main/webapp/WEB-INF/spnego.xml | 61 ---------------- .../src/main/webapp/WEB-INF/web.xml | 39 ----------- .../src/main/webapp/index.jsp | 15 ---- .../src/main/webapp/login.html | 18 ----- .../src/main/webapp/secure/index.jsp | 12 ---- 14 files changed, 429 deletions(-) delete mode 100644 spring-security-kerberos-sample/src/main/java/org/springframework/security/extensions/kerberos/sample/DummyUserDetailsService.java delete mode 100644 spring-security-kerberos-sample/src/main/resources/log4j.properties delete mode 100644 spring-security-kerberos-sample/src/main/webapp/WEB-INF/kerberos.properties delete mode 100644 spring-security-kerberos-sample/src/main/webapp/WEB-INF/sample-krb.conf delete mode 100644 spring-security-kerberos-sample/src/main/webapp/WEB-INF/server-side-kerberos.xml delete mode 100644 spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-form-login.xml delete mode 100644 spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-server-side-kerberos-option.xml delete mode 100644 spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego.xml delete mode 100644 spring-security-kerberos-sample/src/main/webapp/WEB-INF/web.xml delete mode 100644 spring-security-kerberos-sample/src/main/webapp/index.jsp delete mode 100644 spring-security-kerberos-sample/src/main/webapp/login.html delete mode 100644 spring-security-kerberos-sample/src/main/webapp/secure/index.jsp diff --git a/build.gradle b/build.gradle index aa67315..f622ee5 100644 --- a/build.gradle +++ b/build.gradle @@ -152,25 +152,6 @@ project('spring-security-kerberos-test') { } } -project('spring-security-kerberos-sample') { - apply plugin: 'jetty' - description = 'Spring Security Kerberos Sample' - dependencies { - compile "org.springframework:spring-core:$springVersion" - compile "org.springframework:spring-beans:$springVersion" - compile "org.springframework:spring-aop:$springVersion" - compile "org.springframework:spring-expression:$springVersion" - compile "org.springframework:spring-context:$springVersion" - compile "org.springframework:spring-tx:$springVersion" - compile "org.springframework:spring-jdbc:$springVersion" - compile "org.springframework:spring-web:$springVersion" - compile project(":spring-security-kerberos-core") - compile("javax.servlet:servlet-api:$servletApi2Version", provided) - compile("org.springframework.security:spring-security-config:$springSecurityVersion") - compile("log4j:log4j:$log4jVersion") - } -} - project('spring-security-kerberos-samples-common') { dependencies { compile project(":spring-security-kerberos-core") diff --git a/settings.gradle b/settings.gradle index 0f08568..c7eca24 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ rootProject.name = 'spring-security-kerberos' include 'spring-security-kerberos-core' include 'spring-security-kerberos-client' include 'spring-security-kerberos-test' -include 'spring-security-kerberos-sample' include 'spring-security-kerberos-samples' include 'spring-security-kerberos-samples:sec-server-client-auth' include 'spring-security-kerberos-samples:sec-server-spnego-form-auth' diff --git a/spring-security-kerberos-sample/src/main/java/org/springframework/security/extensions/kerberos/sample/DummyUserDetailsService.java b/spring-security-kerberos-sample/src/main/java/org/springframework/security/extensions/kerberos/sample/DummyUserDetailsService.java deleted file mode 100644 index ce8dbfd..0000000 --- a/spring-security-kerberos-sample/src/main/java/org/springframework/security/extensions/kerberos/sample/DummyUserDetailsService.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2009 the original author or authors. - * - * 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. - */ - -package org.springframework.security.extensions.kerberos.sample; - -import org.springframework.dao.DataAccessException; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; - -/** - * Implementation of {@link UserDetailsService} which just returns the a new {@link User} - * with username equals the provided username and ROLE_USER as granted authority. - * - * Useful if you don't know the exact username and just want to see if Kerberos works - * - * @author Mike Wiesner - * @since 1.0 - * @version $Id$ - */ -public class DummyUserDetailsService implements UserDetailsService { - - - /* (non-Javadoc) - * @see org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername(java.lang.String) - */ - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException { - return new User(username, "notUsed", true, true,true,true, AuthorityUtils.createAuthorityList("ROLE_USER")); - } - -} diff --git a/spring-security-kerberos-sample/src/main/resources/log4j.properties b/spring-security-kerberos-sample/src/main/resources/log4j.properties deleted file mode 100644 index d0f5507..0000000 --- a/spring-security-kerberos-sample/src/main/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ - - -log4j.rootLogger=DEBUG, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%m %n -log4j.category.org.springframework.jdbc.datasource=DEBUG - -# log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - - \ No newline at end of file diff --git a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/kerberos.properties b/spring-security-kerberos-sample/src/main/webapp/WEB-INF/kerberos.properties deleted file mode 100644 index 5e24b68..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/kerberos.properties +++ /dev/null @@ -1,22 +0,0 @@ -# These settings are always needed -# ================================ - -krb.debug=true - - -# These settings are only needed for SPNEGO Authentication -# ======================================================== - -krb.service.prinicipal=HTTP/web.springsource.com - -# Setting keyTabLocation to a classpath resource will most likely not work in a Java EE application Server -# See the Javadoc of SunJaasKerberosTicketValidator for more information on that -krb.keytab.location=file:/etc/web-springsource-com.keytab - - -# These settings are only needed for server side Kerberos Authentication -# ====================================================================== - -# No Prefix is supported in krb.conf.location. It must always be an absolute path. -krb.conf.location=/etc/krb5.conf - diff --git a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/sample-krb.conf b/spring-security-kerberos-sample/src/main/webapp/WEB-INF/sample-krb.conf deleted file mode 100644 index ceec22e..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/sample-krb.conf +++ /dev/null @@ -1,6 +0,0 @@ -[libdefaults] - default_realm = SPRINGSOURCE.COM -[realms] - SPRINGSOURCE.COM = { - kdc = kdc.springsource.com - } \ No newline at end of file diff --git a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/server-side-kerberos.xml b/spring-security-kerberos-sample/src/main/webapp/WEB-INF/server-side-kerberos.xml deleted file mode 100644 index 09dfd55..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/server-side-kerberos.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-form-login.xml b/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-form-login.xml deleted file mode 100644 index e64f371..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-form-login.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-server-side-kerberos-option.xml b/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-server-side-kerberos-option.xml deleted file mode 100644 index d648b78..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego-with-server-side-kerberos-option.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego.xml b/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego.xml deleted file mode 100644 index 8fd3d0f..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/spnego.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/web.xml b/spring-security-kerberos-sample/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 7196441..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - spring-security-kerberos-sample - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - contextConfigLocation - - - /WEB-INF/spnego-with-server-side-kerberos-option.xml - - - - - - - org.springframework.web.context.ContextLoaderListener - - - - - log4jConfigLocation - classpath:/log4j.properties - - - - - org.springframework.web.util.Log4jConfigListener - - - \ No newline at end of file diff --git a/spring-security-kerberos-sample/src/main/webapp/index.jsp b/spring-security-kerberos-sample/src/main/webapp/index.jsp deleted file mode 100644 index f1acbae..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/index.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Spring Security Kerberos Sample - - -

Click here to attempt SPNEGO authentication.

- -

Click here to got to the form based login.

- - - \ No newline at end of file diff --git a/spring-security-kerberos-sample/src/main/webapp/login.html b/spring-security-kerberos-sample/src/main/webapp/login.html deleted file mode 100644 index bada362..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/login.html +++ /dev/null @@ -1,18 +0,0 @@ -Login Page -

Login with Username and Password

- -You can activate the different configurations in web.xml. - - - - - - - -
User:
Password:
-
- \ No newline at end of file diff --git a/spring-security-kerberos-sample/src/main/webapp/secure/index.jsp b/spring-security-kerberos-sample/src/main/webapp/secure/index.jsp deleted file mode 100644 index e9525ba..0000000 --- a/spring-security-kerberos-sample/src/main/webapp/secure/index.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Spring Security Kerberos Sample - - -

You are the user <%= request.getRemoteUser() %>!

- - \ No newline at end of file