From 8ebbd1fd6d951eff9a9a91b3f5711dc81c7daed5 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Wed, 18 Dec 2013 14:37:34 +0200
Subject: [PATCH] maven work

---
 spring-mvc-java/.classpath                    |  2 +-
 spring-mvc-no-xml/.classpath                  | 10 +++----
 .../org.eclipse.wst.validation.prefs          |  3 +-
 spring-mvc-no-xml/pom.xml                     | 14 ++++++++--
 .../org.eclipse.wst.common.component          |  2 +-
 .../org.eclipse.wst.validation.prefs          |  3 +-
 .../org.eclipse.wst.validation.prefs          |  3 +-
 .../org.eclipse.wst.validation.prefs          |  3 +-
 .../org.eclipse.wst.common.component          |  1 -
 .../org.eclipse.wst.common.component          |  1 -
 .../org.eclipse.wst.validation.prefs          |  3 +-
 spring-security-rest-full/.classpath          | 16 +++++++----
 .../org.eclipse.wst.validation.prefs          |  3 +-
 spring-security-rest-full/pom.xml             | 28 +++++++++++++------
 14 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/spring-mvc-java/.classpath b/spring-mvc-java/.classpath
index 26784dcaf4..540ef9eab1 100644
--- a/spring-mvc-java/.classpath
+++ b/spring-mvc-java/.classpath
@@ -30,7 +30,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/spring-mvc-no-xml/.classpath b/spring-mvc-no-xml/.classpath
index eed10d8a8b..26c5f263e2 100644
--- a/spring-mvc-no-xml/.classpath
+++ b/spring-mvc-no-xml/.classpath
@@ -22,16 +22,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-mvc-no-xml/.settings/org.eclipse.wst.validation.prefs b/spring-mvc-no-xml/.settings/org.eclipse.wst.validation.prefs
index cacf5451ae..0d0aee4f72 100644
--- a/spring-mvc-no-xml/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-mvc-no-xml/.settings/org.eclipse.wst.validation.prefs
@@ -1,7 +1,8 @@
 DELEGATES_PREFERENCE=delegateValidatorList
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.303.v201202090300
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
+disabled=06target
 eclipse.preferences.version=1
 override=true
 suspend=false
diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml
index ff3f0a8010..ab5a0d271d 100644
--- a/spring-mvc-no-xml/pom.xml
+++ b/spring-mvc-no-xml/pom.xml
@@ -63,7 +63,7 @@
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>${org.slf4j.version}</version>
 		</dependency>
-		
+
 		<!-- test scoped -->
 
 		<dependency>
@@ -105,7 +105,17 @@
 		</resources>
 
 		<plugins>
-
+		
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
diff --git a/spring-mvc-xml/.settings/org.eclipse.wst.common.component b/spring-mvc-xml/.settings/org.eclipse.wst.common.component
index 4d41b2e1b4..02d347382a 100644
--- a/spring-mvc-xml/.settings/org.eclipse.wst.common.component
+++ b/spring-mvc-xml/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,7 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="context-root" value="spring-mvc-xml"/>
         <property name="java-output-path" value="/spring-mvc-xml/target/classes"/>
+        <property name="context-root" value="spring-mvc"/>
     </wb-module>
 </project-modules>
diff --git a/spring-mvc-xml/.settings/org.eclipse.wst.validation.prefs b/spring-mvc-xml/.settings/org.eclipse.wst.validation.prefs
index cacf5451ae..0d0aee4f72 100644
--- a/spring-mvc-xml/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-mvc-xml/.settings/org.eclipse.wst.validation.prefs
@@ -1,7 +1,8 @@
 DELEGATES_PREFERENCE=delegateValidatorList
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.303.v201202090300
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
+disabled=06target
 eclipse.preferences.version=1
 override=true
 suspend=false
diff --git a/spring-rest/.settings/org.eclipse.wst.validation.prefs b/spring-rest/.settings/org.eclipse.wst.validation.prefs
index cacf5451ae..0d0aee4f72 100644
--- a/spring-rest/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-rest/.settings/org.eclipse.wst.validation.prefs
@@ -1,7 +1,8 @@
 DELEGATES_PREFERENCE=delegateValidatorList
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.303.v201202090300
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
+disabled=06target
 eclipse.preferences.version=1
 override=true
 suspend=false
