diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..1ed576b
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'java'
+
+group = 'opensymphony'
+version = '2.4.2'
+
+description = 'OSCache'
+
+sourceCompatibility = 1.4
+targetCompatibility = 1.4
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile group: 'commons-logging', name: 'commons-logging', version:'1.1'
+    compile group: 'org.apache.geronimo.specs', name: 'geronimo-jms_1.1_spec', version: '1.1.1'
+    compile group: 'javax.transaction', name: 'jta', version: '1.1'
+    compile group: 'javax.servlet', name: 'servlet-api', version:'2.3'
+    compile group: 'jgroups', name: 'jgroups-all', version:'2.2.8'
+    compile group: 'org.hibernate', name: 'hibernate', version:'3.2.3.ga'
+    testCompile group: 'junit', name: 'junit', version:'3.8.2'
+    testCompile group: 'httpunit', name: 'httpunit', version:'1.6'
+    testCompile group: 'junitperf', name: 'junitperf', version:'1.9.1'
+    testCompile group: 'groboutils', name: 'groboutils-core', version:'5'
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..283c90f
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..6851c4f
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat May 20 23:12:33 PDT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..4453cce
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/.cvsignore b/old/.cvsignore
similarity index 100%
rename from .cvsignore
rename to old/.cvsignore
diff --git a/.hg_archival.txt b/old/.hg_archival.txt
similarity index 100%
rename from .hg_archival.txt
rename to old/.hg_archival.txt
diff --git a/.hgtags b/old/.hgtags
similarity index 100%
rename from .hgtags
rename to old/.hgtags
diff --git a/build.xml b/old/build.xml
similarity index 99%
rename from build.xml
rename to old/build.xml
index 40de97d..5ebf7b1 100644
--- a/build.xml
+++ b/old/build.xml
@@ -21,7 +21,7 @@
 
     <!-- import common osbuild.xml -->
     
-    <property name="common.build" value="../opensymphony/common/osbuild.xml"/>
+    <property name="common.build" value="osbuild.xml"/>
     <import file="${common.build}"/>
  
     <property name="clover.initstring" location="${build.clover}/coverageBase.db"/>
