John Paulett avatar John Paulett committed 94924d9

Initial patch queue.

Comments (0)

Files changed (4)

+^\.hg
+^\.mq
+syntax: glob
+status
+guards
+From: John Paulett <jpaulett@wustl.edu>
+
+Convert from Eclipse web project to maven 2 project.
+
+Allows easier building and integration with XNAT.
+
+diff --git a/.classpath b/.classpath
+new file mode 100644
+--- /dev/null
++++ b/.classpath
+@@ -0,0 +1,10 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<classpath>
++	<classpathentry kind="src" output="core/target/classes" path="core/src/main/java"/>
++	<classpathentry kind="src" output="core/target/test-classes" path="core/src/test/java"/>
++	<classpathentry kind="src" output="standalone/target/classes" path="standalone/src/main/java"/>
++	<classpathentry kind="src" output="standalone/target/test-classes" path="standalone/src/test/java"/>
++	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
++	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
++	<classpathentry kind="output" path="target/classes"/>
++</classpath>
+diff --git a/.hgignore b/.hgignore
+--- a/.hgignore
++++ b/.hgignore
+@@ -1,19 +1,6 @@
+ syntax: glob
+-# Ignore subversion directories
+-*.svn
+ 
+-# Ignore various possible Eclipse build directories
+-Class/
+-build/
+-bin/
+-
+-# Ignore Eclipse configuration files
+-.classpath
+-.project
+-.settings/
+-
+-# Other
+-xnatfs2
+-xnatfs.jar
+-run.sh
+-*.log
++syntax: regexp
++^target
++^core/target
++^standalone/target
+diff --git a/.project b/.project
+new file mode 100644
+--- /dev/null
++++ b/.project
+@@ -0,0 +1,23 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<projectDescription>
++	<name>xnatfs</name>
++	<comment></comment>
++	<projects>
++	</projects>
++	<buildSpec>
++		<buildCommand>
++			<name>org.eclipse.jdt.core.javabuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++		<buildCommand>
++			<name>org.maven.ide.eclipse.maven2Builder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++	</buildSpec>
++	<natures>
++		<nature>org.maven.ide.eclipse.maven2Nature</nature>
++		<nature>org.eclipse.jdt.core.javanature</nature>
++	</natures>
++</projectDescription>
+diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
+new file mode 100644
+--- /dev/null
++++ b/.settings/org.maven.ide.eclipse.prefs
+@@ -0,0 +1,9 @@
++#Tue Jan 26 17:15:33 CST 2010
++activeProfiles=
++eclipse.preferences.version=1
++fullBuildGoals=process-test-resources
++includeModules=true
++resolveWorkspaceProjects=true
++resourceFilterGoals=process-resources resources\:testResources
++skipCompilerPlugin=true
++version=1
+diff --git a/build.xml b/build.xml
+deleted file mode 100644
+--- a/build.xml
++++ /dev/null
+@@ -1,97 +0,0 @@
+-<?xml version="1.0" encoding="ISO-8859-1"?>
+-<project name="xnatfs" basedir="." default="all">
+-
+-  <property name="src.dir" value="Source"/>
+-  <property name="classes.dir" value="Class"/>
+-  <property name="doc.dir" value="Documentation"/>
+-
+-  <property name="dist.dir" value="${java.io.tmpdir}/${user.name}/xnatfs"/>
+-  <property name="major" value="0"/>
+-  <property name="minor" value="1"/>
+-  <property name="patch" value="0"/>
+-  <property name="version" value="${major}.${minor}.${patch}"/>
+-
+-  <!-- Figure out how to call ant recursively -->
+-  <condition property="AntCommand" value="${ant.home}/bin/ant.bat">
+-    <os family="windows"/>
+-  </condition>
+-  <condition property="AntCommand" value="${ant.home}/bin/ant">
+-    <not>
+-      <os family="windows"/>
+-    </not>
+-  </condition>
+-
+-  <!-- Access environment variables -->
+-  <property environment="env"/>
+-
+-  <path id="classpath">
+-    <fileset dir="lib">
+-      <include name="**/*.jar"/>
+-    </fileset>
+-    <pathelement location="${classes.dir}"/>
+-  </path>
+-  
+-  <target name="all" description="Build the source" depends="compile"/>
+-
+-  <target name="clean" description="Delete all generated files">
+-    <delete dir="${classes.dir}" failonerror="false"/>
+-  </target>
+-  
+-  <target name="compile" description="Compiles the Task">
+-    <mkdir dir="${classes.dir}"/>
+-    <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="on" excludes="Test/**" deprecation="true" target="1.5">
+-      <compilerarg compiler="javac1.5" value="-Xlint:unchecked"/>
+-      <classpath refid="classpath"/>
+-    </javac>
+-  </target>
+-  
+-  <!-- Javadoc runs in a seperate JVM, so the proxy settings are
+-  ignored.  Prefetch the package-list for the external packages that
+-  Dart uses and make them availible to the "doc" task below -->
+-  <target name="doc">
+-    <mkdir dir="${doc.dir}/api"/>
+-    <javadoc destdir="${doc.dir}/api">
+-      <classpath refid="classpath"/>
+-      <fileset dir="${src.dir}"/>
+-      <link href="http://java.sun.com/j2se/1.5/docs/api/" offline="true" packagelistLoc="${doc.dir}/PackageList/Java"/>
+-    </javadoc>
+-  </target>
+-
+-  <!-- Very cool!  Build/update the jar file from all the libraries -->
+-  <target name="jar" depends="compile">
+-    <delete file="xnatfs.jar"/>
+-    <jar compress="true" destfile="xnatfs.jar" update="false" duplicate="preserve" index="true">
+-      <fileset dir="${classes.dir}">
+-        <include name="**"/>
+-      </fileset>
+-      <zipgroupfileset dir="lib">
+-        <include name="**/*.jar"/>
+-      </zipgroupfileset>
+-      <manifest>
+-        <attribute name="Built-By" value="${user.name}"/>
+-        <attribute name="Main-Class" value="org.xnat.xnatfs.xnatfs"/>
+-        <section name="common">
+-          <attribute name="Specification-Title" value="xnatfs"/>
+-          <attribute name="Specification-Version" value="${version}"/>
+-          <attribute name="Specification-Vendor" value="BIRN"/>
+-          <attribute name="Implementation-Title" value="xnatfs"/>
+-          <attribute name="Implementation-Version" value="${version} ${TODAY}"/> 
+-          <attribute name="Implementation-Vendor" value="BIRN"/>
+-        </section>
+-      </manifest>
+-    </jar>
+-  </target>
+-
+-  <!-- Build a binary distribution -->
+-  <target name="dist" depends="jar">
+-    <delete dir="${dist.dir}" failonerror="false"/>
+-    <mkdir dir="${dist.dir}"/>
+-    <mkdir dir="${dist.dir}/xnatfs-${version}"/>
+-    <tar destfile="xnatfs-${version}.tar" basedir="${dist.dir}/"/>
+-    <gzip zipfile="xnatfs-${version}.tar.gz" src="xnatfs-${version}.tar"/>
+-    <delete file="xnatfs-${version}.tar"/>
+-    <zip destfile="xnatfs-${version}.zip" basedir="${dist.dir}"/>
+-  </target>
+-
+-</project>
+-
+diff --git a/core/pom.xml b/core/pom.xml
+new file mode 100644
+--- /dev/null
++++ b/core/pom.xml
+@@ -0,0 +1,74 @@
++<?xml version="1.0"?>
++<project
++	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
++	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++	<modelVersion>4.0.0</modelVersion>
++	<parent>
++		<groupId>org.xnat</groupId>
++		<artifactId>xnatfs</artifactId>
++		<version>1.6.0-SNAPSHOT</version>
++	</parent>
++	<groupId>org.xnat.xnatfs</groupId>
++	<artifactId>core</artifactId>
++	<version>1.6.0-SNAPSHOT</version>
++	<name>xnatfs-core</name>
++	<dependencies>
++		<dependency>
++			<groupId>org.apache.httpcomponents</groupId>
++			<artifactId>httpclient</artifactId>
++			<version>4.0.1</version>
++		</dependency>
++		<dependency>
++			<groupId>javax.servlet</groupId>
++			<artifactId>servlet-api</artifactId>
++			<version>2.5</version>
++		</dependency>
++		<dependency>
++			<groupId>com.ettrema</groupId>
++			<artifactId>milton-api</artifactId>
++			<version>1.5.1</version>
++		</dependency>
++		<dependency>
++			<groupId>com.ettrema</groupId>
++			<artifactId>milton-servlet</artifactId>
++			<version>1.5.1</version>
++		</dependency>
++		<dependency>
++			<groupId>net.sf.ehcache</groupId>
++			<artifactId>ehcache-core</artifactId>
++			<version>2.0.0</version>
++		</dependency>
++		<dependency>
++			<groupId>log4j</groupId>
++			<artifactId>log4j</artifactId>
++			<version>1.2.12</version>
++		</dependency>
++		<dependency>
++			<groupId>org.slf4j</groupId>
++			<artifactId>slf4j-api</artifactId>
++			<version>1.5.8</version>
++		</dependency>
++		<dependency>
++			<groupId>org.slf4j</groupId>
++			<artifactId>slf4j-log4j12</artifactId>
++			<version>1.5.8</version>
++		</dependency>
++		<dependency>
++			<groupId>org.json</groupId>
++			<artifactId>json</artifactId>
++			<version>20090211</version>
++		</dependency>
++		<dependency>
++			<groupId>junit</groupId>
++			<artifactId>junit</artifactId>
++			<version>4.7</version>
++			<scope>test</scope>
++		</dependency>
++		<dependency>
++			<groupId>org.mockito</groupId>
++			<artifactId>mockito-all</artifactId>
++			<version>1.8.2</version>
++			<scope>test</scope>
++		</dependency>
++	</dependencies>
++</project>
+diff --git a/Source/org/xnat/xnatfs/asset/AssetProvider.java b/core/src/main/java/org/xnat/xnatfs/asset/AssetProvider.java
+rename from Source/org/xnat/xnatfs/asset/AssetProvider.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/AssetProvider.java
+diff --git a/Source/org/xnat/xnatfs/asset/CachingAssetProvider.java b/core/src/main/java/org/xnat/xnatfs/asset/CachingAssetProvider.java
+rename from Source/org/xnat/xnatfs/asset/CachingAssetProvider.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/CachingAssetProvider.java
+diff --git a/Source/org/xnat/xnatfs/asset/HttpAssetHead.java b/core/src/main/java/org/xnat/xnatfs/asset/HttpAssetHead.java
+rename from Source/org/xnat/xnatfs/asset/HttpAssetHead.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/HttpAssetHead.java
+diff --git a/Source/org/xnat/xnatfs/asset/HttpResponseAsset.java b/core/src/main/java/org/xnat/xnatfs/asset/HttpResponseAsset.java
+rename from Source/org/xnat/xnatfs/asset/HttpResponseAsset.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/HttpResponseAsset.java
+diff --git a/Source/org/xnat/xnatfs/asset/HttpResponseStreamAsset.java b/core/src/main/java/org/xnat/xnatfs/asset/HttpResponseStreamAsset.java
+rename from Source/org/xnat/xnatfs/asset/HttpResponseStreamAsset.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/HttpResponseStreamAsset.java
+diff --git a/Source/org/xnat/xnatfs/asset/HttpResponseStringAsset.java b/core/src/main/java/org/xnat/xnatfs/asset/HttpResponseStringAsset.java
+rename from Source/org/xnat/xnatfs/asset/HttpResponseStringAsset.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/HttpResponseStringAsset.java
+diff --git a/Source/org/xnat/xnatfs/asset/IAsset.java b/core/src/main/java/org/xnat/xnatfs/asset/IAsset.java
+rename from Source/org/xnat/xnatfs/asset/IAsset.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/IAsset.java
+diff --git a/Source/org/xnat/xnatfs/asset/IAssetProvider.java b/core/src/main/java/org/xnat/xnatfs/asset/IAssetProvider.java
+rename from Source/org/xnat/xnatfs/asset/IAssetProvider.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/IAssetProvider.java
+diff --git a/Source/org/xnat/xnatfs/asset/IStreamAsset.java b/core/src/main/java/org/xnat/xnatfs/asset/IStreamAsset.java
+rename from Source/org/xnat/xnatfs/asset/IStreamAsset.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/IStreamAsset.java
+diff --git a/Source/org/xnat/xnatfs/asset/IStringAsset.java b/core/src/main/java/org/xnat/xnatfs/asset/IStringAsset.java
+rename from Source/org/xnat/xnatfs/asset/IStringAsset.java
+rename to core/src/main/java/org/xnat/xnatfs/asset/IStringAsset.java
+diff --git a/Source/org/xnat/xnatfs/cache/Cache.java b/core/src/main/java/org/xnat/xnatfs/cache/Cache.java
+rename from Source/org/xnat/xnatfs/cache/Cache.java
+rename to core/src/main/java/org/xnat/xnatfs/cache/Cache.java
+diff --git a/Source/org/xnat/xnatfs/cache/CacheProvider.java b/core/src/main/java/org/xnat/xnatfs/cache/CacheProvider.java
+rename from Source/org/xnat/xnatfs/cache/CacheProvider.java
+rename to core/src/main/java/org/xnat/xnatfs/cache/CacheProvider.java
+diff --git a/Source/org/xnat/xnatfs/cache/CacheUtils.java b/core/src/main/java/org/xnat/xnatfs/cache/CacheUtils.java
+rename from Source/org/xnat/xnatfs/cache/CacheUtils.java
+rename to core/src/main/java/org/xnat/xnatfs/cache/CacheUtils.java
+diff --git a/Source/org/xnat/xnatfs/cache/ICache.java b/core/src/main/java/org/xnat/xnatfs/cache/ICache.java
+rename from Source/org/xnat/xnatfs/cache/ICache.java
+rename to core/src/main/java/org/xnat/xnatfs/cache/ICache.java
+diff --git a/Source/org/xnat/xnatfs/connection/ConnectionFactory.java b/core/src/main/java/org/xnat/xnatfs/connection/ConnectionFactory.java
+rename from Source/org/xnat/xnatfs/connection/ConnectionFactory.java
+rename to core/src/main/java/org/xnat/xnatfs/connection/ConnectionFactory.java
+diff --git a/Source/org/xnat/xnatfs/connection/HttpConnection.java b/core/src/main/java/org/xnat/xnatfs/connection/HttpConnection.java
+rename from Source/org/xnat/xnatfs/connection/HttpConnection.java
+rename to core/src/main/java/org/xnat/xnatfs/connection/HttpConnection.java
+diff --git a/Source/org/xnat/xnatfs/connection/IConnection.java b/core/src/main/java/org/xnat/xnatfs/connection/IConnection.java
+rename from Source/org/xnat/xnatfs/connection/IConnection.java
+rename to core/src/main/java/org/xnat/xnatfs/connection/IConnection.java
+diff --git a/Source/org/xnat/xnatfs/connection/LocalConnection.java b/core/src/main/java/org/xnat/xnatfs/connection/LocalConnection.java
+rename from Source/org/xnat/xnatfs/connection/LocalConnection.java
+rename to core/src/main/java/org/xnat/xnatfs/connection/LocalConnection.java
+diff --git a/Source/org/xnat/xnatfs/connection/PreemptiveAuthorization.java b/core/src/main/java/org/xnat/xnatfs/connection/PreemptiveAuthorization.java
+rename from Source/org/xnat/xnatfs/connection/PreemptiveAuthorization.java
+rename to core/src/main/java/org/xnat/xnatfs/connection/PreemptiveAuthorization.java
+diff --git a/Source/org/xnat/xnatfs/connection/XnatContextProvider.java b/core/src/main/java/org/xnat/xnatfs/connection/XnatContextProvider.java
+rename from Source/org/xnat/xnatfs/connection/XnatContextProvider.java
+rename to core/src/main/java/org/xnat/xnatfs/connection/XnatContextProvider.java
+diff --git a/Source/org/xnat/xnatfs/event/ResourceClosingEventListener.java b/core/src/main/java/org/xnat/xnatfs/event/ResourceClosingEventListener.java
+rename from Source/org/xnat/xnatfs/event/ResourceClosingEventListener.java
+rename to core/src/main/java/org/xnat/xnatfs/event/ResourceClosingEventListener.java
+diff --git a/Source/org/xnat/xnatfs/exception/RequestException.java b/core/src/main/java/org/xnat/xnatfs/exception/RequestException.java
+rename from Source/org/xnat/xnatfs/exception/RequestException.java
+rename to core/src/main/java/org/xnat/xnatfs/exception/RequestException.java
+diff --git a/Source/org/xnat/xnatfs/filter/AuthenticationFilter.java b/core/src/main/java/org/xnat/xnatfs/filter/AuthenticationFilter.java
+rename from Source/org/xnat/xnatfs/filter/AuthenticationFilter.java
+rename to core/src/main/java/org/xnat/xnatfs/filter/AuthenticationFilter.java
+diff --git a/Source/org/xnat/xnatfs/filter/ChatterFilter.java b/core/src/main/java/org/xnat/xnatfs/filter/ChatterFilter.java
+rename from Source/org/xnat/xnatfs/filter/ChatterFilter.java
+rename to core/src/main/java/org/xnat/xnatfs/filter/ChatterFilter.java
+diff --git a/Source/org/xnat/xnatfs/util/JSONUtils.java b/core/src/main/java/org/xnat/xnatfs/util/JSONUtils.java
+rename from Source/org/xnat/xnatfs/util/JSONUtils.java
+rename to core/src/main/java/org/xnat/xnatfs/util/JSONUtils.java
+diff --git a/Source/org/xnat/xnatfs/util/PathUtils.java b/core/src/main/java/org/xnat/xnatfs/util/PathUtils.java
+rename from Source/org/xnat/xnatfs/util/PathUtils.java
+rename to core/src/main/java/org/xnat/xnatfs/util/PathUtils.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Bundle.java b/core/src/main/java/org/xnat/xnatfs/webdav/Bundle.java
+rename from Source/org/xnat/xnatfs/webdav/Bundle.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Bundle.java
+diff --git a/Source/org/xnat/xnatfs/webdav/ChildEntry.java b/core/src/main/java/org/xnat/xnatfs/webdav/ChildEntry.java
+rename from Source/org/xnat/xnatfs/webdav/ChildEntry.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/ChildEntry.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Experiment.java b/core/src/main/java/org/xnat/xnatfs/webdav/Experiment.java
+rename from Source/org/xnat/xnatfs/webdav/Experiment.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Experiment.java
+diff --git a/Source/org/xnat/xnatfs/webdav/LockManager.java b/core/src/main/java/org/xnat/xnatfs/webdav/LockManager.java
+rename from Source/org/xnat/xnatfs/webdav/LockManager.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/LockManager.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Project.java b/core/src/main/java/org/xnat/xnatfs/webdav/Project.java
+rename from Source/org/xnat/xnatfs/webdav/Project.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Project.java
+diff --git a/Source/org/xnat/xnatfs/webdav/RemoteFile.java b/core/src/main/java/org/xnat/xnatfs/webdav/RemoteFile.java
+rename from Source/org/xnat/xnatfs/webdav/RemoteFile.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/RemoteFile.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Resources.java b/core/src/main/java/org/xnat/xnatfs/webdav/Resources.java
+rename from Source/org/xnat/xnatfs/webdav/Resources.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Resources.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Root.java b/core/src/main/java/org/xnat/xnatfs/webdav/Root.java
+rename from Source/org/xnat/xnatfs/webdav/Root.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Root.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Scan.java b/core/src/main/java/org/xnat/xnatfs/webdav/Scan.java
+rename from Source/org/xnat/xnatfs/webdav/Scan.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Scan.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Search.java b/core/src/main/java/org/xnat/xnatfs/webdav/Search.java
+rename from Source/org/xnat/xnatfs/webdav/Search.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Search.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Searches.java b/core/src/main/java/org/xnat/xnatfs/webdav/Searches.java
+rename from Source/org/xnat/xnatfs/webdav/Searches.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Searches.java
+diff --git a/Source/org/xnat/xnatfs/webdav/Subject.java b/core/src/main/java/org/xnat/xnatfs/webdav/Subject.java
+rename from Source/org/xnat/xnatfs/webdav/Subject.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/Subject.java
+diff --git a/Source/org/xnat/xnatfs/webdav/VirtualDirectory.java b/core/src/main/java/org/xnat/xnatfs/webdav/VirtualDirectory.java
+rename from Source/org/xnat/xnatfs/webdav/VirtualDirectory.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/VirtualDirectory.java
+diff --git a/Source/org/xnat/xnatfs/webdav/VirtualFile.java b/core/src/main/java/org/xnat/xnatfs/webdav/VirtualFile.java
+rename from Source/org/xnat/xnatfs/webdav/VirtualFile.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/VirtualFile.java
+diff --git a/Source/org/xnat/xnatfs/webdav/VirtualResource.java b/core/src/main/java/org/xnat/xnatfs/webdav/VirtualResource.java
+rename from Source/org/xnat/xnatfs/webdav/VirtualResource.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/VirtualResource.java
+diff --git a/Source/org/xnat/xnatfs/webdav/XNATFS.java b/core/src/main/java/org/xnat/xnatfs/webdav/XNATFS.java
+rename from Source/org/xnat/xnatfs/webdav/XNATFS.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/XNATFS.java
+diff --git a/Source/org/xnat/xnatfs/webdav/test/TestPost.java b/core/src/main/java/org/xnat/xnatfs/webdav/test/TestPost.java
+rename from Source/org/xnat/xnatfs/webdav/test/TestPost.java
+rename to core/src/main/java/org/xnat/xnatfs/webdav/test/TestPost.java
+diff --git a/properties/ehcache.xml b/core/src/main/resources/ehcache.xml
+rename from properties/ehcache.xml
+rename to core/src/main/resources/ehcache.xml
+diff --git a/properties/log4j.properties b/core/src/main/resources/log4j.properties
+rename from properties/log4j.properties
+rename to core/src/main/resources/log4j.properties
+diff --git a/Test/org/xnat/xnatfs/asset/HttpResponseAssetTestCase.java b/core/src/test/java/org/xnat/xnatfs/asset/HttpResponseAssetTestCase.java
+rename from Test/org/xnat/xnatfs/asset/HttpResponseAssetTestCase.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/HttpResponseAssetTestCase.java
+diff --git a/Test/org/xnat/xnatfs/asset/SimpleHttpResponseAsset.java b/core/src/test/java/org/xnat/xnatfs/asset/SimpleHttpResponseAsset.java
+rename from Test/org/xnat/xnatfs/asset/SimpleHttpResponseAsset.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/SimpleHttpResponseAsset.java
+diff --git a/Test/org/xnat/xnatfs/asset/StreamUtils.java b/core/src/test/java/org/xnat/xnatfs/asset/StreamUtils.java
+rename from Test/org/xnat/xnatfs/asset/StreamUtils.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/StreamUtils.java
+diff --git a/Test/org/xnat/xnatfs/asset/TestAssetProvider.java b/core/src/test/java/org/xnat/xnatfs/asset/TestAssetProvider.java
+rename from Test/org/xnat/xnatfs/asset/TestAssetProvider.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/TestAssetProvider.java
+diff --git a/Test/org/xnat/xnatfs/asset/TestHttpResponseAssetHeaders.java b/core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseAssetHeaders.java
+rename from Test/org/xnat/xnatfs/asset/TestHttpResponseAssetHeaders.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseAssetHeaders.java
+diff --git a/Test/org/xnat/xnatfs/asset/TestHttpResponseAssetResponseCodes.java b/core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseAssetResponseCodes.java
+rename from Test/org/xnat/xnatfs/asset/TestHttpResponseAssetResponseCodes.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseAssetResponseCodes.java
+diff --git a/Test/org/xnat/xnatfs/asset/TestHttpResponseStreamAsset.java b/core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseStreamAsset.java
+rename from Test/org/xnat/xnatfs/asset/TestHttpResponseStreamAsset.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseStreamAsset.java
+diff --git a/Test/org/xnat/xnatfs/asset/TestHttpResponseStringAsset.java b/core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseStringAsset.java
+rename from Test/org/xnat/xnatfs/asset/TestHttpResponseStringAsset.java
+rename to core/src/test/java/org/xnat/xnatfs/asset/TestHttpResponseStringAsset.java
+diff --git a/Test/org/xnat/xnatfs/connection/TestXnatContextProvider.java b/core/src/test/java/org/xnat/xnatfs/connection/TestXnatContextProvider.java
+rename from Test/org/xnat/xnatfs/connection/TestXnatContextProvider.java
+rename to core/src/test/java/org/xnat/xnatfs/connection/TestXnatContextProvider.java
+diff --git a/Test/org/xnat/xnatfs/event/TestResourceClosingEventListener.java b/core/src/test/java/org/xnat/xnatfs/event/TestResourceClosingEventListener.java
+rename from Test/org/xnat/xnatfs/event/TestResourceClosingEventListener.java
+rename to core/src/test/java/org/xnat/xnatfs/event/TestResourceClosingEventListener.java
+diff --git a/Test/org/xnat/xnatfs/exception/TestRequestException.java b/core/src/test/java/org/xnat/xnatfs/exception/TestRequestException.java
+rename from Test/org/xnat/xnatfs/exception/TestRequestException.java
+rename to core/src/test/java/org/xnat/xnatfs/exception/TestRequestException.java
+diff --git a/Test/org/xnat/xnatfs/filter/TestAuthenticationFilter.java b/core/src/test/java/org/xnat/xnatfs/filter/TestAuthenticationFilter.java
+rename from Test/org/xnat/xnatfs/filter/TestAuthenticationFilter.java
+rename to core/src/test/java/org/xnat/xnatfs/filter/TestAuthenticationFilter.java
+diff --git a/Test/org/xnat/xnatfs/filter/TestChatterFilter.java b/core/src/test/java/org/xnat/xnatfs/filter/TestChatterFilter.java
+rename from Test/org/xnat/xnatfs/filter/TestChatterFilter.java
+rename to core/src/test/java/org/xnat/xnatfs/filter/TestChatterFilter.java
+diff --git a/Test/org/xnat/xnatfs/util/TestJSONUtils.java b/core/src/test/java/org/xnat/xnatfs/util/TestJSONUtils.java
+rename from Test/org/xnat/xnatfs/util/TestJSONUtils.java
+rename to core/src/test/java/org/xnat/xnatfs/util/TestJSONUtils.java
+diff --git a/Test/org/xnat/xnatfs/util/TestPathUtils.java b/core/src/test/java/org/xnat/xnatfs/util/TestPathUtils.java
+rename from Test/org/xnat/xnatfs/util/TestPathUtils.java
+rename to core/src/test/java/org/xnat/xnatfs/util/TestPathUtils.java
+diff --git a/Test/org/xnat/xnatfs/webdav/TestRemoteFile.java b/core/src/test/java/org/xnat/xnatfs/webdav/TestRemoteFile.java
+rename from Test/org/xnat/xnatfs/webdav/TestRemoteFile.java
+rename to core/src/test/java/org/xnat/xnatfs/webdav/TestRemoteFile.java
+diff --git a/log4j.properties b/log4j.properties
+deleted file mode 100644
+--- a/log4j.properties
++++ /dev/null
+@@ -1,24 +0,0 @@
+-log4j.rootLogger=warn, log, stdout
+-
+-
+-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+-log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+-
+-log4j.appender.log=org.apache.log4j.FileAppender
+-log4j.appender.log.Append=false
+-log4j.appender.log.File=xnatfs.log
+-
+-log4j.appender.R.MaxFileSize=1000KB
+-# Keep one backup file
+-log4j.appender.R.MaxBackupIndex=0
+-
+-log4j.appender.log.layout=org.apache.log4j.PatternLayout
+-log4j.appender.log.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+-
+-log4j.logger.org.xnat.xnatfs.webdav=debug
+-log4j.logger.org.xnat.xnatfs=debug
+-log4j.logger.org.apache.commons=warn
+-log4j.logger.httpclient.wire=warn
+-log4j.logger.org.apache.http.wire=warn
+-log4j.logger.com.ettrema.berry.xlightweb=debug
+diff --git a/pom.xml b/pom.xml
+new file mode 100644
+--- /dev/null
++++ b/pom.xml
+@@ -0,0 +1,118 @@
++<?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">
++	<modelVersion>4.0.0</modelVersion>
++	<groupId>org.xnat</groupId>
++	<artifactId>xnatfs</artifactId>
++	<packaging>pom</packaging>
++	<version>1.6.0-SNAPSHOT</version>
++	<name>xnatfs</name>
++	<url>http://code.google.com/p/xnatfs/</url>
++	<developers>
++		<developer>
++			<name>Daniel Blezek</name>
++			<email>blezek.daniel@mayo.edu</email>
++			<organization>Mayo Clinic, Rochester, MN, USA</organization>
++		</developer>
++		<developer>
++			<name>John Paulett</name>
++			<email>jpaulett@wustl.edu</email>
++			<organization>Neuroinformatics Research Group, Washington University</organization>
++		</developer>
++	</developers>
++
++	<organization>
++		<name>Neuroinformatics Research Group</name>
++		<url>http://nrg.wustl.edu</url>
++	</organization>
++
++	<licenses>
++		<license>
++			<name>BSD</name>
++		</license>
++	</licenses>
++
++	<issueManagement>
++		<system>Google Code</system>
++		<url>http://code.google.com/p/xnatfs/issues/list</url>
++	</issueManagement>
++
++	<scm>
++		<connection>scm:hg:https://xnatfs.googlecode.com/hg/</connection>
++		<developerConnection>scm:hg:https://xnatfs.googlecode.com/hg/</developerConnection>
++		<url>http://code.google.com/p/xnatfs/source/browse/</url>
++	</scm>
++
++	<ciManagement>
++		<system>hudson</system>
++		<url>http://nrg.wustl.edu/hudson/job/xnatfs/</url>
++	</ciManagement>
++
++	<mailingLists>
++		<mailingList>
++			<name>xnat-discussion</name>
++			<subscribe>xnat_discussion+subscribe@googlegroups.com</subscribe>
++			<unsubscribe>xnat_discussion+unsubscribe@googlegroups.com</unsubscribe>
++			<post>xnat_discussion@googlegroups.com</post>
++			<archive>http://groups.google.com/group/xnat_discussion</archive>
++		</mailingList>
++	</mailingLists>
++
++	<repositories>
++		<repository>
++			<id>milton</id>
++			<url>http://www.ettrema.com/maven2/</url>
++		</repository>
++	</repositories>
++
++	<modules>
++		<module>core</module>
++		<module>standalone</module>
++	</modules>
++
++	<reporting>
++		<plugins>
++			<plugin>
++				<groupId>org.apache.maven.plugins</groupId>
++				<artifactId>maven-project-info-reports-plugin</artifactId>
++			</plugin>
++			<plugin>
++				<groupId>org.apache.maven.plugins</groupId>
++				<artifactId>maven-surefire-report-plugin</artifactId>
++			</plugin>
++			<plugin>
++				<groupId>org.codehaus.mojo</groupId>
++				<artifactId>findbugs-maven-plugin</artifactId>
++				<version>2.0.1</version>
++			</plugin>
++		</plugins>
++	</reporting>
++
++	<build>
++		<plugins>
++			<plugin>
++				<artifactId>maven-compiler-plugin</artifactId>
++				<configuration>
++					<source>1.5</source>
++					<target>1.5</target>
++				</configuration>
++			</plugin>
++			<plugin>
++				<groupId>org.apache.maven.plugins</groupId>
++				<artifactId>maven-surefire-plugin</artifactId>
++				<configuration>
++					<includes>
++						<include>**/Test*.java</include>
++					</includes>
++				</configuration>
++			</plugin>
++			<plugin>
++				<groupId>org.apache.maven.plugins</groupId>
++				<artifactId>maven-site-plugin</artifactId>
++				<configuration>
++					<port>9000</port>
++				</configuration>
++			</plugin>
++		</plugins>
++	</build>
++</project>
+diff --git a/standalone/pom.xml b/standalone/pom.xml
+new file mode 100644
+--- /dev/null
++++ b/standalone/pom.xml
+@@ -0,0 +1,37 @@
++<?xml version="1.0"?>
++<project
++	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
++	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++	<modelVersion>4.0.0</modelVersion>
++	<parent>
++		<artifactId>xnatfs</artifactId>
++		<groupId>org.xnat</groupId>
++		<version>1.6.0-SNAPSHOT</version>
++	</parent>
++	<groupId>org.xnat.xnatfs</groupId>
++	<version>1.6.0-SNAPSHOT</version>
++	<artifactId>standalone</artifactId>
++	<name>xnatfs-standalone</name>
++	<dependencies>
++		<dependency>
++			<groupId>org.xnat.xnatfs</groupId>
++			<artifactId>core</artifactId>
++			<version>1.6.0-SNAPSHOT</version>
++		</dependency>
++		<dependency>
++			<groupId>org.eclipse.jetty</groupId>
++			<artifactId>jetty-server</artifactId>
++			<version>7.0.1.v20091125</version>
++		</dependency>
++		<dependency>
++			<groupId>org.eclipse.jetty</groupId>
++			<artifactId>jetty-servlet</artifactId>
++			<version>7.0.1.v20091125</version>
++		</dependency>
++		<dependency>
++			<groupId>com.martiansoftware</groupId>
++			<artifactId>jsap</artifactId>
++			<version>2.1</version>
++		</dependency>
++	</dependencies>
++</project>
+diff --git a/Source/org/xnat/xnatfs/webdav/StartJettyServer.java b/standalone/src/main/java/org/xnat/xnatfs/server/StartJettyServer.java
+rename from Source/org/xnat/xnatfs/webdav/StartJettyServer.java
+rename to standalone/src/main/java/org/xnat/xnatfs/server/StartJettyServer.java
+--- a/Source/org/xnat/xnatfs/webdav/StartJettyServer.java
++++ b/standalone/src/main/java/org/xnat/xnatfs/server/StartJettyServer.java
+@@ -1,7 +1,7 @@
+ /**
+  * 
+  */
+-package org.xnat.xnatfs.webdav;
++package org.xnat.xnatfs.server;
+ 
+ import java.io.File;
+ import java.net.URL;
+@@ -15,6 +15,7 @@
+ import org.xnat.xnatfs.asset.CachingAssetProvider;
+ import org.xnat.xnatfs.connection.ConnectionFactory;
+ import org.xnat.xnatfs.connection.HttpConnection;
++import org.xnat.xnatfs.webdav.XNATFS;
+ 
+ import com.bradmcevoy.http.MiltonServlet;
+ import com.martiansoftware.jsap.FlaggedOption;
+diff --git a/xnatfs.props b/xnatfs.props
+deleted file mode 100644
+From: John Paulett <john@paulett.org>
+Add a README file to the project.
+
+diff --git a/README.rst b/README.rst
+new file mode 100644
+--- /dev/null
++++ b/README.rst
+@@ -0,0 +1,13 @@
++===========================
++xnatfs - XNAT WebDav Server
++===========================
++
++For more information and usage guides, please visit 
++http://nrg.wikispaces.com/xnatfs
++
++Building
++========
++
++To build the maven project, run::
++
++    mvn clean install
+mavenize.patch
+readme.patch
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.