[utilities COMMIT] in /tomcat6-dta-ssl/trunk: .classpath .settings/org.eclipse.jdt.core.prefs

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Sep  8 12:10:00 2015
New Revision: 820

URL: http://svn.shibboleth.net/view/utilities?rev=820&view=rev
Log:
JCONN-2 - Support Java 6

Eclipse settings and classpath.

Modified:
    tomcat6-dta-ssl/trunk/.classpath
    tomcat6-dta-ssl/trunk/.settings/org.eclipse.jdt.core.prefs

Modified: tomcat6-dta-ssl/trunk/.classpath
URL: http://svn.shibboleth.net/view/utilities/tomcat6-dta-ssl/trunk/.classpath?rev=820&r1=819&r2=820&view=diff
==============================================================================
--- tomcat6-dta-ssl/trunk/.classpath	(original)
+++ tomcat6-dta-ssl/trunk/.classpath	Tue Sep  8 12:10:00 2015
@@ -1,16 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <classpath>
-
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-    
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-    
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
-    
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</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 excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<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.6">
+		<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"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
-    
-</classpath>
+</classpath>

Modified: tomcat6-dta-ssl/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.shibboleth.net/view/utilities/tomcat6-dta-ssl/trunk/.settings/org.eclipse.jdt.core.prefs?rev=820&r1=819&r2=820&view=diff
==============================================================================
--- tomcat6-dta-ssl/trunk/.settings/org.eclipse.jdt.core.prefs	(original)
+++ tomcat6-dta-ssl/trunk/.settings/org.eclipse.jdt.core.prefs	Tue Sep  8 12:10:00 2015
@@ -11,9 +11,9 @@
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -73,7 +73,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16