diff --git a/build.gradle b/build.gradle index d6a18f487f..f9a502fe2f 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ ext.javaProjects = subprojects.findAll { project -> project.name != 'docs' && pr ext.sampleProjects = subprojects.findAll { project -> project.name.startsWith('spring-security-samples') } ext.itestProjects = subprojects.findAll { project -> project.name.startsWith('itest') } ext.coreModuleProjects = javaProjects - sampleProjects - itestProjects -ext.aspectjProjects = [project(':spring-security-aspects'), project(':spring-security-samples-aspectj-xml'), project(':spring-security-samples-aspectj-jc')] +ext.aspectjProjects = [project(':spring-security-aspects'), project(':spring-security-samples-xml-aspectj'), project(':spring-security-samples-javaconfig-aspectj')] configure(allprojects - javaProjects) { task afterEclipseImport { @@ -83,7 +83,7 @@ configure(allprojects - javaProjects) { } } -configure(subprojects - coreModuleProjects - project(':spring-security-samples-messages-jc') - project(':spring-security-bom')) { +configure(subprojects - coreModuleProjects - project(':spring-security-samples-javaconfig-messages') - project(':spring-security-bom')) { tasks.findByPath("artifactoryPublish")?.enabled = false sonarqube { skipProject = true diff --git a/docs/guides/src/docs/asciidoc/form.asc b/docs/guides/src/docs/asciidoc/form.asc index 5747c01882..5d87a5e373 100644 --- a/docs/guides/src/docs/asciidoc/form.asc +++ b/docs/guides/src/docs/asciidoc/form.asc @@ -1,7 +1,7 @@ = Creating a Custom Login Form :author: Rob Winch -:starter-appname: hellomvc-jc -:completed-appname: form-jc +:starter-appname: javaconfig/hellomvc +:completed-appname: javaconfig/form :include-dir: _includes This guide builds off of link:hellomvc.html[Hello Spring MVC Security Java Config] to explain how to configure and use a custom login form with Spring Security Java Configuration. @@ -133,7 +133,7 @@ Within Spring Web MVC there are two steps to creating our login page: == Configuring a login view controller -Within Spring Web MVC, the first step is to ensure that we have a controller that can point to our view. Since our project adds the *messages-jc* project as a dependency and it contains a view controller for */login* we do not need to create a controller within our application. For reference, you can see the configuration below: +Within Spring Web MVC, the first step is to ensure that we have a controller that can point to our view. Since our project adds the *javaconfig/messages* project as a dependency and it contains a view controller for */login* we do not need to create a controller within our application. For reference, you can see the configuration below: [source,java] ---- diff --git a/docs/guides/src/docs/asciidoc/hellomvc.asc b/docs/guides/src/docs/asciidoc/hellomvc.asc index d7b302e0b0..d5bd4e784b 100644 --- a/docs/guides/src/docs/asciidoc/hellomvc.asc +++ b/docs/guides/src/docs/asciidoc/hellomvc.asc @@ -1,7 +1,7 @@ = Hello Spring MVC Security Java Config :author: Rob Winch :starter-appname: insecuremvc -:completed-appname: hellomvc-jc +:completed-appname: javaconfig/hellomvc :include-dir: _includes :hello-include-dir: _hello-includes @@ -45,7 +45,7 @@ The `MessageSecurityWebApplicationInitializer` will automatically register the s === Verify SecurityConfig is loaded -Just because <> exists, does not mean that our Spring application knows about it. In this instance, our Spring root application context is initialized using MessageWebApplicationInitializer which is included with our spring-security-samples-messages-jc project. You can find a snippet of it below: +Just because <> exists, does not mean that our Spring application knows about it. In this instance, our Spring root application context is initialized using MessageWebApplicationInitializer which is included with our spring-security-samples-javaconfig-messages project. You can find a snippet of it below: [[message-web-application-inititializer-java]] .MessageWebApplicationInitializer.java @@ -63,7 +63,7 @@ public class MessageWebApplicationInitializer extends } ---- -You will notice it is loading the `RootConfiguration` class which is also included in our spring-security-samples-messages-jc project. +You will notice it is loading the `RootConfiguration` class which is also included in our spring-security-samples-javaconfig-messages project. [[root-configuration-java]] .RootConfiguration.java @@ -85,7 +85,7 @@ include::{hello-include-dir}/exploring-the-secured-application.asc[] Now that we have authenticated, let's see how our application is displaying the username if the user is authenticated. -.messages-jc/src/main/resources/views/layout.html +.messages/src/main/resources/views/layout.html [source,html] ----
@@ -103,7 +103,7 @@ WARNING: The Thymeleaf ensures the username is escaped to avoid http://en.wikipe We can view the user name, but how are we able to log out? Below you can see how we are able to log out. -.messages-jc/src/main/resources/views/layout.html +.messages/src/main/resources/views/layout.html [source,html] ----
diff --git a/docs/guides/src/docs/asciidoc/helloworld.asc b/docs/guides/src/docs/asciidoc/helloworld.asc index 36ec86f998..66e4dbc7b9 100644 --- a/docs/guides/src/docs/asciidoc/helloworld.asc +++ b/docs/guides/src/docs/asciidoc/helloworld.asc @@ -1,7 +1,7 @@ = Hello Spring Security Java Config :author: Rob Winch :starter-appname: insecure -:completed-appname: helloworld-jc +:completed-appname: javaconfig/helloworld :include-dir: _includes :hello-include-dir: _hello-includes diff --git a/docs/manual/src/docs/asciidoc/_includes/websocket.adoc b/docs/manual/src/docs/asciidoc/_includes/websocket.adoc index 748d0a7143..2180a9700f 100644 --- a/docs/manual/src/docs/asciidoc/_includes/websocket.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/websocket.adoc @@ -4,7 +4,7 @@ Spring Security 4 added support for securing http://docs.spring.io/spring/docs/current/spring-framework-reference/html/websocket.html[Spring's WebSocket support]. This section describes how to use Spring Security's WebSocket support. -NOTE: You can find a complete working sample of WebSocket security in samples/chat-jc. +NOTE: You can find a complete working sample of WebSocket security in samples/javaconfig/chat. .Direct JSR-356 Support **** diff --git a/docs/manual/src/docs/asciidoc/index.adoc b/docs/manual/src/docs/asciidoc/index.adoc index 6a860d0ab9..36a48fef47 100644 --- a/docs/manual/src/docs/asciidoc/index.adoc +++ b/docs/manual/src/docs/asciidoc/index.adoc @@ -766,7 +766,7 @@ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception [[jc-authentication-jdbc]] ==== JDBC Authentication -You can find the updates to suppport JDBC based authentication. The example below assumes that you have already defined a `DataSource` within your application. The https://github.com/spring-projects/spring-security/tree/master/samples/jdbc-jc[jdbc-jc sample] provides a complete example of using JDBC based authentication. +You can find the updates to suppport JDBC based authentication. The example below assumes that you have already defined a `DataSource` within your application. The https://github.com/spring-projects/spring-security/tree/master/samples/javaconfig/jdbc[jdbc-javaconfig] sample provides a complete example of using JDBC based authentication. [source,java] ---- @@ -786,7 +786,7 @@ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception ==== LDAP Authentication -You can find the updates to suppport LDAP based authentication. The https://github.com/spring-projects/spring-security/tree/master/samples/ldap-jc[ldap-jc sample] provides a complete example of using LDAP based authentication. +You can find the updates to suppport LDAP based authentication. The https://github.com/spring-projects/spring-security/tree/master/samples/javaconfig/ldap[ldap-javaconfig] sample provides a complete example of using LDAP based authentication. [source,java] ---- @@ -2728,7 +2728,7 @@ If authentication fails, the configured `AuthenticationFailureHandler` will be i [[servletapi]] == Servlet API integration -This section describes how Spring Security is integrated with the Servlet API. The https://github.com/spring-projects/spring-security/tree/master/samples/servletapi-xml[servletapi-xml] sample application demonstrates the usage of each of these methods. +This section describes how Spring Security is integrated with the Servlet API. The https://github.com/spring-projects/spring-security/tree/master/samples/xml/servletapi[servletapi-xml] sample application demonstrates the usage of each of these methods. [[servletapi-25]] @@ -5252,7 +5252,7 @@ We've assumed here that the <> is being used for c ==== Java EE Container Authentication The class `J2eePreAuthenticatedProcessingFilter` will extract the username from the `userPrincipal` property of the `HttpServletRequest`. Use of this filter would usually be combined with the use of Java EE roles as described above in <>. -There is a sample application in the codebase which uses this approach, so get hold of the code from github and have a look at the application context file if you are interested. The code is in the `samples/preauth-xml` directory. +There is a sample application in the codebase which uses this approach, so get hold of the code from github and have a look at the application context file if you are interested. The code is in the `samples/xml/preauth` directory. [[ldap]] diff --git a/samples/aspectj-jc/build.gradle b/samples/javaconfig/aspectj/build.gradle similarity index 100% rename from samples/aspectj-jc/build.gradle rename to samples/javaconfig/aspectj/build.gradle diff --git a/samples/aspectj-jc/pom.xml b/samples/javaconfig/aspectj/pom.xml similarity index 89% rename from samples/aspectj-jc/pom.xml rename to samples/javaconfig/aspectj/pom.xml index d7e148f859..03a97a971e 100644 --- a/samples/aspectj-jc/pom.xml +++ b/samples/javaconfig/aspectj/pom.xml @@ -2,10 +2,10 @@ 4.0.0 org.springframework.security - spring-security-samples-aspectj-jc - 4.1.0.RC1 - spring-security-samples-aspectj-jc - spring-security-samples-aspectj-jc + spring-security-samples-javaconfig-aspectj + 4.1.0.BUILD-SNAPSHOT + spring-security-samples-javaconfig-aspectj + spring-security-samples-javaconfig-aspectj http://spring.io/spring-security spring.io @@ -45,13 +45,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -71,7 +71,7 @@ org.springframework.security spring-security-aspects - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -112,8 +112,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/aspectj-jc/src/main/java/sample/aspectj/AspectjSecurityConfig.java b/samples/javaconfig/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java similarity index 100% rename from samples/aspectj-jc/src/main/java/sample/aspectj/AspectjSecurityConfig.java rename to samples/javaconfig/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java diff --git a/samples/aspectj-jc/src/main/java/sample/aspectj/SecuredService.java b/samples/javaconfig/aspectj/src/main/java/sample/aspectj/SecuredService.java similarity index 100% rename from samples/aspectj-jc/src/main/java/sample/aspectj/SecuredService.java rename to samples/javaconfig/aspectj/src/main/java/sample/aspectj/SecuredService.java diff --git a/samples/aspectj-jc/src/main/java/sample/aspectj/Service.java b/samples/javaconfig/aspectj/src/main/java/sample/aspectj/Service.java similarity index 100% rename from samples/aspectj-jc/src/main/java/sample/aspectj/Service.java rename to samples/javaconfig/aspectj/src/main/java/sample/aspectj/Service.java diff --git a/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/javaconfig/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java similarity index 100% rename from samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java rename to samples/javaconfig/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java diff --git a/samples/aspectj-jc/src/test/resources/logback-test.xml b/samples/javaconfig/aspectj/src/test/resources/logback-test.xml similarity index 100% rename from samples/aspectj-jc/src/test/resources/logback-test.xml rename to samples/javaconfig/aspectj/src/test/resources/logback-test.xml diff --git a/samples/chat-jc/build.gradle b/samples/javaconfig/chat/build.gradle similarity index 100% rename from samples/chat-jc/build.gradle rename to samples/javaconfig/chat/build.gradle diff --git a/samples/chat-jc/pom.xml b/samples/javaconfig/chat/pom.xml similarity index 94% rename from samples/chat-jc/pom.xml rename to samples/javaconfig/chat/pom.xml index a62e59c061..324c56ad1f 100644 --- a/samples/chat-jc/pom.xml +++ b/samples/javaconfig/chat/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-chat-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-chat + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-chat-jc - spring-security-samples-chat-jc + spring-security-samples-javaconfig-chat + spring-security-samples-javaconfig-chat http://spring.io/spring-security spring.io @@ -133,25 +133,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-data - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-messaging - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -244,8 +244,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/chat-jc/src/main/java/sample/config/ChatApplicationInitializer.java b/samples/javaconfig/chat/src/main/java/sample/config/ChatApplicationInitializer.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/ChatApplicationInitializer.java rename to samples/javaconfig/chat/src/main/java/sample/config/ChatApplicationInitializer.java diff --git a/samples/chat-jc/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java b/samples/javaconfig/chat/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java rename to samples/javaconfig/chat/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java diff --git a/samples/chat-jc/src/main/java/sample/config/DataSourceConfig.java b/samples/javaconfig/chat/src/main/java/sample/config/DataSourceConfig.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/DataSourceConfig.java rename to samples/javaconfig/chat/src/main/java/sample/config/DataSourceConfig.java diff --git a/samples/chat-jc/src/main/java/sample/config/EmbeddedRedisConfig.java b/samples/javaconfig/chat/src/main/java/sample/config/EmbeddedRedisConfig.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/EmbeddedRedisConfig.java rename to samples/javaconfig/chat/src/main/java/sample/config/EmbeddedRedisConfig.java diff --git a/samples/chat-jc/src/main/java/sample/config/RedisConfig.java b/samples/javaconfig/chat/src/main/java/sample/config/RedisConfig.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/RedisConfig.java rename to samples/javaconfig/chat/src/main/java/sample/config/RedisConfig.java diff --git a/samples/chat-jc/src/main/java/sample/config/RedisConnectionProperties.java b/samples/javaconfig/chat/src/main/java/sample/config/RedisConnectionProperties.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/RedisConnectionProperties.java rename to samples/javaconfig/chat/src/main/java/sample/config/RedisConnectionProperties.java diff --git a/samples/chat-jc/src/main/java/sample/config/SessionAppInitializer.java b/samples/javaconfig/chat/src/main/java/sample/config/SessionAppInitializer.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/SessionAppInitializer.java rename to samples/javaconfig/chat/src/main/java/sample/config/SessionAppInitializer.java diff --git a/samples/chat-jc/src/main/java/sample/config/SpringDatatConfig.java b/samples/javaconfig/chat/src/main/java/sample/config/SpringDatatConfig.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/SpringDatatConfig.java rename to samples/javaconfig/chat/src/main/java/sample/config/SpringDatatConfig.java diff --git a/samples/chat-jc/src/main/java/sample/config/WebMvcConfiguration.java b/samples/javaconfig/chat/src/main/java/sample/config/WebMvcConfiguration.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/WebMvcConfiguration.java rename to samples/javaconfig/chat/src/main/java/sample/config/WebMvcConfiguration.java diff --git a/samples/chat-jc/src/main/java/sample/config/WebSecurityConfig.java b/samples/javaconfig/chat/src/main/java/sample/config/WebSecurityConfig.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/WebSecurityConfig.java rename to samples/javaconfig/chat/src/main/java/sample/config/WebSecurityConfig.java diff --git a/samples/chat-jc/src/main/java/sample/config/WebSocketConfig.java b/samples/javaconfig/chat/src/main/java/sample/config/WebSocketConfig.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/WebSocketConfig.java rename to samples/javaconfig/chat/src/main/java/sample/config/WebSocketConfig.java diff --git a/samples/chat-jc/src/main/java/sample/config/WebSocketSecurityConfig.java b/samples/javaconfig/chat/src/main/java/sample/config/WebSocketSecurityConfig.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/config/WebSocketSecurityConfig.java rename to samples/javaconfig/chat/src/main/java/sample/config/WebSocketSecurityConfig.java diff --git a/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUser.java b/samples/javaconfig/chat/src/main/java/sample/data/ActiveWebSocketUser.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUser.java rename to samples/javaconfig/chat/src/main/java/sample/data/ActiveWebSocketUser.java diff --git a/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUserRepository.java b/samples/javaconfig/chat/src/main/java/sample/data/ActiveWebSocketUserRepository.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUserRepository.java rename to samples/javaconfig/chat/src/main/java/sample/data/ActiveWebSocketUserRepository.java diff --git a/samples/chat-jc/src/main/java/sample/data/InstantMessage.java b/samples/javaconfig/chat/src/main/java/sample/data/InstantMessage.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/data/InstantMessage.java rename to samples/javaconfig/chat/src/main/java/sample/data/InstantMessage.java diff --git a/samples/chat-jc/src/main/java/sample/data/User.java b/samples/javaconfig/chat/src/main/java/sample/data/User.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/data/User.java rename to samples/javaconfig/chat/src/main/java/sample/data/User.java diff --git a/samples/chat-jc/src/main/java/sample/data/UserRepository.java b/samples/javaconfig/chat/src/main/java/sample/data/UserRepository.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/data/UserRepository.java rename to samples/javaconfig/chat/src/main/java/sample/data/UserRepository.java diff --git a/samples/chat-jc/src/main/java/sample/mvc/CsrfController.java b/samples/javaconfig/chat/src/main/java/sample/mvc/CsrfController.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/mvc/CsrfController.java rename to samples/javaconfig/chat/src/main/java/sample/mvc/CsrfController.java diff --git a/samples/chat-jc/src/main/java/sample/mvc/LoginController.java b/samples/javaconfig/chat/src/main/java/sample/mvc/LoginController.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/mvc/LoginController.java rename to samples/javaconfig/chat/src/main/java/sample/mvc/LoginController.java diff --git a/samples/chat-jc/src/main/java/sample/mvc/MessageController.java b/samples/javaconfig/chat/src/main/java/sample/mvc/MessageController.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/mvc/MessageController.java rename to samples/javaconfig/chat/src/main/java/sample/mvc/MessageController.java diff --git a/samples/chat-jc/src/main/java/sample/security/CurrentUser.java b/samples/javaconfig/chat/src/main/java/sample/security/CurrentUser.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/security/CurrentUser.java rename to samples/javaconfig/chat/src/main/java/sample/security/CurrentUser.java diff --git a/samples/chat-jc/src/main/java/sample/security/UserRepositoryUserDetailsService.java b/samples/javaconfig/chat/src/main/java/sample/security/UserRepositoryUserDetailsService.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/security/UserRepositoryUserDetailsService.java rename to samples/javaconfig/chat/src/main/java/sample/security/UserRepositoryUserDetailsService.java diff --git a/samples/chat-jc/src/main/java/sample/websocket/WebSocketConnectHandler.java b/samples/javaconfig/chat/src/main/java/sample/websocket/WebSocketConnectHandler.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/websocket/WebSocketConnectHandler.java rename to samples/javaconfig/chat/src/main/java/sample/websocket/WebSocketConnectHandler.java diff --git a/samples/chat-jc/src/main/java/sample/websocket/WebSocketDisconnectHandler.java b/samples/javaconfig/chat/src/main/java/sample/websocket/WebSocketDisconnectHandler.java similarity index 100% rename from samples/chat-jc/src/main/java/sample/websocket/WebSocketDisconnectHandler.java rename to samples/javaconfig/chat/src/main/java/sample/websocket/WebSocketDisconnectHandler.java diff --git a/samples/chat-jc/src/main/resources/data.sql b/samples/javaconfig/chat/src/main/resources/data.sql similarity index 100% rename from samples/chat-jc/src/main/resources/data.sql rename to samples/javaconfig/chat/src/main/resources/data.sql diff --git a/samples/chat-jc/src/main/resources/password-encode.sql b/samples/javaconfig/chat/src/main/resources/password-encode.sql similarity index 100% rename from samples/chat-jc/src/main/resources/password-encode.sql rename to samples/javaconfig/chat/src/main/resources/password-encode.sql diff --git a/samples/chat-jc/src/main/resources/resources/css/bootstrap-responsive.css b/samples/javaconfig/chat/src/main/resources/resources/css/bootstrap-responsive.css similarity index 100% rename from samples/chat-jc/src/main/resources/resources/css/bootstrap-responsive.css rename to samples/javaconfig/chat/src/main/resources/resources/css/bootstrap-responsive.css diff --git a/samples/chat-jc/src/main/resources/resources/css/bootstrap.css b/samples/javaconfig/chat/src/main/resources/resources/css/bootstrap.css similarity index 99% rename from samples/chat-jc/src/main/resources/resources/css/bootstrap.css rename to samples/javaconfig/chat/src/main/resources/resources/css/bootstrap.css index 90583be4e8..99e379e3af 100644 --- a/samples/chat-jc/src/main/resources/resources/css/bootstrap.css +++ b/samples/javaconfig/chat/src/main/resources/resources/css/bootstrap.css @@ -2252,7 +2252,7 @@ table th[class*="span"], *margin-right: .3em; line-height: 14px; vertical-align: text-top; - background-image: url("../../../../../../messages-jc/src/main/resources/resources/img/glyphicons-halflings.png"); + background-image: url("../../../../../../../messages/src/main/resources/resources/img/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; } @@ -2272,7 +2272,7 @@ table th[class*="span"], .dropdown-menu > .active > a > [class*=" icon-"], .dropdown-submenu:hover > a > [class^="icon-"], .dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../../../../../../messages-jc/src/main/resources/resources/img/glyphicons-halflings-white.png"); + background-image: url("../../../../../../../messages/src/main/resources/resources/img/glyphicons-halflings-white.png"); } .icon-glass { diff --git a/samples/chat-jc/src/main/resources/resources/img/favicon.ico b/samples/javaconfig/chat/src/main/resources/resources/img/favicon.ico similarity index 100% rename from samples/chat-jc/src/main/resources/resources/img/favicon.ico rename to samples/javaconfig/chat/src/main/resources/resources/img/favicon.ico diff --git a/samples/chat-jc/src/main/resources/resources/img/logo.png b/samples/javaconfig/chat/src/main/resources/resources/img/logo.png similarity index 100% rename from samples/chat-jc/src/main/resources/resources/img/logo.png rename to samples/javaconfig/chat/src/main/resources/resources/img/logo.png diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/.bower.json b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/.bower.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/.bower.json rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/.bower.json diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/README.md b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/README.md similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/README.md rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/README.md diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/bower.json b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/bower.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/bower.json rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/bower.json diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.css b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.css similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.css rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.css diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.min.css b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.min.css similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.min.css rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap-responsive.min.css diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap.css b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap.css similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap.css rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap.css diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap.min.css b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap.min.css similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/css/bootstrap.min.css rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/css/bootstrap.min.css diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings-white.png b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings-white.png rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings-white.png diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings.png b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings.png rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/img/glyphicons-halflings.png diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/js/bootstrap.js b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/js/bootstrap.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/js/bootstrap.js rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/js/bootstrap.js diff --git a/samples/chat-jc/src/main/resources/resources/js/bootstrap/js/bootstrap.min.js b/samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/js/bootstrap.min.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/bootstrap/js/bootstrap.min.js rename to samples/javaconfig/chat/src/main/resources/resources/js/bootstrap/js/bootstrap.min.js diff --git a/samples/chat-jc/src/main/resources/resources/js/jquery/.bower.json b/samples/javaconfig/chat/src/main/resources/resources/js/jquery/.bower.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/jquery/.bower.json rename to samples/javaconfig/chat/src/main/resources/resources/js/jquery/.bower.json diff --git a/samples/chat-jc/src/main/resources/resources/js/jquery/component.json b/samples/javaconfig/chat/src/main/resources/resources/js/jquery/component.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/jquery/component.json rename to samples/javaconfig/chat/src/main/resources/resources/js/jquery/component.json diff --git a/samples/chat-jc/src/main/resources/resources/js/jquery/jquery.js b/samples/javaconfig/chat/src/main/resources/resources/js/jquery/jquery.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/jquery/jquery.js rename to samples/javaconfig/chat/src/main/resources/resources/js/jquery/jquery.js diff --git a/samples/chat-jc/src/main/resources/resources/js/knockout/.bower.json b/samples/javaconfig/chat/src/main/resources/resources/js/knockout/.bower.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/knockout/.bower.json rename to samples/javaconfig/chat/src/main/resources/resources/js/knockout/.bower.json diff --git a/samples/chat-jc/src/main/resources/resources/js/knockout/README.md b/samples/javaconfig/chat/src/main/resources/resources/js/knockout/README.md similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/knockout/README.md rename to samples/javaconfig/chat/src/main/resources/resources/js/knockout/README.md diff --git a/samples/chat-jc/src/main/resources/resources/js/knockout/bower.json b/samples/javaconfig/chat/src/main/resources/resources/js/knockout/bower.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/knockout/bower.json rename to samples/javaconfig/chat/src/main/resources/resources/js/knockout/bower.json diff --git a/samples/chat-jc/src/main/resources/resources/js/knockout/knockout-2.3.0.debug.js b/samples/javaconfig/chat/src/main/resources/resources/js/knockout/knockout-2.3.0.debug.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/knockout/knockout-2.3.0.debug.js rename to samples/javaconfig/chat/src/main/resources/resources/js/knockout/knockout-2.3.0.debug.js diff --git a/samples/chat-jc/src/main/resources/resources/js/knockout/knockout.js b/samples/javaconfig/chat/src/main/resources/resources/js/knockout/knockout.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/knockout/knockout.js rename to samples/javaconfig/chat/src/main/resources/resources/js/knockout/knockout.js diff --git a/samples/chat-jc/src/main/resources/resources/js/message.js b/samples/javaconfig/chat/src/main/resources/resources/js/message.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/message.js rename to samples/javaconfig/chat/src/main/resources/resources/js/message.js diff --git a/samples/chat-jc/src/main/resources/resources/js/sockjs/.bower.json b/samples/javaconfig/chat/src/main/resources/resources/js/sockjs/.bower.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/sockjs/.bower.json rename to samples/javaconfig/chat/src/main/resources/resources/js/sockjs/.bower.json diff --git a/samples/chat-jc/src/main/resources/resources/js/sockjs/component.json b/samples/javaconfig/chat/src/main/resources/resources/js/sockjs/component.json similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/sockjs/component.json rename to samples/javaconfig/chat/src/main/resources/resources/js/sockjs/component.json diff --git a/samples/chat-jc/src/main/resources/resources/js/sockjs/sockjs.js b/samples/javaconfig/chat/src/main/resources/resources/js/sockjs/sockjs.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/sockjs/sockjs.js rename to samples/javaconfig/chat/src/main/resources/resources/js/sockjs/sockjs.js diff --git a/samples/chat-jc/src/main/resources/resources/js/sockjs/sockjs.min.js b/samples/javaconfig/chat/src/main/resources/resources/js/sockjs/sockjs.min.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/sockjs/sockjs.min.js rename to samples/javaconfig/chat/src/main/resources/resources/js/sockjs/sockjs.min.js diff --git a/samples/chat-jc/src/main/resources/resources/js/stomp/lib/stomp.js b/samples/javaconfig/chat/src/main/resources/resources/js/stomp/lib/stomp.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/stomp/lib/stomp.js rename to samples/javaconfig/chat/src/main/resources/resources/js/stomp/lib/stomp.js diff --git a/samples/chat-jc/src/main/resources/resources/js/stomp/lib/stomp.min.js b/samples/javaconfig/chat/src/main/resources/resources/js/stomp/lib/stomp.min.js similarity index 100% rename from samples/chat-jc/src/main/resources/resources/js/stomp/lib/stomp.min.js rename to samples/javaconfig/chat/src/main/resources/resources/js/stomp/lib/stomp.min.js diff --git a/samples/chat-jc/src/main/resources/tiles/tiles-def.xml b/samples/javaconfig/chat/src/main/resources/tiles/tiles-def.xml similarity index 100% rename from samples/chat-jc/src/main/resources/tiles/tiles-def.xml rename to samples/javaconfig/chat/src/main/resources/tiles/tiles-def.xml diff --git a/samples/chat-jc/src/main/resources/views/chat.html b/samples/javaconfig/chat/src/main/resources/views/chat.html similarity index 100% rename from samples/chat-jc/src/main/resources/views/chat.html rename to samples/javaconfig/chat/src/main/resources/views/chat.html diff --git a/samples/chat-jc/src/main/resources/views/layout.html b/samples/javaconfig/chat/src/main/resources/views/layout.html similarity index 100% rename from samples/chat-jc/src/main/resources/views/layout.html rename to samples/javaconfig/chat/src/main/resources/views/layout.html diff --git a/samples/chat-jc/src/main/resources/views/login.html b/samples/javaconfig/chat/src/main/resources/views/login.html similarity index 100% rename from samples/chat-jc/src/main/resources/views/login.html rename to samples/javaconfig/chat/src/main/resources/views/login.html diff --git a/samples/concurrency-jc/build.gradle b/samples/javaconfig/concurrency/build.gradle similarity index 93% rename from samples/concurrency-jc/build.gradle rename to samples/javaconfig/concurrency/build.gradle index 1e203e783e..49387dfa21 100644 --- a/samples/concurrency-jc/build.gradle +++ b/samples/javaconfig/concurrency/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/rememberme-jc/pom.xml b/samples/javaconfig/concurrency/pom.xml similarity index 91% rename from samples/rememberme-jc/pom.xml rename to samples/javaconfig/concurrency/pom.xml index ae7ebca674..ed7b7df033 100644 --- a/samples/rememberme-jc/pom.xml +++ b/samples/javaconfig/concurrency/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-rememberme-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-concurrency + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-rememberme-jc - spring-security-samples-rememberme-jc + spring-security-samples-javaconfig-concurrency + spring-security-samples-javaconfig-concurrency http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -191,8 +191,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/concurrency/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/concurrency-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/concurrency/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/concurrency-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/concurrency/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/data-jc/build.gradle b/samples/javaconfig/data/build.gradle similarity index 100% rename from samples/data-jc/build.gradle rename to samples/javaconfig/data/build.gradle diff --git a/samples/data-jc/pom.xml b/samples/javaconfig/data/pom.xml similarity index 91% rename from samples/data-jc/pom.xml rename to samples/javaconfig/data/pom.xml index 797bf7deeb..627edcabdd 100644 --- a/samples/data-jc/pom.xml +++ b/samples/javaconfig/data/pom.xml @@ -2,10 +2,10 @@ 4.0.0 org.springframework.security - spring-security-samples-data-jc - 4.1.0.RC1 - spring-security-samples-data-jc - spring-security-samples-data-jc + spring-security-samples-javaconfig-data + 4.1.0.BUILD-SNAPSHOT + spring-security-samples-javaconfig-data + spring-security-samples-javaconfig-data http://spring.io/spring-security spring.io @@ -81,13 +81,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-data - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -135,8 +135,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/data-jc/src/main/java/samples/DataConfig.java b/samples/javaconfig/data/src/main/java/samples/DataConfig.java similarity index 100% rename from samples/data-jc/src/main/java/samples/DataConfig.java rename to samples/javaconfig/data/src/main/java/samples/DataConfig.java diff --git a/samples/data-jc/src/main/java/samples/data/Message.java b/samples/javaconfig/data/src/main/java/samples/data/Message.java similarity index 100% rename from samples/data-jc/src/main/java/samples/data/Message.java rename to samples/javaconfig/data/src/main/java/samples/data/Message.java diff --git a/samples/data-jc/src/main/java/samples/data/MessageRepository.java b/samples/javaconfig/data/src/main/java/samples/data/MessageRepository.java similarity index 100% rename from samples/data-jc/src/main/java/samples/data/MessageRepository.java rename to samples/javaconfig/data/src/main/java/samples/data/MessageRepository.java diff --git a/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java b/samples/javaconfig/data/src/main/java/samples/data/SecurityMessageRepository.java similarity index 100% rename from samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java rename to samples/javaconfig/data/src/main/java/samples/data/SecurityMessageRepository.java diff --git a/samples/data-jc/src/main/java/samples/data/User.java b/samples/javaconfig/data/src/main/java/samples/data/User.java similarity index 100% rename from samples/data-jc/src/main/java/samples/data/User.java rename to samples/javaconfig/data/src/main/java/samples/data/User.java diff --git a/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java b/samples/javaconfig/data/src/test/java/samples/data/SecurityMessageRepositoryTests.java similarity index 100% rename from samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java rename to samples/javaconfig/data/src/test/java/samples/data/SecurityMessageRepositoryTests.java diff --git a/samples/data-jc/src/test/resources/data.sql b/samples/javaconfig/data/src/test/resources/data.sql similarity index 100% rename from samples/data-jc/src/test/resources/data.sql rename to samples/javaconfig/data/src/test/resources/data.sql diff --git a/samples/jdbc-jc/build.gradle b/samples/javaconfig/form/build.gradle similarity index 93% rename from samples/jdbc-jc/build.gradle rename to samples/javaconfig/form/build.gradle index d9fa6c6010..3595c78182 100644 --- a/samples/jdbc-jc/build.gradle +++ b/samples/javaconfig/form/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/jdbc-jc/pom.xml b/samples/javaconfig/form/pom.xml similarity index 93% rename from samples/jdbc-jc/pom.xml rename to samples/javaconfig/form/pom.xml index 3a57fc5df9..576ad36834 100644 --- a/samples/jdbc-jc/pom.xml +++ b/samples/javaconfig/form/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-jdbc-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-form + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-jdbc-jc - spring-security-samples-jdbc-jc + spring-security-samples-javaconfig-form + spring-security-samples-javaconfig-form http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -245,8 +245,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/form-jc/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy b/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy similarity index 100% rename from samples/form-jc/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy rename to samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/FormJcTests.groovy diff --git a/samples/form-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/form-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/form-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/form-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/javaconfig/form/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/form-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/form-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/form-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/form-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/form/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/form-jc/src/main/resources/logback.xml b/samples/javaconfig/form/src/main/resources/logback.xml similarity index 100% rename from samples/form-jc/src/main/resources/logback.xml rename to samples/javaconfig/form/src/main/resources/logback.xml diff --git a/samples/form-jc/src/main/resources/views/login.html b/samples/javaconfig/form/src/main/resources/views/login.html similarity index 100% rename from samples/form-jc/src/main/resources/views/login.html rename to samples/javaconfig/form/src/main/resources/views/login.html diff --git a/samples/form-jc/src/main/webapp/WEB-INF/views/login.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/login.jspx similarity index 100% rename from samples/form-jc/src/main/webapp/WEB-INF/views/login.jspx rename to samples/javaconfig/form/src/main/webapp/WEB-INF/views/login.jspx diff --git a/samples/form-jc/src/main/webapp/WEB-INF/views/messages/compose.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/compose.jspx similarity index 100% rename from samples/form-jc/src/main/webapp/WEB-INF/views/messages/compose.jspx rename to samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/compose.jspx diff --git a/samples/form-jc/src/main/webapp/WEB-INF/views/messages/inbox.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/inbox.jspx similarity index 100% rename from samples/form-jc/src/main/webapp/WEB-INF/views/messages/inbox.jspx rename to samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/inbox.jspx diff --git a/samples/form-jc/src/main/webapp/WEB-INF/views/messages/show.jspx b/samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/show.jspx similarity index 100% rename from samples/form-jc/src/main/webapp/WEB-INF/views/messages/show.jspx rename to samples/javaconfig/form/src/main/webapp/WEB-INF/views/messages/show.jspx diff --git a/samples/form-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/form/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/form-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/form/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/hellojs-jc/build.gradle b/samples/javaconfig/hellojs/build.gradle similarity index 93% rename from samples/hellojs-jc/build.gradle rename to samples/javaconfig/hellojs/build.gradle index d5d69a2134..8a6b4ad3e4 100644 --- a/samples/hellojs-jc/build.gradle +++ b/samples/javaconfig/hellojs/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/hellojs-jc/pom.xml b/samples/javaconfig/hellojs/pom.xml similarity index 91% rename from samples/hellojs-jc/pom.xml rename to samples/javaconfig/hellojs/pom.xml index 362e2d7d2b..fe09eb4db5 100644 --- a/samples/hellojs-jc/pom.xml +++ b/samples/javaconfig/hellojs/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-hellojs-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-hellojs + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-hellojs-jc - spring-security-samples-hellojs-jc + spring-security-samples-javaconfig-hellojs + spring-security-samples-javaconfig-hellojs http://spring.io/spring-security spring.io @@ -97,25 +97,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -197,8 +197,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java similarity index 100% rename from samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java rename to samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java similarity index 100% rename from samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java rename to samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java diff --git a/samples/hellojs-jc/src/main/resources/resources/js/bootstrap.js b/samples/javaconfig/hellojs/src/main/resources/resources/js/bootstrap.js similarity index 100% rename from samples/hellojs-jc/src/main/resources/resources/js/bootstrap.js rename to samples/javaconfig/hellojs/src/main/resources/resources/js/bootstrap.js diff --git a/samples/hellojs-jc/src/main/resources/resources/js/jquery-1.8.3.js b/samples/javaconfig/hellojs/src/main/resources/resources/js/jquery-1.8.3.js similarity index 100% rename from samples/hellojs-jc/src/main/resources/resources/js/jquery-1.8.3.js rename to samples/javaconfig/hellojs/src/main/resources/resources/js/jquery-1.8.3.js diff --git a/samples/hellojs-jc/src/main/resources/resources/js/knockout-2.3.0.js b/samples/javaconfig/hellojs/src/main/resources/resources/js/knockout-2.3.0.js similarity index 100% rename from samples/hellojs-jc/src/main/resources/resources/js/knockout-2.3.0.js rename to samples/javaconfig/hellojs/src/main/resources/resources/js/knockout-2.3.0.js diff --git a/samples/hellojs-jc/src/main/resources/resources/js/message.js b/samples/javaconfig/hellojs/src/main/resources/resources/js/message.js similarity index 100% rename from samples/hellojs-jc/src/main/resources/resources/js/message.js rename to samples/javaconfig/hellojs/src/main/resources/resources/js/message.js diff --git a/samples/hellojs-jc/src/main/resources/views/messages/inbox.html b/samples/javaconfig/hellojs/src/main/resources/views/messages/inbox.html similarity index 99% rename from samples/hellojs-jc/src/main/resources/views/messages/inbox.html rename to samples/javaconfig/hellojs/src/main/resources/views/messages/inbox.html index ea986eaf42..e1ce3ac93a 100644 --- a/samples/hellojs-jc/src/main/resources/views/messages/inbox.html +++ b/samples/javaconfig/hellojs/src/main/resources/views/messages/inbox.html @@ -131,7 +131,7 @@

- + diff --git a/samples/hellojs-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/hellojs/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/hellojs-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/hellojs/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/hellojs-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/hellojs/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/hellojs-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/hellojs/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/inmemory-jc/build.gradle b/samples/javaconfig/hellomvc/build.gradle similarity index 93% rename from samples/inmemory-jc/build.gradle rename to samples/javaconfig/hellomvc/build.gradle index 915d79260b..d367903fec 100644 --- a/samples/inmemory-jc/build.gradle +++ b/samples/javaconfig/hellomvc/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/inmemory-jc/pom.xml b/samples/javaconfig/hellomvc/pom.xml similarity index 91% rename from samples/inmemory-jc/pom.xml rename to samples/javaconfig/hellomvc/pom.xml index 4ec5f28c3d..d366f5a931 100644 --- a/samples/inmemory-jc/pom.xml +++ b/samples/javaconfig/hellomvc/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-inmemory-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-hellomvc + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-inmemory-jc - spring-security-samples-inmemory-jc + spring-security-samples-javaconfig-hellomvc + spring-security-samples-javaconfig-hellomvc http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -186,7 +186,7 @@ org.springframework.security spring-security-test - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT test @@ -197,8 +197,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/hellomvc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/hellomvc-jc/src/main/resources/views/README.adoc b/samples/javaconfig/hellomvc/src/main/resources/views/README.adoc similarity index 100% rename from samples/hellomvc-jc/src/main/resources/views/README.adoc rename to samples/javaconfig/hellomvc/src/main/resources/views/README.adoc diff --git a/samples/hellomvc-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/hellomvc/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/hellomvc-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/hellomvc/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/hellomvc-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/hellomvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/hellomvc-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/hellomvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/helloworld-jc/build.gradle b/samples/javaconfig/helloworld/build.gradle similarity index 100% rename from samples/helloworld-jc/build.gradle rename to samples/javaconfig/helloworld/build.gradle diff --git a/samples/helloworld-jc/pom.xml b/samples/javaconfig/helloworld/pom.xml similarity index 93% rename from samples/helloworld-jc/pom.xml rename to samples/javaconfig/helloworld/pom.xml index 9df66b6b8d..5e255c61b0 100644 --- a/samples/helloworld-jc/pom.xml +++ b/samples/javaconfig/helloworld/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-helloworld-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-helloworld + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-helloworld-jc - spring-security-samples-helloworld-jc + spring-security-samples-javaconfig-helloworld + spring-security-samples-javaconfig-helloworld http://spring.io/spring-security spring.io @@ -67,13 +67,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -181,8 +181,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/helloworld-jc/src/integration-test/groovy/org/springframework/security/samples/HelloWorldJcTests.groovy b/samples/javaconfig/helloworld/src/integration-test/groovy/org/springframework/security/samples/HelloWorldJcTests.groovy similarity index 100% rename from samples/helloworld-jc/src/integration-test/groovy/org/springframework/security/samples/HelloWorldJcTests.groovy rename to samples/javaconfig/helloworld/src/integration-test/groovy/org/springframework/security/samples/HelloWorldJcTests.groovy diff --git a/samples/helloworld-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/javaconfig/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/helloworld-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/javaconfig/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/helloworld-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/javaconfig/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/helloworld-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/javaconfig/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java b/samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java similarity index 100% rename from samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java rename to samples/javaconfig/helloworld/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java diff --git a/samples/helloworld-jc/src/main/resources/logback.xml b/samples/javaconfig/helloworld/src/main/resources/logback.xml similarity index 100% rename from samples/helloworld-jc/src/main/resources/logback.xml rename to samples/javaconfig/helloworld/src/main/resources/logback.xml diff --git a/samples/helloworld-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/helloworld/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/helloworld-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/helloworld/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/helloworld-jc/src/main/webapp/index.jsp b/samples/javaconfig/helloworld/src/main/webapp/index.jsp similarity index 100% rename from samples/helloworld-jc/src/main/webapp/index.jsp rename to samples/javaconfig/helloworld/src/main/webapp/index.jsp diff --git a/samples/helloworld-jc/src/main/webapp/resources/css/bootstrap-responsive.css b/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css similarity index 100% rename from samples/helloworld-jc/src/main/webapp/resources/css/bootstrap-responsive.css rename to samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css diff --git a/samples/helloworld-jc/src/main/webapp/resources/css/bootstrap.css b/samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap.css similarity index 100% rename from samples/helloworld-jc/src/main/webapp/resources/css/bootstrap.css rename to samples/javaconfig/helloworld/src/main/webapp/resources/css/bootstrap.css diff --git a/samples/helloworld-jc/src/main/webapp/resources/img/favicon.ico b/samples/javaconfig/helloworld/src/main/webapp/resources/img/favicon.ico similarity index 100% rename from samples/helloworld-jc/src/main/webapp/resources/img/favicon.ico rename to samples/javaconfig/helloworld/src/main/webapp/resources/img/favicon.ico diff --git a/samples/helloworld-jc/src/main/webapp/resources/img/logo.png b/samples/javaconfig/helloworld/src/main/webapp/resources/img/logo.png similarity index 100% rename from samples/helloworld-jc/src/main/webapp/resources/img/logo.png rename to samples/javaconfig/helloworld/src/main/webapp/resources/img/logo.png diff --git a/samples/hellomvc-jc/build.gradle b/samples/javaconfig/inmemory/build.gradle similarity index 93% rename from samples/hellomvc-jc/build.gradle rename to samples/javaconfig/inmemory/build.gradle index 915d79260b..d367903fec 100644 --- a/samples/hellomvc-jc/build.gradle +++ b/samples/javaconfig/inmemory/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/hellomvc-jc/pom.xml b/samples/javaconfig/inmemory/pom.xml similarity index 91% rename from samples/hellomvc-jc/pom.xml rename to samples/javaconfig/inmemory/pom.xml index 633e2b7e68..f22dc4769c 100644 --- a/samples/hellomvc-jc/pom.xml +++ b/samples/javaconfig/inmemory/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-hellomvc-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-inmemory + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-hellomvc-jc - spring-security-samples-hellomvc-jc + spring-security-samples-javaconfig-inmemory + spring-security-samples-javaconfig-inmemory http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -186,7 +186,7 @@ org.springframework.security spring-security-test - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT test @@ -197,8 +197,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/inmemory/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/inmemory/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/inmemory/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/inmemory/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/helloworld-xml/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/inmemory/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/helloworld-xml/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/inmemory/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/inmemory/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/inmemory/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/form-jc/build.gradle b/samples/javaconfig/jdbc/build.gradle similarity index 93% rename from samples/form-jc/build.gradle rename to samples/javaconfig/jdbc/build.gradle index d9fa6c6010..3595c78182 100644 --- a/samples/form-jc/build.gradle +++ b/samples/javaconfig/jdbc/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/form-jc/pom.xml b/samples/javaconfig/jdbc/pom.xml similarity index 93% rename from samples/form-jc/pom.xml rename to samples/javaconfig/jdbc/pom.xml index 1b5243f13e..fd8fa8f296 100644 --- a/samples/form-jc/pom.xml +++ b/samples/javaconfig/jdbc/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-form-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-jdbc + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-form-jc - spring-security-samples-form-jc + spring-security-samples-javaconfig-jdbc + spring-security-samples-javaconfig-jdbc http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -245,8 +245,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/jdbc-jc/src/integration-test/groovy/org/springframework/security/samples/JdbcJcTests.groovy b/samples/javaconfig/jdbc/src/integration-test/groovy/org/springframework/security/samples/JdbcJcTests.groovy similarity index 100% rename from samples/jdbc-jc/src/integration-test/groovy/org/springframework/security/samples/JdbcJcTests.groovy rename to samples/javaconfig/jdbc/src/integration-test/groovy/org/springframework/security/samples/JdbcJcTests.groovy diff --git a/samples/jdbc-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/javaconfig/jdbc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/jdbc-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/javaconfig/jdbc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/jdbc-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/javaconfig/jdbc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/jdbc-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/javaconfig/jdbc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/jdbc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/jdbc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/jdbc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/jdbc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/helloworld-xml/src/main/resources/logback.xml b/samples/javaconfig/jdbc/src/main/resources/logback.xml similarity index 100% rename from samples/helloworld-xml/src/main/resources/logback.xml rename to samples/javaconfig/jdbc/src/main/resources/logback.xml diff --git a/samples/inmemory-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/inmemory-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/ldap-jc/build.gradle b/samples/javaconfig/ldap/build.gradle similarity index 93% rename from samples/ldap-jc/build.gradle rename to samples/javaconfig/ldap/build.gradle index fd696eb600..cee3a521bd 100644 --- a/samples/ldap-jc/build.gradle +++ b/samples/javaconfig/ldap/build.gradle @@ -8,7 +8,7 @@ dependencies { compile project(":spring-security-ldap"), apachedsDependencies, project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/ldap-jc/pom.xml b/samples/javaconfig/ldap/pom.xml similarity index 93% rename from samples/ldap-jc/pom.xml rename to samples/javaconfig/ldap/pom.xml index 64e09b14fe..ce48c68dd7 100644 --- a/samples/ldap-jc/pom.xml +++ b/samples/javaconfig/ldap/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-ldap-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-ldap + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-ldap-jc - spring-security-samples-ldap-jc + spring-security-samples-javaconfig-ldap + spring-security-samples-javaconfig-ldap http://spring.io/spring-security spring.io @@ -127,31 +127,31 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-ldap - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -287,8 +287,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/ldap-jc/src/integration-test/groovy/org/springframework/security/samples/LdapJcTests.groovy b/samples/javaconfig/ldap/src/integration-test/groovy/org/springframework/security/samples/LdapJcTests.groovy similarity index 100% rename from samples/ldap-jc/src/integration-test/groovy/org/springframework/security/samples/LdapJcTests.groovy rename to samples/javaconfig/ldap/src/integration-test/groovy/org/springframework/security/samples/LdapJcTests.groovy diff --git a/samples/ldap-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/javaconfig/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/ldap-jc/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/javaconfig/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/ldap-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/javaconfig/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/ldap-jc/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/javaconfig/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/ldap-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/ldap-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/ldap/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/jaas-xml/src/main/resources/logback.xml b/samples/javaconfig/ldap/src/main/resources/logback.xml similarity index 100% rename from samples/jaas-xml/src/main/resources/logback.xml rename to samples/javaconfig/ldap/src/main/resources/logback.xml diff --git a/samples/ldap-jc/src/main/resources/users.ldif b/samples/javaconfig/ldap/src/main/resources/users.ldif similarity index 100% rename from samples/ldap-jc/src/main/resources/users.ldif rename to samples/javaconfig/ldap/src/main/resources/users.ldif diff --git a/samples/insecuremvc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/ldap/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/insecuremvc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/ldap/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/ldap-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/ldap/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/ldap-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/ldap/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/messages-jc/build.gradle b/samples/javaconfig/messages/build.gradle similarity index 100% rename from samples/messages-jc/build.gradle rename to samples/javaconfig/messages/build.gradle diff --git a/samples/messages-jc/pom.xml b/samples/javaconfig/messages/pom.xml similarity index 94% rename from samples/messages-jc/pom.xml rename to samples/javaconfig/messages/pom.xml index c4b13c1960..9a9419446c 100644 --- a/samples/messages-jc/pom.xml +++ b/samples/javaconfig/messages/pom.xml @@ -2,10 +2,10 @@ 4.0.0 org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 - spring-security-samples-messages-jc - spring-security-samples-messages-jc + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT + spring-security-samples-javaconfig-messages + spring-security-samples-javaconfig-messages http://spring.io/spring-security spring.io @@ -93,13 +93,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -210,8 +210,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/messages-jc/src/main/java/META-INF/MANIFEST.MF b/samples/javaconfig/messages/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from samples/messages-jc/src/main/java/META-INF/MANIFEST.MF rename to samples/javaconfig/messages/src/main/java/META-INF/MANIFEST.MF diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/config/DataConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/DataConfiguration.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/config/DataConfiguration.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/DataConfiguration.java diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/config/RootConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/RootConfiguration.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/config/RootConfiguration.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/config/RootConfiguration.java diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/data/Message.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/Message.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/data/Message.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/Message.java diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/data/MessageRepository.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/MessageRepository.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/data/MessageRepository.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/data/MessageRepository.java diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/DefaultController.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/DefaultController.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/DefaultController.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/DefaultController.java diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/MessageController.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/MessageController.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/MessageController.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/MessageController.java diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java similarity index 100% rename from samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java rename to samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java diff --git a/samples/messages-jc/src/main/resources/data.sql b/samples/javaconfig/messages/src/main/resources/data.sql similarity index 100% rename from samples/messages-jc/src/main/resources/data.sql rename to samples/javaconfig/messages/src/main/resources/data.sql diff --git a/samples/helloworld-xml/src/main/webapp/resources/css/bootstrap-responsive.css b/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap-responsive.css similarity index 100% rename from samples/helloworld-xml/src/main/webapp/resources/css/bootstrap-responsive.css rename to samples/javaconfig/messages/src/main/resources/resources/css/bootstrap-responsive.css diff --git a/samples/helloworld-xml/src/main/webapp/resources/css/bootstrap.css b/samples/javaconfig/messages/src/main/resources/resources/css/bootstrap.css similarity index 100% rename from samples/helloworld-xml/src/main/webapp/resources/css/bootstrap.css rename to samples/javaconfig/messages/src/main/resources/resources/css/bootstrap.css diff --git a/samples/helloworld-xml/src/main/webapp/resources/img/favicon.ico b/samples/javaconfig/messages/src/main/resources/resources/img/favicon.ico similarity index 100% rename from samples/helloworld-xml/src/main/webapp/resources/img/favicon.ico rename to samples/javaconfig/messages/src/main/resources/resources/img/favicon.ico diff --git a/samples/helloworld-xml/src/main/webapp/resources/img/logo.png b/samples/javaconfig/messages/src/main/resources/resources/img/logo.png similarity index 100% rename from samples/helloworld-xml/src/main/webapp/resources/img/logo.png rename to samples/javaconfig/messages/src/main/resources/resources/img/logo.png diff --git a/samples/messages-jc/src/main/resources/tiles/tiles-def.xml b/samples/javaconfig/messages/src/main/resources/tiles/tiles-def.xml similarity index 100% rename from samples/messages-jc/src/main/resources/tiles/tiles-def.xml rename to samples/javaconfig/messages/src/main/resources/tiles/tiles-def.xml diff --git a/samples/messages-jc/src/main/resources/views/layout.html b/samples/javaconfig/messages/src/main/resources/views/layout.html similarity index 100% rename from samples/messages-jc/src/main/resources/views/layout.html rename to samples/javaconfig/messages/src/main/resources/views/layout.html diff --git a/samples/messages-jc/src/main/resources/views/messages/compose.html b/samples/javaconfig/messages/src/main/resources/views/messages/compose.html similarity index 100% rename from samples/messages-jc/src/main/resources/views/messages/compose.html rename to samples/javaconfig/messages/src/main/resources/views/messages/compose.html diff --git a/samples/messages-jc/src/main/resources/views/messages/inbox.html b/samples/javaconfig/messages/src/main/resources/views/messages/inbox.html similarity index 100% rename from samples/messages-jc/src/main/resources/views/messages/inbox.html rename to samples/javaconfig/messages/src/main/resources/views/messages/inbox.html diff --git a/samples/messages-jc/src/main/resources/views/messages/show.html b/samples/javaconfig/messages/src/main/resources/views/messages/show.html similarity index 100% rename from samples/messages-jc/src/main/resources/views/messages/show.html rename to samples/javaconfig/messages/src/main/resources/views/messages/show.html diff --git a/samples/openid-jc/build.gradle b/samples/javaconfig/openid/build.gradle similarity index 93% rename from samples/openid-jc/build.gradle rename to samples/javaconfig/openid/build.gradle index a9f84d4d39..ea6a911664 100644 --- a/samples/openid-jc/build.gradle +++ b/samples/javaconfig/openid/build.gradle @@ -7,7 +7,7 @@ dependencies { compile project(":spring-security-config"), project(":spring-security-openid"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/openid-jc/pom.xml b/samples/javaconfig/openid/pom.xml similarity index 91% rename from samples/openid-jc/pom.xml rename to samples/javaconfig/openid/pom.xml index 9bd35577e3..3b8138cc5c 100644 --- a/samples/openid-jc/pom.xml +++ b/samples/javaconfig/openid/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-openid-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-openid + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-openid-jc - spring-security-samples-openid-jc + spring-security-samples-javaconfig-openid + spring-security-samples-javaconfig-openid http://spring.io/spring-security spring.io @@ -91,31 +91,31 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-openid - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -203,8 +203,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/openid-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/openid-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/openid/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/mvc/UserController.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/mvc/UserController.java similarity index 100% rename from samples/openid-jc/src/main/java/org/springframework/security/samples/mvc/UserController.java rename to samples/javaconfig/openid/src/main/java/org/springframework/security/samples/mvc/UserController.java diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java b/samples/javaconfig/openid/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java similarity index 100% rename from samples/openid-jc/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java rename to samples/javaconfig/openid/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java diff --git a/samples/jdbc-jc/src/main/resources/logback.xml b/samples/javaconfig/openid/src/main/resources/logback.xml similarity index 100% rename from samples/jdbc-jc/src/main/resources/logback.xml rename to samples/javaconfig/openid/src/main/resources/logback.xml diff --git a/samples/openid-jc/src/main/resources/resources/css/openid.css b/samples/javaconfig/openid/src/main/resources/resources/css/openid.css similarity index 100% rename from samples/openid-jc/src/main/resources/resources/css/openid.css rename to samples/javaconfig/openid/src/main/resources/resources/css/openid.css diff --git a/samples/openid-jc/src/main/resources/resources/img/aol.gif b/samples/javaconfig/openid/src/main/resources/resources/img/aol.gif similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/aol.gif rename to samples/javaconfig/openid/src/main/resources/resources/img/aol.gif diff --git a/samples/openid-jc/src/main/resources/resources/img/blogger.ico b/samples/javaconfig/openid/src/main/resources/resources/img/blogger.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/blogger.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/blogger.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/claimid.ico b/samples/javaconfig/openid/src/main/resources/resources/img/claimid.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/claimid.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/claimid.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/facebook.gif b/samples/javaconfig/openid/src/main/resources/resources/img/facebook.gif similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/facebook.gif rename to samples/javaconfig/openid/src/main/resources/resources/img/facebook.gif diff --git a/samples/insecure/src/main/webapp/resources/img/favicon.ico b/samples/javaconfig/openid/src/main/resources/resources/img/favicon.ico similarity index 100% rename from samples/insecure/src/main/webapp/resources/img/favicon.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/favicon.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/flickr.ico b/samples/javaconfig/openid/src/main/resources/resources/img/flickr.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/flickr.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/flickr.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/google.gif b/samples/javaconfig/openid/src/main/resources/resources/img/google.gif similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/google.gif rename to samples/javaconfig/openid/src/main/resources/resources/img/google.gif diff --git a/samples/openid-jc/src/main/resources/resources/img/livejournal.ico b/samples/javaconfig/openid/src/main/resources/resources/img/livejournal.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/livejournal.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/livejournal.ico diff --git a/samples/insecure/src/main/webapp/resources/img/logo.png b/samples/javaconfig/openid/src/main/resources/resources/img/logo.png similarity index 100% rename from samples/insecure/src/main/webapp/resources/img/logo.png rename to samples/javaconfig/openid/src/main/resources/resources/img/logo.png diff --git a/samples/openid-jc/src/main/resources/resources/img/myopenid.ico b/samples/javaconfig/openid/src/main/resources/resources/img/myopenid.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/myopenid.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/myopenid.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/openid-inputicon.gif b/samples/javaconfig/openid/src/main/resources/resources/img/openid-inputicon.gif similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/openid-inputicon.gif rename to samples/javaconfig/openid/src/main/resources/resources/img/openid-inputicon.gif diff --git a/samples/openid-jc/src/main/resources/resources/img/openid.gif b/samples/javaconfig/openid/src/main/resources/resources/img/openid.gif similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/openid.gif rename to samples/javaconfig/openid/src/main/resources/resources/img/openid.gif diff --git a/samples/openid-jc/src/main/resources/resources/img/technorati.ico b/samples/javaconfig/openid/src/main/resources/resources/img/technorati.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/technorati.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/technorati.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/verisign.gif b/samples/javaconfig/openid/src/main/resources/resources/img/verisign.gif similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/verisign.gif rename to samples/javaconfig/openid/src/main/resources/resources/img/verisign.gif diff --git a/samples/openid-jc/src/main/resources/resources/img/verisign.ico b/samples/javaconfig/openid/src/main/resources/resources/img/verisign.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/verisign.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/verisign.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/vidoop.ico b/samples/javaconfig/openid/src/main/resources/resources/img/vidoop.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/vidoop.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/vidoop.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/wordpress.ico b/samples/javaconfig/openid/src/main/resources/resources/img/wordpress.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/wordpress.ico rename to samples/javaconfig/openid/src/main/resources/resources/img/wordpress.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/yahoo.gif b/samples/javaconfig/openid/src/main/resources/resources/img/yahoo.gif similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/yahoo.gif rename to samples/javaconfig/openid/src/main/resources/resources/img/yahoo.gif diff --git a/samples/openid-jc/src/main/resources/resources/js/jquery-1.2.6.min.js b/samples/javaconfig/openid/src/main/resources/resources/js/jquery-1.2.6.min.js similarity index 100% rename from samples/openid-jc/src/main/resources/resources/js/jquery-1.2.6.min.js rename to samples/javaconfig/openid/src/main/resources/resources/js/jquery-1.2.6.min.js diff --git a/samples/openid-jc/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js similarity index 100% rename from samples/openid-jc/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js rename to samples/javaconfig/openid/src/main/resources/resources/js/openid-client/jquery.query-2.1.3.js diff --git a/samples/openid-jc/src/main/resources/resources/js/openid-client/openid-client-config.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client-config.js similarity index 100% rename from samples/openid-jc/src/main/resources/resources/js/openid-client/openid-client-config.js rename to samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client-config.js diff --git a/samples/openid-jc/src/main/resources/resources/js/openid-client/openid-client.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client.js similarity index 100% rename from samples/openid-jc/src/main/resources/resources/js/openid-client/openid-client.js rename to samples/javaconfig/openid/src/main/resources/resources/js/openid-client/openid-client.js diff --git a/samples/openid-jc/src/main/resources/resources/js/openid-jquery.js b/samples/javaconfig/openid/src/main/resources/resources/js/openid-jquery.js similarity index 100% rename from samples/openid-jc/src/main/resources/resources/js/openid-jquery.js rename to samples/javaconfig/openid/src/main/resources/resources/js/openid-jquery.js diff --git a/samples/openid-jc/src/main/resources/users.ldif b/samples/javaconfig/openid/src/main/resources/users.ldif similarity index 100% rename from samples/openid-jc/src/main/resources/users.ldif rename to samples/javaconfig/openid/src/main/resources/users.ldif diff --git a/samples/openid-jc/src/main/resources/views/login.html b/samples/javaconfig/openid/src/main/resources/views/login.html similarity index 100% rename from samples/openid-jc/src/main/resources/views/login.html rename to samples/javaconfig/openid/src/main/resources/views/login.html diff --git a/samples/openid-jc/src/main/resources/views/user/show.html b/samples/javaconfig/openid/src/main/resources/views/user/show.html similarity index 100% rename from samples/openid-jc/src/main/resources/views/user/show.html rename to samples/javaconfig/openid/src/main/resources/views/user/show.html diff --git a/samples/openid-jc/src/main/resources/views/user/show.jspx b/samples/javaconfig/openid/src/main/resources/views/user/show.jspx similarity index 100% rename from samples/openid-jc/src/main/resources/views/user/show.jspx rename to samples/javaconfig/openid/src/main/resources/views/user/show.jspx diff --git a/samples/jdbc-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/openid/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/jdbc-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/openid/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/openid-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/openid/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/openid-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/openid/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/javaconfig/pom.xml b/samples/javaconfig/pom.xml new file mode 100644 index 0000000000..45e8ee3a7f --- /dev/null +++ b/samples/javaconfig/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + org.springframework.security + javaconfig + 4.1.0.BUILD-SNAPSHOT + javaconfig + javaconfig + http://spring.io/spring-security + + spring.io + http://spring.io/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + rwinch + Rob Winch + rwinch@gopivotal.com + + + + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security + + + + + org.springframework + spring-framework-bom + 4.2.5.RELEASE + pom + import + + + + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 2.2.0 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + test + + + + + spring-snapshot + https://repo.spring.io/snapshot + + + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + + diff --git a/samples/rememberme-jc/build.gradle b/samples/javaconfig/preauth/build.gradle similarity index 93% rename from samples/rememberme-jc/build.gradle rename to samples/javaconfig/preauth/build.gradle index 1e203e783e..49387dfa21 100644 --- a/samples/rememberme-jc/build.gradle +++ b/samples/javaconfig/preauth/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/preauth-jc/pom.xml b/samples/javaconfig/preauth/pom.xml similarity index 91% rename from samples/preauth-jc/pom.xml rename to samples/javaconfig/preauth/pom.xml index e21b38ac7f..8efe17ea78 100644 --- a/samples/preauth-jc/pom.xml +++ b/samples/javaconfig/preauth/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-preauth-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-preauth + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-preauth-jc - spring-security-samples-preauth-jc + spring-security-samples-javaconfig-preauth + spring-security-samples-javaconfig-preauth http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -191,8 +191,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/preauth-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/preauth-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/preauth/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/ldap-jc/src/main/resources/logback.xml b/samples/javaconfig/preauth/src/main/resources/logback.xml similarity index 100% rename from samples/ldap-jc/src/main/resources/logback.xml rename to samples/javaconfig/preauth/src/main/resources/logback.xml diff --git a/samples/preauth-jc/src/main/resources/views/login.html b/samples/javaconfig/preauth/src/main/resources/views/login.html similarity index 100% rename from samples/preauth-jc/src/main/resources/views/login.html rename to samples/javaconfig/preauth/src/main/resources/views/login.html diff --git a/samples/ldap-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/preauth/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/ldap-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/preauth/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/preauth-jc/src/main/webapp/WEB-INF/web.xml b/samples/javaconfig/preauth/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/preauth-jc/src/main/webapp/WEB-INF/web.xml rename to samples/javaconfig/preauth/src/main/webapp/WEB-INF/web.xml diff --git a/samples/preauth-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/preauth/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/preauth-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/preauth/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/preauth-jc/build.gradle b/samples/javaconfig/rememberme/build.gradle similarity index 93% rename from samples/preauth-jc/build.gradle rename to samples/javaconfig/rememberme/build.gradle index 1e203e783e..49387dfa21 100644 --- a/samples/preauth-jc/build.gradle +++ b/samples/javaconfig/rememberme/build.gradle @@ -6,7 +6,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/x509-jc/pom.xml b/samples/javaconfig/rememberme/pom.xml similarity index 91% rename from samples/x509-jc/pom.xml rename to samples/javaconfig/rememberme/pom.xml index ef7c34d89c..dc8ed5a296 100644 --- a/samples/x509-jc/pom.xml +++ b/samples/javaconfig/rememberme/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-x509-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-rememberme + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-x509-jc - spring-security-samples-x509-jc + spring-security-samples-javaconfig-rememberme + spring-security-samples-javaconfig-rememberme http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -191,8 +191,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/rememberme/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/ldap-xml/src/main/webapp/WEB-INF/classes/logback.xml b/samples/javaconfig/rememberme/src/main/resources/logback.xml similarity index 100% rename from samples/ldap-xml/src/main/webapp/WEB-INF/classes/logback.xml rename to samples/javaconfig/rememberme/src/main/resources/logback.xml diff --git a/samples/rememberme-jc/src/main/resources/views/login.html b/samples/javaconfig/rememberme/src/main/resources/views/login.html similarity index 100% rename from samples/rememberme-jc/src/main/resources/views/login.html rename to samples/javaconfig/rememberme/src/main/resources/views/login.html diff --git a/samples/openid-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/rememberme/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/openid-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/rememberme/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/rememberme-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/rememberme/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/rememberme-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/rememberme/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/x509-jc/build.gradle b/samples/javaconfig/x509/build.gradle similarity index 93% rename from samples/x509-jc/build.gradle rename to samples/javaconfig/x509/build.gradle index 75ee07cdf7..e4f0b067ad 100644 --- a/samples/x509-jc/build.gradle +++ b/samples/javaconfig/x509/build.gradle @@ -7,7 +7,7 @@ dependencies { 'javax.servlet.jsp:jsp-api:2.1' compile project(":spring-security-config"), - project(":spring-security-samples-messages-jc"), + project(":spring-security-samples-javaconfig-messages"), project(":spring-security-core"), project(":spring-security-web"), "org.springframework:spring-webmvc:$springVersion", diff --git a/samples/concurrency-jc/pom.xml b/samples/javaconfig/x509/pom.xml similarity index 91% rename from samples/concurrency-jc/pom.xml rename to samples/javaconfig/x509/pom.xml index 8a4daec907..c873791782 100644 --- a/samples/concurrency-jc/pom.xml +++ b/samples/javaconfig/x509/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-concurrency-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-x509 + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-concurrency-jc - spring-security-samples-concurrency-jc + spring-security-samples-javaconfig-x509 + spring-security-samples-javaconfig-x509 http://spring.io/spring-security spring.io @@ -91,25 +91,25 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -191,8 +191,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/x509-jc/src/etc/ca.pem b/samples/javaconfig/x509/src/etc/ca.pem similarity index 100% rename from samples/x509-jc/src/etc/ca.pem rename to samples/javaconfig/x509/src/etc/ca.pem diff --git a/samples/x509-jc/src/etc/dianne.p12 b/samples/javaconfig/x509/src/etc/dianne.p12 similarity index 100% rename from samples/x509-jc/src/etc/dianne.p12 rename to samples/javaconfig/x509/src/etc/dianne.p12 diff --git a/samples/x509-jc/src/etc/rod.p12 b/samples/javaconfig/x509/src/etc/rod.p12 similarity index 100% rename from samples/x509-jc/src/etc/rod.p12 rename to samples/javaconfig/x509/src/etc/rod.p12 diff --git a/samples/x509-jc/src/etc/scott.p12 b/samples/javaconfig/x509/src/etc/scott.p12 similarity index 100% rename from samples/x509-jc/src/etc/scott.p12 rename to samples/javaconfig/x509/src/etc/scott.p12 diff --git a/samples/x509-jc/src/etc/server.jks b/samples/javaconfig/x509/src/etc/server.jks similarity index 100% rename from samples/x509-jc/src/etc/server.jks rename to samples/javaconfig/x509/src/etc/server.jks diff --git a/samples/x509-jc/src/etc/server.xml b/samples/javaconfig/x509/src/etc/server.xml similarity index 83% rename from samples/x509-jc/src/etc/server.xml rename to samples/javaconfig/x509/src/etc/server.xml index f7378201bd..a120a6e8a3 100644 --- a/samples/x509-jc/src/etc/server.xml +++ b/samples/javaconfig/x509/src/etc/server.xml @@ -28,7 +28,7 @@ - + @@ -40,7 +40,7 @@ - + \ No newline at end of file diff --git a/samples/x509-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java similarity index 100% rename from samples/x509-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java rename to samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java diff --git a/samples/x509-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java similarity index 100% rename from samples/x509-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java rename to samples/javaconfig/x509/src/main/java/org/springframework/security/samples/config/SecurityConfig.java diff --git a/samples/openid-jc/src/main/resources/logback.xml b/samples/javaconfig/x509/src/main/resources/logback.xml similarity index 100% rename from samples/openid-jc/src/main/resources/logback.xml rename to samples/javaconfig/x509/src/main/resources/logback.xml diff --git a/samples/preauth-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/x509/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/preauth-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/x509/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/decorators.xml b/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators.xml similarity index 100% rename from samples/x509-jc/src/main/webapp/WEB-INF/decorators.xml rename to samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators.xml diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators/main.jsp similarity index 100% rename from samples/x509-jc/src/main/webapp/WEB-INF/decorators/main.jsp rename to samples/javaconfig/x509/src/main/webapp/WEB-INF/decorators/main.jsp diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/views/login.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/login.jspx similarity index 100% rename from samples/x509-jc/src/main/webapp/WEB-INF/views/login.jspx rename to samples/javaconfig/x509/src/main/webapp/WEB-INF/views/login.jspx diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/views/messages/compose.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/compose.jspx similarity index 100% rename from samples/x509-jc/src/main/webapp/WEB-INF/views/messages/compose.jspx rename to samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/compose.jspx diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/views/messages/inbox.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/inbox.jspx similarity index 100% rename from samples/x509-jc/src/main/webapp/WEB-INF/views/messages/inbox.jspx rename to samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/inbox.jspx diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/views/messages/show.jspx b/samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/show.jspx similarity index 100% rename from samples/x509-jc/src/main/webapp/WEB-INF/views/messages/show.jspx rename to samples/javaconfig/x509/src/main/webapp/WEB-INF/views/messages/show.jspx diff --git a/samples/x509-jc/src/main/webapp/WEB-INF/web.xml- b/samples/javaconfig/x509/src/main/webapp/WEB-INF/web.xml- similarity index 100% rename from samples/x509-jc/src/main/webapp/WEB-INF/web.xml- rename to samples/javaconfig/x509/src/main/webapp/WEB-INF/web.xml- diff --git a/samples/x509-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/javaconfig/x509/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/x509-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/javaconfig/x509/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/pom.xml b/samples/pom.xml new file mode 100644 index 0000000000..f3c4e0b580 --- /dev/null +++ b/samples/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + org.springframework.security + samples + 4.1.0.BUILD-SNAPSHOT + samples + samples + http://spring.io/spring-security + + spring.io + http://spring.io/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + rwinch + Rob Winch + rwinch@gopivotal.com + + + + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security + + + + + org.springframework + spring-framework-bom + 4.2.5.RELEASE + pom + import + + + + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 2.2.0 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + test + + + + + spring-snapshot + https://repo.spring.io/snapshot + + + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + + diff --git a/samples/servletapi-xml/src/main/resources/applicationContext-security.xml b/samples/servletapi-xml/src/main/resources/applicationContext-security.xml deleted file mode 100644 index da64fd140f..0000000000 --- a/samples/servletapi-xml/src/main/resources/applicationContext-security.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/aspectj-xml/aspectj.gradle b/samples/xml/aspectj/aspectj.gradle similarity index 100% rename from samples/aspectj-xml/aspectj.gradle rename to samples/xml/aspectj/aspectj.gradle diff --git a/samples/aspectj-xml/pom.xml b/samples/xml/aspectj/pom.xml similarity index 89% rename from samples/aspectj-xml/pom.xml rename to samples/xml/aspectj/pom.xml index 8fa72d7b4e..d8df62e9d3 100644 --- a/samples/aspectj-xml/pom.xml +++ b/samples/xml/aspectj/pom.xml @@ -2,10 +2,10 @@ 4.0.0 org.springframework.security - spring-security-samples-aspectj-xml - 4.1.0.RC1 - spring-security-samples-aspectj-xml - spring-security-samples-aspectj-xml + spring-security-samples-xml-aspectj + 4.1.0.BUILD-SNAPSHOT + spring-security-samples-xml-aspectj + spring-security-samples-xml-aspectj http://spring.io/spring-security spring.io @@ -45,7 +45,7 @@ org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -65,13 +65,13 @@ org.springframework.security spring-security-aspects - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -112,8 +112,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/aspectj-xml/src/main/java/sample/aspectj/SecuredService.java b/samples/xml/aspectj/src/main/java/sample/aspectj/SecuredService.java similarity index 100% rename from samples/aspectj-xml/src/main/java/sample/aspectj/SecuredService.java rename to samples/xml/aspectj/src/main/java/sample/aspectj/SecuredService.java diff --git a/samples/aspectj-xml/src/main/java/sample/aspectj/Service.java b/samples/xml/aspectj/src/main/java/sample/aspectj/Service.java similarity index 100% rename from samples/aspectj-xml/src/main/java/sample/aspectj/Service.java rename to samples/xml/aspectj/src/main/java/sample/aspectj/Service.java diff --git a/samples/aspectj-xml/src/main/resources/aspectj-context.xml b/samples/xml/aspectj/src/main/resources/aspectj-context.xml similarity index 100% rename from samples/aspectj-xml/src/main/resources/aspectj-context.xml rename to samples/xml/aspectj/src/main/resources/aspectj-context.xml diff --git a/samples/aspectj-xml/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/xml/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java similarity index 100% rename from samples/aspectj-xml/src/test/java/sample/aspectj/AspectJInterceptorTests.java rename to samples/xml/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java diff --git a/samples/aspectj-xml/src/test/resources/logback-test.xml b/samples/xml/aspectj/src/test/resources/logback-test.xml similarity index 100% rename from samples/aspectj-xml/src/test/resources/logback-test.xml rename to samples/xml/aspectj/src/test/resources/logback-test.xml diff --git a/samples/cas/Readme.txt b/samples/xml/cas/Readme.txt similarity index 100% rename from samples/cas/Readme.txt rename to samples/xml/cas/Readme.txt diff --git a/samples/cas/sample-xml/cassample.gradle b/samples/xml/cas/cassample/cassample.gradle similarity index 93% rename from samples/cas/sample-xml/cassample.gradle rename to samples/xml/cas/cassample/cassample.gradle index 951ec2b800..b6dea3b9f1 100644 --- a/samples/cas/sample-xml/cassample.gradle +++ b/samples/xml/cas/cassample/cassample.gradle @@ -68,10 +68,10 @@ dependencies { } task cas (dependsOn: [jettyRunWar]) { - jettyRunWar.dependsOn(':spring-security-samples-casserver:casServer') + jettyRunWar.dependsOn(':spring-security-samples-xml-casserver:casServer') } -task casServer(dependsOn: ':spring-security-samples-casserver:casServer') { +task casServer(dependsOn: ':spring-security-samples-xml-casserver:casServer') { } integrationTest.dependsOn cas @@ -103,7 +103,7 @@ gradle.taskGraph.whenReady {graph -> casServer.daemon = true } if(graph.hasTask(integrationTest)) { - tasks.getByPath(':spring-security-samples-casserver:casServerOverlay').logLevel = 'ERROR' + tasks.getByPath(':spring-security-samples-xml-casserver:casServerOverlay').logLevel = 'ERROR' jettyRunWar { additionalRuntimeJars += file("src/integration-test/resources") daemon = true @@ -125,5 +125,5 @@ gradle.taskGraph.whenReady {graph -> } def casServer() { - tasks.getByPath(':spring-security-samples-casserver:casServer') + tasks.getByPath(':spring-security-samples-xml-casserver:casServer') } diff --git a/samples/cas/sample-xml/pom.xml b/samples/xml/cas/cassample/pom.xml similarity index 91% rename from samples/cas/sample-xml/pom.xml rename to samples/xml/cas/cassample/pom.xml index 38182b742c..720d33be03 100644 --- a/samples/cas/sample-xml/pom.xml +++ b/samples/xml/cas/cassample/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-cassample-xml - 4.1.0.RC1 + spring-security-samples-xml-cassample + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-cassample-xml - spring-security-samples-cassample-xml + spring-security-samples-xml-cassample + spring-security-samples-xml-cassample http://spring.io/spring-security spring.io @@ -32,7 +32,7 @@ https://github.com/spring-projects/spring-security - /spring-security-samples-cassample-xml + /spring-security-samples-xml-cassample @@ -55,13 +55,13 @@ org.springframework.security spring-security-cas - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -98,13 +98,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -198,8 +198,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/AbstractCasTests.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/AbstractCasTests.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/AbstractCasTests.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/AbstractCasTests.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxyTests.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxyTests.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxyTests.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleProxyTests.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/JettyCasService.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/modules/NavModule.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/AccessDeniedPage.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ExtremelySecurePage.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/HomePage.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LocalLogoutPage.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/LoginPage.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/ProxyTicketSamplePage.groovy diff --git a/samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy b/samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy similarity index 100% rename from samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy rename to samples/xml/cas/cassample/src/integration-test/groovy/org/springframework/security/samples/cas/pages/SecurePage.groovy diff --git a/samples/cas/sample-xml/src/integration-test/resources/logback-test.xml b/samples/xml/cas/cassample/src/integration-test/resources/logback-test.xml similarity index 100% rename from samples/cas/sample-xml/src/integration-test/resources/logback-test.xml rename to samples/xml/cas/cassample/src/integration-test/resources/logback-test.xml diff --git a/samples/cas/sample-xml/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java b/samples/xml/cas/cassample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java similarity index 100% rename from samples/cas/sample-xml/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java rename to samples/xml/cas/cassample/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java diff --git a/samples/cas/sample-xml/src/main/webapp/403.jsp b/samples/xml/cas/cassample/src/main/webapp/403.jsp similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/403.jsp rename to samples/xml/cas/cassample/src/main/webapp/403.jsp diff --git a/samples/cas/sample-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/cas/cassample/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/WEB-INF/applicationContext-security.xml rename to samples/xml/cas/cassample/src/main/webapp/WEB-INF/applicationContext-security.xml diff --git a/samples/cas/sample-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/cas/cassample/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/cas/cassample/src/main/webapp/WEB-INF/web.xml diff --git a/samples/cas/sample-xml/src/main/webapp/cas-logout.jsp b/samples/xml/cas/cassample/src/main/webapp/cas-logout.jsp similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/cas-logout.jsp rename to samples/xml/cas/cassample/src/main/webapp/cas-logout.jsp diff --git a/samples/cas/sample-xml/src/main/webapp/casfailed.jsp b/samples/xml/cas/cassample/src/main/webapp/casfailed.jsp similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/casfailed.jsp rename to samples/xml/cas/cassample/src/main/webapp/casfailed.jsp diff --git a/samples/cas/sample-xml/src/main/webapp/index.jsp b/samples/xml/cas/cassample/src/main/webapp/index.jsp similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/index.jsp rename to samples/xml/cas/cassample/src/main/webapp/index.jsp diff --git a/samples/cas/sample-xml/src/main/webapp/secure/extreme/index.jsp b/samples/xml/cas/cassample/src/main/webapp/secure/extreme/index.jsp similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/secure/extreme/index.jsp rename to samples/xml/cas/cassample/src/main/webapp/secure/extreme/index.jsp diff --git a/samples/cas/sample-xml/src/main/webapp/secure/index.jsp b/samples/xml/cas/cassample/src/main/webapp/secure/index.jsp similarity index 100% rename from samples/cas/sample-xml/src/main/webapp/secure/index.jsp rename to samples/xml/cas/cassample/src/main/webapp/secure/index.jsp diff --git a/samples/cas/server/casserver.gradle b/samples/xml/cas/casserver/casserver.gradle similarity index 100% rename from samples/cas/server/casserver.gradle rename to samples/xml/cas/casserver/casserver.gradle diff --git a/samples/cas/server/pom.xml b/samples/xml/cas/casserver/pom.xml similarity index 89% rename from samples/cas/server/pom.xml rename to samples/xml/cas/casserver/pom.xml index 9bcdbbde39..1bfb22b893 100644 --- a/samples/cas/server/pom.xml +++ b/samples/xml/cas/casserver/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-casserver - 4.1.0.RC1 + spring-security-samples-xml-casserver + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-casserver - spring-security-samples-casserver + spring-security-samples-xml-casserver + spring-security-samples-xml-casserver http://spring.io/spring-security spring.io @@ -32,7 +32,7 @@ https://github.com/spring-projects/spring-security - /spring-security-samples-casserver + /spring-security-samples-xml-casserver @@ -91,8 +91,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/cas/server/src/main/webapp/WEB-INF/classes/log4j.xml b/samples/xml/cas/casserver/src/main/webapp/WEB-INF/classes/log4j.xml similarity index 100% rename from samples/cas/server/src/main/webapp/WEB-INF/classes/log4j.xml rename to samples/xml/cas/casserver/src/main/webapp/WEB-INF/classes/log4j.xml diff --git a/samples/cas/server/src/main/webapp/WEB-INF/deployerConfigContext.xml b/samples/xml/cas/casserver/src/main/webapp/WEB-INF/deployerConfigContext.xml similarity index 100% rename from samples/cas/server/src/main/webapp/WEB-INF/deployerConfigContext.xml rename to samples/xml/cas/casserver/src/main/webapp/WEB-INF/deployerConfigContext.xml diff --git a/samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml b/samples/xml/cas/casserver/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml similarity index 100% rename from samples/cas/server/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml rename to samples/xml/cas/casserver/src/main/webapp/WEB-INF/spring-configuration/applicationContext.xml diff --git a/samples/xml/cas/pom.xml b/samples/xml/cas/pom.xml new file mode 100644 index 0000000000..d44f67455f --- /dev/null +++ b/samples/xml/cas/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + org.springframework.security + cas + 4.1.0.BUILD-SNAPSHOT + cas + cas + http://spring.io/spring-security + + spring.io + http://spring.io/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + rwinch + Rob Winch + rwinch@gopivotal.com + + + + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security + + + + + org.springframework + spring-framework-bom + 4.2.5.RELEASE + pom + import + + + + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 2.2.0 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + test + + + + + spring-snapshot + https://repo.spring.io/snapshot + + + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + + diff --git a/samples/contacts-xml/client/client.properties b/samples/xml/contacts/client/client.properties similarity index 100% rename from samples/contacts-xml/client/client.properties rename to samples/xml/contacts/client/client.properties diff --git a/samples/contacts-xml/client/clientContext.xml b/samples/xml/contacts/client/clientContext.xml similarity index 100% rename from samples/contacts-xml/client/clientContext.xml rename to samples/xml/contacts/client/clientContext.xml diff --git a/samples/contacts-xml/contacts.gradle b/samples/xml/contacts/contacts.gradle similarity index 100% rename from samples/contacts-xml/contacts.gradle rename to samples/xml/contacts/contacts.gradle diff --git a/samples/contacts-xml/pom.xml b/samples/xml/contacts/pom.xml similarity index 93% rename from samples/contacts-xml/pom.xml rename to samples/xml/contacts/pom.xml index dd96ad2d1c..000e6e15b8 100644 --- a/samples/contacts-xml/pom.xml +++ b/samples/xml/contacts/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-contacts-xml - 4.1.0.RC1 + spring-security-samples-xml-contacts + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-contacts-xml - spring-security-samples-contacts-xml + spring-security-samples-xml-contacts + spring-security-samples-xml-contacts http://spring.io/spring-security spring.io @@ -49,13 +49,13 @@ org.springframework.security spring-security-acl - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -145,19 +145,19 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -245,8 +245,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/ContactsTests.groovy b/samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/ContactsTests.groovy similarity index 100% rename from samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/ContactsTests.groovy rename to samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/ContactsTests.groovy diff --git a/samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/AddPage.groovy b/samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/AddPage.groovy similarity index 100% rename from samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/AddPage.groovy rename to samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/AddPage.groovy diff --git a/samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/ContactsPage.groovy b/samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/ContactsPage.groovy similarity index 100% rename from samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/ContactsPage.groovy rename to samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/ContactsPage.groovy diff --git a/samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/DeleteConfirmPage.groovy b/samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/DeleteConfirmPage.groovy similarity index 100% rename from samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/DeleteConfirmPage.groovy rename to samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/DeleteConfirmPage.groovy diff --git a/samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/contacts-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/xml/contacts/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/contacts-xml/src/main/java/sample/contact/AddDeleteContactController.java b/samples/xml/contacts/src/main/java/sample/contact/AddDeleteContactController.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/AddDeleteContactController.java rename to samples/xml/contacts/src/main/java/sample/contact/AddDeleteContactController.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/AddPermission.java b/samples/xml/contacts/src/main/java/sample/contact/AddPermission.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/AddPermission.java rename to samples/xml/contacts/src/main/java/sample/contact/AddPermission.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/AddPermissionValidator.java b/samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/AddPermissionValidator.java rename to samples/xml/contacts/src/main/java/sample/contact/AddPermissionValidator.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/AdminPermissionController.java b/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/AdminPermissionController.java rename to samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/ClientApplication.java b/samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/ClientApplication.java rename to samples/xml/contacts/src/main/java/sample/contact/ClientApplication.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/Contact.java b/samples/xml/contacts/src/main/java/sample/contact/Contact.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/Contact.java rename to samples/xml/contacts/src/main/java/sample/contact/Contact.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactDao.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/ContactDao.java rename to samples/xml/contacts/src/main/java/sample/contact/ContactDao.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactDaoSpring.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/ContactDaoSpring.java rename to samples/xml/contacts/src/main/java/sample/contact/ContactDaoSpring.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactManager.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/ContactManager.java rename to samples/xml/contacts/src/main/java/sample/contact/ContactManager.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactManagerBackend.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/ContactManagerBackend.java rename to samples/xml/contacts/src/main/java/sample/contact/ContactManagerBackend.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java b/samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java rename to samples/xml/contacts/src/main/java/sample/contact/DataSourcePopulator.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/IndexController.java b/samples/xml/contacts/src/main/java/sample/contact/IndexController.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/IndexController.java rename to samples/xml/contacts/src/main/java/sample/contact/IndexController.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/WebContact.java b/samples/xml/contacts/src/main/java/sample/contact/WebContact.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/WebContact.java rename to samples/xml/contacts/src/main/java/sample/contact/WebContact.java diff --git a/samples/contacts-xml/src/main/java/sample/contact/WebContactValidator.java b/samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java similarity index 100% rename from samples/contacts-xml/src/main/java/sample/contact/WebContactValidator.java rename to samples/xml/contacts/src/main/java/sample/contact/WebContactValidator.java diff --git a/samples/contacts-xml/src/main/resources/applicationContext-common-authorization.xml b/samples/xml/contacts/src/main/resources/applicationContext-common-authorization.xml similarity index 100% rename from samples/contacts-xml/src/main/resources/applicationContext-common-authorization.xml rename to samples/xml/contacts/src/main/resources/applicationContext-common-authorization.xml diff --git a/samples/contacts-xml/src/main/resources/applicationContext-common-business.xml b/samples/xml/contacts/src/main/resources/applicationContext-common-business.xml similarity index 100% rename from samples/contacts-xml/src/main/resources/applicationContext-common-business.xml rename to samples/xml/contacts/src/main/resources/applicationContext-common-business.xml diff --git a/samples/contacts-xml/src/main/resources/applicationContext-security.xml b/samples/xml/contacts/src/main/resources/applicationContext-security.xml similarity index 100% rename from samples/contacts-xml/src/main/resources/applicationContext-security.xml rename to samples/xml/contacts/src/main/resources/applicationContext-security.xml diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/classes/logback.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/classes/logback.xml similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/classes/logback.xml rename to samples/xml/contacts/src/main/webapp/WEB-INF/classes/logback.xml diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/classes/messages.properties b/samples/xml/contacts/src/main/webapp/WEB-INF/classes/messages.properties similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/classes/messages.properties rename to samples/xml/contacts/src/main/webapp/WEB-INF/classes/messages.properties diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/contacts-servlet.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/contacts-servlet.xml rename to samples/xml/contacts/src/main/webapp/WEB-INF/contacts-servlet.xml diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/add.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/add.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/add.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/add.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/addPermission.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/addPermission.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/addPermission.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/addPermission.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/adminPermission.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/adminPermission.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/adminPermission.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/adminPermission.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/deletePermission.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deletePermission.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/deletePermission.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deletePermission.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/deleted.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deleted.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/deleted.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/deleted.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/frames.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/frames.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/frames.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/frames.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/hello.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/hello.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/hello.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/include.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/include.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/include.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/include.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/jsp/index.jsp b/samples/xml/contacts/src/main/webapp/WEB-INF/jsp/index.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/jsp/index.jsp rename to samples/xml/contacts/src/main/webapp/WEB-INF/jsp/index.jsp diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/remoting-servlet.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/remoting-servlet.xml rename to samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/spring.tld b/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/spring.tld rename to samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld diff --git a/samples/contacts-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/contacts-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/contacts/src/main/webapp/WEB-INF/web.xml diff --git a/samples/contacts-xml/src/main/webapp/accessDenied.jsp b/samples/xml/contacts/src/main/webapp/accessDenied.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/accessDenied.jsp rename to samples/xml/contacts/src/main/webapp/accessDenied.jsp diff --git a/samples/contacts-xml/src/main/webapp/error.html b/samples/xml/contacts/src/main/webapp/error.html similarity index 100% rename from samples/contacts-xml/src/main/webapp/error.html rename to samples/xml/contacts/src/main/webapp/error.html diff --git a/samples/contacts-xml/src/main/webapp/exitUser.jsp b/samples/xml/contacts/src/main/webapp/exitUser.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/exitUser.jsp rename to samples/xml/contacts/src/main/webapp/exitUser.jsp diff --git a/samples/contacts-xml/src/main/webapp/index.jsp b/samples/xml/contacts/src/main/webapp/index.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/index.jsp rename to samples/xml/contacts/src/main/webapp/index.jsp diff --git a/samples/contacts-xml/src/main/webapp/login.jsp b/samples/xml/contacts/src/main/webapp/login.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/login.jsp rename to samples/xml/contacts/src/main/webapp/login.jsp diff --git a/samples/contacts-xml/src/main/webapp/secure/debug.jsp b/samples/xml/contacts/src/main/webapp/secure/debug.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/secure/debug.jsp rename to samples/xml/contacts/src/main/webapp/secure/debug.jsp diff --git a/samples/contacts-xml/src/main/webapp/switchUser.jsp b/samples/xml/contacts/src/main/webapp/switchUser.jsp similarity index 100% rename from samples/contacts-xml/src/main/webapp/switchUser.jsp rename to samples/xml/contacts/src/main/webapp/switchUser.jsp diff --git a/samples/contacts-xml/src/site/resources/sslhowto.txt b/samples/xml/contacts/src/site/resources/sslhowto.txt similarity index 100% rename from samples/contacts-xml/src/site/resources/sslhowto.txt rename to samples/xml/contacts/src/site/resources/sslhowto.txt diff --git a/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java b/samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java similarity index 100% rename from samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java rename to samples/xml/contacts/src/test/java/sample/contact/ContactManagerTests.java diff --git a/samples/contacts-xml/src/test/resources/logback-test.xml b/samples/xml/contacts/src/test/resources/logback-test.xml similarity index 100% rename from samples/contacts-xml/src/test/resources/logback-test.xml rename to samples/xml/contacts/src/test/resources/logback-test.xml diff --git a/samples/dms-xml/dms.gradle b/samples/xml/dms/dms.gradle similarity index 100% rename from samples/dms-xml/dms.gradle rename to samples/xml/dms/dms.gradle diff --git a/samples/dms-xml/pom.xml b/samples/xml/dms/pom.xml similarity index 91% rename from samples/dms-xml/pom.xml rename to samples/xml/dms/pom.xml index 292de1fc15..da7ad013e2 100644 --- a/samples/dms-xml/pom.xml +++ b/samples/xml/dms/pom.xml @@ -2,10 +2,10 @@ 4.0.0 org.springframework.security - spring-security-samples-dms-xml - 4.1.0.RC1 - spring-security-samples-dms-xml - spring-security-samples-dms-xml + spring-security-samples-xml-dms + 4.1.0.BUILD-SNAPSHOT + spring-security-samples-xml-dms + spring-security-samples-xml-dms http://spring.io/spring-security spring.io @@ -45,13 +45,13 @@ org.springframework.security spring-security-acl - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -143,8 +143,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/dms-xml/src/main/java/sample/dms/AbstractElement.java b/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/AbstractElement.java rename to samples/xml/dms/src/main/java/sample/dms/AbstractElement.java diff --git a/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java b/samples/xml/dms/src/main/java/sample/dms/DataSourcePopulator.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java rename to samples/xml/dms/src/main/java/sample/dms/DataSourcePopulator.java diff --git a/samples/dms-xml/src/main/java/sample/dms/Directory.java b/samples/xml/dms/src/main/java/sample/dms/Directory.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/Directory.java rename to samples/xml/dms/src/main/java/sample/dms/Directory.java diff --git a/samples/dms-xml/src/main/java/sample/dms/DocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/DocumentDao.java rename to samples/xml/dms/src/main/java/sample/dms/DocumentDao.java diff --git a/samples/dms-xml/src/main/java/sample/dms/DocumentDaoImpl.java b/samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/DocumentDaoImpl.java rename to samples/xml/dms/src/main/java/sample/dms/DocumentDaoImpl.java diff --git a/samples/dms-xml/src/main/java/sample/dms/File.java b/samples/xml/dms/src/main/java/sample/dms/File.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/File.java rename to samples/xml/dms/src/main/java/sample/dms/File.java diff --git a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java rename to samples/xml/dms/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java diff --git a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDao.java rename to samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java diff --git a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java similarity index 100% rename from samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java rename to samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java diff --git a/samples/dms-xml/src/main/resources/applicationContext-dms-insecure.xml b/samples/xml/dms/src/main/resources/applicationContext-dms-insecure.xml similarity index 100% rename from samples/dms-xml/src/main/resources/applicationContext-dms-insecure.xml rename to samples/xml/dms/src/main/resources/applicationContext-dms-insecure.xml diff --git a/samples/dms-xml/src/main/resources/applicationContext-dms-secure.xml b/samples/xml/dms/src/main/resources/applicationContext-dms-secure.xml similarity index 100% rename from samples/dms-xml/src/main/resources/applicationContext-dms-secure.xml rename to samples/xml/dms/src/main/resources/applicationContext-dms-secure.xml diff --git a/samples/dms-xml/src/main/resources/applicationContext-dms-shared.xml b/samples/xml/dms/src/main/resources/applicationContext-dms-shared.xml similarity index 100% rename from samples/dms-xml/src/main/resources/applicationContext-dms-shared.xml rename to samples/xml/dms/src/main/resources/applicationContext-dms-shared.xml diff --git a/samples/dms-xml/src/test/java/sample/DmsIntegrationTests.java b/samples/xml/dms/src/test/java/sample/DmsIntegrationTests.java similarity index 100% rename from samples/dms-xml/src/test/java/sample/DmsIntegrationTests.java rename to samples/xml/dms/src/test/java/sample/DmsIntegrationTests.java diff --git a/samples/dms-xml/src/test/java/sample/SecureDmsIntegrationTests.java b/samples/xml/dms/src/test/java/sample/SecureDmsIntegrationTests.java similarity index 100% rename from samples/dms-xml/src/test/java/sample/SecureDmsIntegrationTests.java rename to samples/xml/dms/src/test/java/sample/SecureDmsIntegrationTests.java diff --git a/samples/dms-xml/src/test/resources/logback-test.xml b/samples/xml/dms/src/test/resources/logback-test.xml similarity index 100% rename from samples/dms-xml/src/test/resources/logback-test.xml rename to samples/xml/dms/src/test/resources/logback-test.xml diff --git a/samples/gae-xml/README.adoc b/samples/xml/gae/README.adoc similarity index 100% rename from samples/gae-xml/README.adoc rename to samples/xml/gae/README.adoc diff --git a/samples/gae-xml/gae.gradle b/samples/xml/gae/gae.gradle similarity index 100% rename from samples/gae-xml/gae.gradle rename to samples/xml/gae/gae.gradle diff --git a/samples/gae-xml/pom.xml b/samples/xml/gae/pom.xml similarity index 92% rename from samples/gae-xml/pom.xml rename to samples/xml/gae/pom.xml index 86431bffcf..d3bc2e815d 100644 --- a/samples/gae-xml/pom.xml +++ b/samples/xml/gae/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-gae-xml - 4.1.0.RC1 + spring-security-samples-xml-gae + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-gae-xml - spring-security-samples-gae-xml + spring-security-samples-xml-gae + spring-security-samples-xml-gae http://spring.io/spring-security spring.io @@ -32,7 +32,7 @@ https://github.com/spring-projects/spring-security - /spring-security-samples-gae-xml + /spring-security-samples-xml-gae @@ -73,13 +73,13 @@ org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -147,13 +147,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -206,8 +206,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/gae-xml/src/main/java/samples/gae/security/AppRole.java b/samples/xml/gae/src/main/java/samples/gae/security/AppRole.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/security/AppRole.java rename to samples/xml/gae/src/main/java/samples/gae/security/AppRole.java diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GaeAuthenticationFilter.java b/samples/xml/gae/src/main/java/samples/gae/security/GaeAuthenticationFilter.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/security/GaeAuthenticationFilter.java rename to samples/xml/gae/src/main/java/samples/gae/security/GaeAuthenticationFilter.java diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GaeUserAuthentication.java b/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/security/GaeUserAuthentication.java rename to samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java b/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java rename to samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java b/samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java rename to samples/xml/gae/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java diff --git a/samples/gae-xml/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java rename to samples/xml/gae/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java diff --git a/samples/gae-xml/src/main/java/samples/gae/users/GaeUser.java b/samples/xml/gae/src/main/java/samples/gae/users/GaeUser.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/users/GaeUser.java rename to samples/xml/gae/src/main/java/samples/gae/users/GaeUser.java diff --git a/samples/gae-xml/src/main/java/samples/gae/users/InMemoryUserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/users/InMemoryUserRegistry.java rename to samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java diff --git a/samples/gae-xml/src/main/java/samples/gae/users/UserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/UserRegistry.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/users/UserRegistry.java rename to samples/xml/gae/src/main/java/samples/gae/users/UserRegistry.java diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/Forename.java b/samples/xml/gae/src/main/java/samples/gae/validation/Forename.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/validation/Forename.java rename to samples/xml/gae/src/main/java/samples/gae/validation/Forename.java diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/ForenameValidator.java b/samples/xml/gae/src/main/java/samples/gae/validation/ForenameValidator.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/validation/ForenameValidator.java rename to samples/xml/gae/src/main/java/samples/gae/validation/ForenameValidator.java diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/Surname.java b/samples/xml/gae/src/main/java/samples/gae/validation/Surname.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/validation/Surname.java rename to samples/xml/gae/src/main/java/samples/gae/validation/Surname.java diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/SurnameValidator.java b/samples/xml/gae/src/main/java/samples/gae/validation/SurnameValidator.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/validation/SurnameValidator.java rename to samples/xml/gae/src/main/java/samples/gae/validation/SurnameValidator.java diff --git a/samples/gae-xml/src/main/java/samples/gae/web/GaeAppController.java b/samples/xml/gae/src/main/java/samples/gae/web/GaeAppController.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/web/GaeAppController.java rename to samples/xml/gae/src/main/java/samples/gae/web/GaeAppController.java diff --git a/samples/gae-xml/src/main/java/samples/gae/web/RegistrationController.java b/samples/xml/gae/src/main/java/samples/gae/web/RegistrationController.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/web/RegistrationController.java rename to samples/xml/gae/src/main/java/samples/gae/web/RegistrationController.java diff --git a/samples/gae-xml/src/main/java/samples/gae/web/RegistrationForm.java b/samples/xml/gae/src/main/java/samples/gae/web/RegistrationForm.java similarity index 100% rename from samples/gae-xml/src/main/java/samples/gae/web/RegistrationForm.java rename to samples/xml/gae/src/main/java/samples/gae/web/RegistrationForm.java diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/appengine-web.xml b/samples/xml/gae/src/main/webapp/WEB-INF/appengine-web.xml similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/appengine-web.xml rename to samples/xml/gae/src/main/webapp/WEB-INF/appengine-web.xml diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/applicationContext-security.xml rename to samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/classes/ValidationMessages.properties b/samples/xml/gae/src/main/webapp/WEB-INF/classes/ValidationMessages.properties similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/classes/ValidationMessages.properties rename to samples/xml/gae/src/main/webapp/WEB-INF/classes/ValidationMessages.properties diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/gae-servlet.xml b/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/gae-servlet.xml rename to samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/jsp/disabled.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/disabled.jsp similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/jsp/disabled.jsp rename to samples/xml/gae/src/main/webapp/WEB-INF/jsp/disabled.jsp diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/jsp/home.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/home.jsp similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/jsp/home.jsp rename to samples/xml/gae/src/main/webapp/WEB-INF/jsp/home.jsp diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/jsp/landing.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/landing.jsp similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/jsp/landing.jsp rename to samples/xml/gae/src/main/webapp/WEB-INF/jsp/landing.jsp diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/jsp/loggedout.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/loggedout.jsp similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/jsp/loggedout.jsp rename to samples/xml/gae/src/main/webapp/WEB-INF/jsp/loggedout.jsp diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/jsp/register.jsp b/samples/xml/gae/src/main/webapp/WEB-INF/jsp/register.jsp similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/jsp/register.jsp rename to samples/xml/gae/src/main/webapp/WEB-INF/jsp/register.jsp diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/logging.properties b/samples/xml/gae/src/main/webapp/WEB-INF/logging.properties similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/logging.properties rename to samples/xml/gae/src/main/webapp/WEB-INF/logging.properties diff --git a/samples/gae-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/gae/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/gae-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/gae/src/main/webapp/WEB-INF/web.xml diff --git a/samples/gae-xml/src/main/webapp/favicon.ico b/samples/xml/gae/src/main/webapp/favicon.ico similarity index 100% rename from samples/gae-xml/src/main/webapp/favicon.ico rename to samples/xml/gae/src/main/webapp/favicon.ico diff --git a/samples/gae-xml/src/main/webapp/static/css/gae.css b/samples/xml/gae/src/main/webapp/static/css/gae.css similarity index 100% rename from samples/gae-xml/src/main/webapp/static/css/gae.css rename to samples/xml/gae/src/main/webapp/static/css/gae.css diff --git a/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java b/samples/xml/gae/src/test/java/samples/gae/security/AppRoleTests.java similarity index 100% rename from samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java rename to samples/xml/gae/src/test/java/samples/gae/security/AppRoleTests.java diff --git a/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java b/samples/xml/gae/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java similarity index 100% rename from samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java rename to samples/xml/gae/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java diff --git a/samples/helloworld-xml/build.gradle b/samples/xml/helloworld/build.gradle similarity index 100% rename from samples/helloworld-xml/build.gradle rename to samples/xml/helloworld/build.gradle diff --git a/samples/helloworld-xml/pom.xml b/samples/xml/helloworld/pom.xml similarity index 93% rename from samples/helloworld-xml/pom.xml rename to samples/xml/helloworld/pom.xml index 03feb8888b..1c11757c69 100644 --- a/samples/helloworld-xml/pom.xml +++ b/samples/xml/helloworld/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-helloworld-xml - 4.1.0.RC1 + spring-security-samples-xml-helloworld + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-helloworld-xml - spring-security-samples-helloworld-xml + spring-security-samples-xml-helloworld + spring-security-samples-xml-helloworld http://spring.io/spring-security spring.io @@ -67,13 +67,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -181,8 +181,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/helloworld-xml/src/integration-test/groovy/org/springframework/security/samples/HelloWorldXmlTests.groovy b/samples/xml/helloworld/src/integration-test/groovy/org/springframework/security/samples/HelloWorldXmlTests.groovy similarity index 100% rename from samples/helloworld-xml/src/integration-test/groovy/org/springframework/security/samples/HelloWorldXmlTests.groovy rename to samples/xml/helloworld/src/integration-test/groovy/org/springframework/security/samples/HelloWorldXmlTests.groovy diff --git a/samples/helloworld-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/xml/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/helloworld-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/xml/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/helloworld-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/xml/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/helloworld-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/xml/helloworld/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/openid-xml/src/main/resources/logback.xml b/samples/xml/helloworld/src/main/resources/logback.xml similarity index 100% rename from samples/openid-xml/src/main/resources/logback.xml rename to samples/xml/helloworld/src/main/resources/logback.xml diff --git a/samples/rememberme-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/xml/helloworld/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/rememberme-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/xml/helloworld/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/helloworld-xml/src/main/webapp/WEB-INF/spring/security.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml similarity index 100% rename from samples/helloworld-xml/src/main/webapp/WEB-INF/spring/security.xml rename to samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml diff --git a/samples/helloworld-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/helloworld-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml diff --git a/samples/helloworld-xml/src/main/webapp/index.jsp b/samples/xml/helloworld/src/main/webapp/index.jsp similarity index 100% rename from samples/helloworld-xml/src/main/webapp/index.jsp rename to samples/xml/helloworld/src/main/webapp/index.jsp diff --git a/samples/insecure/src/main/webapp/resources/css/bootstrap-responsive.css b/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css similarity index 100% rename from samples/insecure/src/main/webapp/resources/css/bootstrap-responsive.css rename to samples/xml/helloworld/src/main/webapp/resources/css/bootstrap-responsive.css diff --git a/samples/insecure/src/main/webapp/resources/css/bootstrap.css b/samples/xml/helloworld/src/main/webapp/resources/css/bootstrap.css similarity index 100% rename from samples/insecure/src/main/webapp/resources/css/bootstrap.css rename to samples/xml/helloworld/src/main/webapp/resources/css/bootstrap.css diff --git a/samples/messages-jc/src/main/resources/resources/img/favicon.ico b/samples/xml/helloworld/src/main/webapp/resources/img/favicon.ico similarity index 100% rename from samples/messages-jc/src/main/resources/resources/img/favicon.ico rename to samples/xml/helloworld/src/main/webapp/resources/img/favicon.ico diff --git a/samples/messages-jc/src/main/resources/resources/img/logo.png b/samples/xml/helloworld/src/main/webapp/resources/img/logo.png similarity index 100% rename from samples/messages-jc/src/main/resources/resources/img/logo.png rename to samples/xml/helloworld/src/main/webapp/resources/img/logo.png diff --git a/samples/insecure/build.gradle b/samples/xml/insecure/build.gradle similarity index 100% rename from samples/insecure/build.gradle rename to samples/xml/insecure/build.gradle diff --git a/samples/insecure/pom.xml b/samples/xml/insecure/pom.xml similarity index 94% rename from samples/insecure/pom.xml rename to samples/xml/insecure/pom.xml index ae702fb5a1..82133e116d 100644 --- a/samples/insecure/pom.xml +++ b/samples/xml/insecure/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-insecure - 4.1.0.RC1 + spring-security-samples-xml-insecure + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-insecure - spring-security-samples-insecure + spring-security-samples-xml-insecure + spring-security-samples-xml-insecure http://spring.io/spring-security spring.io @@ -169,8 +169,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/insecure/src/integration-test/groovy/org/springframework/security/samples/HelloInsecureTests.groovy b/samples/xml/insecure/src/integration-test/groovy/org/springframework/security/samples/HelloInsecureTests.groovy similarity index 97% rename from samples/insecure/src/integration-test/groovy/org/springframework/security/samples/HelloInsecureTests.groovy rename to samples/xml/insecure/src/integration-test/groovy/org/springframework/security/samples/HelloInsecureTests.groovy index 27ed3a9105..7ccdbd4265 100644 --- a/samples/insecure/src/integration-test/groovy/org/springframework/security/samples/HelloInsecureTests.groovy +++ b/samples/xml/insecure/src/integration-test/groovy/org/springframework/security/samples/HelloInsecureTests.groovy @@ -16,7 +16,6 @@ package org.springframework.security.samples import geb.spock.* -import spock.lang.Shared import spock.lang.Stepwise import org.springframework.security.samples.pages.* diff --git a/samples/insecure/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/xml/insecure/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/insecure/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/xml/insecure/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/insecure/src/main/java/README.adoc b/samples/xml/insecure/src/main/java/README.adoc similarity index 100% rename from samples/insecure/src/main/java/README.adoc rename to samples/xml/insecure/src/main/java/README.adoc diff --git a/samples/insecure/src/main/webapp/index.jsp b/samples/xml/insecure/src/main/webapp/index.jsp similarity index 100% rename from samples/insecure/src/main/webapp/index.jsp rename to samples/xml/insecure/src/main/webapp/index.jsp diff --git a/samples/messages-jc/src/main/resources/resources/css/bootstrap-responsive.css b/samples/xml/insecure/src/main/webapp/resources/css/bootstrap-responsive.css similarity index 100% rename from samples/messages-jc/src/main/resources/resources/css/bootstrap-responsive.css rename to samples/xml/insecure/src/main/webapp/resources/css/bootstrap-responsive.css diff --git a/samples/messages-jc/src/main/resources/resources/css/bootstrap.css b/samples/xml/insecure/src/main/webapp/resources/css/bootstrap.css similarity index 100% rename from samples/messages-jc/src/main/resources/resources/css/bootstrap.css rename to samples/xml/insecure/src/main/webapp/resources/css/bootstrap.css diff --git a/samples/openid-jc/src/main/resources/resources/img/favicon.ico b/samples/xml/insecure/src/main/webapp/resources/img/favicon.ico similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/favicon.ico rename to samples/xml/insecure/src/main/webapp/resources/img/favicon.ico diff --git a/samples/openid-jc/src/main/resources/resources/img/logo.png b/samples/xml/insecure/src/main/webapp/resources/img/logo.png similarity index 100% rename from samples/openid-jc/src/main/resources/resources/img/logo.png rename to samples/xml/insecure/src/main/webapp/resources/img/logo.png diff --git a/samples/insecuremvc/build.gradle b/samples/xml/insecuremvc/build.gradle similarity index 91% rename from samples/insecuremvc/build.gradle rename to samples/xml/insecuremvc/build.gradle index 668b1502aa..37ac1a3d91 100644 --- a/samples/insecuremvc/build.gradle +++ b/samples/xml/insecuremvc/build.gradle @@ -5,7 +5,7 @@ dependencies { providedCompile "javax.servlet:javax.servlet-api:3.0.1", 'javax.servlet.jsp:jsp-api:2.1' - compile project(":spring-security-samples-messages-jc"), + compile project(":spring-security-samples-javaconfig-messages"), "org.springframework:spring-webmvc:$springVersion", "org.springframework:spring-jdbc:$springVersion", "org.slf4j:slf4j-api:$slf4jVersion", diff --git a/samples/insecuremvc/pom.xml b/samples/xml/insecuremvc/pom.xml similarity index 93% rename from samples/insecuremvc/pom.xml rename to samples/xml/insecuremvc/pom.xml index dbbcc01e02..fec16e4bad 100644 --- a/samples/insecuremvc/pom.xml +++ b/samples/xml/insecuremvc/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-insecuremvc - 4.1.0.RC1 + spring-security-samples-xml-insecuremvc + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-insecuremvc - spring-security-samples-insecuremvc + spring-security-samples-xml-insecuremvc + spring-security-samples-xml-insecuremvc http://spring.io/spring-security spring.io @@ -90,8 +90,8 @@ org.springframework.security - spring-security-samples-messages-jc - 4.1.0.RC1 + spring-security-samples-javaconfig-messages + 4.1.0.BUILD-SNAPSHOT compile @@ -173,8 +173,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/insecuremvc/src/main/java/README.adoc b/samples/xml/insecuremvc/src/main/java/README.adoc similarity index 100% rename from samples/insecuremvc/src/main/java/README.adoc rename to samples/xml/insecuremvc/src/main/java/README.adoc diff --git a/samples/x509-jc/src/main/webapp/META-INF/MANIFEST.MF b/samples/xml/insecuremvc/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/x509-jc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/xml/insecuremvc/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/xml/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java similarity index 100% rename from samples/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java rename to samples/xml/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java diff --git a/samples/jaas-xml/jaas.gradle b/samples/xml/jaas/jaas.gradle similarity index 100% rename from samples/jaas-xml/jaas.gradle rename to samples/xml/jaas/jaas.gradle diff --git a/samples/jaas-xml/pom.xml b/samples/xml/jaas/pom.xml similarity index 93% rename from samples/jaas-xml/pom.xml rename to samples/xml/jaas/pom.xml index ad50b1c802..d4fc1cd24d 100644 --- a/samples/jaas-xml/pom.xml +++ b/samples/xml/jaas/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-jaas-xml - 4.1.0.RC1 + spring-security-samples-xml-jaas + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-jaas-xml - spring-security-samples-jaas-xml + spring-security-samples-xml-jaas + spring-security-samples-xml-jaas http://spring.io/spring-security spring.io @@ -49,7 +49,7 @@ org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -107,19 +107,19 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -207,8 +207,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/JaasXmlTests.groovy b/samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/JaasXmlTests.groovy similarity index 100% rename from samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/JaasXmlTests.groovy rename to samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/JaasXmlTests.groovy diff --git a/samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy b/samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy similarity index 100% rename from samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy rename to samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy diff --git a/samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy b/samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy similarity index 100% rename from samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy rename to samples/xml/jaas/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy diff --git a/samples/jaas-xml/src/main/java/samples/jaas/RoleUserAuthorityGranter.java b/samples/xml/jaas/src/main/java/samples/jaas/RoleUserAuthorityGranter.java similarity index 100% rename from samples/jaas-xml/src/main/java/samples/jaas/RoleUserAuthorityGranter.java rename to samples/xml/jaas/src/main/java/samples/jaas/RoleUserAuthorityGranter.java diff --git a/samples/jaas-xml/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java b/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java similarity index 100% rename from samples/jaas-xml/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java rename to samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java diff --git a/samples/jaas-xml/src/main/resources/applicationContext-security.xml b/samples/xml/jaas/src/main/resources/applicationContext-security.xml similarity index 100% rename from samples/jaas-xml/src/main/resources/applicationContext-security.xml rename to samples/xml/jaas/src/main/resources/applicationContext-security.xml diff --git a/samples/preauth-jc/src/main/resources/logback.xml b/samples/xml/jaas/src/main/resources/logback.xml similarity index 100% rename from samples/preauth-jc/src/main/resources/logback.xml rename to samples/xml/jaas/src/main/resources/logback.xml diff --git a/samples/jaas-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/jaas/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/jaas-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/jaas/src/main/webapp/WEB-INF/web.xml diff --git a/samples/jaas-xml/src/main/webapp/index.jsp b/samples/xml/jaas/src/main/webapp/index.jsp similarity index 100% rename from samples/jaas-xml/src/main/webapp/index.jsp rename to samples/xml/jaas/src/main/webapp/index.jsp diff --git a/samples/jaas-xml/src/main/webapp/secure/index.jsp b/samples/xml/jaas/src/main/webapp/secure/index.jsp similarity index 100% rename from samples/jaas-xml/src/main/webapp/secure/index.jsp rename to samples/xml/jaas/src/main/webapp/secure/index.jsp diff --git a/samples/ldap-xml/ldap.gradle b/samples/xml/ldap/ldap.gradle similarity index 100% rename from samples/ldap-xml/ldap.gradle rename to samples/xml/ldap/ldap.gradle diff --git a/samples/ldap-xml/pom.xml b/samples/xml/ldap/pom.xml similarity index 93% rename from samples/ldap-xml/pom.xml rename to samples/xml/ldap/pom.xml index 04eaacf8f6..e2929f0d52 100644 --- a/samples/ldap-xml/pom.xml +++ b/samples/xml/ldap/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-ldap-xml - 4.1.0.RC1 + spring-security-samples-xml-ldap + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-ldap-xml - spring-security-samples-ldap-xml + spring-security-samples-xml-ldap + spring-security-samples-xml-ldap http://spring.io/spring-security spring.io @@ -61,7 +61,7 @@ org.springframework.security spring-security-taglibs - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -128,19 +128,19 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-ldap - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -223,8 +223,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/LdapXmlTests.groovy b/samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/LdapXmlTests.groovy similarity index 100% rename from samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/LdapXmlTests.groovy rename to samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/LdapXmlTests.groovy diff --git a/samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy b/samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy similarity index 100% rename from samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy rename to samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/HomePage.groovy diff --git a/samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy b/samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy similarity index 100% rename from samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy rename to samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy diff --git a/samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy b/samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy similarity index 100% rename from samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy rename to samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy diff --git a/samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy b/samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy similarity index 100% rename from samples/ldap-xml/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy rename to samples/xml/ldap/src/integration-test/groovy/org/springframework/security/samples/pages/SecurePage.groovy diff --git a/samples/ldap-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/ldap/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 100% rename from samples/ldap-xml/src/main/webapp/WEB-INF/applicationContext-security.xml rename to samples/xml/ldap/src/main/webapp/WEB-INF/applicationContext-security.xml diff --git a/samples/preauth-xml/src/main/resources/logback.xml b/samples/xml/ldap/src/main/webapp/WEB-INF/classes/logback.xml similarity index 100% rename from samples/preauth-xml/src/main/resources/logback.xml rename to samples/xml/ldap/src/main/webapp/WEB-INF/classes/logback.xml diff --git a/samples/ldap-xml/src/main/webapp/WEB-INF/classes/users.ldif b/samples/xml/ldap/src/main/webapp/WEB-INF/classes/users.ldif similarity index 100% rename from samples/ldap-xml/src/main/webapp/WEB-INF/classes/users.ldif rename to samples/xml/ldap/src/main/webapp/WEB-INF/classes/users.ldif diff --git a/samples/ldap-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/ldap/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/ldap-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/ldap/src/main/webapp/WEB-INF/web.xml diff --git a/samples/ldap-xml/src/main/webapp/index.jsp b/samples/xml/ldap/src/main/webapp/index.jsp similarity index 100% rename from samples/ldap-xml/src/main/webapp/index.jsp rename to samples/xml/ldap/src/main/webapp/index.jsp diff --git a/samples/ldap-xml/src/main/webapp/secure/extreme/index.jsp b/samples/xml/ldap/src/main/webapp/secure/extreme/index.jsp similarity index 100% rename from samples/ldap-xml/src/main/webapp/secure/extreme/index.jsp rename to samples/xml/ldap/src/main/webapp/secure/extreme/index.jsp diff --git a/samples/ldap-xml/src/main/webapp/secure/index.jsp b/samples/xml/ldap/src/main/webapp/secure/index.jsp similarity index 100% rename from samples/ldap-xml/src/main/webapp/secure/index.jsp rename to samples/xml/ldap/src/main/webapp/secure/index.jsp diff --git a/samples/openid-xml/openid.gradle b/samples/xml/openid/openid.gradle similarity index 100% rename from samples/openid-xml/openid.gradle rename to samples/xml/openid/openid.gradle diff --git a/samples/openid-xml/pom.xml b/samples/xml/openid/pom.xml similarity index 89% rename from samples/openid-xml/pom.xml rename to samples/xml/openid/pom.xml index 96a97047f4..87df1d5520 100644 --- a/samples/openid-xml/pom.xml +++ b/samples/xml/openid/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-openid-xml - 4.1.0.RC1 + spring-security-samples-xml-openid + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-openid-xml - spring-security-samples-openid-xml + spring-security-samples-xml-openid + spring-security-samples-xml-openid http://spring.io/spring-security spring.io @@ -32,7 +32,7 @@ https://github.com/spring-projects/spring-security - /spring-security-samples-openid-xml + /spring-security-samples-xml-openid @@ -49,13 +49,13 @@ org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-openid - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -103,13 +103,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -138,8 +138,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java b/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java similarity index 100% rename from samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java rename to samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java diff --git a/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java b/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java similarity index 100% rename from samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java rename to samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java diff --git a/samples/rememberme-jc/src/main/resources/logback.xml b/samples/xml/openid/src/main/resources/logback.xml similarity index 100% rename from samples/rememberme-jc/src/main/resources/logback.xml rename to samples/xml/openid/src/main/resources/logback.xml diff --git a/samples/openid-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/openid/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 100% rename from samples/openid-xml/src/main/webapp/WEB-INF/applicationContext-security.xml rename to samples/xml/openid/src/main/webapp/WEB-INF/applicationContext-security.xml diff --git a/samples/openid-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/openid/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/openid-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/openid/src/main/webapp/WEB-INF/web.xml diff --git a/samples/openid-xml/src/main/webapp/css/openid.css b/samples/xml/openid/src/main/webapp/css/openid.css similarity index 100% rename from samples/openid-xml/src/main/webapp/css/openid.css rename to samples/xml/openid/src/main/webapp/css/openid.css diff --git a/samples/openid-xml/src/main/webapp/images/aol.gif b/samples/xml/openid/src/main/webapp/images/aol.gif similarity index 100% rename from samples/openid-xml/src/main/webapp/images/aol.gif rename to samples/xml/openid/src/main/webapp/images/aol.gif diff --git a/samples/openid-xml/src/main/webapp/images/blogger.ico b/samples/xml/openid/src/main/webapp/images/blogger.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/blogger.ico rename to samples/xml/openid/src/main/webapp/images/blogger.ico diff --git a/samples/openid-xml/src/main/webapp/images/claimid.ico b/samples/xml/openid/src/main/webapp/images/claimid.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/claimid.ico rename to samples/xml/openid/src/main/webapp/images/claimid.ico diff --git a/samples/openid-xml/src/main/webapp/images/facebook.gif b/samples/xml/openid/src/main/webapp/images/facebook.gif similarity index 100% rename from samples/openid-xml/src/main/webapp/images/facebook.gif rename to samples/xml/openid/src/main/webapp/images/facebook.gif diff --git a/samples/openid-xml/src/main/webapp/images/flickr.ico b/samples/xml/openid/src/main/webapp/images/flickr.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/flickr.ico rename to samples/xml/openid/src/main/webapp/images/flickr.ico diff --git a/samples/openid-xml/src/main/webapp/images/google.gif b/samples/xml/openid/src/main/webapp/images/google.gif similarity index 100% rename from samples/openid-xml/src/main/webapp/images/google.gif rename to samples/xml/openid/src/main/webapp/images/google.gif diff --git a/samples/openid-xml/src/main/webapp/images/livejournal.ico b/samples/xml/openid/src/main/webapp/images/livejournal.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/livejournal.ico rename to samples/xml/openid/src/main/webapp/images/livejournal.ico diff --git a/samples/openid-xml/src/main/webapp/images/myopenid.ico b/samples/xml/openid/src/main/webapp/images/myopenid.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/myopenid.ico rename to samples/xml/openid/src/main/webapp/images/myopenid.ico diff --git a/samples/openid-xml/src/main/webapp/images/openid-inputicon.gif b/samples/xml/openid/src/main/webapp/images/openid-inputicon.gif similarity index 100% rename from samples/openid-xml/src/main/webapp/images/openid-inputicon.gif rename to samples/xml/openid/src/main/webapp/images/openid-inputicon.gif diff --git a/samples/openid-xml/src/main/webapp/images/openid.gif b/samples/xml/openid/src/main/webapp/images/openid.gif similarity index 100% rename from samples/openid-xml/src/main/webapp/images/openid.gif rename to samples/xml/openid/src/main/webapp/images/openid.gif diff --git a/samples/openid-xml/src/main/webapp/images/technorati.ico b/samples/xml/openid/src/main/webapp/images/technorati.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/technorati.ico rename to samples/xml/openid/src/main/webapp/images/technorati.ico diff --git a/samples/openid-xml/src/main/webapp/images/verisign.gif b/samples/xml/openid/src/main/webapp/images/verisign.gif similarity index 100% rename from samples/openid-xml/src/main/webapp/images/verisign.gif rename to samples/xml/openid/src/main/webapp/images/verisign.gif diff --git a/samples/openid-xml/src/main/webapp/images/verisign.ico b/samples/xml/openid/src/main/webapp/images/verisign.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/verisign.ico rename to samples/xml/openid/src/main/webapp/images/verisign.ico diff --git a/samples/openid-xml/src/main/webapp/images/vidoop.ico b/samples/xml/openid/src/main/webapp/images/vidoop.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/vidoop.ico rename to samples/xml/openid/src/main/webapp/images/vidoop.ico diff --git a/samples/openid-xml/src/main/webapp/images/wordpress.ico b/samples/xml/openid/src/main/webapp/images/wordpress.ico similarity index 100% rename from samples/openid-xml/src/main/webapp/images/wordpress.ico rename to samples/xml/openid/src/main/webapp/images/wordpress.ico diff --git a/samples/openid-xml/src/main/webapp/images/yahoo.gif b/samples/xml/openid/src/main/webapp/images/yahoo.gif similarity index 100% rename from samples/openid-xml/src/main/webapp/images/yahoo.gif rename to samples/xml/openid/src/main/webapp/images/yahoo.gif diff --git a/samples/openid-xml/src/main/webapp/index.jsp b/samples/xml/openid/src/main/webapp/index.jsp similarity index 100% rename from samples/openid-xml/src/main/webapp/index.jsp rename to samples/xml/openid/src/main/webapp/index.jsp diff --git a/samples/openid-xml/src/main/webapp/js/jquery-1.2.6.min.js b/samples/xml/openid/src/main/webapp/js/jquery-1.2.6.min.js similarity index 100% rename from samples/openid-xml/src/main/webapp/js/jquery-1.2.6.min.js rename to samples/xml/openid/src/main/webapp/js/jquery-1.2.6.min.js diff --git a/samples/openid-xml/src/main/webapp/js/openid-client/jquery.query-2.1.3.js b/samples/xml/openid/src/main/webapp/js/openid-client/jquery.query-2.1.3.js similarity index 100% rename from samples/openid-xml/src/main/webapp/js/openid-client/jquery.query-2.1.3.js rename to samples/xml/openid/src/main/webapp/js/openid-client/jquery.query-2.1.3.js diff --git a/samples/openid-xml/src/main/webapp/js/openid-client/openid-client-config.js b/samples/xml/openid/src/main/webapp/js/openid-client/openid-client-config.js similarity index 100% rename from samples/openid-xml/src/main/webapp/js/openid-client/openid-client-config.js rename to samples/xml/openid/src/main/webapp/js/openid-client/openid-client-config.js diff --git a/samples/openid-xml/src/main/webapp/js/openid-client/openid-client.js b/samples/xml/openid/src/main/webapp/js/openid-client/openid-client.js similarity index 100% rename from samples/openid-xml/src/main/webapp/js/openid-client/openid-client.js rename to samples/xml/openid/src/main/webapp/js/openid-client/openid-client.js diff --git a/samples/openid-xml/src/main/webapp/js/openid-jquery.js b/samples/xml/openid/src/main/webapp/js/openid-jquery.js similarity index 100% rename from samples/openid-xml/src/main/webapp/js/openid-jquery.js rename to samples/xml/openid/src/main/webapp/js/openid-jquery.js diff --git a/samples/openid-xml/src/main/webapp/openidlogin.jsp b/samples/xml/openid/src/main/webapp/openidlogin.jsp similarity index 100% rename from samples/openid-xml/src/main/webapp/openidlogin.jsp rename to samples/xml/openid/src/main/webapp/openidlogin.jsp diff --git a/samples/xml/pom.xml b/samples/xml/pom.xml new file mode 100644 index 0000000000..649f6c1881 --- /dev/null +++ b/samples/xml/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + org.springframework.security + xml + 4.1.0.BUILD-SNAPSHOT + xml + xml + http://spring.io/spring-security + + spring.io + http://spring.io/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + rwinch + Rob Winch + rwinch@gopivotal.com + + + + scm:git:git://github.com/spring-projects/spring-security + scm:git:git://github.com/spring-projects/spring-security + https://github.com/spring-projects/spring-security + + + + + org.springframework + spring-framework-bom + 4.2.5.RELEASE + pom + import + + + + + + commons-logging + commons-logging + 1.2 + compile + true + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 2.2.0 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.slf4j + jcl-over-slf4j + 1.7.7 + test + + + org.springframework + spring-test + test + + + + + spring-snapshot + https://repo.spring.io/snapshot + + + + + + maven-compiler-plugin + + 1.7 + 1.7 + + + + + diff --git a/samples/preauth-xml/pom.xml b/samples/xml/preauth/pom.xml similarity index 90% rename from samples/preauth-xml/pom.xml rename to samples/xml/preauth/pom.xml index c68fad9d79..a3f2e837c4 100644 --- a/samples/preauth-xml/pom.xml +++ b/samples/xml/preauth/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-preauth-xml - 4.1.0.RC1 + spring-security-samples-xml-preauth + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-preauth-xml - spring-security-samples-preauth-xml + spring-security-samples-xml-preauth + spring-security-samples-xml-preauth http://spring.io/spring-security spring.io @@ -74,13 +74,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -109,8 +109,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/preauth-xml/preauth.gradle b/samples/xml/preauth/preauth.gradle similarity index 100% rename from samples/preauth-xml/preauth.gradle rename to samples/xml/preauth/preauth.gradle diff --git a/samples/preauth-xml/realm.properties b/samples/xml/preauth/realm.properties similarity index 100% rename from samples/preauth-xml/realm.properties rename to samples/xml/preauth/realm.properties diff --git a/samples/servletapi-xml/src/main/resources/logback.xml b/samples/xml/preauth/src/main/resources/logback.xml similarity index 100% rename from samples/servletapi-xml/src/main/resources/logback.xml rename to samples/xml/preauth/src/main/resources/logback.xml diff --git a/samples/preauth-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 71% rename from samples/preauth-xml/src/main/webapp/WEB-INF/applicationContext-security.xml rename to samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml index 2559c676ee..4698926782 100644 --- a/samples/preauth-xml/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -6,9 +6,9 @@ --> diff --git a/samples/preauth-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/preauth-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/preauth/src/main/webapp/WEB-INF/web.xml diff --git a/samples/preauth-xml/src/main/webapp/index.jsp b/samples/xml/preauth/src/main/webapp/index.jsp similarity index 100% rename from samples/preauth-xml/src/main/webapp/index.jsp rename to samples/xml/preauth/src/main/webapp/index.jsp diff --git a/samples/preauth-xml/src/main/webapp/secure/extreme/index.jsp b/samples/xml/preauth/src/main/webapp/secure/extreme/index.jsp similarity index 100% rename from samples/preauth-xml/src/main/webapp/secure/extreme/index.jsp rename to samples/xml/preauth/src/main/webapp/secure/extreme/index.jsp diff --git a/samples/preauth-xml/src/main/webapp/secure/index.jsp b/samples/xml/preauth/src/main/webapp/secure/index.jsp similarity index 100% rename from samples/preauth-xml/src/main/webapp/secure/index.jsp rename to samples/xml/preauth/src/main/webapp/secure/index.jsp diff --git a/samples/preauth-xml/src/test/java/sample/PreAuthXmlTests.java b/samples/xml/preauth/src/test/java/sample/PreAuthXmlTests.java similarity index 100% rename from samples/preauth-xml/src/test/java/sample/PreAuthXmlTests.java rename to samples/xml/preauth/src/test/java/sample/PreAuthXmlTests.java diff --git a/samples/servletapi-xml/pom.xml b/samples/xml/servletapi/pom.xml similarity index 90% rename from samples/servletapi-xml/pom.xml rename to samples/xml/servletapi/pom.xml index 8945b989e2..d50c459e4c 100644 --- a/samples/servletapi-xml/pom.xml +++ b/samples/xml/servletapi/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-servletapi-xml - 4.1.0.RC1 + spring-security-samples-xml-servletapi + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-servletapi-xml - spring-security-samples-servletapi-xml + spring-security-samples-xml-servletapi + spring-security-samples-xml-servletapi http://spring.io/spring-security spring.io @@ -32,7 +32,7 @@ https://github.com/spring-projects/spring-security - /spring-security-samples-servletapi-xml + /spring-security-samples-xml-servletapi @@ -55,13 +55,13 @@ org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -118,13 +118,13 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -158,8 +158,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/servletapi-xml/servletapi.gradle b/samples/xml/servletapi/servletapi.gradle similarity index 100% rename from samples/servletapi-xml/servletapi.gradle rename to samples/xml/servletapi/servletapi.gradle diff --git a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java b/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java similarity index 100% rename from samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java rename to samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java diff --git a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java b/samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java similarity index 100% rename from samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java rename to samples/xml/servletapi/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java diff --git a/samples/xml/servletapi/src/main/resources/applicationContext-security.xml b/samples/xml/servletapi/src/main/resources/applicationContext-security.xml new file mode 100644 index 0000000000..966594acfb --- /dev/null +++ b/samples/xml/servletapi/src/main/resources/applicationContext-security.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/tutorial-xml/src/main/resources/logback.xml b/samples/xml/servletapi/src/main/resources/logback.xml similarity index 100% rename from samples/tutorial-xml/src/main/resources/logback.xml rename to samples/xml/servletapi/src/main/resources/logback.xml diff --git a/samples/servletapi-xml/src/main/webapp/WEB-INF/spring-servlet.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml similarity index 100% rename from samples/servletapi-xml/src/main/webapp/WEB-INF/spring-servlet.xml rename to samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml diff --git a/samples/servletapi-xml/src/main/webapp/WEB-INF/views/index.jsp b/samples/xml/servletapi/src/main/webapp/WEB-INF/views/index.jsp similarity index 100% rename from samples/servletapi-xml/src/main/webapp/WEB-INF/views/index.jsp rename to samples/xml/servletapi/src/main/webapp/WEB-INF/views/index.jsp diff --git a/samples/servletapi-xml/src/main/webapp/WEB-INF/views/login.jsp b/samples/xml/servletapi/src/main/webapp/WEB-INF/views/login.jsp similarity index 100% rename from samples/servletapi-xml/src/main/webapp/WEB-INF/views/login.jsp rename to samples/xml/servletapi/src/main/webapp/WEB-INF/views/login.jsp diff --git a/samples/servletapi-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/servletapi-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml diff --git a/samples/tutorial-xml/pom.xml b/samples/xml/tutorial/pom.xml similarity index 91% rename from samples/tutorial-xml/pom.xml rename to samples/xml/tutorial/pom.xml index f4b7dcaee9..87ceb92fb4 100644 --- a/samples/tutorial-xml/pom.xml +++ b/samples/xml/tutorial/pom.xml @@ -2,11 +2,11 @@ 4.0.0 org.springframework.security - spring-security-samples-tutorial-xml - 4.1.0.RC1 + spring-security-samples-xml-tutorial + 4.1.0.BUILD-SNAPSHOT war - spring-security-samples-tutorial-xml - spring-security-samples-tutorial-xml + spring-security-samples-xml-tutorial + spring-security-samples-xml-tutorial http://spring.io/spring-security spring.io @@ -55,7 +55,7 @@ org.springframework.security spring-security-core - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT compile @@ -119,19 +119,19 @@ org.springframework.security spring-security-config - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-taglibs - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime org.springframework.security spring-security-web - 4.1.0.RC1 + 4.1.0.BUILD-SNAPSHOT runtime @@ -160,8 +160,8 @@ - spring-milestone - https://repo.spring.io/milestone + spring-snapshot + https://repo.spring.io/snapshot diff --git a/samples/tutorial-xml/readme.txt b/samples/xml/tutorial/readme.txt similarity index 100% rename from samples/tutorial-xml/readme.txt rename to samples/xml/tutorial/readme.txt diff --git a/samples/tutorial-xml/scripts/exec-list-as-peter b/samples/xml/tutorial/scripts/exec-list-as-peter similarity index 100% rename from samples/tutorial-xml/scripts/exec-list-as-peter rename to samples/xml/tutorial/scripts/exec-list-as-peter diff --git a/samples/tutorial-xml/scripts/exec-list-as-rod b/samples/xml/tutorial/scripts/exec-list-as-rod similarity index 100% rename from samples/tutorial-xml/scripts/exec-list-as-rod rename to samples/xml/tutorial/scripts/exec-list-as-rod diff --git a/samples/tutorial-xml/scripts/exec-list-no-auth b/samples/xml/tutorial/scripts/exec-list-no-auth similarity index 100% rename from samples/tutorial-xml/scripts/exec-list-no-auth rename to samples/xml/tutorial/scripts/exec-list-no-auth diff --git a/samples/tutorial-xml/scripts/exec-list-wrong-password b/samples/xml/tutorial/scripts/exec-list-wrong-password similarity index 100% rename from samples/tutorial-xml/scripts/exec-list-wrong-password rename to samples/xml/tutorial/scripts/exec-list-wrong-password diff --git a/samples/tutorial-xml/scripts/exec-post-as-peter b/samples/xml/tutorial/scripts/exec-post-as-peter similarity index 100% rename from samples/tutorial-xml/scripts/exec-post-as-peter rename to samples/xml/tutorial/scripts/exec-post-as-peter diff --git a/samples/tutorial-xml/scripts/exec-post-as-rod b/samples/xml/tutorial/scripts/exec-post-as-rod similarity index 100% rename from samples/tutorial-xml/scripts/exec-post-as-rod rename to samples/xml/tutorial/scripts/exec-post-as-rod diff --git a/samples/tutorial-xml/scripts/exec-post-no-auth b/samples/xml/tutorial/scripts/exec-post-no-auth similarity index 100% rename from samples/tutorial-xml/scripts/exec-post-no-auth rename to samples/xml/tutorial/scripts/exec-post-no-auth diff --git a/samples/tutorial-xml/scripts/exec-post-wrong-password b/samples/xml/tutorial/scripts/exec-post-wrong-password similarity index 100% rename from samples/tutorial-xml/scripts/exec-post-wrong-password rename to samples/xml/tutorial/scripts/exec-post-wrong-password diff --git a/samples/tutorial-xml/src/main/java/bigbank/Account.java b/samples/xml/tutorial/src/main/java/bigbank/Account.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/Account.java rename to samples/xml/tutorial/src/main/java/bigbank/Account.java diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankDao.java b/samples/xml/tutorial/src/main/java/bigbank/BankDao.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/BankDao.java rename to samples/xml/tutorial/src/main/java/bigbank/BankDao.java diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankDaoStub.java b/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/BankDaoStub.java rename to samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankService.java b/samples/xml/tutorial/src/main/java/bigbank/BankService.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/BankService.java rename to samples/xml/tutorial/src/main/java/bigbank/BankService.java diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankServiceImpl.java b/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/BankServiceImpl.java rename to samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java diff --git a/samples/tutorial-xml/src/main/java/bigbank/SeedData.java b/samples/xml/tutorial/src/main/java/bigbank/SeedData.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/SeedData.java rename to samples/xml/tutorial/src/main/java/bigbank/SeedData.java diff --git a/samples/tutorial-xml/src/main/java/bigbank/web/ListAccounts.java b/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/web/ListAccounts.java rename to samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java diff --git a/samples/tutorial-xml/src/main/java/bigbank/web/PostAccounts.java b/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java similarity index 100% rename from samples/tutorial-xml/src/main/java/bigbank/web/PostAccounts.java rename to samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java diff --git a/samples/tutorial-xml/src/main/resources/applicationContext-business.xml b/samples/xml/tutorial/src/main/resources/applicationContext-business.xml similarity index 100% rename from samples/tutorial-xml/src/main/resources/applicationContext-business.xml rename to samples/xml/tutorial/src/main/resources/applicationContext-business.xml diff --git a/samples/x509-jc/src/main/resources/logback.xml b/samples/xml/tutorial/src/main/resources/logback.xml similarity index 100% rename from samples/x509-jc/src/main/resources/logback.xml rename to samples/xml/tutorial/src/main/resources/logback.xml diff --git a/samples/tutorial-xml/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/tutorial/src/main/webapp/WEB-INF/applicationContext-security.xml similarity index 100% rename from samples/tutorial-xml/src/main/webapp/WEB-INF/applicationContext-security.xml rename to samples/xml/tutorial/src/main/webapp/WEB-INF/applicationContext-security.xml diff --git a/samples/tutorial-xml/src/main/webapp/WEB-INF/bank-servlet.xml b/samples/xml/tutorial/src/main/webapp/WEB-INF/bank-servlet.xml similarity index 100% rename from samples/tutorial-xml/src/main/webapp/WEB-INF/bank-servlet.xml rename to samples/xml/tutorial/src/main/webapp/WEB-INF/bank-servlet.xml diff --git a/samples/tutorial-xml/src/main/webapp/WEB-INF/jsp/listAccounts.jsp b/samples/xml/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp similarity index 100% rename from samples/tutorial-xml/src/main/webapp/WEB-INF/jsp/listAccounts.jsp rename to samples/xml/tutorial/src/main/webapp/WEB-INF/jsp/listAccounts.jsp diff --git a/samples/tutorial-xml/src/main/webapp/WEB-INF/web.xml b/samples/xml/tutorial/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/tutorial-xml/src/main/webapp/WEB-INF/web.xml rename to samples/xml/tutorial/src/main/webapp/WEB-INF/web.xml diff --git a/samples/tutorial-xml/src/main/webapp/index.jsp b/samples/xml/tutorial/src/main/webapp/index.jsp similarity index 100% rename from samples/tutorial-xml/src/main/webapp/index.jsp rename to samples/xml/tutorial/src/main/webapp/index.jsp diff --git a/samples/tutorial-xml/src/main/webapp/loggedout.jsp b/samples/xml/tutorial/src/main/webapp/loggedout.jsp similarity index 100% rename from samples/tutorial-xml/src/main/webapp/loggedout.jsp rename to samples/xml/tutorial/src/main/webapp/loggedout.jsp diff --git a/samples/tutorial-xml/src/main/webapp/secure/extreme/index.jsp b/samples/xml/tutorial/src/main/webapp/secure/extreme/index.jsp similarity index 100% rename from samples/tutorial-xml/src/main/webapp/secure/extreme/index.jsp rename to samples/xml/tutorial/src/main/webapp/secure/extreme/index.jsp diff --git a/samples/tutorial-xml/src/main/webapp/secure/index.jsp b/samples/xml/tutorial/src/main/webapp/secure/index.jsp similarity index 100% rename from samples/tutorial-xml/src/main/webapp/secure/index.jsp rename to samples/xml/tutorial/src/main/webapp/secure/index.jsp diff --git a/samples/tutorial-xml/src/main/webapp/static/css/tutorial.css b/samples/xml/tutorial/src/main/webapp/static/css/tutorial.css similarity index 100% rename from samples/tutorial-xml/src/main/webapp/static/css/tutorial.css rename to samples/xml/tutorial/src/main/webapp/static/css/tutorial.css diff --git a/samples/tutorial-xml/src/main/webapp/timeout.jsp b/samples/xml/tutorial/src/main/webapp/timeout.jsp similarity index 100% rename from samples/tutorial-xml/src/main/webapp/timeout.jsp rename to samples/xml/tutorial/src/main/webapp/timeout.jsp diff --git a/samples/tutorial-xml/tutorial.gradle b/samples/xml/tutorial/tutorial.gradle similarity index 100% rename from samples/tutorial-xml/tutorial.gradle rename to samples/xml/tutorial/tutorial.gradle diff --git a/settings.gradle b/settings.gradle index c6b38d2a55..abd94a8992 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,10 @@ +rootProject.name = 'spring-security' + +rootProject.children.each {project -> + //assert project.projectDir.isDirectory() + //assert project.buildFile.isFile() +} + def String[] modules = [ 'core', 'data', @@ -15,45 +22,6 @@ def String[] modules = [ 'test' ] -def String[] samples = [ - 'tutorial-xml', - 'contacts-xml', - 'chat-jc', - 'openid-xml', - 'aspectj-xml', - 'aspectj-jc', - 'data-jc', - 'gae-xml', - 'dms-xml', - 'preauth-xml', - 'cas/server', - 'cas/sample-xml', - 'ldap-xml', - 'jaas-xml', - 'servletapi-xml', - 'concurrency-jc', - 'form-jc', - 'helloworld-jc', - 'helloworld-xml', - 'hellomvc-jc', - 'hellojs-jc', - 'insecure', - 'insecuremvc', - 'inmemory-jc', - 'jdbc-jc', - 'ldap-jc', - 'messages-jc', - 'openid-jc', - 'preauth-jc', - 'rememberme-jc', - 'x509-jc' -] - -def String[] itest = [ - 'web', - 'context' -] - include modules modules.each {name -> @@ -62,18 +30,10 @@ modules.each {name -> p.buildFileName = "${name}.gradle" } -include samples - -samples.each {name -> - def p = findProject(":${name}") - def fullName = name.replaceAll('/','') - p.name = "spring-security-samples-${fullName}" - p.projectDir = new File(settingsDir, "samples/${name}"); - if(!p.buildFile.exists()) { - def buildFile = fullName.replaceFirst("-xml","") - p.buildFileName = "${buildFile}.gradle" - } -} +def String[] itest = [ + 'web', + 'context' +] include itest @@ -89,12 +49,31 @@ include 'docs', 'docs:manual', 'docs:guides' def docs = findProject(':docs') docs.buildFileName = 'docs.gradle' -rootProject.name = 'spring-security' - -rootProject.children.each {project -> - //assert project.projectDir.isDirectory() - //assert project.buildFile.isFile() -} - include 'bom' + findProject(':bom').name = 'spring-security-bom' + +includeSamples("samples/xml") +includeSamples("samples/javaconfig") + +void includeSamples(String samplesDir) { + FileTree tree = fileTree(samplesDir) { + include '**/*.gradle' + } + tree.each {File file -> + String projectDir = file.path.substring(file.path.indexOf(samplesDir), file.path.lastIndexOf('/')) + String projectPath = projectDir.substring(projectDir.lastIndexOf('/') + 1) + String projectNamePrefix = samplesDir.substring(samplesDir.lastIndexOf('/') + 1).toLowerCase(); + + include projectPath + + def project = findProject(":${projectPath}") + + project.name = "spring-security-samples-${projectNamePrefix}-${project.name}" + project.projectDir = new File(settingsDir, projectDir) + + if (!project.buildFile.exists()) { + project.buildFileName = file.path.substring(file.path.lastIndexOf('/') + 1) + } + } +}