diff --git a/.gitignore b/.gitignore index 9eca9b6..f06dfad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -build -bin +.gradle +build \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 50000ae..654cfee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,8 @@ language: java -script: ant os: - linux -before_install: - - sudo apt-get update - - sudo apt-get install -y ant # safelist branches: diff --git a/README.md b/README.md index 8861fe8..db5414c 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,13 @@ SheepIt Render Farm Client is an *Open Source* client for the distributed render ## Compilation You will need Java 1.7 or higher. (OpenJDK and Oracle are both supported). -You also need [ant](http://ant.apache.org/). -To create the jar file, simply type `ant` in the project's root directory. +To create the jar file, simply type `./gradlew jar` on linux/OSX and `gradlew.bat jar` on Windows in the project's root directory. ## Usage Once you have the jar file, you can see how to use it by running: - java -jar bin/sheepit-client.jar --help + java -jar build/libs/sheepit-client.jar --help When you are doing development work, you can use a mirror of the main site specially made for demo/dev. The mirror is located at **http://sandbox.sheepit-renderfarm.com**, and you can use it by passing `-server http://sandbox.sheepit-renderfarm.com` to your invocation of the client. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..565dafd --- /dev/null +++ b/build.gradle @@ -0,0 +1,51 @@ +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1' + } +} +apply plugin: 'java' +apply plugin: 'com.github.johnrengelman.shadow' + +sourceCompatibility = '1.7' +targetCompatibility = '1.7' + +repositories { + jcenter() + mavenCentral() +} + +dependencies { + compile 'org.projectlombok:lombok:1.18.8' + compile 'org.kohsuke.args4j:args4j-maven-plugin:2.0.31' + compile 'net.lingala.zip4j:zip4j:1.3.2' + compile 'net.java.dev.jna:jna-platform:4.0.0' + compile 'net.java.dev.jna:jna:4.0.0' + compile 'javax.xml.bind:jaxb-api:2.3.1' +} + +jar { + manifest { + attributes "Main-Class": "com.sheepit.client.standalone.Worker" + } + + from { + configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + } +} + +sourceSets { + main { + java { + srcDirs = ['src'] + } + } + + test { + java { + srcDirs = ['test'] + } + } +} diff --git a/build.xml b/build.xml deleted file mode 100644 index 59919b6..0000000 --- a/build.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/extern/args4j.jar b/extern/args4j.jar deleted file mode 100644 index e188b3d..0000000 Binary files a/extern/args4j.jar and /dev/null differ diff --git a/extern/jaxb-api.jar b/extern/jaxb-api.jar deleted file mode 100644 index 0817c08..0000000 Binary files a/extern/jaxb-api.jar and /dev/null differ diff --git a/extern/jaxb-core.jar b/extern/jaxb-core.jar deleted file mode 100644 index 864ba31..0000000 Binary files a/extern/jaxb-core.jar and /dev/null differ diff --git a/extern/jaxb-impl.jar b/extern/jaxb-impl.jar deleted file mode 100644 index 02f50ab..0000000 Binary files a/extern/jaxb-impl.jar and /dev/null differ diff --git a/extern/jna.jar b/extern/jna.jar deleted file mode 100644 index 9038048..0000000 Binary files a/extern/jna.jar and /dev/null differ diff --git a/extern/lombok.jar b/extern/lombok.jar deleted file mode 100644 index b1dd5a8..0000000 Binary files a/extern/lombok.jar and /dev/null differ diff --git a/extern/platform.jar b/extern/platform.jar deleted file mode 100644 index 4b3d567..0000000 Binary files a/extern/platform.jar and /dev/null differ diff --git a/extern/zip4j.jar b/extern/zip4j.jar deleted file mode 100644 index 66a19e4..0000000 Binary files a/extern/zip4j.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..9ab0a83 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..2c2bbe5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..4a88bed --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'sheepit-client' diff --git a/src/com/sheepit/client/Client.java b/src/main/java/com/sheepit/client/Client.java similarity index 100% rename from src/com/sheepit/client/Client.java rename to src/main/java/com/sheepit/client/Client.java diff --git a/src/com/sheepit/client/Configuration.java b/src/main/java/com/sheepit/client/Configuration.java similarity index 100% rename from src/com/sheepit/client/Configuration.java rename to src/main/java/com/sheepit/client/Configuration.java diff --git a/src/com/sheepit/client/Error.java b/src/main/java/com/sheepit/client/Error.java similarity index 100% rename from src/com/sheepit/client/Error.java rename to src/main/java/com/sheepit/client/Error.java diff --git a/src/com/sheepit/client/Gui.java b/src/main/java/com/sheepit/client/Gui.java similarity index 100% rename from src/com/sheepit/client/Gui.java rename to src/main/java/com/sheepit/client/Gui.java diff --git a/src/com/sheepit/client/Job.java b/src/main/java/com/sheepit/client/Job.java similarity index 100% rename from src/com/sheepit/client/Job.java rename to src/main/java/com/sheepit/client/Job.java diff --git a/src/com/sheepit/client/Log.java b/src/main/java/com/sheepit/client/Log.java similarity index 100% rename from src/com/sheepit/client/Log.java rename to src/main/java/com/sheepit/client/Log.java diff --git a/src/com/sheepit/client/Pair.java b/src/main/java/com/sheepit/client/Pair.java similarity index 100% rename from src/com/sheepit/client/Pair.java rename to src/main/java/com/sheepit/client/Pair.java diff --git a/src/com/sheepit/client/RenderProcess.java b/src/main/java/com/sheepit/client/RenderProcess.java similarity index 100% rename from src/com/sheepit/client/RenderProcess.java rename to src/main/java/com/sheepit/client/RenderProcess.java diff --git a/src/com/sheepit/client/Server.java b/src/main/java/com/sheepit/client/Server.java similarity index 100% rename from src/com/sheepit/client/Server.java rename to src/main/java/com/sheepit/client/Server.java diff --git a/src/com/sheepit/client/SettingsLoader.java b/src/main/java/com/sheepit/client/SettingsLoader.java similarity index 100% rename from src/com/sheepit/client/SettingsLoader.java rename to src/main/java/com/sheepit/client/SettingsLoader.java diff --git a/src/com/sheepit/client/ShutdownHook.java b/src/main/java/com/sheepit/client/ShutdownHook.java similarity index 100% rename from src/com/sheepit/client/ShutdownHook.java rename to src/main/java/com/sheepit/client/ShutdownHook.java diff --git a/src/com/sheepit/client/Stats.java b/src/main/java/com/sheepit/client/Stats.java similarity index 100% rename from src/com/sheepit/client/Stats.java rename to src/main/java/com/sheepit/client/Stats.java diff --git a/src/com/sheepit/client/Utils.java b/src/main/java/com/sheepit/client/Utils.java similarity index 100% rename from src/com/sheepit/client/Utils.java rename to src/main/java/com/sheepit/client/Utils.java diff --git a/src/com/sheepit/client/exception/FermeException.java b/src/main/java/com/sheepit/client/exception/FermeException.java similarity index 100% rename from src/com/sheepit/client/exception/FermeException.java rename to src/main/java/com/sheepit/client/exception/FermeException.java diff --git a/src/com/sheepit/client/exception/FermeExceptionBadResponseFromServer.java b/src/main/java/com/sheepit/client/exception/FermeExceptionBadResponseFromServer.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionBadResponseFromServer.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionBadResponseFromServer.java diff --git a/src/com/sheepit/client/exception/FermeExceptionNoRendererAvailable.java b/src/main/java/com/sheepit/client/exception/FermeExceptionNoRendererAvailable.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionNoRendererAvailable.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionNoRendererAvailable.java diff --git a/src/com/sheepit/client/exception/FermeExceptionNoRightToRender.java b/src/main/java/com/sheepit/client/exception/FermeExceptionNoRightToRender.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionNoRightToRender.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionNoRightToRender.java diff --git a/src/com/sheepit/client/exception/FermeExceptionNoSession.java b/src/main/java/com/sheepit/client/exception/FermeExceptionNoSession.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionNoSession.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionNoSession.java diff --git a/src/com/sheepit/client/exception/FermeExceptionNoSpaceLeftOnDevice.java b/src/main/java/com/sheepit/client/exception/FermeExceptionNoSpaceLeftOnDevice.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionNoSpaceLeftOnDevice.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionNoSpaceLeftOnDevice.java diff --git a/src/com/sheepit/client/exception/FermeExceptionServerInMaintenance.java b/src/main/java/com/sheepit/client/exception/FermeExceptionServerInMaintenance.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionServerInMaintenance.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionServerInMaintenance.java diff --git a/src/com/sheepit/client/exception/FermeExceptionServerOverloaded.java b/src/main/java/com/sheepit/client/exception/FermeExceptionServerOverloaded.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionServerOverloaded.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionServerOverloaded.java diff --git a/src/com/sheepit/client/exception/FermeExceptionSessionDisabled.java b/src/main/java/com/sheepit/client/exception/FermeExceptionSessionDisabled.java similarity index 100% rename from src/com/sheepit/client/exception/FermeExceptionSessionDisabled.java rename to src/main/java/com/sheepit/client/exception/FermeExceptionSessionDisabled.java diff --git a/src/com/sheepit/client/exception/FermeServerDown.java b/src/main/java/com/sheepit/client/exception/FermeServerDown.java similarity index 100% rename from src/com/sheepit/client/exception/FermeServerDown.java rename to src/main/java/com/sheepit/client/exception/FermeServerDown.java diff --git a/src/com/sheepit/client/hardware/cpu/CPU.java b/src/main/java/com/sheepit/client/hardware/cpu/CPU.java similarity index 100% rename from src/com/sheepit/client/hardware/cpu/CPU.java rename to src/main/java/com/sheepit/client/hardware/cpu/CPU.java diff --git a/src/com/sheepit/client/hardware/gpu/GPU.java b/src/main/java/com/sheepit/client/hardware/gpu/GPU.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/GPU.java rename to src/main/java/com/sheepit/client/hardware/gpu/GPU.java diff --git a/src/com/sheepit/client/hardware/gpu/GPUDevice.java b/src/main/java/com/sheepit/client/hardware/gpu/GPUDevice.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/GPUDevice.java rename to src/main/java/com/sheepit/client/hardware/gpu/GPUDevice.java diff --git a/src/com/sheepit/client/hardware/gpu/GPULister.java b/src/main/java/com/sheepit/client/hardware/gpu/GPULister.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/GPULister.java rename to src/main/java/com/sheepit/client/hardware/gpu/GPULister.java diff --git a/src/com/sheepit/client/hardware/gpu/nvidia/CUDA.java b/src/main/java/com/sheepit/client/hardware/gpu/nvidia/CUDA.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/nvidia/CUDA.java rename to src/main/java/com/sheepit/client/hardware/gpu/nvidia/CUDA.java diff --git a/src/com/sheepit/client/hardware/gpu/nvidia/CUDeviceAttribute.java b/src/main/java/com/sheepit/client/hardware/gpu/nvidia/CUDeviceAttribute.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/nvidia/CUDeviceAttribute.java rename to src/main/java/com/sheepit/client/hardware/gpu/nvidia/CUDeviceAttribute.java diff --git a/src/com/sheepit/client/hardware/gpu/nvidia/CUresult.java b/src/main/java/com/sheepit/client/hardware/gpu/nvidia/CUresult.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/nvidia/CUresult.java rename to src/main/java/com/sheepit/client/hardware/gpu/nvidia/CUresult.java diff --git a/src/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java b/src/main/java/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java rename to src/main/java/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java diff --git a/src/com/sheepit/client/hardware/gpu/opencl/OpenCL.java b/src/main/java/com/sheepit/client/hardware/gpu/opencl/OpenCL.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/opencl/OpenCL.java rename to src/main/java/com/sheepit/client/hardware/gpu/opencl/OpenCL.java diff --git a/src/com/sheepit/client/hardware/gpu/opencl/OpenCLLib.java b/src/main/java/com/sheepit/client/hardware/gpu/opencl/OpenCLLib.java similarity index 100% rename from src/com/sheepit/client/hardware/gpu/opencl/OpenCLLib.java rename to src/main/java/com/sheepit/client/hardware/gpu/opencl/OpenCLLib.java diff --git a/src/com/sheepit/client/network/Proxy.java b/src/main/java/com/sheepit/client/network/Proxy.java similarity index 100% rename from src/com/sheepit/client/network/Proxy.java rename to src/main/java/com/sheepit/client/network/Proxy.java diff --git a/src/com/sheepit/client/network/ProxyAuthenticator.java b/src/main/java/com/sheepit/client/network/ProxyAuthenticator.java similarity index 100% rename from src/com/sheepit/client/network/ProxyAuthenticator.java rename to src/main/java/com/sheepit/client/network/ProxyAuthenticator.java diff --git a/src/com/sheepit/client/os/FreeBSD.java b/src/main/java/com/sheepit/client/os/FreeBSD.java similarity index 100% rename from src/com/sheepit/client/os/FreeBSD.java rename to src/main/java/com/sheepit/client/os/FreeBSD.java diff --git a/src/com/sheepit/client/os/Linux.java b/src/main/java/com/sheepit/client/os/Linux.java similarity index 100% rename from src/com/sheepit/client/os/Linux.java rename to src/main/java/com/sheepit/client/os/Linux.java diff --git a/src/com/sheepit/client/os/Mac.java b/src/main/java/com/sheepit/client/os/Mac.java similarity index 100% rename from src/com/sheepit/client/os/Mac.java rename to src/main/java/com/sheepit/client/os/Mac.java diff --git a/src/com/sheepit/client/os/OS.java b/src/main/java/com/sheepit/client/os/OS.java similarity index 100% rename from src/com/sheepit/client/os/OS.java rename to src/main/java/com/sheepit/client/os/OS.java diff --git a/src/com/sheepit/client/os/Windows.java b/src/main/java/com/sheepit/client/os/Windows.java similarity index 100% rename from src/com/sheepit/client/os/Windows.java rename to src/main/java/com/sheepit/client/os/Windows.java diff --git a/src/com/sheepit/client/os/windows/Kernel32Lib.java b/src/main/java/com/sheepit/client/os/windows/Kernel32Lib.java similarity index 100% rename from src/com/sheepit/client/os/windows/Kernel32Lib.java rename to src/main/java/com/sheepit/client/os/windows/Kernel32Lib.java diff --git a/src/com/sheepit/client/os/windows/WinProcess.java b/src/main/java/com/sheepit/client/os/windows/WinProcess.java similarity index 100% rename from src/com/sheepit/client/os/windows/WinProcess.java rename to src/main/java/com/sheepit/client/os/windows/WinProcess.java diff --git a/src/com/sheepit/client/standalone/GuiSwing.java b/src/main/java/com/sheepit/client/standalone/GuiSwing.java similarity index 100% rename from src/com/sheepit/client/standalone/GuiSwing.java rename to src/main/java/com/sheepit/client/standalone/GuiSwing.java diff --git a/src/com/sheepit/client/standalone/GuiText.java b/src/main/java/com/sheepit/client/standalone/GuiText.java similarity index 100% rename from src/com/sheepit/client/standalone/GuiText.java rename to src/main/java/com/sheepit/client/standalone/GuiText.java diff --git a/src/com/sheepit/client/standalone/GuiTextOneLine.java b/src/main/java/com/sheepit/client/standalone/GuiTextOneLine.java similarity index 100% rename from src/com/sheepit/client/standalone/GuiTextOneLine.java rename to src/main/java/com/sheepit/client/standalone/GuiTextOneLine.java diff --git a/src/com/sheepit/client/standalone/ListGpuParameterHandler.java b/src/main/java/com/sheepit/client/standalone/ListGpuParameterHandler.java similarity index 100% rename from src/com/sheepit/client/standalone/ListGpuParameterHandler.java rename to src/main/java/com/sheepit/client/standalone/ListGpuParameterHandler.java diff --git a/src/com/sheepit/client/standalone/VersionParameterHandler.java b/src/main/java/com/sheepit/client/standalone/VersionParameterHandler.java similarity index 100% rename from src/com/sheepit/client/standalone/VersionParameterHandler.java rename to src/main/java/com/sheepit/client/standalone/VersionParameterHandler.java diff --git a/src/com/sheepit/client/standalone/Worker.java b/src/main/java/com/sheepit/client/standalone/Worker.java similarity index 100% rename from src/com/sheepit/client/standalone/Worker.java rename to src/main/java/com/sheepit/client/standalone/Worker.java diff --git a/src/com/sheepit/client/standalone/swing/activity/Activity.java b/src/main/java/com/sheepit/client/standalone/swing/activity/Activity.java similarity index 100% rename from src/com/sheepit/client/standalone/swing/activity/Activity.java rename to src/main/java/com/sheepit/client/standalone/swing/activity/Activity.java diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/main/java/com/sheepit/client/standalone/swing/activity/Settings.java similarity index 100% rename from src/com/sheepit/client/standalone/swing/activity/Settings.java rename to src/main/java/com/sheepit/client/standalone/swing/activity/Settings.java diff --git a/src/com/sheepit/client/standalone/swing/activity/Working.java b/src/main/java/com/sheepit/client/standalone/swing/activity/Working.java similarity index 100% rename from src/com/sheepit/client/standalone/swing/activity/Working.java rename to src/main/java/com/sheepit/client/standalone/swing/activity/Working.java diff --git a/src/com/sheepit/client/standalone/swing/components/CollapsibleJPanel.java b/src/main/java/com/sheepit/client/standalone/swing/components/CollapsibleJPanel.java similarity index 100% rename from src/com/sheepit/client/standalone/swing/components/CollapsibleJPanel.java rename to src/main/java/com/sheepit/client/standalone/swing/components/CollapsibleJPanel.java diff --git a/src/com/sheepit/client/standalone/text/CLIInputActionHandler.java b/src/main/java/com/sheepit/client/standalone/text/CLIInputActionHandler.java similarity index 100% rename from src/com/sheepit/client/standalone/text/CLIInputActionHandler.java rename to src/main/java/com/sheepit/client/standalone/text/CLIInputActionHandler.java diff --git a/src/com/sheepit/client/standalone/text/CLIInputListener.java b/src/main/java/com/sheepit/client/standalone/text/CLIInputListener.java similarity index 100% rename from src/com/sheepit/client/standalone/text/CLIInputListener.java rename to src/main/java/com/sheepit/client/standalone/text/CLIInputListener.java diff --git a/src/com/sheepit/client/standalone/text/CLIInputObserver.java b/src/main/java/com/sheepit/client/standalone/text/CLIInputObserver.java similarity index 100% rename from src/com/sheepit/client/standalone/text/CLIInputObserver.java rename to src/main/java/com/sheepit/client/standalone/text/CLIInputObserver.java diff --git a/resources/icon.png b/src/main/resources/icon.png similarity index 100% rename from resources/icon.png rename to src/main/resources/icon.png diff --git a/resources/title.png b/src/main/resources/title.png similarity index 100% rename from resources/title.png rename to src/main/resources/title.png