diff --git a/ivy.xml b/old/ivy.xml
similarity index 100%
rename from ivy.xml
rename to old/ivy.xml
diff --git a/ivyconf.properties b/old/ivyconf.properties
similarity index 100%
rename from ivyconf.properties
rename to old/ivyconf.properties
diff --git a/ivyconf.xml b/old/ivyconf.xml
similarity index 100%
rename from ivyconf.xml
rename to old/ivyconf.xml
diff --git a/lib/.cvsignore b/old/lib/.cvsignore
similarity index 100%
rename from lib/.cvsignore
rename to old/lib/.cvsignore
diff --git a/old/osbuild.xml b/old/osbuild.xml
new file mode 100644
index 0000000..95de72c
--- /dev/null
+++ b/old/osbuild.xml
@@ -0,0 +1,383 @@
+<project name="common" default="jar" basedir=".">
+    <!--
+    OpenSymphony Common Build
+    =========================
+    TODO (Introduction)
+
+    Layout
+    =========================
+    TODO
+
+    Overriding
+    =========================
+    TODO
+    Example: <target name="compile" depends="myPreCompile,common.compile,myPostCompile"/>
+
+    -->
+    <!-- NOTE: this property is purely here to make a clear distinction in IDEA where the common build is -->
+    <property name="------common-properties-below------" value="Common properties below:"/>
+
+    <property name="compile.version" value="1.3"/>
+    <property name="test.compile.version" value="1.3"/>
+
+    <dirname property="common.dir" file="${ant.file.common}"/>
+    <property file="build.properties"/>
+    <property file="release.properties"/>
+    <property file="ivyrep.properties"/>
+
+    <property name="lib" location="lib"/>
+    <property name="lib.core" value="${lib}/core"/>
+    <property name="lib.build" value="${lib}/build"/>
+    <property name="lib.optional" value="${lib}/optional"/>
+
+    <property name="src" location="src"/>
+    <property name="src.java" value="${src}/java"/>
+
+    <property name="test" value="${src}/test"/>
+    <property name="src.test" value="${test}/java"/>
+
+    <property name="build" location="build"/>
+    <property name="build.test" value="${build}/test"/>
+    <property name="build.java-test" value="${build}/java-test"/>
+    <property name="build.java" value="${build}/java"/>
+    <property name="build.clover" value="${build}/clover"/>
+    <property name="dist" location="dist"/>
+
+    <property name="docs" location="docs"/>
+    <property name="docs.packages" value="com.opensymphony.*"/>
+
+    <property name="jar.manifest" value="${common.dir}/EMPTY.MF"/>
+    <property name="jar.excludes" value=""/>
+
+    <property name="testcase" value="*"/>
+    <patternset id="src.test.pattern">
+        <exclude name="**/Abstract*.java"/>
+        <include name="**/${testcase}Test.java"/>
+        <include name="**/${testcase}TestCase.java"/>
+    </patternset>
+
+    <path id="cp">
+        <fileset dir="lib">
+            <include name="**/*.jar"/>
+            <include name="**/*.zip"/>
+            <exclude name="**/jalopy/**"/>
+        </fileset>
+    </path>
+
+    <path id="junit.cp">
+        <pathelement location="${build.test}"/>
+        <pathelement location="${build.java-test}"/>
+        <path refid="cp"/>
+    </path>
+
+    <available property="junit.available" classname="junit.framework.TestCase"/>
+    <available property="clover.available" classname="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
+
+    <target name="init" depends="init-anthill, init-standalone">
+        <tstamp/>
+    </target>
+
+    <!-- in Anthill, the docs should be the Intranet copyDir -->
+    <target name="init-anthill" if="anthill.copyDir">
+        <property name="dist.docs" value="${anthill.copyDir}"/>
+    </target>
+
+    <!-- when building Standalone, the docs should be the normal place -->
+    <target name="init-standalone" unless="anthill.copyDir">
+        <property name="dist.docs" value="${dist}/docs"/>
+    </target>
+
+    <target name="junit-check" depends="init" unless="junit.available">
+        <fail message="Cannot run test cases. Please copy lib/build/junit-3.8.1.jar to ${ant.home}/lib"/>
+    </target>
+
+    <target name="clover-check" depends="init" unless="clover.available">
+        <fail message="Cannot run coverage tests. Please copy lib/build/clover.jar and lib/build/clover.license (if it exists) to ${ant.home}/lib"/>
+    </target>
+
+    <target name="clean" depends="init">
+        <delete dir="${build}"/>
+        <delete dir="${dist}"/>
+    </target>
+
+    <target name="precompile"/>
+
+    <macrodef name="compile">
+        <attribute name="srcdir"/>
+        <attribute name="destdir"/>
+        <attribute name="classpath" default=""/>
+        <attribute name="classpathref" default="cp"/>
+        <attribute name="excludes" default=""/>
+        <attribute name="source" default="${compile.version}"/>
+        <attribute name="target" default="${compile.version}"/>
+        <sequential>
+            <mkdir dir="@{destdir}"/>
+            <javac srcdir="@{srcdir}" destdir="@{destdir}" classpath="@{classpath}" classpathref="@{classpathref}"
+                   debug="on" source="@{source}" target="@{target}"/>
+            <copy filtering="no" todir="@{destdir}">
+                <fileset dir="@{srcdir}">
+                    <exclude name="**/*.java"/>
+                    <exclude name="**/package.html"/>
+                </fileset>
+            </copy>
+        </sequential>
+    </macrodef>
+
+    <target name="compile" depends="init,precompile" description="compile project">
+        <compile srcdir="${src.java}" destdir="${build.java}"/>
+    </target>
+
+    <target name="jar" depends="compile" description="build the project jar file">
+        <mkdir dir="${build}"/>
+
+        <jar basedir="${build.java}" excludes="${jar.excludes}" jarfile="${build}/${name}-${version}.jar"
+             manifest="${jar.manifest}">
+            <manifest>
+                <attribute name="Implementation-Title" value="${fullname}"/>
+                <attribute name="Implementation-Version" value="${version}"/>
+                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
+            </manifest>
+        </jar>
+        <!--        <jar basedir="${src.java}" jarfile="${build}/${name}-${version}-src.jar">
+           <manifest>
+               <attribute name="Implementation-Title" value="${fullname}" />
+               <attribute name="Implementation-Version" value="${version}" />
+               <attribute name="Implementation-Vendor" value="OpenSymphony" />
+           </manifest>
+       </jar> -->
+    </target>
+
+    <target name="src-jar" depends="init" description="build a jar of the project source code">
+        <mkdir dir="${build}"/>
+        <jar basedir="${src.java}" jarfile="${build}/${name}-${version}-src.jar">
+            <manifest>
+                <attribute name="Implementation-Title" value="${fullname}"/>
+                <attribute name="Implementation-Version" value="${version}"/>
+                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="test-compile" unless="skip.tests">
+        <compile srcdir="${src.test}" destdir="${build.test}" classpath="${build.java}"
+                 source="${test.compile.version}" target="${test.compile.version}"/>
+
+        <taskdef resource="clovertasks"/>
+        <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+
+        <mkdir dir="${build.clover}"/>
+        <clover-setup initString="${build.clover}/coverage.db">
+            <files>
+                <exclude name="${src.test}/**/*.java"/>
+            </files>
+        </clover-setup>
+
+        <compile srcdir="${src.java}" destdir="${build.java-test}"/>
+    </target>
+
+    <target name="test" depends="junit-check, clover-check, compile, test-compile" description="run tests"
+            unless="skip.tests">
+        <run-junit />
+    </target>
+
+    <macrodef name="run-junit">
+        <attribute name="classpathref" default="junit.cp" />
+        <sequential>
+          <mkdir dir="${dist.docs}/junit"/>
+          <junit haltonfailure="no" haltonerror="yes" fork="yes" forkmode="once" failureproperty="test.failure">
+              <jvmarg value="-Djava.awt.headless=true"/>
+              <jvmarg value="-Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl"/>
+              <classpath>
+                  <path refid="@{classpathref}"/>
+              </classpath>
+
+              <formatter type="plain" useFile="false"/>
+              <formatter type="xml"/>
+
+              <batchtest todir="${dist.docs}/junit">
+                  <fileset dir="${src.test}">
+                      <patternset refid="src.test.pattern"/>
+                  </fileset>
+              </batchtest>
+          </junit>          
+        </sequential>
+    </macrodef>
+  
+    <target name="javadocs" description="generate javadocs" depends="init">
+        <mkdir dir="${dist.docs}/api"/>
+        <javadoc sourcepath="${src.java}"
+                 destdir="${dist.docs}/api"
+                 packagenames="${docs.packages}"
+                 classpathref="cp"
+                 author="true"
+                 version="true"
+                 overview="${src.java}/overview.html"
+                 windowTitle="${fullname} API - ${version}"
+                 doctitle="${fullname} API (${version})"
+                 footer="&lt;a href=&quot;http://www.opensymphony.com/${name}/&quot; target=&quot;_top&quot;&gt;${fullname} Project Page&lt;/a&gt;"
+                 use="true"
+                 verbose="false">
+            <link href="http://java.sun.com/j2se/${compile.version}/docs/api/"/>
+            <link href="http://java.sun.com/j2ee/${compile.version}/docs/api/"/>
+        </javadoc>
+        <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> -->
+    </target>
+
+    <target name="docs.impl">
+        <copy todir="${dist.docs}">
+            <fileset dir="${docs}"/>
+        </copy>
+    </target>
+
+    <target name="reports" depends="junit.report, clover.report, javadocs"
+            description="generate javadocs and junit and coverage reports"/>
+
+    <target name="docs" depends="reports, docs.impl"/>
+
+    <target name="clover.report" depends="test" description="generate coverage reports" unless="skip.tests">
+        <clover-report>
+            <current outfile="${dist.docs}/clover">
+                <format type="html"/>
+            </current>
+        </clover-report>
+    </target>
+
+    <target name="clover.historical" depends="clover.report" description="generate coverage historical reports"
+            unless="skip.tests">
+        <clover-historypoint historyDir="${build.clover}"/>
+
+        <clover-report>
+            <historical outfile="${dist.docs}/clover" historyDir="${build.clover}">
+                <format type="html"/>
+            </historical>
+        </clover-report>
+    </target>
+
+    <target name="junit.report" depends="test" description="generate junit reports" unless="skip.tests">
+        <junitreport todir="${dist.docs}/junit">
+            <fileset dir="${dist.docs}/junit">
+                <include name="TEST-*.xml"/>
+            </fileset>
+            <report format="frames" todir="${dist.docs}/junit"/>
+        </junitreport>
+
+        <!-- we fail here (instead of in the test target) so that the reports get generated first) -->
+        <fail if="test.failure" message="Tests did not all pass, failing!"/>
+    </target>
+
+    <target name="predist"/>
+
+    <target name="predist.zip"/>
+
+    <target name="dist" depends="jar, docs, predist" description="generate distribution zip file">
+        <copy todir="${dist}">
+            <fileset dir="${build}">
+                <include name="*.jar"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist}/src">
+            <fileset dir="${src}"/>
+        </copy>
+
+        <mkdir dir="${dist}/lib"/>
+        <copy todir="${dist}/lib">
+            <fileset dir="${lib}">
+                <exclude name="**/no_dist/**"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${dist}">
+            <fileset dir="${basedir}">
+                <include name="*build.*"/>
+                <include name="readme.txt"/>
+                <include name="license.txt"/>
+            </fileset>
+        </copy>
+
+        <!-- give a chance for project builds to do more before the zip is made. -->
+        <antcall target="predist.zip"/>
+
+        <zip zipfile="${build}/${name}-${version}.zip" basedir="${dist}">
+            <exclude name="docs/clover/**/*"/>
+            <exclude name="docs/junit/**/*"/>
+        </zip>
+    </target>
+
+    <target name="website" depends="javadocs, docs.impl"/>
+
+    <target name="ivyrep" depends="jar">
+        <tstamp>
+            <format property="TIME" pattern="yyyyMMddHHmmss"/>
+        </tstamp>
+
+        <!-- make sure we have the latest -->
+        <echo>svn update</echo>
+        <exec executable="svn">
+            <arg value="update"/>
+            <arg line="${ivyrep.path}/opensymphony/${name}"/>
+        </exec>
+
+        <!-- delete the old timestamped builds and commit -->
+        <fileset dir="${ivyrep.path}/opensymphony/${name}" id="filesref">
+            <include name="${name}-${version}-*"/>
+            <include name="ivy-${version}-*"/>
+        </fileset>
+        <pathconvert property="files" refid="filesref" pathsep=" "/>
+        <echo>svn delete: ${files}</echo>
+        <exec executable="svn">
+            <arg value="delete"/>
+            <arg line="${files}"/>
+        </exec>
+
+        <!-- copy over the new build -->
+        <copy file="${build}/${name}-${version}.jar"
+              tofile="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}.jar"/>
+        <echo>svn add (jar)</echo>
+        <exec executable="svn">
+            <arg value="add"/>
+            <arg value="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}.jar"/>
+        </exec>
+
+        <antcall target="ivyrep.copy-ivy"/>
+        <exec executable="svn">
+            <arg value="add"/>
+            <arg value="${ivyrep.path}/opensymphony/${name}/ivy-${version}-${TIME}.xml"/>
+        </exec>
+
+        <!-- now commit everything -->
+        <echo>svn commit</echo>
+        <exec executable="svn">
+            <arg value="commit"/>
+            <arg value="--username"/>
+            <arg value="${ivyrep.username}"/>
+            <arg value="--password"/>
+            <arg value="${ivyrep.password}"/>
+            <arg value="--non-interactive"/>
+            <arg value="-m"/>
+            <arg value="automatic commit"/>
+            <arg value="${ivyrep.path}/opensymphony/${name}"/>
+        </exec>
+    </target>
+
+    <target name="ivyrep.copy-ivy">
+        <!--
+        Note: Default implementation does not use Ivy itself to generate these files.
+              However, Ivy is really the best way to generate these, so projects that
+              do use Ivy should override this target like so:
+
+              <ivy-deliver deliverpattern="${ivyrep.path}/opensymphony/${name}/[artifact]-[revision].[ext]"
+                           pubrevision="${version}-${TIME}" pubdate="${TIME}"/>
+
+              Over time as more projects adopt Ivy, this may become built in to the
+              common build.
+        -->
+        <copy file="ivy.xml" tofile="${ivyrep.path}/opensymphony/${name}/ivy-${version}-${TIME}.xml">
+            <filterset id="ivy.filter">
+                <filter token="VERSION" value="${version}-${TIME}"/>
+                <filter token="STATUS" value="${status}"/>
+                <filter token="PUBLICATION" value="${TIME}"/>
+            </filterset>
+        </copy>
+    </target>
+</project>
diff --git a/pom.xml b/old/pom.xml
similarity index 100%
rename from pom.xml
rename to old/pom.xml
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..0e80a82
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'oscache'
diff --git a/src/java/com/opensymphony/oscache/base/AbstractCacheAdministrator.java b/src/main/java/com/opensymphony/oscache/base/AbstractCacheAdministrator.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/AbstractCacheAdministrator.java
rename to src/main/java/com/opensymphony/oscache/base/AbstractCacheAdministrator.java
diff --git a/src/java/com/opensymphony/oscache/base/Cache.java b/src/main/java/com/opensymphony/oscache/base/Cache.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/Cache.java
rename to src/main/java/com/opensymphony/oscache/base/Cache.java
diff --git a/src/java/com/opensymphony/oscache/base/CacheEntry.java b/src/main/java/com/opensymphony/oscache/base/CacheEntry.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/CacheEntry.java
rename to src/main/java/com/opensymphony/oscache/base/CacheEntry.java
diff --git a/src/java/com/opensymphony/oscache/base/Config.java b/src/main/java/com/opensymphony/oscache/base/Config.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/Config.java
rename to src/main/java/com/opensymphony/oscache/base/Config.java
diff --git a/src/java/com/opensymphony/oscache/base/EntryRefreshPolicy.java b/src/main/java/com/opensymphony/oscache/base/EntryRefreshPolicy.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/EntryRefreshPolicy.java
rename to src/main/java/com/opensymphony/oscache/base/EntryRefreshPolicy.java
diff --git a/src/java/com/opensymphony/oscache/base/EntryUpdateState.java b/src/main/java/com/opensymphony/oscache/base/EntryUpdateState.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/EntryUpdateState.java
rename to src/main/java/com/opensymphony/oscache/base/EntryUpdateState.java
diff --git a/src/java/com/opensymphony/oscache/base/FinalizationException.java b/src/main/java/com/opensymphony/oscache/base/FinalizationException.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/FinalizationException.java
rename to src/main/java/com/opensymphony/oscache/base/FinalizationException.java
diff --git a/src/java/com/opensymphony/oscache/base/InitializationException.java b/src/main/java/com/opensymphony/oscache/base/InitializationException.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/InitializationException.java
rename to src/main/java/com/opensymphony/oscache/base/InitializationException.java
diff --git a/src/java/com/opensymphony/oscache/base/LifecycleAware.java b/src/main/java/com/opensymphony/oscache/base/LifecycleAware.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/LifecycleAware.java
rename to src/main/java/com/opensymphony/oscache/base/LifecycleAware.java
diff --git a/src/java/com/opensymphony/oscache/base/NeedsRefreshException.java b/src/main/java/com/opensymphony/oscache/base/NeedsRefreshException.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/NeedsRefreshException.java
rename to src/main/java/com/opensymphony/oscache/base/NeedsRefreshException.java
diff --git a/src/java/com/opensymphony/oscache/base/algorithm/AbstractConcurrentReadCache.java b/src/main/java/com/opensymphony/oscache/base/algorithm/AbstractConcurrentReadCache.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/algorithm/AbstractConcurrentReadCache.java
rename to src/main/java/com/opensymphony/oscache/base/algorithm/AbstractConcurrentReadCache.java
diff --git a/src/java/com/opensymphony/oscache/base/algorithm/FIFOCache.java b/src/main/java/com/opensymphony/oscache/base/algorithm/FIFOCache.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/algorithm/FIFOCache.java
rename to src/main/java/com/opensymphony/oscache/base/algorithm/FIFOCache.java
diff --git a/src/java/com/opensymphony/oscache/base/algorithm/LRUCache.java b/src/main/java/com/opensymphony/oscache/base/algorithm/LRUCache.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/algorithm/LRUCache.java
rename to src/main/java/com/opensymphony/oscache/base/algorithm/LRUCache.java
diff --git a/src/java/com/opensymphony/oscache/base/algorithm/UnlimitedCache.java b/src/main/java/com/opensymphony/oscache/base/algorithm/UnlimitedCache.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/algorithm/UnlimitedCache.java
rename to src/main/java/com/opensymphony/oscache/base/algorithm/UnlimitedCache.java
diff --git a/src/java/com/opensymphony/oscache/base/algorithm/package.html b/src/main/java/com/opensymphony/oscache/base/algorithm/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/algorithm/package.html
rename to src/main/java/com/opensymphony/oscache/base/algorithm/package.html
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheEntryEvent.java b/src/main/java/com/opensymphony/oscache/base/events/CacheEntryEvent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheEntryEvent.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheEntryEvent.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheEntryEventListener.java b/src/main/java/com/opensymphony/oscache/base/events/CacheEntryEventListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheEntryEventListener.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheEntryEventListener.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheEntryEventType.java b/src/main/java/com/opensymphony/oscache/base/events/CacheEntryEventType.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheEntryEventType.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheEntryEventType.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheEvent.java b/src/main/java/com/opensymphony/oscache/base/events/CacheEvent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheEvent.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheEvent.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheEventListener.java b/src/main/java/com/opensymphony/oscache/base/events/CacheEventListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheEventListener.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheEventListener.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheGroupEvent.java b/src/main/java/com/opensymphony/oscache/base/events/CacheGroupEvent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheGroupEvent.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheGroupEvent.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheMapAccessEvent.java b/src/main/java/com/opensymphony/oscache/base/events/CacheMapAccessEvent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheMapAccessEvent.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheMapAccessEvent.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheMapAccessEventListener.java b/src/main/java/com/opensymphony/oscache/base/events/CacheMapAccessEventListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheMapAccessEventListener.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheMapAccessEventListener.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CacheMapAccessEventType.java b/src/main/java/com/opensymphony/oscache/base/events/CacheMapAccessEventType.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CacheMapAccessEventType.java
rename to src/main/java/com/opensymphony/oscache/base/events/CacheMapAccessEventType.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CachePatternEvent.java b/src/main/java/com/opensymphony/oscache/base/events/CachePatternEvent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CachePatternEvent.java
rename to src/main/java/com/opensymphony/oscache/base/events/CachePatternEvent.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CachewideEvent.java b/src/main/java/com/opensymphony/oscache/base/events/CachewideEvent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CachewideEvent.java
rename to src/main/java/com/opensymphony/oscache/base/events/CachewideEvent.java
diff --git a/src/java/com/opensymphony/oscache/base/events/CachewideEventType.java b/src/main/java/com/opensymphony/oscache/base/events/CachewideEventType.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/CachewideEventType.java
rename to src/main/java/com/opensymphony/oscache/base/events/CachewideEventType.java
diff --git a/src/java/com/opensymphony/oscache/base/events/ScopeEvent.java b/src/main/java/com/opensymphony/oscache/base/events/ScopeEvent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/ScopeEvent.java
rename to src/main/java/com/opensymphony/oscache/base/events/ScopeEvent.java
diff --git a/src/java/com/opensymphony/oscache/base/events/ScopeEventListener.java b/src/main/java/com/opensymphony/oscache/base/events/ScopeEventListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/ScopeEventListener.java
rename to src/main/java/com/opensymphony/oscache/base/events/ScopeEventListener.java
diff --git a/src/java/com/opensymphony/oscache/base/events/ScopeEventType.java b/src/main/java/com/opensymphony/oscache/base/events/ScopeEventType.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/ScopeEventType.java
rename to src/main/java/com/opensymphony/oscache/base/events/ScopeEventType.java
diff --git a/src/java/com/opensymphony/oscache/base/events/package.html b/src/main/java/com/opensymphony/oscache/base/events/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/events/package.html
rename to src/main/java/com/opensymphony/oscache/base/events/package.html
diff --git a/src/java/com/opensymphony/oscache/base/package.html b/src/main/java/com/opensymphony/oscache/base/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/package.html
rename to src/main/java/com/opensymphony/oscache/base/package.html
diff --git a/src/java/com/opensymphony/oscache/base/persistence/CachePersistenceException.java b/src/main/java/com/opensymphony/oscache/base/persistence/CachePersistenceException.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/persistence/CachePersistenceException.java
rename to src/main/java/com/opensymphony/oscache/base/persistence/CachePersistenceException.java
diff --git a/src/java/com/opensymphony/oscache/base/persistence/PersistenceListener.java b/src/main/java/com/opensymphony/oscache/base/persistence/PersistenceListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/persistence/PersistenceListener.java
rename to src/main/java/com/opensymphony/oscache/base/persistence/PersistenceListener.java
diff --git a/src/java/com/opensymphony/oscache/base/persistence/package.html b/src/main/java/com/opensymphony/oscache/base/persistence/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/base/persistence/package.html
rename to src/main/java/com/opensymphony/oscache/base/persistence/package.html
diff --git a/src/java/com/opensymphony/oscache/extra/CacheEntryEventListenerImpl.java b/src/main/java/com/opensymphony/oscache/extra/CacheEntryEventListenerImpl.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/extra/CacheEntryEventListenerImpl.java
rename to src/main/java/com/opensymphony/oscache/extra/CacheEntryEventListenerImpl.java
diff --git a/src/java/com/opensymphony/oscache/extra/CacheMapAccessEventListenerImpl.java b/src/main/java/com/opensymphony/oscache/extra/CacheMapAccessEventListenerImpl.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/extra/CacheMapAccessEventListenerImpl.java
rename to src/main/java/com/opensymphony/oscache/extra/CacheMapAccessEventListenerImpl.java
diff --git a/src/java/com/opensymphony/oscache/extra/ScopeEventListenerImpl.java b/src/main/java/com/opensymphony/oscache/extra/ScopeEventListenerImpl.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/extra/ScopeEventListenerImpl.java
rename to src/main/java/com/opensymphony/oscache/extra/ScopeEventListenerImpl.java
diff --git a/src/java/com/opensymphony/oscache/extra/StatisticListenerImpl.java b/src/main/java/com/opensymphony/oscache/extra/StatisticListenerImpl.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/extra/StatisticListenerImpl.java
rename to src/main/java/com/opensymphony/oscache/extra/StatisticListenerImpl.java
diff --git a/src/java/com/opensymphony/oscache/extra/package.html b/src/main/java/com/opensymphony/oscache/extra/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/extra/package.html
rename to src/main/java/com/opensymphony/oscache/extra/package.html
diff --git a/src/java/com/opensymphony/oscache/general/GeneralCacheAdministrator.java b/src/main/java/com/opensymphony/oscache/general/GeneralCacheAdministrator.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/general/GeneralCacheAdministrator.java
rename to src/main/java/com/opensymphony/oscache/general/GeneralCacheAdministrator.java
diff --git a/src/java/com/opensymphony/oscache/general/package.html b/src/main/java/com/opensymphony/oscache/general/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/general/package.html
rename to src/main/java/com/opensymphony/oscache/general/package.html
diff --git a/src/java/com/opensymphony/oscache/hibernate/OSCache.java b/src/main/java/com/opensymphony/oscache/hibernate/OSCache.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/hibernate/OSCache.java
rename to src/main/java/com/opensymphony/oscache/hibernate/OSCache.java
diff --git a/src/java/com/opensymphony/oscache/hibernate/OSCacheProvider.java b/src/main/java/com/opensymphony/oscache/hibernate/OSCacheProvider.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/hibernate/OSCacheProvider.java
rename to src/main/java/com/opensymphony/oscache/hibernate/OSCacheProvider.java
diff --git a/src/java/com/opensymphony/oscache/hibernate/package.html b/src/main/java/com/opensymphony/oscache/hibernate/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/hibernate/package.html
rename to src/main/java/com/opensymphony/oscache/hibernate/package.html
diff --git a/src/java/com/opensymphony/oscache/plugins/clustersupport/AbstractBroadcastingListener.java b/src/main/java/com/opensymphony/oscache/plugins/clustersupport/AbstractBroadcastingListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/clustersupport/AbstractBroadcastingListener.java
rename to src/main/java/com/opensymphony/oscache/plugins/clustersupport/AbstractBroadcastingListener.java
diff --git a/src/java/com/opensymphony/oscache/plugins/clustersupport/ClusterNotification.java b/src/main/java/com/opensymphony/oscache/plugins/clustersupport/ClusterNotification.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/clustersupport/ClusterNotification.java
rename to src/main/java/com/opensymphony/oscache/plugins/clustersupport/ClusterNotification.java
diff --git a/src/java/com/opensymphony/oscache/plugins/clustersupport/JMS10BroadcastingListener.java b/src/main/java/com/opensymphony/oscache/plugins/clustersupport/JMS10BroadcastingListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/clustersupport/JMS10BroadcastingListener.java
rename to src/main/java/com/opensymphony/oscache/plugins/clustersupport/JMS10BroadcastingListener.java
diff --git a/src/java/com/opensymphony/oscache/plugins/clustersupport/JMSBroadcastingListener.java b/src/main/java/com/opensymphony/oscache/plugins/clustersupport/JMSBroadcastingListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/clustersupport/JMSBroadcastingListener.java
rename to src/main/java/com/opensymphony/oscache/plugins/clustersupport/JMSBroadcastingListener.java
diff --git a/src/java/com/opensymphony/oscache/plugins/clustersupport/JavaGroupsBroadcastingListener.java b/src/main/java/com/opensymphony/oscache/plugins/clustersupport/JavaGroupsBroadcastingListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/clustersupport/JavaGroupsBroadcastingListener.java
rename to src/main/java/com/opensymphony/oscache/plugins/clustersupport/JavaGroupsBroadcastingListener.java
diff --git a/src/java/com/opensymphony/oscache/plugins/clustersupport/package.html b/src/main/java/com/opensymphony/oscache/plugins/clustersupport/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/clustersupport/package.html
rename to src/main/java/com/opensymphony/oscache/plugins/clustersupport/package.html
diff --git a/src/java/com/opensymphony/oscache/plugins/diskpersistence/AbstractDiskPersistenceListener.java b/src/main/java/com/opensymphony/oscache/plugins/diskpersistence/AbstractDiskPersistenceListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/diskpersistence/AbstractDiskPersistenceListener.java
rename to src/main/java/com/opensymphony/oscache/plugins/diskpersistence/AbstractDiskPersistenceListener.java
diff --git a/src/java/com/opensymphony/oscache/plugins/diskpersistence/DiskPersistenceListener.java b/src/main/java/com/opensymphony/oscache/plugins/diskpersistence/DiskPersistenceListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/diskpersistence/DiskPersistenceListener.java
rename to src/main/java/com/opensymphony/oscache/plugins/diskpersistence/DiskPersistenceListener.java
diff --git a/src/java/com/opensymphony/oscache/plugins/diskpersistence/HashDiskPersistenceListener.java b/src/main/java/com/opensymphony/oscache/plugins/diskpersistence/HashDiskPersistenceListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/diskpersistence/HashDiskPersistenceListener.java
rename to src/main/java/com/opensymphony/oscache/plugins/diskpersistence/HashDiskPersistenceListener.java
diff --git a/src/java/com/opensymphony/oscache/plugins/diskpersistence/package.html b/src/main/java/com/opensymphony/oscache/plugins/diskpersistence/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/plugins/diskpersistence/package.html
rename to src/main/java/com/opensymphony/oscache/plugins/diskpersistence/package.html
diff --git a/src/java/com/opensymphony/oscache/util/ClassLoaderUtil.java b/src/main/java/com/opensymphony/oscache/util/ClassLoaderUtil.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/util/ClassLoaderUtil.java
rename to src/main/java/com/opensymphony/oscache/util/ClassLoaderUtil.java
diff --git a/src/java/com/opensymphony/oscache/util/FastCronParser.java b/src/main/java/com/opensymphony/oscache/util/FastCronParser.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/util/FastCronParser.java
rename to src/main/java/com/opensymphony/oscache/util/FastCronParser.java
diff --git a/src/java/com/opensymphony/oscache/util/StringUtil.java b/src/main/java/com/opensymphony/oscache/util/StringUtil.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/util/StringUtil.java
rename to src/main/java/com/opensymphony/oscache/util/StringUtil.java
diff --git a/src/java/com/opensymphony/oscache/util/package.html b/src/main/java/com/opensymphony/oscache/util/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/util/package.html
rename to src/main/java/com/opensymphony/oscache/util/package.html
diff --git a/src/java/com/opensymphony/oscache/web/CacheContextListener.java b/src/main/java/com/opensymphony/oscache/web/CacheContextListener.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/CacheContextListener.java
rename to src/main/java/com/opensymphony/oscache/web/CacheContextListener.java
diff --git a/src/java/com/opensymphony/oscache/web/ServletCache.java b/src/main/java/com/opensymphony/oscache/web/ServletCache.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/ServletCache.java
rename to src/main/java/com/opensymphony/oscache/web/ServletCache.java
diff --git a/src/java/com/opensymphony/oscache/web/ServletCacheAdministrator.java b/src/main/java/com/opensymphony/oscache/web/ServletCacheAdministrator.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/ServletCacheAdministrator.java
rename to src/main/java/com/opensymphony/oscache/web/ServletCacheAdministrator.java
diff --git a/src/java/com/opensymphony/oscache/web/WebEntryRefreshPolicy.java b/src/main/java/com/opensymphony/oscache/web/WebEntryRefreshPolicy.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/WebEntryRefreshPolicy.java
rename to src/main/java/com/opensymphony/oscache/web/WebEntryRefreshPolicy.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/CacheFilter.java b/src/main/java/com/opensymphony/oscache/web/filter/CacheFilter.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/CacheFilter.java
rename to src/main/java/com/opensymphony/oscache/web/filter/CacheFilter.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/CacheHttpServletResponseWrapper.java b/src/main/java/com/opensymphony/oscache/web/filter/CacheHttpServletResponseWrapper.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/CacheHttpServletResponseWrapper.java
rename to src/main/java/com/opensymphony/oscache/web/filter/CacheHttpServletResponseWrapper.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/ExpiresRefreshPolicy.java b/src/main/java/com/opensymphony/oscache/web/filter/ExpiresRefreshPolicy.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/ExpiresRefreshPolicy.java
rename to src/main/java/com/opensymphony/oscache/web/filter/ExpiresRefreshPolicy.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/ICacheGroupsProvider.java b/src/main/java/com/opensymphony/oscache/web/filter/ICacheGroupsProvider.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/ICacheGroupsProvider.java
rename to src/main/java/com/opensymphony/oscache/web/filter/ICacheGroupsProvider.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/ICacheKeyProvider.java b/src/main/java/com/opensymphony/oscache/web/filter/ICacheKeyProvider.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/ICacheKeyProvider.java
rename to src/main/java/com/opensymphony/oscache/web/filter/ICacheKeyProvider.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/ResponseContent.java b/src/main/java/com/opensymphony/oscache/web/filter/ResponseContent.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/ResponseContent.java
rename to src/main/java/com/opensymphony/oscache/web/filter/ResponseContent.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/SplitServletOutputStream.java b/src/main/java/com/opensymphony/oscache/web/filter/SplitServletOutputStream.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/SplitServletOutputStream.java
rename to src/main/java/com/opensymphony/oscache/web/filter/SplitServletOutputStream.java
diff --git a/src/java/com/opensymphony/oscache/web/filter/package.html b/src/main/java/com/opensymphony/oscache/web/filter/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/filter/package.html
rename to src/main/java/com/opensymphony/oscache/web/filter/package.html
diff --git a/src/java/com/opensymphony/oscache/web/package.html b/src/main/java/com/opensymphony/oscache/web/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/package.html
rename to src/main/java/com/opensymphony/oscache/web/package.html
diff --git a/src/java/com/opensymphony/oscache/web/tag/CacheTag.java b/src/main/java/com/opensymphony/oscache/web/tag/CacheTag.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/tag/CacheTag.java
rename to src/main/java/com/opensymphony/oscache/web/tag/CacheTag.java
diff --git a/src/java/com/opensymphony/oscache/web/tag/FlushTag.java b/src/main/java/com/opensymphony/oscache/web/tag/FlushTag.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/tag/FlushTag.java
rename to src/main/java/com/opensymphony/oscache/web/tag/FlushTag.java
diff --git a/src/java/com/opensymphony/oscache/web/tag/GroupTag.java b/src/main/java/com/opensymphony/oscache/web/tag/GroupTag.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/tag/GroupTag.java
rename to src/main/java/com/opensymphony/oscache/web/tag/GroupTag.java
diff --git a/src/java/com/opensymphony/oscache/web/tag/GroupsTag.java b/src/main/java/com/opensymphony/oscache/web/tag/GroupsTag.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/tag/GroupsTag.java
rename to src/main/java/com/opensymphony/oscache/web/tag/GroupsTag.java
diff --git a/src/java/com/opensymphony/oscache/web/tag/UseCachedTag.java b/src/main/java/com/opensymphony/oscache/web/tag/UseCachedTag.java
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/tag/UseCachedTag.java
rename to src/main/java/com/opensymphony/oscache/web/tag/UseCachedTag.java
diff --git a/src/java/com/opensymphony/oscache/web/tag/package.html b/src/main/java/com/opensymphony/oscache/web/tag/package.html
similarity index 100%
rename from src/java/com/opensymphony/oscache/web/tag/package.html
rename to src/main/java/com/opensymphony/oscache/web/tag/package.html
diff --git a/src/java/overview.html b/src/main/java/overview.html
similarity index 100%
rename from src/java/overview.html
rename to src/main/java/overview.html
diff --git a/src/etc/META-INF/taglib.tld b/src/main/resources/META-INF/taglib.tld
similarity index 100%
rename from src/etc/META-INF/taglib.tld
rename to src/main/resources/META-INF/taglib.tld
diff --git a/src/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java b/src/main/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java
rename to src/main/test/java/com/opensymphony/oscache/base/DummyAlwayRefreshEntryPolicy.java
diff --git a/src/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java b/src/main/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java
rename to src/main/test/java/com/opensymphony/oscache/base/GroupConcurrencyProblemTestCase.java
diff --git a/src/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java b/src/main/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java
rename to src/main/test/java/com/opensymphony/oscache/base/TestAbstractCacheAdministrator.java
diff --git a/src/test/java/com/opensymphony/oscache/base/TestCache.java b/src/main/test/java/com/opensymphony/oscache/base/TestCache.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/TestCache.java
rename to src/main/test/java/com/opensymphony/oscache/base/TestCache.java
diff --git a/src/test/java/com/opensymphony/oscache/base/TestCacheEntry.java b/src/main/test/java/com/opensymphony/oscache/base/TestCacheEntry.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/TestCacheEntry.java
rename to src/main/test/java/com/opensymphony/oscache/base/TestCacheEntry.java
diff --git a/src/test/java/com/opensymphony/oscache/base/TestCompleteBase.java b/src/main/test/java/com/opensymphony/oscache/base/TestCompleteBase.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/TestCompleteBase.java
rename to src/main/test/java/com/opensymphony/oscache/base/TestCompleteBase.java
diff --git a/src/test/java/com/opensymphony/oscache/base/TestConcurrency.java b/src/main/test/java/com/opensymphony/oscache/base/TestConcurrency.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/TestConcurrency.java
rename to src/main/test/java/com/opensymphony/oscache/base/TestConcurrency.java
diff --git a/src/test/java/com/opensymphony/oscache/base/TestConcurrency2.java b/src/main/test/java/com/opensymphony/oscache/base/TestConcurrency2.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/TestConcurrency2.java
rename to src/main/test/java/com/opensymphony/oscache/base/TestConcurrency2.java
diff --git a/src/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java b/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java
rename to src/main/test/java/com/opensymphony/oscache/base/algorithm/TestAbstractCache.java
diff --git a/src/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java b/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java
rename to src/main/test/java/com/opensymphony/oscache/base/algorithm/TestCompleteAlgorithm.java
diff --git a/src/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java b/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java
rename to src/main/test/java/com/opensymphony/oscache/base/algorithm/TestFIFOCache.java
diff --git a/src/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java b/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java
rename to src/main/test/java/com/opensymphony/oscache/base/algorithm/TestLRUCache.java
diff --git a/src/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java b/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java
rename to src/main/test/java/com/opensymphony/oscache/base/algorithm/TestQueueCache.java
diff --git a/src/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java b/src/main/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java
rename to src/main/test/java/com/opensymphony/oscache/base/algorithm/TestUnlimitedCache.java
diff --git a/src/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java b/src/main/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java
rename to src/main/test/java/com/opensymphony/oscache/base/events/TestCacheEntryEvent.java
diff --git a/src/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java b/src/main/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java
rename to src/main/test/java/com/opensymphony/oscache/base/events/TestCacheGroupEvent.java
diff --git a/src/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java b/src/main/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java
rename to src/main/test/java/com/opensymphony/oscache/base/events/TestCacheMapAccessEvent.java
diff --git a/src/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java b/src/main/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java
rename to src/main/test/java/com/opensymphony/oscache/base/events/TestCachePatternEvent.java
diff --git a/src/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java b/src/main/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java
rename to src/main/test/java/com/opensymphony/oscache/base/events/TestCachewideEvent.java
diff --git a/src/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java b/src/main/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java
rename to src/main/test/java/com/opensymphony/oscache/base/events/TestCompleteEvents.java
diff --git a/src/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java b/src/main/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java
rename to src/main/test/java/com/opensymphony/oscache/base/events/TestScopeEvent.java
diff --git a/src/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java b/src/main/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java
rename to src/main/test/java/com/opensymphony/oscache/extra/TestCacheEntryEventListenerImpl.java
diff --git a/src/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java b/src/main/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java
rename to src/main/test/java/com/opensymphony/oscache/extra/TestCacheMapAccessEventListenerImpl.java
diff --git a/src/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java b/src/main/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java
rename to src/main/test/java/com/opensymphony/oscache/extra/TestCompleteExtra.java
diff --git a/src/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java b/src/main/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java
rename to src/main/test/java/com/opensymphony/oscache/extra/TestScopeEventListenerImpl.java
diff --git a/src/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java b/src/main/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java
rename to src/main/test/java/com/opensymphony/oscache/extra/TestStatisticListenerImpl.java
diff --git a/src/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java b/src/main/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java
rename to src/main/test/java/com/opensymphony/oscache/general/TestCompleteGeneral.java
diff --git a/src/test/java/com/opensymphony/oscache/general/TestConcurrent.java b/src/main/test/java/com/opensymphony/oscache/general/TestConcurrent.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/general/TestConcurrent.java
rename to src/main/test/java/com/opensymphony/oscache/general/TestConcurrent.java
diff --git a/src/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java b/src/main/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java
rename to src/main/test/java/com/opensymphony/oscache/general/TestGeneralCacheAdministrator.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java b/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/BaseTestBroadcastingListener.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java b/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/ListenForClusterTests.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java b/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestCompleteClustering.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java b/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMS10BroadcastingListener.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java b/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJMSBroadcastingListener.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java b/src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/clustersupport/TestJavaGroupsBroadcastingListener.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java b/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestCompleteDiskPersistence.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java b/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestDiskPersistenceListener.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java b/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestHashDiskPersistenceListener.java
diff --git a/src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java b/src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java
rename to src/main/test/java/com/opensymphony/oscache/plugins/diskpersistence/TestUnSerializable.java
diff --git a/src/test/java/com/opensymphony/oscache/util/TestFastCronParser.java b/src/main/test/java/com/opensymphony/oscache/util/TestFastCronParser.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/util/TestFastCronParser.java
rename to src/main/test/java/com/opensymphony/oscache/util/TestFastCronParser.java
diff --git a/src/test/java/com/opensymphony/oscache/web/CheckDeployment.java b/src/main/test/java/com/opensymphony/oscache/web/CheckDeployment.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/web/CheckDeployment.java
rename to src/main/test/java/com/opensymphony/oscache/web/CheckDeployment.java
diff --git a/src/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java b/src/main/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java
rename to src/main/test/java/com/opensymphony/oscache/web/TestCompleteWeb.java
diff --git a/src/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java b/src/main/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java
rename to src/main/test/java/com/opensymphony/oscache/web/TestLoadCompleteWeb.java
diff --git a/src/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java b/src/main/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java
rename to src/main/test/java/com/opensymphony/oscache/web/TestOscacheFilter.java
diff --git a/src/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java b/src/main/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java
rename to src/main/test/java/com/opensymphony/oscache/web/TestOscacheJsp.java
diff --git a/src/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java b/src/main/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java
similarity index 100%
rename from src/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java
rename to src/main/test/java/com/opensymphony/oscache/web/TestOscacheServlet.java
diff --git a/src/test/java/oscacheDiskAndMemory.properties b/src/main/test/java/oscacheDiskAndMemory.properties
similarity index 100%
rename from src/test/java/oscacheDiskAndMemory.properties
rename to src/main/test/java/oscacheDiskAndMemory.properties
diff --git a/src/test/java/oscacheDiskOnly.properties b/src/main/test/java/oscacheDiskOnly.properties
similarity index 100%
rename from src/test/java/oscacheDiskOnly.properties
rename to src/main/test/java/oscacheDiskOnly.properties
diff --git a/src/test/java/oscacheDiskOnlyHash.properties b/src/main/test/java/oscacheDiskOnlyHash.properties
similarity index 100%
rename from src/test/java/oscacheDiskOnlyHash.properties
rename to src/main/test/java/oscacheDiskOnlyHash.properties
diff --git a/src/test/java/oscacheMemoryAndOverflowToDisk.properties b/src/main/test/java/oscacheMemoryAndOverflowToDisk.properties
similarity index 100%
rename from src/test/java/oscacheMemoryAndOverflowToDisk.properties
rename to src/main/test/java/oscacheMemoryAndOverflowToDisk.properties
diff --git a/src/test/java/oscacheMemoryOnly.properties b/src/main/test/java/oscacheMemoryOnly.properties
similarity index 100%
rename from src/test/java/oscacheMemoryOnly.properties
rename to src/main/test/java/oscacheMemoryOnly.properties