[java-shib-common COMMIT] in /branches/REL_1: ./ .checkstyle .classpath pom.xml src/main/assembly/bin.xml src/main/as...
noreply at shibboleth.net
noreply at shibboleth.net
Sun Aug 7 13:50:41 BST 2011
Author: lajoie
Date: Sun Aug 7 13:50:41 2011
New Revision: 1003
URL: http://svn.shibboleth.net/view/java-shib-common?rev=1003&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/pom.xml
branches/REL_1/src/main/assembly/bin.xml
Modified: branches/REL_1/.checkstyle
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/.checkstyle?rev=1003&r1=1002&r2=1003&view=diff
==============================================================================
--- branches/REL_1/.checkstyle (original)
+++ branches/REL_1/.checkstyle Sun Aug 7 13:50:41 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">
- <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-shib-common/branches/REL_1/.classpath?rev=1003&r1=1002&r2=1003&view=diff
==============================================================================
--- branches/REL_1/.classpath (original)
+++ branches/REL_1/.classpath Sun Aug 7 13:50:41 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="output" path="target/classes"/>
-</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="output" path="target/classes"/>
+
+</classpath>
Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/pom.xml?rev=1003&r1=1002&r2=1003&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Sun Aug 7 13:50:41 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">
-
+<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">
+
<modelVersion>4.0.0</modelVersion>
-
+
+ <parent>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ </parent>
+
<groupId>edu.internet2.middleware</groupId>
<artifactId>shibboleth-common</artifactId>
<version>1.3.3</version>
@@ -16,29 +22,10 @@
</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <svn.relative.location>java-shib-common</svn.relative.location>
<spring.groupId>org.springframework</spring.groupId>
<spring.version>2.5.6.SEC02</spring.version>
[... 553 lines stripped ...]
More information about the commits
mailing list