diff --git a/.gitignore b/.gitignore index 80fe98dc..6198c6be 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ javadoc lib tmp run-test +/.gradle +.idea diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..422bd74e --- /dev/null +++ b/build.gradle @@ -0,0 +1,139 @@ +buildscript { + dependencies { + classpath files('gradle/gradle-witness.jar') + } +} + +apply plugin: 'java' +apply plugin: 'witness' +apply plugin: 'maven-publish' +apply plugin: 'application' + +compileJava { + sourceCompatibility = 1.7 + targetCompatibility = 1.7 +} + +version = "37" + +repositories { + maven { url "http://4thline.org/m2" } + maven { url 'https://mvn.freenetproject.org' } + jcenter() +} + +configurations { + extraLibs +} + +dependencies { + compile group: 'org.freenetproject', name: 'fred', version: 'build+' + compile group: 'org.yaml', name: 'snakeyaml', version: '1.5' + testImplementation 'junit:junit:4.13' +} + +dependencyVerification { + verify = [ + 'org.freenetproject:fred:a6021924f7e6572c19d5c290755c16bdbb7dfcb1a948a46dd8425c9eaa3d5079', + 'org.yaml:snakeyaml:9cf5e385cea2aaa58eb943a6a63c3a674d9ba00d88eca480548294d93c7b85c0', + 'org.bouncycastle:bcprov-jdk15on:1c31e44e331d25e46d293b3e8ee2d07028a67db011e74cb2443285aed1d59c85', + 'net.java.dev.jna:jna-platform:f1d00c167d8921c6e23c626ef9f1c3ae0be473c95c68ffa012bc7ae55a87e2d6', + 'net.java.dev.jna:jna:0c8eb7acf67261656d79005191debaba3b6bf5dd60a43735a245429381dbecff', + 'org.freenetproject:freenet-ext:32f2b3d6beedf54137ea2f9a3ebef67666d769f0966b08cd17fd7db59ba4d79f', + ] +} + +def gitrev +task buildInfo { + try { + def cmd = "git describe --always --abbrev=4 --dirty" + def proc = cmd.execute() + gitrev = proc.text.trim() + } catch (java.io.IOException e) { + gitrev = "@unknown@" + } +} + +test { + useJUnit() +} + +application { + mainClassName = 'plugins.Library.ui.TestInterface' +} + + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.attribute.BasicFileAttributes; + +Date getMTime(String file) { + return new Date(Files.readAttributes(Paths.get(file), BasicFileAttributes.class).lastModifiedTime().toMillis()); +} + +jar { + manifest { + attributes 'Plugin-Main-Class': 'plugins.Library.Main', + 'Main-Class': 'plugins.Library.ui.TestInterface', + 'Required-Node-Version': '1239', + 'Implementation-Version': version, + 'Built-By': System.getProperty('user.name'), + 'Built-Date': getMTime("src/main/java/plugins/Library/Version.java"), + 'Built-JDK': System.getProperty('java.version') + } + from (configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }) { + exclude "META-INF/*.SF" + exclude "META-INF/*.DSA" + exclude "META-INF/*.RSA" + } + preserveFileTimestamps = false + reproducibleFileOrder = true + duplicatesStrategy = "exclude" + archiveName = 'freenet-Library.jar' +} + +def jars = [] +gradle.addListener(new TaskExecutionListener() { + void afterExecute(Task task, TaskState state) { + if(task in AbstractArchiveTask) { + jars << task.outputs.files.singleFile + } + } + + void beforeExecute(Task task) { } +}) +gradle.addBuildListener(new BuildAdapter() { + void buildFinished(BuildResult result) { + if(jars) { + def hash = { + File file -> def sha256 = java.security.MessageDigest.getInstance('SHA-256') + file.eachByte(1024 * 4) { buffer, len -> sha256.update(buffer, 0, len) } + println "SHA-256 of ${file.name}: ${sha256.digest().encodeHex().toString()}" + } + + jars.each { hash(it) } + } + } +}) + +publishing { + publications { + mavenJava(MavenPublication) { + groupId 'org.freenetproject.plugins' + artifactId "Library" + version version + from components.java + } + } + repositories { + maven { + url "s3://mvn.freenetproject.org/" + credentials(AwsCredentials) { + accessKey System.getenv('AWS_ACCESS_KEY_ID') + secretKey System.getenv('AWS_SECRET_ACCESS_KEY') + } + } + } +} + diff --git a/build.xml b/build.xml index fa7a6670..e2827426 100644 --- a/build.xml +++ b/build.xml @@ -29,79 +29,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gradle/gradle-witness.jar b/gradle/gradle-witness.jar new file mode 100644 index 00000000..1006bade Binary files /dev/null and b/gradle/gradle-witness.jar differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..94336fca 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 00000000..4230076d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionSha256Sum=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..cccdd3d5 --- /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 00000000..e95643d6 --- /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/src/plugins/Library/Index.java b/src/main/java/plugins/Library/Index.java similarity index 100% rename from src/plugins/Library/Index.java rename to src/main/java/plugins/Library/Index.java diff --git a/src/plugins/Library/Library.java b/src/main/java/plugins/Library/Library.java similarity index 100% rename from src/plugins/Library/Library.java rename to src/main/java/plugins/Library/Library.java diff --git a/src/plugins/Library/Main.java b/src/main/java/plugins/Library/Main.java similarity index 100% rename from src/plugins/Library/Main.java rename to src/main/java/plugins/Library/Main.java diff --git a/src/plugins/Library/SpiderIndexURIs.java b/src/main/java/plugins/Library/SpiderIndexURIs.java similarity index 100% rename from src/plugins/Library/SpiderIndexURIs.java rename to src/main/java/plugins/Library/SpiderIndexURIs.java diff --git a/src/plugins/Library/SpiderIndexUploader.java b/src/main/java/plugins/Library/SpiderIndexUploader.java similarity index 100% rename from src/plugins/Library/SpiderIndexUploader.java rename to src/main/java/plugins/Library/SpiderIndexUploader.java diff --git a/src/plugins/Library/Version.java b/src/main/java/plugins/Library/Version.java similarity index 100% rename from src/plugins/Library/Version.java rename to src/main/java/plugins/Library/Version.java diff --git a/src/plugins/Library/VirtualIndex.java b/src/main/java/plugins/Library/VirtualIndex.java similarity index 100% rename from src/plugins/Library/VirtualIndex.java rename to src/main/java/plugins/Library/VirtualIndex.java diff --git a/src/plugins/Library/WriteableIndex.java b/src/main/java/plugins/Library/WriteableIndex.java similarity index 100% rename from src/plugins/Library/WriteableIndex.java rename to src/main/java/plugins/Library/WriteableIndex.java diff --git a/src/plugins/Library/client/FreenetArchiver.java b/src/main/java/plugins/Library/client/FreenetArchiver.java similarity index 100% rename from src/plugins/Library/client/FreenetArchiver.java rename to src/main/java/plugins/Library/client/FreenetArchiver.java diff --git a/src/plugins/Library/index/ProtoIndex.java b/src/main/java/plugins/Library/index/ProtoIndex.java similarity index 100% rename from src/plugins/Library/index/ProtoIndex.java rename to src/main/java/plugins/Library/index/ProtoIndex.java diff --git a/src/plugins/Library/index/ProtoIndexComponentSerialiser.java b/src/main/java/plugins/Library/index/ProtoIndexComponentSerialiser.java similarity index 100% rename from src/plugins/Library/index/ProtoIndexComponentSerialiser.java rename to src/main/java/plugins/Library/index/ProtoIndexComponentSerialiser.java diff --git a/src/plugins/Library/index/ProtoIndexSerialiser.java b/src/main/java/plugins/Library/index/ProtoIndexSerialiser.java similarity index 100% rename from src/plugins/Library/index/ProtoIndexSerialiser.java rename to src/main/java/plugins/Library/index/ProtoIndexSerialiser.java diff --git a/src/plugins/Library/index/TermEntry.java b/src/main/java/plugins/Library/index/TermEntry.java similarity index 100% rename from src/plugins/Library/index/TermEntry.java rename to src/main/java/plugins/Library/index/TermEntry.java diff --git a/src/plugins/Library/index/TermEntryReaderWriter.java b/src/main/java/plugins/Library/index/TermEntryReaderWriter.java similarity index 100% rename from src/plugins/Library/index/TermEntryReaderWriter.java rename to src/main/java/plugins/Library/index/TermEntryReaderWriter.java diff --git a/src/plugins/Library/index/TermIndexEntry.java b/src/main/java/plugins/Library/index/TermIndexEntry.java similarity index 100% rename from src/plugins/Library/index/TermIndexEntry.java rename to src/main/java/plugins/Library/index/TermIndexEntry.java diff --git a/src/plugins/Library/index/TermPageEntry.java b/src/main/java/plugins/Library/index/TermPageEntry.java similarity index 100% rename from src/plugins/Library/index/TermPageEntry.java rename to src/main/java/plugins/Library/index/TermPageEntry.java diff --git a/src/plugins/Library/index/TermTermEntry.java b/src/main/java/plugins/Library/index/TermTermEntry.java similarity index 100% rename from src/plugins/Library/index/TermTermEntry.java rename to src/main/java/plugins/Library/index/TermTermEntry.java diff --git a/src/plugins/Library/index/URIEntry.java b/src/main/java/plugins/Library/index/URIEntry.java similarity index 100% rename from src/plugins/Library/index/URIEntry.java rename to src/main/java/plugins/Library/index/URIEntry.java diff --git a/src/plugins/Library/index/URIKey.java b/src/main/java/plugins/Library/index/URIKey.java similarity index 100% rename from src/plugins/Library/index/URIKey.java rename to src/main/java/plugins/Library/index/URIKey.java diff --git a/src/plugins/Library/index/package-info.java b/src/main/java/plugins/Library/index/package-info.java similarity index 100% rename from src/plugins/Library/index/package-info.java rename to src/main/java/plugins/Library/index/package-info.java diff --git a/src/plugins/Library/index/xml/FindRequest.java b/src/main/java/plugins/Library/index/xml/FindRequest.java similarity index 100% rename from src/plugins/Library/index/xml/FindRequest.java rename to src/main/java/plugins/Library/index/xml/FindRequest.java diff --git a/src/plugins/Library/index/xml/LibrarianHandler.java b/src/main/java/plugins/Library/index/xml/LibrarianHandler.java similarity index 100% rename from src/plugins/Library/index/xml/LibrarianHandler.java rename to src/main/java/plugins/Library/index/xml/LibrarianHandler.java diff --git a/src/plugins/Library/index/xml/MainIndexParser.java b/src/main/java/plugins/Library/index/xml/MainIndexParser.java similarity index 100% rename from src/plugins/Library/index/xml/MainIndexParser.java rename to src/main/java/plugins/Library/index/xml/MainIndexParser.java diff --git a/src/plugins/Library/index/xml/URLUpdateHook.java b/src/main/java/plugins/Library/index/xml/URLUpdateHook.java similarity index 100% rename from src/plugins/Library/index/xml/URLUpdateHook.java rename to src/main/java/plugins/Library/index/xml/URLUpdateHook.java diff --git a/src/plugins/Library/index/xml/Util.java b/src/main/java/plugins/Library/index/xml/Util.java similarity index 100% rename from src/plugins/Library/index/xml/Util.java rename to src/main/java/plugins/Library/index/xml/Util.java diff --git a/src/plugins/Library/index/xml/XMLIndex.java b/src/main/java/plugins/Library/index/xml/XMLIndex.java similarity index 100% rename from src/plugins/Library/index/xml/XMLIndex.java rename to src/main/java/plugins/Library/index/xml/XMLIndex.java diff --git a/src/plugins/Library/index/xml/package-info.java b/src/main/java/plugins/Library/index/xml/package-info.java similarity index 100% rename from src/plugins/Library/index/xml/package-info.java rename to src/main/java/plugins/Library/index/xml/package-info.java diff --git a/src/plugins/Library/io/DataFormatException.java b/src/main/java/plugins/Library/io/DataFormatException.java similarity index 100% rename from src/plugins/Library/io/DataFormatException.java rename to src/main/java/plugins/Library/io/DataFormatException.java diff --git a/src/plugins/Library/io/ObjectBlueprint.java b/src/main/java/plugins/Library/io/ObjectBlueprint.java similarity index 100% rename from src/plugins/Library/io/ObjectBlueprint.java rename to src/main/java/plugins/Library/io/ObjectBlueprint.java diff --git a/src/plugins/Library/io/ObjectStreamReader.java b/src/main/java/plugins/Library/io/ObjectStreamReader.java similarity index 100% rename from src/plugins/Library/io/ObjectStreamReader.java rename to src/main/java/plugins/Library/io/ObjectStreamReader.java diff --git a/src/plugins/Library/io/ObjectStreamWriter.java b/src/main/java/plugins/Library/io/ObjectStreamWriter.java similarity index 100% rename from src/plugins/Library/io/ObjectStreamWriter.java rename to src/main/java/plugins/Library/io/ObjectStreamWriter.java diff --git a/src/plugins/Library/io/YamlReaderWriter.java b/src/main/java/plugins/Library/io/YamlReaderWriter.java similarity index 100% rename from src/plugins/Library/io/YamlReaderWriter.java rename to src/main/java/plugins/Library/io/YamlReaderWriter.java diff --git a/src/plugins/Library/io/serial/Archiver.java b/src/main/java/plugins/Library/io/serial/Archiver.java similarity index 100% rename from src/plugins/Library/io/serial/Archiver.java rename to src/main/java/plugins/Library/io/serial/Archiver.java diff --git a/src/plugins/Library/io/serial/FileArchiver.java b/src/main/java/plugins/Library/io/serial/FileArchiver.java similarity index 100% rename from src/plugins/Library/io/serial/FileArchiver.java rename to src/main/java/plugins/Library/io/serial/FileArchiver.java diff --git a/src/plugins/Library/io/serial/IterableSerialiser.java b/src/main/java/plugins/Library/io/serial/IterableSerialiser.java similarity index 100% rename from src/plugins/Library/io/serial/IterableSerialiser.java rename to src/main/java/plugins/Library/io/serial/IterableSerialiser.java diff --git a/src/plugins/Library/io/serial/LiveArchiver.java b/src/main/java/plugins/Library/io/serial/LiveArchiver.java similarity index 100% rename from src/plugins/Library/io/serial/LiveArchiver.java rename to src/main/java/plugins/Library/io/serial/LiveArchiver.java diff --git a/src/plugins/Library/io/serial/MapSerialiser.java b/src/main/java/plugins/Library/io/serial/MapSerialiser.java similarity index 100% rename from src/plugins/Library/io/serial/MapSerialiser.java rename to src/main/java/plugins/Library/io/serial/MapSerialiser.java diff --git a/src/plugins/Library/io/serial/Packer.java b/src/main/java/plugins/Library/io/serial/Packer.java similarity index 100% rename from src/plugins/Library/io/serial/Packer.java rename to src/main/java/plugins/Library/io/serial/Packer.java diff --git a/src/plugins/Library/io/serial/ParallelSerialiser.java b/src/main/java/plugins/Library/io/serial/ParallelSerialiser.java similarity index 100% rename from src/plugins/Library/io/serial/ParallelSerialiser.java rename to src/main/java/plugins/Library/io/serial/ParallelSerialiser.java diff --git a/src/plugins/Library/io/serial/ProgressTracker.java b/src/main/java/plugins/Library/io/serial/ProgressTracker.java similarity index 100% rename from src/plugins/Library/io/serial/ProgressTracker.java rename to src/main/java/plugins/Library/io/serial/ProgressTracker.java diff --git a/src/plugins/Library/io/serial/ScheduledSerialiser.java b/src/main/java/plugins/Library/io/serial/ScheduledSerialiser.java similarity index 100% rename from src/plugins/Library/io/serial/ScheduledSerialiser.java rename to src/main/java/plugins/Library/io/serial/ScheduledSerialiser.java diff --git a/src/plugins/Library/io/serial/Serialiser.java b/src/main/java/plugins/Library/io/serial/Serialiser.java similarity index 100% rename from src/plugins/Library/io/serial/Serialiser.java rename to src/main/java/plugins/Library/io/serial/Serialiser.java diff --git a/src/plugins/Library/io/serial/Translator.java b/src/main/java/plugins/Library/io/serial/Translator.java similarity index 100% rename from src/plugins/Library/io/serial/Translator.java rename to src/main/java/plugins/Library/io/serial/Translator.java diff --git a/src/plugins/Library/io/serial/package-info.java b/src/main/java/plugins/Library/io/serial/package-info.java similarity index 100% rename from src/plugins/Library/io/serial/package-info.java rename to src/main/java/plugins/Library/io/serial/package-info.java diff --git a/src/plugins/Library/package-info.java b/src/main/java/plugins/Library/package-info.java similarity index 100% rename from src/plugins/Library/package-info.java rename to src/main/java/plugins/Library/package-info.java diff --git a/src/plugins/Library/search/InvalidSearchException.java b/src/main/java/plugins/Library/search/InvalidSearchException.java similarity index 100% rename from src/plugins/Library/search/InvalidSearchException.java rename to src/main/java/plugins/Library/search/InvalidSearchException.java diff --git a/src/plugins/Library/search/ResultSet.java b/src/main/java/plugins/Library/search/ResultSet.java similarity index 100% rename from src/plugins/Library/search/ResultSet.java rename to src/main/java/plugins/Library/search/ResultSet.java diff --git a/src/plugins/Library/search/Search.java b/src/main/java/plugins/Library/search/Search.java similarity index 100% rename from src/plugins/Library/search/Search.java rename to src/main/java/plugins/Library/search/Search.java diff --git a/src/plugins/Library/search/SearchTokenizer.java b/src/main/java/plugins/Library/search/SearchTokenizer.java similarity index 100% rename from src/plugins/Library/search/SearchTokenizer.java rename to src/main/java/plugins/Library/search/SearchTokenizer.java diff --git a/src/plugins/Library/search/SearchUtil.java b/src/main/java/plugins/Library/search/SearchUtil.java similarity index 100% rename from src/plugins/Library/search/SearchUtil.java rename to src/main/java/plugins/Library/search/SearchUtil.java diff --git a/src/plugins/Library/search/inter/IndexQuery.java b/src/main/java/plugins/Library/search/inter/IndexQuery.java similarity index 100% rename from src/plugins/Library/search/inter/IndexQuery.java rename to src/main/java/plugins/Library/search/inter/IndexQuery.java diff --git a/src/plugins/Library/search/inter/Interdex.java b/src/main/java/plugins/Library/search/inter/Interdex.java similarity index 100% rename from src/plugins/Library/search/inter/Interdex.java rename to src/main/java/plugins/Library/search/inter/Interdex.java diff --git a/src/plugins/Library/search/inter/TermResults.java b/src/main/java/plugins/Library/search/inter/TermResults.java similarity index 100% rename from src/plugins/Library/search/inter/TermResults.java rename to src/main/java/plugins/Library/search/inter/TermResults.java diff --git a/src/plugins/Library/search/package-info.java b/src/main/java/plugins/Library/search/package-info.java similarity index 100% rename from src/plugins/Library/search/package-info.java rename to src/main/java/plugins/Library/search/package-info.java diff --git a/src/plugins/Library/ui/L10nString.java b/src/main/java/plugins/Library/ui/L10nString.java similarity index 100% rename from src/plugins/Library/ui/L10nString.java rename to src/main/java/plugins/Library/ui/L10nString.java diff --git a/src/plugins/Library/ui/MainPage.java b/src/main/java/plugins/Library/ui/MainPage.java similarity index 100% rename from src/plugins/Library/ui/MainPage.java rename to src/main/java/plugins/Library/ui/MainPage.java diff --git a/src/plugins/Library/ui/MainPageToadlet.java b/src/main/java/plugins/Library/ui/MainPageToadlet.java similarity index 100% rename from src/plugins/Library/ui/MainPageToadlet.java rename to src/main/java/plugins/Library/ui/MainPageToadlet.java diff --git a/src/plugins/Library/ui/RelevanceComparator.java b/src/main/java/plugins/Library/ui/RelevanceComparator.java similarity index 100% rename from src/plugins/Library/ui/RelevanceComparator.java rename to src/main/java/plugins/Library/ui/RelevanceComparator.java diff --git a/src/plugins/Library/ui/ResultNodeGenerator.java b/src/main/java/plugins/Library/ui/ResultNodeGenerator.java similarity index 100% rename from src/plugins/Library/ui/ResultNodeGenerator.java rename to src/main/java/plugins/Library/ui/ResultNodeGenerator.java diff --git a/src/plugins/Library/ui/StaticToadlet.java b/src/main/java/plugins/Library/ui/StaticToadlet.java similarity index 97% rename from src/plugins/Library/ui/StaticToadlet.java rename to src/main/java/plugins/Library/ui/StaticToadlet.java index 0259d15e..3bd6054c 100644 --- a/src/plugins/Library/ui/StaticToadlet.java +++ b/src/main/java/plugins/Library/ui/StaticToadlet.java @@ -41,7 +41,7 @@ public String path() { } public static final String ROOT_URL = "/library/static/"; - public static final String ROOT_PATH = "staticfiles/"; + public static final String ROOT_PATH = "/staticfiles/"; public void handleMethodGET(URI uri, final HTTPRequest httprequest, final ToadletContext ctx) throws ToadletContextClosedException, IOException, RedirectException { diff --git a/src/plugins/Library/ui/TermPageGroupEntry.java b/src/main/java/plugins/Library/ui/TermPageGroupEntry.java similarity index 100% rename from src/plugins/Library/ui/TermPageGroupEntry.java rename to src/main/java/plugins/Library/ui/TermPageGroupEntry.java diff --git a/src/plugins/Library/ui/TestInterface.java b/src/main/java/plugins/Library/ui/TestInterface.java similarity index 100% rename from src/plugins/Library/ui/TestInterface.java rename to src/main/java/plugins/Library/ui/TestInterface.java diff --git a/src/plugins/Library/ui/WebInterface.java b/src/main/java/plugins/Library/ui/WebInterface.java similarity index 100% rename from src/plugins/Library/ui/WebInterface.java rename to src/main/java/plugins/Library/ui/WebInterface.java diff --git a/src/plugins/Library/ui/package-info.java b/src/main/java/plugins/Library/ui/package-info.java similarity index 100% rename from src/plugins/Library/ui/package-info.java rename to src/main/java/plugins/Library/ui/package-info.java diff --git a/src/plugins/Library/util/BTreeMap.java b/src/main/java/plugins/Library/util/BTreeMap.java similarity index 100% rename from src/plugins/Library/util/BTreeMap.java rename to src/main/java/plugins/Library/util/BTreeMap.java diff --git a/src/plugins/Library/util/BTreeSet.java b/src/main/java/plugins/Library/util/BTreeSet.java similarity index 100% rename from src/plugins/Library/util/BTreeSet.java rename to src/main/java/plugins/Library/util/BTreeSet.java diff --git a/src/plugins/Library/util/BytePrefixKey.java b/src/main/java/plugins/Library/util/BytePrefixKey.java similarity index 100% rename from src/plugins/Library/util/BytePrefixKey.java rename to src/main/java/plugins/Library/util/BytePrefixKey.java diff --git a/src/plugins/Library/util/CompositeIterable.java b/src/main/java/plugins/Library/util/CompositeIterable.java similarity index 100% rename from src/plugins/Library/util/CompositeIterable.java rename to src/main/java/plugins/Library/util/CompositeIterable.java diff --git a/src/plugins/Library/util/DataNotLoadedException.java b/src/main/java/plugins/Library/util/DataNotLoadedException.java similarity index 100% rename from src/plugins/Library/util/DataNotLoadedException.java rename to src/main/java/plugins/Library/util/DataNotLoadedException.java diff --git a/src/plugins/Library/util/IdentityComparator.java b/src/main/java/plugins/Library/util/IdentityComparator.java similarity index 100% rename from src/plugins/Library/util/IdentityComparator.java rename to src/main/java/plugins/Library/util/IdentityComparator.java diff --git a/src/plugins/Library/util/Integers.java b/src/main/java/plugins/Library/util/Integers.java similarity index 100% rename from src/plugins/Library/util/Integers.java rename to src/main/java/plugins/Library/util/Integers.java diff --git a/src/plugins/Library/util/Maps.java b/src/main/java/plugins/Library/util/Maps.java similarity index 100% rename from src/plugins/Library/util/Maps.java rename to src/main/java/plugins/Library/util/Maps.java diff --git a/src/plugins/Library/util/PrefixTree.java b/src/main/java/plugins/Library/util/PrefixTree.java similarity index 100% rename from src/plugins/Library/util/PrefixTree.java rename to src/main/java/plugins/Library/util/PrefixTree.java diff --git a/src/plugins/Library/util/Skeleton.java b/src/main/java/plugins/Library/util/Skeleton.java similarity index 100% rename from src/plugins/Library/util/Skeleton.java rename to src/main/java/plugins/Library/util/Skeleton.java diff --git a/src/plugins/Library/util/SkeletonBTreeMap.java b/src/main/java/plugins/Library/util/SkeletonBTreeMap.java similarity index 100% rename from src/plugins/Library/util/SkeletonBTreeMap.java rename to src/main/java/plugins/Library/util/SkeletonBTreeMap.java diff --git a/src/plugins/Library/util/SkeletonBTreeSet.java b/src/main/java/plugins/Library/util/SkeletonBTreeSet.java similarity index 100% rename from src/plugins/Library/util/SkeletonBTreeSet.java rename to src/main/java/plugins/Library/util/SkeletonBTreeSet.java diff --git a/src/plugins/Library/util/SkeletonMap.java b/src/main/java/plugins/Library/util/SkeletonMap.java similarity index 100% rename from src/plugins/Library/util/SkeletonMap.java rename to src/main/java/plugins/Library/util/SkeletonMap.java diff --git a/src/plugins/Library/util/SkeletonTreeMap.java b/src/main/java/plugins/Library/util/SkeletonTreeMap.java similarity index 100% rename from src/plugins/Library/util/SkeletonTreeMap.java rename to src/main/java/plugins/Library/util/SkeletonTreeMap.java diff --git a/src/plugins/Library/util/Sorted.java b/src/main/java/plugins/Library/util/Sorted.java similarity index 100% rename from src/plugins/Library/util/Sorted.java rename to src/main/java/plugins/Library/util/Sorted.java diff --git a/src/plugins/Library/util/SortedArraySet.java b/src/main/java/plugins/Library/util/SortedArraySet.java similarity index 100% rename from src/plugins/Library/util/SortedArraySet.java rename to src/main/java/plugins/Library/util/SortedArraySet.java diff --git a/src/plugins/Library/util/SortedMapSet.java b/src/main/java/plugins/Library/util/SortedMapSet.java similarity index 100% rename from src/plugins/Library/util/SortedMapSet.java rename to src/main/java/plugins/Library/util/SortedMapSet.java diff --git a/src/plugins/Library/util/SortedSetMap.java b/src/main/java/plugins/Library/util/SortedSetMap.java similarity index 100% rename from src/plugins/Library/util/SortedSetMap.java rename to src/main/java/plugins/Library/util/SortedSetMap.java diff --git a/src/plugins/Library/util/TaskAbortExceptionConvertor.java b/src/main/java/plugins/Library/util/TaskAbortExceptionConvertor.java similarity index 100% rename from src/plugins/Library/util/TaskAbortExceptionConvertor.java rename to src/main/java/plugins/Library/util/TaskAbortExceptionConvertor.java diff --git a/src/plugins/Library/util/concurrent/BoundedPriorityBlockingQueue.java b/src/main/java/plugins/Library/util/concurrent/BoundedPriorityBlockingQueue.java similarity index 100% rename from src/plugins/Library/util/concurrent/BoundedPriorityBlockingQueue.java rename to src/main/java/plugins/Library/util/concurrent/BoundedPriorityBlockingQueue.java diff --git a/src/plugins/Library/util/concurrent/ExceptionConvertor.java b/src/main/java/plugins/Library/util/concurrent/ExceptionConvertor.java similarity index 100% rename from src/plugins/Library/util/concurrent/ExceptionConvertor.java rename to src/main/java/plugins/Library/util/concurrent/ExceptionConvertor.java diff --git a/src/plugins/Library/util/concurrent/Executors.java b/src/main/java/plugins/Library/util/concurrent/Executors.java similarity index 100% rename from src/plugins/Library/util/concurrent/Executors.java rename to src/main/java/plugins/Library/util/concurrent/Executors.java diff --git a/src/plugins/Library/util/concurrent/Notifier.java b/src/main/java/plugins/Library/util/concurrent/Notifier.java similarity index 100% rename from src/plugins/Library/util/concurrent/Notifier.java rename to src/main/java/plugins/Library/util/concurrent/Notifier.java diff --git a/src/plugins/Library/util/concurrent/ObjectProcessor.java b/src/main/java/plugins/Library/util/concurrent/ObjectProcessor.java similarity index 100% rename from src/plugins/Library/util/concurrent/ObjectProcessor.java rename to src/main/java/plugins/Library/util/concurrent/ObjectProcessor.java diff --git a/src/plugins/Library/util/concurrent/Scheduler.java b/src/main/java/plugins/Library/util/concurrent/Scheduler.java similarity index 100% rename from src/plugins/Library/util/concurrent/Scheduler.java rename to src/main/java/plugins/Library/util/concurrent/Scheduler.java diff --git a/src/plugins/Library/util/event/AbstractSweeper.java b/src/main/java/plugins/Library/util/event/AbstractSweeper.java similarity index 100% rename from src/plugins/Library/util/event/AbstractSweeper.java rename to src/main/java/plugins/Library/util/event/AbstractSweeper.java diff --git a/src/plugins/Library/util/event/CountingSweeper.java b/src/main/java/plugins/Library/util/event/CountingSweeper.java similarity index 100% rename from src/plugins/Library/util/event/CountingSweeper.java rename to src/main/java/plugins/Library/util/event/CountingSweeper.java diff --git a/src/plugins/Library/util/event/Sweeper.java b/src/main/java/plugins/Library/util/event/Sweeper.java similarity index 100% rename from src/plugins/Library/util/event/Sweeper.java rename to src/main/java/plugins/Library/util/event/Sweeper.java diff --git a/src/plugins/Library/util/event/TrackingSweeper.java b/src/main/java/plugins/Library/util/event/TrackingSweeper.java similarity index 100% rename from src/plugins/Library/util/event/TrackingSweeper.java rename to src/main/java/plugins/Library/util/event/TrackingSweeper.java diff --git a/src/plugins/Library/util/exec/AbstractExecution.java b/src/main/java/plugins/Library/util/exec/AbstractExecution.java similarity index 100% rename from src/plugins/Library/util/exec/AbstractExecution.java rename to src/main/java/plugins/Library/util/exec/AbstractExecution.java diff --git a/src/plugins/Library/util/exec/BaseCompositeProgress.java b/src/main/java/plugins/Library/util/exec/BaseCompositeProgress.java similarity index 100% rename from src/plugins/Library/util/exec/BaseCompositeProgress.java rename to src/main/java/plugins/Library/util/exec/BaseCompositeProgress.java diff --git a/src/plugins/Library/util/exec/ChainedProgress.java b/src/main/java/plugins/Library/util/exec/ChainedProgress.java similarity index 100% rename from src/plugins/Library/util/exec/ChainedProgress.java rename to src/main/java/plugins/Library/util/exec/ChainedProgress.java diff --git a/src/plugins/Library/util/exec/CompositeProgress.java b/src/main/java/plugins/Library/util/exec/CompositeProgress.java similarity index 100% rename from src/plugins/Library/util/exec/CompositeProgress.java rename to src/main/java/plugins/Library/util/exec/CompositeProgress.java diff --git a/src/plugins/Library/util/exec/Execution.java b/src/main/java/plugins/Library/util/exec/Execution.java similarity index 100% rename from src/plugins/Library/util/exec/Execution.java rename to src/main/java/plugins/Library/util/exec/Execution.java diff --git a/src/plugins/Library/util/exec/ExecutionAcceptor.java b/src/main/java/plugins/Library/util/exec/ExecutionAcceptor.java similarity index 100% rename from src/plugins/Library/util/exec/ExecutionAcceptor.java rename to src/main/java/plugins/Library/util/exec/ExecutionAcceptor.java diff --git a/src/plugins/Library/util/exec/Progress.java b/src/main/java/plugins/Library/util/exec/Progress.java similarity index 100% rename from src/plugins/Library/util/exec/Progress.java rename to src/main/java/plugins/Library/util/exec/Progress.java diff --git a/src/plugins/Library/util/exec/ProgressParts.java b/src/main/java/plugins/Library/util/exec/ProgressParts.java similarity index 100% rename from src/plugins/Library/util/exec/ProgressParts.java rename to src/main/java/plugins/Library/util/exec/ProgressParts.java diff --git a/src/plugins/Library/util/exec/SimpleProgress.java b/src/main/java/plugins/Library/util/exec/SimpleProgress.java similarity index 100% rename from src/plugins/Library/util/exec/SimpleProgress.java rename to src/main/java/plugins/Library/util/exec/SimpleProgress.java diff --git a/src/plugins/Library/util/exec/TaskAbortException.java b/src/main/java/plugins/Library/util/exec/TaskAbortException.java similarity index 100% rename from src/plugins/Library/util/exec/TaskAbortException.java rename to src/main/java/plugins/Library/util/exec/TaskAbortException.java diff --git a/src/plugins/Library/util/exec/TaskCompleteException.java b/src/main/java/plugins/Library/util/exec/TaskCompleteException.java similarity index 100% rename from src/plugins/Library/util/exec/TaskCompleteException.java rename to src/main/java/plugins/Library/util/exec/TaskCompleteException.java diff --git a/src/plugins/Library/util/exec/TaskInProgressException.java b/src/main/java/plugins/Library/util/exec/TaskInProgressException.java similarity index 100% rename from src/plugins/Library/util/exec/TaskInProgressException.java rename to src/main/java/plugins/Library/util/exec/TaskInProgressException.java diff --git a/src/plugins/Library/util/exec/package-info.java b/src/main/java/plugins/Library/util/exec/package-info.java similarity index 100% rename from src/plugins/Library/util/exec/package-info.java rename to src/main/java/plugins/Library/util/exec/package-info.java diff --git a/src/plugins/Library/util/func/Closure.java b/src/main/java/plugins/Library/util/func/Closure.java similarity index 100% rename from src/plugins/Library/util/func/Closure.java rename to src/main/java/plugins/Library/util/func/Closure.java diff --git a/src/plugins/Library/util/func/SafeClosure.java b/src/main/java/plugins/Library/util/func/SafeClosure.java similarity index 100% rename from src/plugins/Library/util/func/SafeClosure.java rename to src/main/java/plugins/Library/util/func/SafeClosure.java diff --git a/src/plugins/Library/util/func/Tuples.java b/src/main/java/plugins/Library/util/func/Tuples.java similarity index 100% rename from src/plugins/Library/util/func/Tuples.java rename to src/main/java/plugins/Library/util/func/Tuples.java diff --git a/src/plugins/Library/util/func/package-info.java b/src/main/java/plugins/Library/util/func/package-info.java similarity index 100% rename from src/plugins/Library/util/func/package-info.java rename to src/main/java/plugins/Library/util/func/package-info.java diff --git a/src/plugins/Library/util/package-info.java b/src/main/java/plugins/Library/util/package-info.java similarity index 100% rename from src/plugins/Library/util/package-info.java rename to src/main/java/plugins/Library/util/package-info.java diff --git a/src/plugins/Library/ui/staticfiles/detect.js b/src/main/resources/staticfiles/detect.js similarity index 100% rename from src/plugins/Library/ui/staticfiles/detect.js rename to src/main/resources/staticfiles/detect.js diff --git a/src/plugins/Library/ui/staticfiles/script.js b/src/main/resources/staticfiles/script.js similarity index 100% rename from src/plugins/Library/ui/staticfiles/script.js rename to src/main/resources/staticfiles/script.js diff --git a/src/plugins/Library/ui/staticfiles/style.css b/src/main/resources/staticfiles/style.css similarity index 100% rename from src/plugins/Library/ui/staticfiles/style.css rename to src/main/resources/staticfiles/style.css diff --git a/test/plugins/Library/Tester.java b/src/test/java/plugins/Library/Tester.java similarity index 100% rename from test/plugins/Library/Tester.java rename to src/test/java/plugins/Library/Tester.java diff --git a/test/plugins/Library/index/BIndexTest.java b/src/test/java/plugins/Library/index/BIndexTest.java similarity index 97% rename from test/plugins/Library/index/BIndexTest.java rename to src/test/java/plugins/Library/index/BIndexTest.java index e3fadcf6..27af5bdd 100644 --- a/test/plugins/Library/index/BIndexTest.java +++ b/src/test/java/plugins/Library/index/BIndexTest.java @@ -57,11 +57,11 @@ public long timeDiff() { return time - oldtime; } - public BIndexTest() { - f = new File("BindexTest"); - f.mkdir(); - srl = ProtoIndexSerialiser.forIndex(f); - csrl = ProtoIndexComponentSerialiser.get(ProtoIndexComponentSerialiser.FMT_FILE_LOCAL, srl.getChildSerialiser()); + public BIndexTest() throws IOException { + f = File.createTempFile("tmp", "BindexTest"); + f.mkdir(); + srl = ProtoIndexSerialiser.forIndex(f); + csrl = ProtoIndexComponentSerialiser.get(ProtoIndexComponentSerialiser.FMT_FILE_LOCAL, srl.getChildSerialiser()); } private final File f; diff --git a/test/plugins/Library/index/TermEntryTest.java b/src/test/java/plugins/Library/index/TermEntryTest.java similarity index 95% rename from test/plugins/Library/index/TermEntryTest.java rename to src/test/java/plugins/Library/index/TermEntryTest.java index fec1256f..4e6c9516 100644 --- a/test/plugins/Library/index/TermEntryTest.java +++ b/src/test/java/plugins/Library/index/TermEntryTest.java @@ -14,6 +14,8 @@ import freenet.keys.FreenetURI; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; import java.util.ArrayList; @@ -44,9 +46,9 @@ public class TermEntryTest extends TestCase { } final static TermTermEntry y = new TermTermEntry("test", 0.8f, "lol2"); - public void testBasic() throws TaskAbortException { - File f = new File("TermEntryTest"); - f.mkdir(); + public void testBasic() throws TaskAbortException, IOException { + Path p = Files.createTempDirectory("TermEntryTest"); + File f = p.toFile(); FileArchiver> ym = new FileArchiver>(new YamlReaderWriter(), "test", null, ".yml", f); Map map = new HashMap(); diff --git a/test/plugins/Library/io/serial/PackerTest.java b/src/test/java/plugins/Library/io/serial/PackerTest.java similarity index 100% rename from test/plugins/Library/io/serial/PackerTest.java rename to src/test/java/plugins/Library/io/serial/PackerTest.java diff --git a/test/plugins/Library/io/serial/YamlMapTest.java b/src/test/java/plugins/Library/io/serial/YamlMapTest.java similarity index 98% rename from test/plugins/Library/io/serial/YamlMapTest.java rename to src/test/java/plugins/Library/io/serial/YamlMapTest.java index 414e8a21..b001409a 100644 --- a/test/plugins/Library/io/serial/YamlMapTest.java +++ b/src/test/java/plugins/Library/io/serial/YamlMapTest.java @@ -37,7 +37,7 @@ public void testYamlMap() throws IOException { Yaml yaml = new Yaml(new Loader(new ExtendedConstructor()), new Dumper(new ExtendedRepresenter(), new DumperOptions())); - File file = new File("beantest.yml"); + File file = File.createTempFile("tmp", "beantest.yml"); FileOutputStream os = new FileOutputStream(file); yaml.dump(data, new OutputStreamWriter(os)); diff --git a/test/plugins/Library/util/BTreeMapTest.java b/src/test/java/plugins/Library/util/BTreeMapTest.java similarity index 100% rename from test/plugins/Library/util/BTreeMapTest.java rename to src/test/java/plugins/Library/util/BTreeMapTest.java diff --git a/test/plugins/Library/util/BytePrefixKeyTest.java b/src/test/java/plugins/Library/util/BytePrefixKeyTest.java similarity index 100% rename from test/plugins/Library/util/BytePrefixKeyTest.java rename to src/test/java/plugins/Library/util/BytePrefixKeyTest.java diff --git a/test/plugins/Library/util/Generators.java b/src/test/java/plugins/Library/util/Generators.java similarity index 100% rename from test/plugins/Library/util/Generators.java rename to src/test/java/plugins/Library/util/Generators.java diff --git a/test/plugins/Library/util/IntegersTest.java b/src/test/java/plugins/Library/util/IntegersTest.java similarity index 100% rename from test/plugins/Library/util/IntegersTest.java rename to src/test/java/plugins/Library/util/IntegersTest.java diff --git a/test/plugins/Library/util/SkeletonTreeMapTest.java b/src/test/java/plugins/Library/util/SkeletonTreeMapTest.java similarity index 100% rename from test/plugins/Library/util/SkeletonTreeMapTest.java rename to src/test/java/plugins/Library/util/SkeletonTreeMapTest.java diff --git a/test/plugins/Library/util/SortedArraySetTest.java b/src/test/java/plugins/Library/util/SortedArraySetTest.java similarity index 100% rename from test/plugins/Library/util/SortedArraySetTest.java rename to src/test/java/plugins/Library/util/SortedArraySetTest.java diff --git a/test/plugins/Library/util/SortedMapTestSkeleton.java b/src/test/java/plugins/Library/util/SortedMapTestSkeleton.java similarity index 100% rename from test/plugins/Library/util/SortedMapTestSkeleton.java rename to src/test/java/plugins/Library/util/SortedMapTestSkeleton.java diff --git a/test/plugins/Library/util/SortedTest.java b/src/test/java/plugins/Library/util/SortedTest.java similarity index 100% rename from test/plugins/Library/util/SortedTest.java rename to src/test/java/plugins/Library/util/SortedTest.java diff --git a/test/plugins/Library/util/event/SweepersTest.java b/src/test/java/plugins/Library/util/event/SweepersTest.java similarity index 100% rename from test/plugins/Library/util/event/SweepersTest.java rename to src/test/java/plugins/Library/util/event/SweepersTest.java