[java-centralized-discovery COMMIT] in /branches/REL_1: ./ .checkstyle .classpath .project pom.xml src/main/assembly/...

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Aug  6 23:18:29 2011
New Revision: 2192

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2192&view=rev
Log:
migrate to eclipse 3.7 and parent-project configs

Removed:
    branches/REL_1/src/main/assembly/src.xml
Modified:
    branches/REL_1/   (props changed)
    branches/REL_1/.checkstyle
    branches/REL_1/.classpath
    branches/REL_1/.project
    branches/REL_1/pom.xml
    branches/REL_1/src/main/assembly/bin.xml

Modified: branches/REL_1/.checkstyle
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/.checkstyle?rev=2192&r1=2191&r2=2192&view=diff
==============================================================================
--- branches/REL_1/.checkstyle (original)
+++ branches/REL_1/.checkstyle Sat Aug  6 23:18:29 2011
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Shibboleth" location="checkstyle.xml" type="project" description="Coding standards for Shibboleth code">
-    <additional-data name="protect-config-file" value="true"/>
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+   <local-check-config name="Shibboleth Checkstyle" type="remote" description="" 
+                       location="https://svn.shibboleth.net/java-parent-project/tags/1/resources/checkstyle/checkstyle.xml" >
+    <additional-data name="cache-file" value="true"/>
+    <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+    <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="Shibboleth" local="true">
-    <file-match-pattern match-pattern="." include-pattern="true"/>
+ 
+  <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+    <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
   </fileset>
-  <filter name="FileTypesFilter" enabled="true">
-    <filter-data value="java"/>
-  </filter>
+  
 </fileset-config>

Modified: branches/REL_1/.classpath
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/.classpath?rev=2192&r1=2191&r2=2192&view=diff
==============================================================================
--- branches/REL_1/.classpath (original)
+++ branches/REL_1/.classpath Sat Aug  6 23:18:29 2011
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <classpath>
-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-    <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+
+	<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="output" path="target/classes"/>
-</classpath>
+    
+</classpath>

Modified: branches/REL_1/.project
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/.project?rev=2192&r1=2191&r2=2192&view=diff
==============================================================================
--- branches/REL_1/.project (original)
+++ branches/REL_1/.project Sat Aug  6 23:18:29 2011
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.iam.jdt.core.mavenNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/pom.xml?rev=2192&r1=2191&r2=2192&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Sat Aug  6 23:18:29 2011
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-         

[... 599 lines stripped ...]