[utilities COMMIT] /spring-extensions/trunk/ /spring-extensions/trunk/.checkstyle /spring-extensions/trunk/.classpath...

noreply at shibboleth.net noreply at shibboleth.net
Sat Aug 6 15:40:02 BST 2011


Author: lajoie
Date: Sat Aug  6 15:40:02 2011
New Revision: 161

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

Modified:
    spring-extensions/trunk/   (props changed)
    spring-extensions/trunk/.checkstyle
    spring-extensions/trunk/.classpath
    spring-extensions/trunk/.project
    spring-extensions/trunk/pom.xml
    tomcat6-dta-ssl/trunk/pom.xml

Modified: spring-extensions/trunk/.checkstyle
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/.checkstyle?rev=161&r1=160&r2=161&view=diff
==============================================================================
--- spring-extensions/trunk/.checkstyle (original)
+++ spring-extensions/trunk/.checkstyle Sat Aug  6 15:40:02 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 Checkstyle" location="checkstyle.xml" type="project" description="">
-    <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 Checkstyle" 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>
+  
 </fileset-config>

Modified: spring-extensions/trunk/.classpath
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/.classpath?rev=161&r1=160&r2=161&view=diff
==============================================================================
--- spring-extensions/trunk/.classpath (original)
+++ spring-extensions/trunk/.classpath Sat Aug  6 15:40:02 2011
@@ -1,10 +1,16 @@
 <?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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+    
 	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+    
+</classpath>

Modified: spring-extensions/trunk/.project
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/.project?rev=161&r1=160&r2=161&view=diff
==============================================================================
--- spring-extensions/trunk/.project (original)
+++ spring-extensions/trunk/.project Sat Aug  6 15:40:02 2011
@@ -11,19 +11,19 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</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.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>

Modified: spring-extensions/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/pom.xml?rev=161&r1=160&r2=161&view=diff
==============================================================================
--- spring-extensions/trunk/pom.xml (original)
+++ spring-extensions/trunk/pom.xml Sat Aug  6 15:40:02 2011
@@ -1,7 +1,14 @@
 <?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/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

[... 194 lines stripped ...]


More information about the commits mailing list