Merge pull request #3 from pwm-project/mavenized

PWM mavenification

.gitignore

@@ -0,0 +1,11 @@
+/pwm/supplemental/build/work
+/pwm/supplemental/build/artifacts
+/.project
+/.settings
+/target
+/.classpath
+/src/main/webapp/WEB-INF/logs
+/src/main/webapp/WEB-INF/PwmConfiguration.xml
+/src/main/webapp/WEB-INF/backup
+/src/main/webapp/WEB-INF/LocalDB
+/bin/

pom.xml

@@ -0,0 +1,273 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.github.pwmproject</groupId>
+    <artifactId>pwm</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <properties>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+        <skipTests>true</skipTests>
+        <timestamp.iso>${maven.build.timestamp}</timestamp.iso>
+        <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>codeship</id>
+            <build>
+                <finalName>${timestamp.iso}-${project.artifactId}-${project.version}</finalName>
+            </build>
+        </profile>
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <properties>
+                <javadoc.opts>-Xdoclint:none</javadoc.opts>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/BuildInformation.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <excludes>
+                    <exclude>**/BuildInformation.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19</version>
+                <configuration>
+                    <skipTests>${skipTests}</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- This allows us to run: "mvn tomcat7:run", then we can open a browser to: http://localhost:8080/pwm -->
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.3</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <additionalparam>${javadoc.opts}</additionalparam>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- container dependencies -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- / container dependencies -->
+
+        <!-- NMAS jars (not available from a maven repo) -->
+        <dependency>
+            <groupId>com.novell.security.nmas</groupId>
+            <artifactId>ChallengeResponseLCM</artifactId>
+            <version>2013.04.18</version>
+        </dependency>
+        <dependency>
+            <groupId>com.novell.security.nmas</groupId>
+            <artifactId>nmasclient</artifactId>
+            <version>2013.04.26</version>
+        </dependency>
+        <dependency>
+            <groupId>com.novell.security.nmas</groupId>
+            <artifactId>NMASToolkit</artifactId>
+            <version>2013.04.26</version>
+        </dependency>
+        <dependency>
+            <groupId>com.novell.security.nmas</groupId>
+            <artifactId>jsso</artifactId>
+            <version>2003.05.06</version>
+        </dependency>
+        <dependency>
+            <groupId>com.novell.security.nmas</groupId>
+            <artifactId>ldap</artifactId>
+            <version>2013.04.26</version>
+        </dependency>
+        <!-- / Novell jars (not available from a maven repo) -->
+
+        <dependency>
+            <groupId>com.github.ldapchai</groupId>
+            <version>0.6.6</version>
+            <artifactId>ldapchai</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+            <artifactId>concurrentlinkedhashmap-lru</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.graylog2</groupId>
+            <artifactId>syslog4j</artifactId>
+            <version>0.9.48</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sleepycat</groupId>
+            <artifactId>je</artifactId>
+            <version>6.4.9</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-bundle</artifactId>
+            <version>1.18</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jasig.cas.client</groupId>
+            <artifactId>cas-client-core</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapdb</groupId>
+            <artifactId>mapdb</artifactId>
+            <version>1.0.5</version>
+        </dependency>
+        <dependency>
+            <groupId>net.glxn</groupId>
+            <artifactId>qrgen</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.52</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml</groupId>
+            <artifactId>jaxrpc</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>1.1.4</version>
+        </dependency>
+    </dependencies>
+
+    <repositories>
+        <!-- Include our own local maven repository, for artifacts that aren't available elsewhere -->
+        <repository>
+            <id>project.local</id>
+            <name>project</name>
+            <url>file:///${project.basedir}/local-maven-repo</url>
+        </repository>
+        <repository>
+            <id>oracleReleases</id>
+            <name>Oracle Released Java Packages</name>
+            <url>http://download.oracle.com/maven</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
+</project>

pwm/servlet/local-build.properties

@@ -1,27 +0,0 @@
-#
-# Password Management Servlets (PWM)
-# http://code.google.com/p/pwm/
-#
-# Copyright (c) 2006-2009 Novell, Inc.
-# Copyright (c) 2009-2012 The PWM Project
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-src.root=.
-destination=./build
-destination.war=./build/pwm.war
-build_lib=../supplemental/build/build_lib
-svn.source=https://pwm.googlecode.com/svn/trunk

pwm/servlet/local-build.xml

