Use xml / javaconfig folders for samples

Fixes gh-3752

samples/javaconfig/aspectj/pom.xml

@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
-  <artifactId>spring-security-samples-aspectj-jc</artifactId>
-  <version>4.1.0.RC1</version>
-  <name>spring-security-samples-aspectj-jc</name>
-  <description>spring-security-samples-aspectj-jc</description>
+  <artifactId>spring-security-samples-javaconfig-aspectj</artifactId>
+  <version>4.1.0.BUILD-SNAPSHOT</version>
+  <name>spring-security-samples-javaconfig-aspectj</name>
+  <description>spring-security-samples-javaconfig-aspectj</description>
   <url>http://spring.io/spring-security</url>
   <organization>
     <name>spring.io</name>
@@ -45,13 +45,13 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-aspects</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -112,8 +112,8 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>spring-milestone</id>
-      <url>https://repo.spring.io/milestone</url>
+      <id>spring-snapshot</id>
+      <url>https://repo.spring.io/snapshot</url>
     </repository>
   </repositories>
   <build>

samples/javaconfig/chat/pom.xml

@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
-  <artifactId>spring-security-samples-chat-jc</artifactId>
-  <version>4.1.0.RC1</version>
+  <artifactId>spring-security-samples-javaconfig-chat</artifactId>
+  <version>4.1.0.BUILD-SNAPSHOT</version>
   <packaging>war</packaging>
-  <name>spring-security-samples-chat-jc</name>
-  <description>spring-security-samples-chat-jc</description>
+  <name>spring-security-samples-javaconfig-chat</name>
+  <description>spring-security-samples-javaconfig-chat</description>
   <url>http://spring.io/spring-security</url>
   <organization>
     <name>spring.io</name>
@@ -133,25 +133,25 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-data</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-messaging</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -244,8 +244,8 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>spring-milestone</id>
-      <url>https://repo.spring.io/milestone</url>
+      <id>spring-snapshot</id>
+      <url>https://repo.spring.io/snapshot</url>
     </repository>
   </repositories>
   <build>

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 {

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

samples/javaconfig/concurrency/pom.xml

@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
-  <artifactId>spring-security-samples-rememberme-jc</artifactId>
-  <version>4.1.0.RC1</version>
+  <artifactId>spring-security-samples-javaconfig-concurrency</artifactId>
+  <version>4.1.0.BUILD-SNAPSHOT</version>
   <packaging>war</packaging>
-  <name>spring-security-samples-rememberme-jc</name>
-  <description>spring-security-samples-rememberme-jc</description>
+  <name>spring-security-samples-javaconfig-concurrency</name>
+  <description>spring-security-samples-javaconfig-concurrency</description>
   <url>http://spring.io/spring-security</url>
   <organization>
     <name>spring.io</name>
@@ -91,25 +91,25 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-samples-messages-jc</artifactId>
-      <version>4.1.0.RC1</version>
+      <artifactId>spring-security-samples-javaconfig-messages</artifactId>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -191,8 +191,8 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>spring-milestone</id>
-      <url>https://repo.spring.io/milestone</url>
+      <id>spring-snapshot</id>
+      <url>https://repo.spring.io/snapshot</url>
     </repository>
   </repositories>
   <build>

samples/javaconfig/data/pom.xml

@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
-  <artifactId>spring-security-samples-data-jc</artifactId>
-  <version>4.1.0.RC1</version>
-  <name>spring-security-samples-data-jc</name>
-  <description>spring-security-samples-data-jc</description>
+  <artifactId>spring-security-samples-javaconfig-data</artifactId>
+  <version>4.1.0.BUILD-SNAPSHOT</version>
+  <name>spring-security-samples-javaconfig-data</name>
+  <description>spring-security-samples-javaconfig-data</description>
   <url>http://spring.io/spring-security</url>
   <organization>
     <name>spring.io</name>
@@ -81,13 +81,13 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-data</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -135,8 +135,8 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>spring-milestone</id>
-      <url>https://repo.spring.io/milestone</url>
+      <id>spring-snapshot</id>
+      <url>https://repo.spring.io/snapshot</url>
     </repository>
   </repositories>
   <build>

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

samples/javaconfig/form/pom.xml

@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
-  <artifactId>spring-security-samples-jdbc-jc</artifactId>
-  <version>4.1.0.RC1</version>
+  <artifactId>spring-security-samples-javaconfig-form</artifactId>
+  <version>4.1.0.BUILD-SNAPSHOT</version>
   <packaging>war</packaging>
-  <name>spring-security-samples-jdbc-jc</name>
-  <description>spring-security-samples-jdbc-jc</description>
+  <name>spring-security-samples-javaconfig-form</name>
+  <description>spring-security-samples-javaconfig-form</description>
   <url>http://spring.io/spring-security</url>
   <organization>
     <name>spring.io</name>
@@ -91,25 +91,25 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-samples-messages-jc</artifactId>
-      <version>4.1.0.RC1</version>
+      <artifactId>spring-security-samples-javaconfig-messages</artifactId>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -245,8 +245,8 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>spring-milestone</id>
-      <url>https://repo.spring.io/milestone</url>
+      <id>spring-snapshot</id>
+      <url>https://repo.spring.io/snapshot</url>
     </repository>
   </repositories>
   <build>

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

samples/javaconfig/hellojs/pom.xml

@@ -2,11 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
-  <artifactId>spring-security-samples-hellojs-jc</artifactId>
-  <version>4.1.0.RC1</version>
+  <artifactId>spring-security-samples-javaconfig-hellojs</artifactId>
+  <version>4.1.0.BUILD-SNAPSHOT</version>
   <packaging>war</packaging>
-  <name>spring-security-samples-hellojs-jc</name>
-  <description>spring-security-samples-hellojs-jc</description>
+  <name>spring-security-samples-javaconfig-hellojs</name>
+  <description>spring-security-samples-javaconfig-hellojs</description>
   <url>http://spring.io/spring-security</url>
   <organization>
     <name>spring.io</name>
@@ -97,25 +97,25 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-samples-messages-jc</artifactId>
-      <version>4.1.0.RC1</version>
+      <artifactId>spring-security-samples-javaconfig-messages</artifactId>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
-      <version>4.1.0.RC1</version>
+      <version>4.1.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -197,8 +197,8 @@
   </dependencies>
   <repositories>
     <repository>
-      <id>spring-milestone</id>
-      <url>https://repo.spring.io/milestone</url>
+      <id>spring-snapshot</id>
+      <url>https://repo.spring.io/snapshot</url>
     </repository>
   </repositories>
   <build>