diff --git a/java/application.lightroom/build.gradle b/java/application.lightroom/build.gradle index f141cf2..9124bb3 100644 --- a/java/application.lightroom/build.gradle +++ b/java/application.lightroom/build.gradle @@ -1,4 +1,6 @@ dependencies { + compile project(':core.worker') + compile project(':core.mimis') compile project(':core.windows') compile 'com.github.boukefalos:jlibwinapi:0.1' diff --git a/java/application.lightroom/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java b/java/application.lightroom/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java index 59e5c60..6f27197 100644 --- a/java/application.lightroom/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java +++ b/java/application.lightroom/src/main/java/mimis/application/cmd/windows/lightroom/LightroomApplication.java @@ -17,14 +17,14 @@ package mimis.application.cmd.windows.lightroom; +import base.exception.worker.ActivateException; +import base.util.ArrayCycle; import mimis.application.cmd.windows.WindowsApplication; import mimis.input.Task; import mimis.value.Action; import winapi.Amount; import winapi.Slider; import winapi.Test; -import base.exception.worker.ActivateException; -import base.util.ArrayCycle; public class LightroomApplication extends WindowsApplication { protected final static String PROGRAM = "lightroom.exe"; diff --git a/java/core.legacy/build.gradle b/java/core.legacy/build.gradle deleted file mode 100644 index e57c02f..0000000 --- a/java/core.legacy/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - compile 'org.slf4j:slf4j-log4j12:1.7.7' - compile 'org.picocontainer:picocontainer:2.15' - compile 'junit:junit:4.12' -} \ No newline at end of file diff --git a/java/core.mimis/build.gradle b/java/core.mimis/build.gradle index e3f6fc4..1eb0fe6 100644 --- a/java/core.mimis/build.gradle +++ b/java/core.mimis/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':core.legacy') + compile project(':core.worker') compile 'com.github.boukefalos:jlibmimis:0.1' compile 'com.github.boukefalos:jlibxinput:1.0' diff --git a/java/core.networking/build.gradle b/java/core.networking/build.gradle index 2f260f4..0e64177 100644 --- a/java/core.networking/build.gradle +++ b/java/core.networking/build.gradle @@ -1,3 +1,3 @@ dependencies { - compile project(':core.legacy') + compile project(':core.worker') } \ No newline at end of file diff --git a/java/core.worker/build.gradle b/java/core.worker/build.gradle index e69de29..e57c02f 100644 --- a/java/core.worker/build.gradle +++ b/java/core.worker/build.gradle @@ -0,0 +1,5 @@ +dependencies { + compile 'org.slf4j:slf4j-log4j12:1.7.7' + compile 'org.picocontainer:picocontainer:2.15' + compile 'junit:junit:4.12' +} \ No newline at end of file diff --git a/java/core.legacy/gradle/wrapper/gradle-wrapper.jar b/java/core.worker/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from java/core.legacy/gradle/wrapper/gradle-wrapper.jar rename to java/core.worker/gradle/wrapper/gradle-wrapper.jar diff --git a/java/core.legacy/gradle/wrapper/gradle-wrapper.properties b/java/core.worker/gradle/wrapper/gradle-wrapper.properties similarity index 84% rename from java/core.legacy/gradle/wrapper/gradle-wrapper.properties rename to java/core.worker/gradle/wrapper/gradle-wrapper.properties index 9caa9bf..3c3e34a 100644 --- a/java/core.legacy/gradle/wrapper/gradle-wrapper.properties +++ b/java/core.worker/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Sun Jul 03 12:05:00 BST 2016 +#Mon Jul 11 22:59:09 BST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/java/core.legacy/gradlew b/java/core.worker/gradlew similarity index 100% rename from java/core.legacy/gradlew rename to java/core.worker/gradlew diff --git a/java/core.legacy/gradlew.bat b/java/core.worker/gradlew.bat similarity index 100% rename from java/core.legacy/gradlew.bat rename to java/core.worker/gradlew.bat diff --git a/java/core.legacy/src/main/java/base/Control.java b/java/core.worker/src/main/java/base/Control.java similarity index 100% rename from java/core.legacy/src/main/java/base/Control.java rename to java/core.worker/src/main/java/base/Control.java diff --git a/java/core.legacy/src/main/java/base/Duplex.java b/java/core.worker/src/main/java/base/Duplex.java similarity index 100% rename from java/core.legacy/src/main/java/base/Duplex.java rename to java/core.worker/src/main/java/base/Duplex.java diff --git a/java/core.legacy/src/main/java/base/Forwarder.java b/java/core.worker/src/main/java/base/Forwarder.java similarity index 100% rename from java/core.legacy/src/main/java/base/Forwarder.java rename to java/core.worker/src/main/java/base/Forwarder.java diff --git a/java/core.legacy/src/main/java/base/Receiver.java b/java/core.worker/src/main/java/base/Receiver.java similarity index 100% rename from java/core.legacy/src/main/java/base/Receiver.java rename to java/core.worker/src/main/java/base/Receiver.java diff --git a/java/core.legacy/src/main/java/base/Sender.java b/java/core.worker/src/main/java/base/Sender.java similarity index 100% rename from java/core.legacy/src/main/java/base/Sender.java rename to java/core.worker/src/main/java/base/Sender.java diff --git a/java/core.legacy/src/main/java/base/exception/WorkerException.java b/java/core.worker/src/main/java/base/exception/WorkerException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/WorkerException.java rename to java/core.worker/src/main/java/base/exception/WorkerException.java diff --git a/java/core.legacy/src/main/java/base/exception/worker/ActivateException.java b/java/core.worker/src/main/java/base/exception/worker/ActivateException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/worker/ActivateException.java rename to java/core.worker/src/main/java/base/exception/worker/ActivateException.java diff --git a/java/core.legacy/src/main/java/base/exception/worker/AlreadyActiveException.java b/java/core.worker/src/main/java/base/exception/worker/AlreadyActiveException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/worker/AlreadyActiveException.java rename to java/core.worker/src/main/java/base/exception/worker/AlreadyActiveException.java diff --git a/java/core.legacy/src/main/java/base/exception/worker/AlreadyRunningException.java b/java/core.worker/src/main/java/base/exception/worker/AlreadyRunningException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/worker/AlreadyRunningException.java rename to java/core.worker/src/main/java/base/exception/worker/AlreadyRunningException.java diff --git a/java/core.legacy/src/main/java/base/exception/worker/DeactivateException.java b/java/core.worker/src/main/java/base/exception/worker/DeactivateException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/worker/DeactivateException.java rename to java/core.worker/src/main/java/base/exception/worker/DeactivateException.java diff --git a/java/core.legacy/src/main/java/base/exception/worker/NotActiveException.java b/java/core.worker/src/main/java/base/exception/worker/NotActiveException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/worker/NotActiveException.java rename to java/core.worker/src/main/java/base/exception/worker/NotActiveException.java diff --git a/java/core.legacy/src/main/java/base/exception/worker/NotRunningException.java b/java/core.worker/src/main/java/base/exception/worker/NotRunningException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/worker/NotRunningException.java rename to java/core.worker/src/main/java/base/exception/worker/NotRunningException.java diff --git a/java/core.legacy/src/main/java/base/exception/worker/StartException.java b/java/core.worker/src/main/java/base/exception/worker/StartException.java similarity index 100% rename from java/core.legacy/src/main/java/base/exception/worker/StartException.java rename to java/core.worker/src/main/java/base/exception/worker/StartException.java diff --git a/java/core.legacy/src/main/java/base/util/ArrayCycle.java b/java/core.worker/src/main/java/base/util/ArrayCycle.java similarity index 100% rename from java/core.legacy/src/main/java/base/util/ArrayCycle.java rename to java/core.worker/src/main/java/base/util/ArrayCycle.java diff --git a/java/core.legacy/src/main/java/base/util/Buffer.java b/java/core.worker/src/main/java/base/util/Buffer.java similarity index 100% rename from java/core.legacy/src/main/java/base/util/Buffer.java rename to java/core.worker/src/main/java/base/util/Buffer.java diff --git a/java/core.legacy/src/main/java/base/util/Bufferable.java b/java/core.worker/src/main/java/base/util/Bufferable.java similarity index 100% rename from java/core.legacy/src/main/java/base/util/Bufferable.java rename to java/core.worker/src/main/java/base/util/Bufferable.java diff --git a/java/core.legacy/src/main/java/base/util/BufferedArrayCycle.java b/java/core.worker/src/main/java/base/util/BufferedArrayCycle.java similarity index 100% rename from java/core.legacy/src/main/java/base/util/BufferedArrayCycle.java rename to java/core.worker/src/main/java/base/util/BufferedArrayCycle.java diff --git a/java/core.legacy/src/main/java/base/util/Dummy.java b/java/core.worker/src/main/java/base/util/Dummy.java similarity index 100% rename from java/core.legacy/src/main/java/base/util/Dummy.java rename to java/core.worker/src/main/java/base/util/Dummy.java diff --git a/java/core.legacy/src/main/java/base/work/Listen.java b/java/core.worker/src/main/java/base/work/Listen.java similarity index 100% rename from java/core.legacy/src/main/java/base/work/Listen.java rename to java/core.worker/src/main/java/base/work/Listen.java diff --git a/java/core.legacy/src/main/java/base/work/ReflectiveListen.java b/java/core.worker/src/main/java/base/work/ReflectiveListen.java similarity index 100% rename from java/core.legacy/src/main/java/base/work/ReflectiveListen.java rename to java/core.worker/src/main/java/base/work/ReflectiveListen.java diff --git a/java/core.legacy/src/main/java/base/work/Work.java b/java/core.worker/src/main/java/base/work/Work.java similarity index 100% rename from java/core.legacy/src/main/java/base/work/Work.java rename to java/core.worker/src/main/java/base/work/Work.java diff --git a/java/core.legacy/src/main/java/base/worker/BackgroundListener.java b/java/core.worker/src/main/java/base/worker/BackgroundListener.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/BackgroundListener.java rename to java/core.worker/src/main/java/base/worker/BackgroundListener.java diff --git a/java/core.legacy/src/main/java/base/worker/DirectIntervalWorker.java b/java/core.worker/src/main/java/base/worker/DirectIntervalWorker.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/DirectIntervalWorker.java rename to java/core.worker/src/main/java/base/worker/DirectIntervalWorker.java diff --git a/java/core.legacy/src/main/java/base/worker/DirectWorker.java b/java/core.worker/src/main/java/base/worker/DirectWorker.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/DirectWorker.java rename to java/core.worker/src/main/java/base/worker/DirectWorker.java diff --git a/java/core.legacy/src/main/java/base/worker/ForegroundListener.java b/java/core.worker/src/main/java/base/worker/ForegroundListener.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/ForegroundListener.java rename to java/core.worker/src/main/java/base/worker/ForegroundListener.java diff --git a/java/core.legacy/src/main/java/base/worker/IntervalWork.java b/java/core.worker/src/main/java/base/worker/IntervalWork.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/IntervalWork.java rename to java/core.worker/src/main/java/base/worker/IntervalWork.java diff --git a/java/core.legacy/src/main/java/base/worker/ThreadIntervalWorker.java b/java/core.worker/src/main/java/base/worker/ThreadIntervalWorker.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/ThreadIntervalWorker.java rename to java/core.worker/src/main/java/base/worker/ThreadIntervalWorker.java diff --git a/java/core.legacy/src/main/java/base/worker/ThreadWorker.java b/java/core.worker/src/main/java/base/worker/ThreadWorker.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/ThreadWorker.java rename to java/core.worker/src/main/java/base/worker/ThreadWorker.java diff --git a/java/core.legacy/src/main/java/base/worker/Worker.java b/java/core.worker/src/main/java/base/worker/Worker.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/Worker.java rename to java/core.worker/src/main/java/base/worker/Worker.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/Listener.java b/java/core.worker/src/main/java/base/worker/pool/Listener.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/Listener.java rename to java/core.worker/src/main/java/base/worker/pool/Listener.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/ListenerPool.java b/java/core.worker/src/main/java/base/worker/pool/ListenerPool.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/ListenerPool.java rename to java/core.worker/src/main/java/base/worker/pool/ListenerPool.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/ListenerPoolRunnable.java b/java/core.worker/src/main/java/base/worker/pool/ListenerPoolRunnable.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/ListenerPoolRunnable.java rename to java/core.worker/src/main/java/base/worker/pool/ListenerPoolRunnable.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/PooledListener.java b/java/core.worker/src/main/java/base/worker/pool/PooledListener.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/PooledListener.java rename to java/core.worker/src/main/java/base/worker/pool/PooledListener.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/PooledWorker.java b/java/core.worker/src/main/java/base/worker/pool/PooledWorker.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/PooledWorker.java rename to java/core.worker/src/main/java/base/worker/pool/PooledWorker.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/WorkerPool.java b/java/core.worker/src/main/java/base/worker/pool/WorkerPool.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/WorkerPool.java rename to java/core.worker/src/main/java/base/worker/pool/WorkerPool.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/WorkerPoolRunnable.java b/java/core.worker/src/main/java/base/worker/pool/WorkerPoolRunnable.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/WorkerPoolRunnable.java rename to java/core.worker/src/main/java/base/worker/pool/WorkerPoolRunnable.java diff --git a/java/core.legacy/src/main/java/base/worker/pool/Wrapper.java b/java/core.worker/src/main/java/base/worker/pool/Wrapper.java similarity index 100% rename from java/core.legacy/src/main/java/base/worker/pool/Wrapper.java rename to java/core.worker/src/main/java/base/worker/pool/Wrapper.java diff --git a/java/core.legacy/src/test/java/worker/TestDirectWork.java b/java/core.worker/src/test/java/worker/TestDirectWork.java similarity index 100% rename from java/core.legacy/src/test/java/worker/TestDirectWork.java rename to java/core.worker/src/test/java/worker/TestDirectWork.java diff --git a/java/core.legacy/src/test/java/worker/TestIntervalWork.java b/java/core.worker/src/test/java/worker/TestIntervalWork.java similarity index 100% rename from java/core.legacy/src/test/java/worker/TestIntervalWork.java rename to java/core.worker/src/test/java/worker/TestIntervalWork.java diff --git a/java/core.legacy/src/test/java/worker/TestListen.java b/java/core.worker/src/test/java/worker/TestListen.java similarity index 100% rename from java/core.legacy/src/test/java/worker/TestListen.java rename to java/core.worker/src/test/java/worker/TestListen.java diff --git a/java/core.legacy/src/test/java/worker/TestPooledListen.java b/java/core.worker/src/test/java/worker/TestPooledListen.java similarity index 100% rename from java/core.legacy/src/test/java/worker/TestPooledListen.java rename to java/core.worker/src/test/java/worker/TestPooledListen.java diff --git a/java/core.legacy/src/test/java/worker/TestPooledWork.java b/java/core.worker/src/test/java/worker/TestPooledWork.java similarity index 100% rename from java/core.legacy/src/test/java/worker/TestPooledWork.java rename to java/core.worker/src/test/java/worker/TestPooledWork.java diff --git a/java/core.legacy/src/test/java/worker/dummy/DummyIntervalWork.java b/java/core.worker/src/test/java/worker/dummy/DummyIntervalWork.java similarity index 100% rename from java/core.legacy/src/test/java/worker/dummy/DummyIntervalWork.java rename to java/core.worker/src/test/java/worker/dummy/DummyIntervalWork.java diff --git a/java/core.legacy/src/test/java/worker/dummy/DummyListen.java b/java/core.worker/src/test/java/worker/dummy/DummyListen.java similarity index 100% rename from java/core.legacy/src/test/java/worker/dummy/DummyListen.java rename to java/core.worker/src/test/java/worker/dummy/DummyListen.java diff --git a/java/core.legacy/src/test/java/worker/dummy/DummyWork.java b/java/core.worker/src/test/java/worker/dummy/DummyWork.java similarity index 100% rename from java/core.legacy/src/test/java/worker/dummy/DummyWork.java rename to java/core.worker/src/test/java/worker/dummy/DummyWork.java diff --git a/java/core.legacy/src/test/resources/log4j.properties b/java/core.worker/src/test/resources/log4j.properties similarity index 100% rename from java/core.legacy/src/test/resources/log4j.properties rename to java/core.worker/src/test/resources/log4j.properties diff --git a/java/device.wiimote/build.gradle b/java/device.wiimote/build.gradle index 72ee848..fcc4c11 100644 --- a/java/device.wiimote/build.gradle +++ b/java/device.wiimote/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':core.legacy') + compile project(':core.worker') compile project(':core.mimis') compile project(':device.lirc') diff --git a/java/exec.connected/build.gradle b/java/exec.connected/build.gradle index a4f6dd3..8d619e9 100644 --- a/java/exec.connected/build.gradle +++ b/java/exec.connected/build.gradle @@ -1,7 +1,7 @@ dependencies { compile project(':core.networking') compile project(':core.mimis') - compile project(':core.legacy') + compile project(':core.worker') compile project(':device.lirc') compile project(':exec.mimis') diff --git a/java/exec.sound/build.gradle b/java/exec.sound/build.gradle index 83c34c4..abf6100 100644 --- a/java/exec.sound/build.gradle +++ b/java/exec.sound/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile project(':core.legacy') + compile project(':core.worker') compile 'commons-io:commons-io:2.+' compile 'commons-cli:commons-cli:1.+' diff --git a/java/settings.gradle b/java/settings.gradle index 2211fd4..93eca8d 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -10,7 +10,6 @@ include ':application.vlc' include ':application.winamp' include ':application.wmp' include ':core.input' -include ':core.legacy' include ':core.networking' include ':core.routing' include ':core.windows'