First part of mavenizing IdP

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2714 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/.classpath b/.classpath
index 100362d..5b00555 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="test"/>
-       <classpathentry excluding="classpath/|conf/" including="META-INF/" kind="src" path="resources"/>
-       <classpathentry kind="src" path="resources/conf"/>
-       <classpathentry kind="src" path="resources/classpath"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+               <attributes>
+                       <attribute name="maven.type" value="test"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>
+       <classpathentry excluding="**" kind="src" output="src/test/resources" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="lib" path="build-lib/servlet-2.4.jar"/>
-       <classpathentry kind="lib" path="build-lib/junit-3.8.1.jar"/>
-       <classpathentry combineaccessrules="false" exported="true" kind="src" path="/java-shib-common"/>
-       <classpathentry kind="lib" path="build-lib/spring-2.0.7-mock.jar"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/.project b/.project
index 94f9b58..973bdab 100644 (file)
--- a/.project
+++ b/.project
@@ -15,9 +15,15 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>org.eclipse.team.cvs.core.cvsnature</nature>
                <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
                <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index c711d35..3478285 100644 (file)
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Thu Feb 21 07:29:42 CET 2008
+#Sat Apr 12 17:22:05 BST 2008
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
 org.eclipse.jdt.core.codeComplete.fieldPrefixes=

diff --git a/build-lib/ant-1.6.5-junit.jar b/build-lib/ant-1.6.5-junit.jar
deleted file mode 100644 (file)
index 5ee4f7f..0000000
Binary files a/build-lib/ant-1.6.5-junit.jar and /dev/null differ

diff --git a/build-lib/ant-1.6.5-launcher.jar b/build-lib/ant-1.6.5-launcher.jar
deleted file mode 100644 (file)
index 1a71612..0000000
Binary files a/build-lib/ant-1.6.5-launcher.jar and /dev/null differ

diff --git a/build-lib/ant-1.6.5-nodeps.jar b/build-lib/ant-1.6.5-nodeps.jar
deleted file mode 100644 (file)
index 3e0e5d4..0000000
Binary files a/build-lib/ant-1.6.5-nodeps.jar and /dev/null differ

diff --git a/build-lib/ant-1.6.5.jar b/build-lib/ant-1.6.5.jar
deleted file mode 100644 (file)
index 3beb3b8..0000000
Binary files a/build-lib/ant-1.6.5.jar and /dev/null differ

diff --git a/build-lib/ant-contrib-1.0b2.jar b/build-lib/ant-contrib-1.0b2.jar
deleted file mode 100644 (file)
index ea817cd..0000000
Binary files a/build-lib/ant-contrib-1.0b2.jar and /dev/null differ

diff --git a/build-lib/antext-9Mar2008.jar b/build-lib/antext-9Mar2008.jar
deleted file mode 100644 (file)
index e55e79e..0000000
Binary files a/build-lib/antext-9Mar2008.jar and /dev/null differ

diff --git a/build-lib/bcprov-jdk14-138.jar b/build-lib/bcprov-jdk14-138.jar
deleted file mode 100644 (file)
index d1befb7..0000000
Binary files a/build-lib/bcprov-jdk14-138.jar and /dev/null differ

diff --git a/build-lib/checkstyle-all-4.2.jar b/build-lib/checkstyle-all-4.2.jar
deleted file mode 100644 (file)
index 35865ca..0000000
Binary files a/build-lib/checkstyle-all-4.2.jar and /dev/null differ

diff --git a/build-lib/junit-3.8.1.jar b/build-lib/junit-3.8.1.jar
deleted file mode 100644 (file)
index 674d71e..0000000
Binary files a/build-lib/junit-3.8.1.jar and /dev/null differ

diff --git a/build-lib/servlet-2.4.jar b/build-lib/servlet-2.4.jar
deleted file mode 100644 (file)
index ea36070..0000000
Binary files a/build-lib/servlet-2.4.jar and /dev/null differ

diff --git a/build-lib/spring-2.0.7-mock.jar b/build-lib/spring-2.0.7-mock.jar
deleted file mode 100644 (file)
index 233f3ab..0000000
Binary files a/build-lib/spring-2.0.7-mock.jar and /dev/null differ

diff --git a/lib/shib-jce-1.0.jar b/lib/shib-jce-1.0.jar
deleted file mode 100644 (file)
index e7866ff..0000000
Binary files a/lib/shib-jce-1.0.jar and /dev/null differ

