migrate to eclipse 3.7 and parent-project configs
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Sun, 7 Aug 2011 12:44:23 +0000 (12:44 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Sun, 7 Aug 2011 12:44:23 +0000 (12:44 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@3063 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

.checkstyle
.classpath
.project
pom.xml
src/main/assembly/bin.xml

index 82f24a5..2882642 100644 (file)
@@ -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>
index 1797868..72cc122 100644 (file)
@@ -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>
index db94ec1..4fafc55 100644 (file)
--- a/.project
+++ b/.project
                        </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>
diff --git a/pom.xml b/pom.xml
index 24a01c7..e0314c2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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-identityprovider</artifactId>
     <version>2.3.3</version>
     </description>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <xerces.groupId>org.apache.xerces</xerces.groupId>
-        <xerces.version>2.10.0</xerces.version>
+        <svn.relative.location>java-shib-idp2</svn.relative.location>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>shib-release</id>
-            <url>https://shibboleth.net/nexus/content/groups/public</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>shib-snapshot</id>
-            <url>https://shibboleth.net/nexus/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <dependencies>
         <!-- Compile dependencies -->
         <dependency>
 
         <!-- Provided dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <version>2.0</version>
 
         <!-- Runtime dependencies -->
         <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xerces.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${xerces.groupId}</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
-            <version>1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>2.7.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-nodeps</artifactId>
-            <version>1.7.1</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
             <groupId>ant-contrib</groupId>
             <artifactId>ant-contrib</artifactId>
             <version>1.0b2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>xmlunit</groupId>
-            <artifactId>xmlunit</artifactId>
-            <version>1.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>2.5.6.SEC02</version>
                 </exclusion>
             </exclusions>
         </dependency>
-    </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <id>release</id>
-            <url>https://shibboleth.net/nexus/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>snapshot</id>
-            <url>https://shibboleth.net/nexus/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
+        <!-- Managed Dependencies -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${xerces.groupId}</groupId>
+            <artifactId>xml-apis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${xerces.groupId}</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${xerces.groupId}</groupId>
+            <artifactId>serializer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${xalan.groupId}</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <debug>true</debug>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                    </descriptors>
-                    <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <argLine>-Xmx256m</argLine>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.3.1</version>
                 <configuration>
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <quiet>true</quiet>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8</version>
-                <configuration>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://joda-time.sourceforge.net/apidocs/</link>
-                        <link>http://static.springsource.org/spring/docs/2.0.x/api/</link>
-                    </links>
-                    <quiet>true</quiet>
-                    <author>false</author>
-                    <version>true</version>
-                    <doctitle>${project.name} ${project.version} Java API.</doctitle>
-                    <windowtitle>${project.name} ${project.version} Java API.</windowtitle>
-                    <overview>src/main/java/overview.html</overview>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <outputDirectory>${project.reporting.outputDirectory}/xref</outputDirectory>
-                    <doctitle>${project.name} ${project.version} Code Cross-Reference</doctitle>
-                    <windowtitle>${project.name} ${project.version} Java API.</windowtitle>
-                    <javadocDir>${project.reporting.outputDirectory}/apidocs</javadocDir>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.8.1</version>
-                <configuration>
-                    <outputDirectory>${project.reporting.outputDirectory}/unitTest</outputDirectory>
-                    <xrefLocation>${project.reporting.outputDirectory}/xref</xrefLocation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
     <profiles>
         <profile>
             <id>release</id>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.8</version>
-                        <executions>
-                            <execution>
-                                <id>release-javadoc</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>javadoc</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jxr-plugin</artifactId>
-                        <version>2.2</version>
-                        <executions>
-                            <execution>
-                                <id>release-jxr</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jxr</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-report-plugin</artifactId>
-                        <version>2.9</version>
-                        <executions>
-                            <execution>
-                                <id>release-unitTest</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>report-only</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/bin.xml</descriptor>
+                            </descriptors>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
 
-    <!-- Project Metadata -->
-    <url>http://shibboleth.internet2.edu/</url>
-
-    <inceptionYear>2006</inceptionYear>
-
-    <licenses>
-        <license>
-            <name>Apache 2</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <organization>
-        <name>Internet2</name>
-        <url>http://www.internet2.edu/</url>
-    </organization>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>http://bugs.internet2.edu/</url>
-    </issueManagement>
-
-    <mailingLists>
-        <mailingList>
-            <name>Shibboleth Announce</name>
-            <subscribe>http://shibboleth.internet2.edu/support.html#lists</subscribe>
-            <unsubscribe>http://shibboleth.internet2.edu/support.html#lists</unsubscribe>
-            <post>shibboleth-announce@internet2.edu</post>
-            <archive>https://mail.internet2.edu/wws/arc/shibboleth-announce</archive>
-        </mailingList>
-        <mailingList>
-            <name>Shibboleth Users</name>
-            <subscribe>http://shibboleth.internet2.edu/support.html#lists</subscribe>
-            <unsubscribe>http://shibboleth.internet2.edu/support.html#lists</unsubscribe>
-            <post>shibboleth-users@internet2.edu</post>
-            <archive>https://mail.internet2.edu/wws/arc/shibboleth-users</archive>
-        </mailingList>
-        <mailingList>
-            <name>Shibboleth Development</name>
-            <subscribe>http://shibboleth.internet2.edu/support.html#lists</subscribe>
-            <unsubscribe>http://shibboleth.internet2.edu/support.html#lists</unsubscribe>
-            <post>shibboleth-dev@internet2.edu</post>
-            <archive>https://mail.internet2.edu/wws/arc/shibboleth-dev</archive>
-        </mailingList>
-    </mailingLists>
-
-    <scm>
-        <connection>scm:svn:https://svn.middleware.georgetown.edu/java-idp/</connection>
-        <developerConnection>scm:svn:https://svn.middleware.georgetown.edu/java-idp/</developerConnection>
-        <tag>HEAD</tag>
-        <url>http://svn.middleware.georgetown.edu/view/?root=java-idp</url>
-    </scm>
-
-    <developers>
-        <developer>
-            <id>cantor</id>
-            <name>Scott Cantor</name>
-            <organization>The Ohio State University</organization>
-            <organizationUrl>http://www.osu.edu/</organizationUrl>
-            <roles>
-                <role>developer</role>
-            </roles>
-            <timezone>-5</timezone>
-        </developer>
-        <developer>
-            <id>ndk</id>
-            <name>Nate Klingenstein</name>
-            <organization>Internet2</organization>
-            <organizationUrl>http://www.internet2.edu/</organizationUrl>
-            <roles>
-                <role>documentation</role>
-            </roles>
-            <timezone>-7</timezone>
-        </developer>
-        <developer>
-            <id>lajoie</id>
-            <name>Chad La Joie</name>
-            <organization>Itumi, LLC</organization>
-            <organizationUrl>http://www.itumi.biz/</organizationUrl>
-            <roles>
-                <role>developer</role>
-                <role>documentation</role>
-            </roles>
-            <timezone>-5</timezone>
-        </developer>
-        <developer>
-            <id>wnorris</id>
-            <name>Will Norris</name>
-            <organization>Google, Inc.</organization>
-            <organizationUrl>http://www.google.com/</organizationUrl>
-            <roles>
-                <role>developer</role>
-            </roles>
-            <timezone>-8</timezone>
-        </developer>
-        <developer>
-            <id>rdw</id>
-            <name>Rod Widdowson</name>
-            <organization>University of Edinburgh</organization>
-            <organizationUrl>http://www.ed.ac.uk/</organizationUrl>
-            <roles>
-                <role>developer</role>
-            </roles>
-            <timezone>0</timezone>
-        </developer>
-    </developers>
-
-</project>
+</project>
\ No newline at end of file
index 20a8c01..214337d 100644 (file)
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Binary distribution, along with dependency jar files -->
-<assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    
     <id>bin</id>
     <formats>
         <format>tar.gz</format>
         <format>zip</format>
     </formats>
-    
+
     <dependencySets>
         <dependencySet>
             <outputDirectory>/lib</outputDirectory>
-            <excludes>
-                <exclude>org.apache.xerces:*</exclude>
-                <exclude>xalan:*</exclude>
-                <exclude>xml-resolver:*</exclude>
-                <exclude>xml-apis:</exclude>
-                <exclude>org.apache.ant:*</exclude>
-                <exclude>ant-contrib:*</exclude>
-                <exclude>edu.internet2.middleware:ant-extensions:*</exclude>
-            </excludes>
+            <directoryMode>774</directoryMode>
+            <fileMode>444</fileMode>
+            <scope>compile</scope>
             <includes>
                 <include>*:jar:*</include>
             </includes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>src/installer/lib</outputDirectory>
+            <directoryMode>774</directoryMode>
+            <fileMode>444</fileMode>
+            <scope>runtime</scope>
             <includes>
                 <include>org.apache.ant:*</include>
                 <include>ant-contrib:*</include>
@@ -34,6 +32,9 @@
         </dependencySet>
         <dependencySet>
             <outputDirectory>/endorsed</outputDirectory>
+            <directoryMode>774</directoryMode>
+            <fileMode>444</fileMode>
+            <scope>runtime</scope>
             <includes>
                 <include>org.apache.xerces:*</include>
                 <include>xalan:*</include>
             </includes>
         </dependencySet>
     </dependencySets>
-    
-    <fileSets>    
+
+    <fileSets>
         <!-- Copy up our installer srcipts into the root of the package -->
         <fileSet>
             <directory>src/installer/bash</directory>
-            <outputDirectory/>
+            <outputDirectory />
             <includes>
                 <include>*.sh</include>
             </includes>
         </fileSet>
         <fileSet>
             <directory>src/installer/bat</directory>
-            <outputDirectory/>
+            <outputDirectory />
             <includes>
                 <include>*.bat</include>
             </includes>
         </fileSet>
-        
+
         <!-- Keep our various resource files in the package -->
         <fileSet>
             <directory>src/installer/resources</directory>
@@ -74,7 +75,7 @@
             <directory>src/tools</directory>
             <outputDirectory>src/tools</outputDirectory>
         </fileSet>
-        
+
         <!-- Documentation -->
         <fileSet>
             <includes>
             <outputDirectory>/doc/src-xref</outputDirectory>
         </fileSet>
     </fileSets>
-    
+
 </assembly>