[utilities COMMIT] in /tomcat6-dta-ssl/trunk: ./ .checkstyle .classpath .project checkstyle.xml pom.xml src/main/asse...

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Aug  6 15:35:05 2011
New Revision: 159

URL: http://svn.shibboleth.net/view/utilities?rev=159&view=rev
Log:
migrate to eclipse 3.7 and parent-project configs
add schema info to assembly file

Added:
    tomcat6-dta-ssl/trunk/src/main/resources/
    tomcat6-dta-ssl/trunk/src/test/resources/
Removed:
    tomcat6-dta-ssl/trunk/checkstyle.xml
Modified:
    tomcat6-dta-ssl/trunk/   (props changed)
    tomcat6-dta-ssl/trunk/.checkstyle
    tomcat6-dta-ssl/trunk/.classpath
    tomcat6-dta-ssl/trunk/.project
    tomcat6-dta-ssl/trunk/pom.xml
    tomcat6-dta-ssl/trunk/src/main/assembly/bin.xml

Modified: tomcat6-dta-ssl/trunk/.checkstyle
URL: http://svn.shibboleth.net/view/utilities/tomcat6-dta-ssl/trunk/.checkstyle?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- tomcat6-dta-ssl/trunk/.checkstyle (original)
+++ tomcat6-dta-ssl/trunk/.checkstyle Sat Aug  6 15:35:05 2011
@@ -1,10 +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="Standard code check for Shibboleth">
-    <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="Sun Checks" local="false">
-    <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>
+  
 </fileset-config>

Modified: tomcat6-dta-ssl/trunk/.classpath
URL: http://svn.shibboleth.net/view/utilities/tomcat6-dta-ssl/trunk/.classpath?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- tomcat6-dta-ssl/trunk/.classpath (original)
+++ tomcat6-dta-ssl/trunk/.classpath Sat Aug  6 15:35:05 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: tomcat6-dta-ssl/trunk/.project
URL: http://svn.shibboleth.net/view/utilities/tomcat6-dta-ssl/trunk/.project?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- tomcat6-dta-ssl/trunk/.project (original)
+++ tomcat6-dta-ssl/trunk/.project Sat Aug  6 15:35:05 2011
@@ -11,18 +11,18 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.iam.jdt.core.mavenIncrementalBuilder</name>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.iam.jdt.core.mavenNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>

Modified: tomcat6-dta-ssl/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/tomcat6-dta-ssl/trunk/pom.xml?rev=159&r1=158&r2=159&view=diff
==============================================================================
--- tomcat6-dta-ssl/trunk/pom.xml (original)
+++ tomcat6-dta-ssl/trunk/pom.xml Sat Aug  6 15:35:05 2011
@@ -1,6 +1,15 @@

[... 190 lines stripped ...]