diff --git a/pom.xml b/pom.xml
new file mode 100644 (file)
index 0000000..cfaa744
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>edu.internet2.shibboleth</groupId>
+    <artifactId>identityprovider</artifactId>
+    <version>2.1.0</version>
+    <!-- We bundle as a jar here, the installer creates the WAR -->
+    <packaging>jar</packaging>
+
+    <name>Shibboleth Identity Provider</name>
+    <description>
+        The Shibboleth Identity Provider is used by an organization to securely assert information, via SAML, about
+        their users.  This information is then read and acted upon by Service Providers.
+    </description>
+    
+    <repositories>
+        <repository>
+            <id>shibboleth.internet2.edu</id>
+            <name>Internet2</name>
+            <layout>default</layout>
+            <url>http://shibboleth.internet2.edu/downloads/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <!-- Compile dependencies -->
+        <dependency>
+            <groupId>edu.internet2.shibboleth</groupId>
+            <artifactId>shibboleth-common</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>0.9.8</version>
+        </dependency>
+            <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>0.9.8</version>
+        </dependency>
+        
+        <!-- Provided dependencies -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+                
+        <!-- Runtime dependencies -->
+        <dependency>
+            <groupId>org.apache.xerces</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>2.9.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.9.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xerces</groupId>
+            <artifactId>resolver</artifactId>
+            <version>2.9.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xerces</groupId>
+            <artifactId>serializer</artifactId>
+            <version>2.9.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.1</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.7.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant-nodeps</artifactId>
+            <version>1.7.0</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>ant-contrib</groupId>
+            <artifactId>ant-contrib</artifactId>
+            <version>1.0b2</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>ant</groupId>
+                    <artifactId>ant</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <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>
+                <configuration>
+                    <descriptors>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                        <descriptor>src/main/assembly/src.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <links>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/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>
+                <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-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>checkstyle.xml</configLocation>
+                    <outputDirectory>${project.reporting.outputDirectory}/style</outputDirectory>
+                    <enableRSS>false</enableRSS>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${project.reporting.outputDirectory}/unitTest</outputDirectory>
+                    <xrefLocation>${project.reporting.outputDirectory}/xref</xrefLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+    
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <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>
+                        <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-checkstyle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>release-checkstyle</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>checkstyle</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-report-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>release-unitTest</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>report-only</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <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>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>    
+            </build>            
+        </profile>
+    </profiles>
+    
+    <!-- Project Metadata -->
+    <url>https://opensaml.org/</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>OpenSAML Users</name>
+            <subscribe>https://spaces.internet2.edu/display/OpenSAML/MailingList</subscribe>
+            <unsubscribe>https://spaces.internet2.edu/display/OpenSAML/MailingList</unsubscribe>
+            <post>mace-opensaml-users@internet2.edu</post>
+            <archive>https://mail.internet2.edu/wws/arc/mace-opensaml-users</archive>
+            <otherArchives>
+                <otherArchive>http://groups.google.com/group/opensaml-users</otherArchive>
+            </otherArchives>
+        </mailingList>
+    </mailingLists>
+    
+    <scm>
+        <connection>scm:svn:https://svn.middleware.georgetown.edu/java-xmltooling/</connection>
+        <developerConnection>scm:svn:https://svn.middleware.georgetown.edu/java-xmltooling/</developerConnection>
+        <tag>HEAD</tag>
+        <url>http://svn.middleware.georgetown.edu/view/?root=java-xmltooling</url>
+    </scm>
+    
+    <developers>
+        <developer>
+            <id>cantor</id>
+            <name>Scott Cantor</name>
+            <organization>The Ohio State University</organization>
+            <organizationUrl>http://www.ohio-state.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>SWITCH</organization>
+            <organizationUrl>http://www.switch.ch/</organizationUrl>
+            <roles>
+                <role>developer</role>
+                <role>documentation</role>
+            </roles>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <id>wnorris</id>
+            <name>Will Norris</name>
+            <organization>University of Southern California</organization>
+            <organizationUrl>http://www.usc.edu/</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>
\ No newline at end of file

diff --git a/ant.sh b/src/installer/bash/install.sh
similarity index 100%
rename from ant.sh
rename to src/installer/bash/install.sh

diff --git a/ant.bat b/src/installer/bat/install.bat
similarity index 100%
rename from ant.bat
rename to src/installer/bat/install.bat