diff --git a/spring-security-rest-basic-auth/.settings/org.eclipse.wst.validation.prefs b/spring-security-rest-basic-auth/.settings/org.eclipse.wst.validation.prefs
index cacf5451ae..0d0aee4f72 100644
--- a/spring-security-rest-basic-auth/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-security-rest-basic-auth/.settings/org.eclipse.wst.validation.prefs
@@ -1,7 +1,8 @@
 DELEGATES_PREFERENCE=delegateValidatorList
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.303.v201202090300
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
+disabled=06target
 eclipse.preferences.version=1
 override=true
 suspend=false
diff --git a/spring-security-rest-custom/.settings/org.eclipse.wst.common.component b/spring-security-rest-custom/.settings/org.eclipse.wst.common.component
index 4bf6e222f3..3b22cb60bb 100644
--- a/spring-security-rest-custom/.settings/org.eclipse.wst.common.component
+++ b/spring-security-rest-custom/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
         <property name="context-root" value="spring-security-rest-custom"/>
         <property name="java-output-path" value="/spring-security-rest-custom/target/classes"/>
     </wb-module>
diff --git a/spring-security-rest-digest-auth/.settings/org.eclipse.wst.common.component b/spring-security-rest-digest-auth/.settings/org.eclipse.wst.common.component
index 9e1a61e740..128f61d711 100644
--- a/spring-security-rest-digest-auth/.settings/org.eclipse.wst.common.component
+++ b/spring-security-rest-digest-auth/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
         <property name="context-root" value="spring-security-rest-digest-auth"/>
         <property name="java-output-path" value="/spring-security-rest-digest-auth/target/classes"/>
     </wb-module>
diff --git a/spring-security-rest-digest-auth/.settings/org.eclipse.wst.validation.prefs b/spring-security-rest-digest-auth/.settings/org.eclipse.wst.validation.prefs
index cacf5451ae..0d0aee4f72 100644
--- a/spring-security-rest-digest-auth/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-security-rest-digest-auth/.settings/org.eclipse.wst.validation.prefs
@@ -1,7 +1,8 @@
 DELEGATES_PREFERENCE=delegateValidatorList
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.303.v201202090300
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
+disabled=06target
 eclipse.preferences.version=1
 override=true
 suspend=false
diff --git a/spring-security-rest-full/.classpath b/spring-security-rest-full/.classpath
index 5dea193677..a72442544c 100644
--- a/spring-security-rest-full/.classpath
+++ b/spring-security-rest-full/.classpath
@@ -16,16 +16,22 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-security-rest-full/.settings/org.eclipse.wst.validation.prefs b/spring-security-rest-full/.settings/org.eclipse.wst.validation.prefs
index cacf5451ae..0d0aee4f72 100644
--- a/spring-security-rest-full/.settings/org.eclipse.wst.validation.prefs
+++ b/spring-security-rest-full/.settings/org.eclipse.wst.validation.prefs
@@ -1,7 +1,8 @@
 DELEGATES_PREFERENCE=delegateValidatorList
 USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
 USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.303.v201202090300
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
+disabled=06target
 eclipse.preferences.version=1
 override=true
 suspend=false
diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml
index db0e888479..fe45280b33 100644
--- a/spring-security-rest-full/pom.xml
+++ b/spring-security-rest-full/pom.xml
@@ -132,7 +132,7 @@
 			<artifactId>guava</artifactId>
 			<version>${guava.version}</version>
 		</dependency>
-		
+
 		<!-- logging -->
 
 		<dependency>
@@ -157,7 +157,7 @@
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>${org.slf4j.version}</version>
 		</dependency>
-		
+
 		<!-- test scoped -->
 
 		<dependency>
@@ -200,6 +200,22 @@
 
 		<plugins>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>${maven-war-plugin.version}</version>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -235,12 +251,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${maven-war-plugin.version}</version>
-			</plugin>
-
 		</plugins>
 
 	</build>
@@ -285,7 +295,7 @@
 		<maven-war-plugin.version>2.4</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 		<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
-		
+
 	</properties>
 
 </project>
\ No newline at end of file