@@ -1,143 +0,0 @@
-<!--
-  ~ Password Management Servlets (PWM)
-  ~ http://code.google.com/p/pwm/
-  ~
-  ~ Copyright (c) 2006-2009 Novell, Inc.
-  ~ Copyright (c) 2009-2014 The PWM Project
-  ~
-  ~ This program is free software; you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation; either version 2 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program; if not, write to the Free Software
-  ~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  -->
-
-<project default="makeWAR" name="PWM Build Script">
-    <target name="init">
-        <property file="local-build.properties"/>
-        <echo>PWM Build Script</echo>
-        <echo> working directory: ${basedir}</echo>
-        <echo> </echo>
-        <echo>settings:</echo>
-        <echo> source root: ${src.root}</echo>
-        <echo> destination: ${destination}</echo>
-        <echo> destination war: ${destination.war}</echo>
-        <echo> build lib: ${build_lib}</echo>
-    </target>
-
-    <target name="clean" depends="init">
-        <delete dir="${destination}"/>
-        <delete file="${destination.war}"/>
-    </target>
-
-    <target name="googleSvnExport" depends="init">
-        <typedef resource="org/tigris/subversion/svnant/svnantlib.xml">
-            <classpath>
-                <fileset dir="${build_lib}/ant" includes="*.jar"/>
-            </classpath>
-        </typedef>
-        <echo> svn source: ${build_lib}</echo>
-
-        <property name="svnExportDir" value="${destination}/svn-current"/>
-        <delete dir="${svnExportDir}"/>
-        <mkdir dir="${svnExportDir}"/>
-        <svnSetting javahl="false" svnkit="true" username="" password="" id="svn.settings"/>
-        <svn refid="svn.settings"> <!-- single checkout to determine revision -->
-            <checkout url="${svn.source}" destpath="${svnExportDir}/checkout" recurse="false"/>
-            <status path="${svnExportDir}/checkout" revisionproperty="svn.revision"/>
-        </svn>
-
-        <echo>Beginning export of revision ${svn.revision}</echo>
-        <delete dir="${svnExportDir}"/>
-        <mkdir dir="${svnExportDir}"/>
-        <svn refid="svn.settings">
-            <export srcurl="https://pwm.googlecode.com/svn/trunk"  destPath="${svnExportDir}"/>
-        </svn>
-        <echo>Read revision ${svn.revision}</echo>
-    </target>
-
-    <target name="compileCode" depends="init">
-        <mkdir dir="${destination}/bin"/>
-        <javac srcdir="${src.root}/src" destdir="${destination}/bin" debug="true" target="1.7" source="1.7">
-            <classpath>
-                <fileset dir="${src.root}/web/WEB-INF/lib" includes="*.jar"/>
-                <fileset dir="${build_lib}" includes="*.jar"/>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="copyResources" depends="init">
-        <mkdir dir="${destination}/bin"/>
-        <copy todir="${destination}/bin">
-            <fileset dir="${src.root}/src" includes="**/*.properties"/>
-            <fileset dir="${src.root}/src" includes="**/*.xml"/>
-            <fileset dir="${src.root}/src" includes="**/*.xsd"/>
-        </copy>
-    </target>                                                                                                          
-
-    <target name="makeWAR" depends="compileCode,copyResources,makeJAR">
-        <war zipfile="${destination.war}" webxml="${src.root}/web/WEB-INF/web.xml">
-            <zipfileset dir="${src.root}/web"/>
-            <zipfileset file="${destination}/pwm-servlet.jar" prefix="WEB-INF/lib"/>
-        </war>
-    </target>
-
-    <target name="makeJAR" depends="compileCode,copyResources">
-        <jar destfile="${destination}/pwm-servlet.jar">
-            <fileset dir="${destination}/bin"/>
-            <zipfileset dir="${src.root}/src" prefix="src"/>
-            <manifest>
-                <attribute name="Main-Class" value="password.pwm.util.JarMain"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="javadoc" depends="init">
-        <mkdir dir="${destination}/javadoc"/>
-        <javadoc packagenames="password.pwm.*"
-                 sourcepath="${src.root}/src"
-                 destdir="${destination}/javadoc"
-                 private="yes" source="1.7">
-            <link href="http://docs.oracle.com/javase/6/docs/api/"/>
-            <link href="http://download.oracle.com/docs/cd/E17802_01/products/products/servlet/2.3/javadoc/"/>
-            <link href="http://ldapchai.googlecode.com/svn/trunk/javadoc/"/>
-            <classpath>
-                <fileset dir="${src.root}/web/WEB-INF/lib" includes="*.jar"/>
-                <fileset dir="${build_lib}" includes="*.jar"/>
-            </classpath>
-        </javadoc>
-    </target>
-
-    <target name="makeZIP" depends="makeWAR,javadoc">
-        <zip zipfile="${destination}/pwm.zip" filesonly="true">
-            <zipfileset file="${destination.war}"/>
-            <zipfileset dir="${src.root}/src" prefix="servlet/src"/>
-            <zipfileset dir="${src.root}/web" prefix="servlet/web"/>
-            <zipfileset dir="${src.root}/../supplemental" prefix="supplemental"/>
-            <zipfileset dir="${src.root}/." includes="build.**" prefix="servlet"/>
-        </zip>
-    </target>
-
-    <target name="makeRelease" depends="updateBuildInfo,makeZIP">
-    </target>
-
-    <target name="updateBuildInfo" depends="init">
-        <property name="buildFilename" value="${src.root}/src/password/pwm/BuildInformation.properties"/>
-        <propertyfile file="${buildFilename}">
-            <entry key="build.java.vendor" value="${java.vendor}"/>
-            <entry key="build.java.version" value="${java.version}"/>
-            <entry key="build.time" type="date" value="now" pattern="yyyy.MM.dd HH:mm:ss z"/>
-            <entry key="build.user" value="${user.name}"/>
-        </propertyfile>
-        <buildnumber file="${buildFilename}"/>
-        <echo>build number: ${build.number}</echo>
-    </target>
-</project>