diff --git a/build.properties b/src/installer/resources/build.properties
similarity index 100%
rename from build.properties
rename to src/installer/resources/build.properties

diff --git a/build.xml b/src/installer/resources/build.xml
similarity index 100%
rename from build.xml
rename to src/installer/resources/build.xml

diff --git a/resources/conf/attribute-filter.xml b/src/installer/resources/conf-tmpl/attribute-filter.xml
similarity index 100%
rename from resources/conf/attribute-filter.xml
rename to src/installer/resources/conf-tmpl/attribute-filter.xml

diff --git a/resources/conf/attribute-resolver.xml b/src/installer/resources/conf-tmpl/attribute-resolver.xml
similarity index 100%
rename from resources/conf/attribute-resolver.xml
rename to src/installer/resources/conf-tmpl/attribute-resolver.xml

diff --git a/resources/conf/handler.xml b/src/installer/resources/conf-tmpl/handler.xml
similarity index 100%
rename from resources/conf/handler.xml
rename to src/installer/resources/conf-tmpl/handler.xml

diff --git a/resources/conf/internal.xml b/src/installer/resources/conf-tmpl/internal.xml
similarity index 100%
rename from resources/conf/internal.xml
rename to src/installer/resources/conf-tmpl/internal.xml

diff --git a/resources/conf/logging.xml b/src/installer/resources/conf-tmpl/logging.xml
similarity index 100%
rename from resources/conf/logging.xml
rename to src/installer/resources/conf-tmpl/logging.xml

diff --git a/resources/conf/login.config b/src/installer/resources/conf-tmpl/login.config
similarity index 100%
rename from resources/conf/login.config
rename to src/installer/resources/conf-tmpl/login.config

diff --git a/resources/conf/relying-party.xml b/src/installer/resources/conf-tmpl/relying-party.xml
similarity index 100%
rename from resources/conf/relying-party.xml
rename to src/installer/resources/conf-tmpl/relying-party.xml

diff --git a/resources/conf/service.xml b/src/installer/resources/conf-tmpl/service.xml
similarity index 100%
rename from resources/conf/service.xml
rename to src/installer/resources/conf-tmpl/service.xml

diff --git a/install.properties b/src/installer/resources/install.properties
similarity index 100%
rename from install.properties
rename to src/installer/resources/install.properties

diff --git a/resources/metadata/idp-metadata.xml b/src/installer/resources/metadata-tmpl/idp-metadata.xml
similarity index 100%
rename from resources/metadata/idp-metadata.xml
rename to src/installer/resources/metadata-tmpl/idp-metadata.xml

diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
new file mode 100644 (file)
index 0000000..59ab2e4
--- /dev/null
+++ b/src/main/assembly/bin.xml
@@ -0,0 +1,96 @@
+<!-- Binary distribution, along with dependency jar files -->
+<assembly>
+    <id>bin</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <excludes>
+                <exclude>org.apache.xerces:*</exclude>
+                <exclude>org.apache.xalan:*</exclude>
+                <exclude>org.apache.ant:*</exclude>
+                <exclude>ant-contrib:*</exclude>
+            </excludes>
+            <includes>
+                <include>*:jar:*</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>src/installer/lib</outputDirectory>
+            <includes>
+                <include>org.apache.ant:*</include>
+                <include>ant-contrib:*</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/endorsed</outputDirectory>
+            <includes>
+                <include>org.apache.xerces:*</include>
+                <include>org.apache.xalan:*</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+    
+    <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>
+            <outputDirectory>/src/installer/resources</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/webapp</directory>
+            <outputDirectory>/src/main/webapp</outputDirectory>
+        </fileSet>
+        
+        <!-- Docs -->
+        <fileSet>
+            <includes>
+                <include>RELEASE-NOTES*</include>
+                <include>LICENSE*</include>
+            </includes>
+        </fileSet>
+
+        <!-- Documentation -->
+        <fileSet>
+            <directory>doc/</directory>
+            <outputDirectory>/doc</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>/doc/api</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/style</directory>
+            <outputDirectory>/doc/style</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/unitTest</directory>
+            <outputDirectory>/doc/unitTest</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/xref</directory>
+            <outputDirectory>/doc/src-xref</outputDirectory>
+        </fileSet>
+    </fileSets>
+    
+</assembly>
\ No newline at end of file

diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
new file mode 100644 (file)
index 0000000..5fd5602
--- /dev/null
+++ b/src/main/assembly/src.xml
@@ -0,0 +1,70 @@
+<!-- Source distribution -->
+<assembly>
+    <id>src</id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <excludes>
+                <exclude>org.apache.xerces:*</exclude>
+                <exclude>org.apache.xalan:*</exclude>
+                <exclude>org.apache.ant:*</exclude>
+                <exclude>ant-contrib:*</exclude>
+            </excludes>
+            <includes>
+                <include>*:jar:*</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>src/installer/lib</outputDirectory>
+            <includes>
+                <include>org.apache.ant:*</include>
+                <include>ant-contrib:*</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/endorsed</outputDirectory>
+            <includes>
+                <include>org.apache.xerces:*</include>
+                <include>org.apache.xalan:*</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+    
+    <fileSets>
+        <fileSet>
+            <useDefaultExcludes>true</useDefaultExcludes>
+            <excludes>
+                <exclude>**/target/**</exclude>
+                <exclude>**/bin/**</exclude>
+            </excludes>
+        </fileSet>
+
+        <!-- Documentation -->
+        <fileSet>
+            <directory>doc/</directory>
+            <outputDirectory>/doc</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>/doc/api</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/style</directory>
+            <outputDirectory>/doc/style</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/unitTest</directory>
+            <outputDirectory>/doc/unitTest</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/site/xref</directory>
+            <outputDirectory>/doc/src-xref</outputDirectory>
+        </fileSet>
+    </fileSets>
+    
+</assembly>
\ No newline at end of file

diff --git a/src/edu/internet2/middleware/shibboleth/idp/Version.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/Version.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/Version.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/Version.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationEngine.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationException.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationException.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationException.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/AuthenticationException.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/ForceAuthenticationException.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/ForceAuthenticationException.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/ForceAuthenticationException.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/ForceAuthenticationException.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/LoginContext.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/LoginContext.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/LoginContext.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/LoginContext.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/LoginHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/LoginHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/LoginHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/LoginHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/PassiveAuthenticationException.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/PassiveAuthenticationException.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/PassiveAuthenticationException.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/PassiveAuthenticationException.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/Saml2LoginContext.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/Saml2LoginContext.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/Saml2LoginContext.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/Saml2LoginContext.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/ShibbolethSSOLoginContext.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/ShibbolethSSOLoginContext.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/ShibbolethSSOLoginContext.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/ShibbolethSSOLoginContext.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/IPAddressLoginHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/IPAddressLoginHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/provider/IPAddressLoginHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/IPAddressLoginHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/PreviousSessionLoginHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/PreviousSessionLoginHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/provider/PreviousSessionLoginHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/PreviousSessionLoginHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserAuthServlet.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserAuthServlet.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserAuthServlet.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserAuthServlet.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserLoginHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserLoginHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserLoginHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/RemoteUserLoginHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/UsernamePasswordLoginServlet.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/AbstractSAMLProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/IdPProfileHandlerManagerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/IdPProfileHandlerManagerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/IdPProfileHandlerManagerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/IdPProfileHandlerManagerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerGroupBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/SAMLMetadataHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/SAMLMetadataHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/SAMLMetadataHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/SAMLMetadataHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/StatusHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/StatusHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/StatusHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/StatusHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerFactoryBean.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerFactoryBean.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerFactoryBean.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/AbstractLoginHandlerFactoryBean.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerFactoryBean.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerFactoryBean.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerFactoryBean.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/IPAddressLoginHandlerFactoryBean.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerFactoryBean.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerFactoryBean.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerFactoryBean.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/PreviousSessionLoginHandlerFactoryBean.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerFactoryBean.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerFactoryBean.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerFactoryBean.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/RemoteUserLoginHandlerFactoryBean.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerFactoryBean.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerFactoryBean.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerFactoryBean.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/UsernamePasswordLoginHandlerFactoryBean.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/AbstractSAML1ProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/AbstractSAML1ProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/AbstractSAML1ProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/AbstractSAML1ProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1ArtifactResolutionProfileHanderBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1ArtifactResolutionProfileHanderBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1ArtifactResolutionProfileHanderBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1ArtifactResolutionProfileHanderBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1AttributeQueryProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1AttributeQueryProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1AttributeQueryProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/SAML1AttributeQueryProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml1/ShibbolethSSOProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/AbstractSAML2ProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/AbstractSAML2ProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/AbstractSAML2ProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/AbstractSAML2ProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2ArtifactResolutionProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2ArtifactResolutionProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2ArtifactResolutionProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2ArtifactResolutionProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2AttributeQueryProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2AttributeQueryProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2AttributeQueryProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2AttributeQueryProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/saml2/SAML2SSOProfileHandlerBeanDefinitionParser.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/IdPProfileHandlerManager.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/IdPProfileHandlerManager.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/IdPProfileHandlerManager.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/IdPProfileHandlerManager.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/SAMLMetadataProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/StatusProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/StatusProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/StatusProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/StatusProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AbstractSAML1ProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ArtifactResolution.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/BaseSAML1ProfileRequestContext.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/BaseSAML1ProfileRequestContext.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml1/BaseSAML1ProfileRequestContext.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/BaseSAML1ProfileRequestContext.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSODecoder.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSODecoder.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSODecoder.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSODecoder.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOEndpointSelector.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOEndpointSelector.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOEndpointSelector.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOEndpointSelector.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AbstractSAML2ProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/BaseSAML2ProfileRequestContext.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/BaseSAML2ProfileRequestContext.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml2/BaseSAML2ProfileRequestContext.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/BaseSAML2ProfileRequestContext.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/AuthenticationMethodInformation.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/AuthenticationMethodInformation.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/AuthenticationMethodInformation.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/AuthenticationMethodInformation.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/ContainerSessionListener.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/ContainerSessionListener.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/ContainerSessionListener.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/ContainerSessionListener.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/IdPSessionFilter.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/ServiceInformation.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/ServiceInformation.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/ServiceInformation.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/ServiceInformation.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/Session.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/Session.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/Session.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/Session.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/impl/AuthenticationMethodInformationImpl.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/AuthenticationMethodInformationImpl.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/impl/AuthenticationMethodInformationImpl.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/AuthenticationMethodInformationImpl.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/impl/ServiceInformationImpl.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/ServiceInformationImpl.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/impl/ServiceInformationImpl.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/ServiceInformationImpl.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/impl/SessionImpl.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/SessionImpl.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/impl/SessionImpl.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/SessionImpl.java

diff --git a/src/edu/internet2/middleware/shibboleth/idp/session/impl/SessionManagerImpl.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/SessionManagerImpl.java
similarity index 100%
rename from src/edu/internet2/middleware/shibboleth/idp/session/impl/SessionManagerImpl.java
rename to src/main/java/edu/internet2/middleware/shibboleth/idp/session/impl/SessionManagerImpl.java

diff --git a/src/overview.html b/src/main/java/overview.html
similarity index 100%
rename from src/overview.html
rename to src/main/java/overview.html

diff --git a/resources/META-INF/spring.handlers b/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from resources/META-INF/spring.handlers
rename to src/main/resources/META-INF/spring.handlers

diff --git a/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from resources/META-INF/spring.schemas
rename to src/main/resources/META-INF/spring.schemas

diff --git a/resources/classpath/logback.xml b/src/main/resources/logback.xml
similarity index 100%
rename from resources/classpath/logback.xml
rename to src/main/resources/logback.xml

diff --git a/resources/classpath/schema/shibboleth-2.0-idp-profile-handler.xsd b/src/main/resources/schema/shibboleth-2.0-idp-profile-handler.xsd
similarity index 100%
rename from resources/classpath/schema/shibboleth-2.0-idp-profile-handler.xsd
rename to src/main/resources/schema/shibboleth-2.0-idp-profile-handler.xsd

diff --git a/resources/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from resources/WEB-INF/web.xml
rename to src/main/webapp/WEB-INF/web.xml

diff --git a/resources/webpages/error-404.jsp b/src/main/webapp/error-404.jsp
similarity index 100%
rename from resources/webpages/error-404.jsp
rename to src/main/webapp/error-404.jsp

diff --git a/resources/webpages/error.jsp b/src/main/webapp/error.jsp
similarity index 100%
rename from resources/webpages/error.jsp
rename to src/main/webapp/error.jsp

diff --git a/resources/webpages/images/internet2.gif b/src/main/webapp/images/internet2.gif
similarity index 100%
rename from resources/webpages/images/internet2.gif
rename to src/main/webapp/images/internet2.gif

diff --git a/resources/webpages/images/logo.jpg b/src/main/webapp/images/logo.jpg
similarity index 100%
rename from resources/webpages/images/logo.jpg
rename to src/main/webapp/images/logo.jpg

diff --git a/resources/webpages/login-error.jsp b/src/main/webapp/login-error.jsp
similarity index 100%
rename from resources/webpages/login-error.jsp
rename to src/main/webapp/login-error.jsp

diff --git a/resources/webpages/login.jsp b/src/main/webapp/login.jsp
similarity index 100%
rename from resources/webpages/login.jsp
rename to src/main/webapp/login.jsp

diff --git a/test/edu/internet2/middleware/shibboleth/idp/BaseIdPTestCase.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/BaseIdPTestCase.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/BaseIdPTestCase.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/BaseIdPTestCase.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/BaseConf1TestCase.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/BaseConf1TestCase.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/BaseConf1TestCase.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/BaseConf1TestCase.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/LoadConf1Test.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/LoadConf1Test.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/LoadConf1Test.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/LoadConf1Test.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1ArtifactResolutionTest.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1ArtifactResolutionTest.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1ArtifactResolutionTest.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1ArtifactResolutionTest.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1AttributeQueryTestCase.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1AttributeQueryTestCase.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1AttributeQueryTestCase.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML1AttributeQueryTestCase.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2ArtifactResolutionTest.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2ArtifactResolutionTest.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2ArtifactResolutionTest.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2ArtifactResolutionTest.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2AttributeQueryTestCase.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2AttributeQueryTestCase.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2AttributeQueryTestCase.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2AttributeQueryTestCase.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java

diff --git a/test/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java b/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java
similarity index 100%
rename from test/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java
rename to src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java

diff --git a/test/data/conf1/attribute-filter.xml b/src/test/resources/data/conf1/attribute-filter.xml
similarity index 100%
rename from test/data/conf1/attribute-filter.xml
rename to src/test/resources/data/conf1/attribute-filter.xml

diff --git a/test/data/conf1/attribute-resolver.xml b/src/test/resources/data/conf1/attribute-resolver.xml
similarity index 100%
rename from test/data/conf1/attribute-resolver.xml
rename to src/test/resources/data/conf1/attribute-resolver.xml

diff --git a/test/data/conf1/handler.xml b/src/test/resources/data/conf1/handler.xml
similarity index 100%
rename from test/data/conf1/handler.xml
rename to src/test/resources/data/conf1/handler.xml

diff --git a/test/data/conf1/internal.xml b/src/test/resources/data/conf1/internal.xml
similarity index 100%
rename from test/data/conf1/internal.xml
rename to src/test/resources/data/conf1/internal.xml

diff --git a/test/data/conf1/login.config b/src/test/resources/data/conf1/login.config
similarity index 100%
rename from test/data/conf1/login.config
rename to src/test/resources/data/conf1/login.config

diff --git a/test/data/conf1/relying-party.xml b/src/test/resources/data/conf1/relying-party.xml
similarity index 100%
rename from test/data/conf1/relying-party.xml
rename to src/test/resources/data/conf1/relying-party.xml

diff --git a/test/data/conf1/service.xml b/src/test/resources/data/conf1/service.xml
similarity index 100%
rename from test/data/conf1/service.xml
rename to src/test/resources/data/conf1/service.xml

diff --git a/test/logback.xml b/src/test/resources/logback.xml
similarity index 100%
rename from test/logback.xml
rename to src/test/resources/logback.xml

diff --git a/tools/aacli.sh b/src/tools/bash/aacli.sh
similarity index 100%
rename from tools/aacli.sh
rename to src/tools/bash/aacli.sh

diff --git a/tools/version.sh b/src/tools/bash/version.sh
similarity index 100%
rename from tools/version.sh
rename to src/tools/bash/version.sh

diff --git a/tools/aacli.bat b/src/tools/bat/aacli.bat
similarity index 100%
rename from tools/aacli.bat
rename to src/tools/bat/aacli.bat

diff --git a/tools/cpappend.bat b/src/tools/bat/cpappend.bat
similarity index 100%
rename from tools/cpappend.bat
rename to src/tools/bat/cpappend.bat

diff --git a/tools/version.bat b/src/tools/bat/version.bat
similarity index 100%
rename from tools/version.bat
rename to src/tools/bat/version.bat