From f80342ef57adbb541e65675ef5fde79bf6f71c15 Mon Sep 17 00:00:00 2001 From: Vincent Wiencek Date: Mon, 1 Sep 2014 17:13:17 +0200 Subject: [PATCH] merge daemon in lib --- build.gradle | 4 ---- settings.gradle | 4 +--- syncany-cli/build.gradle | 1 - .../java/org/syncany/cli/DaemonCommand.java | 0 syncany-daemon/build.gradle | 18 ------------------ ...ersion.select.master.getFileHistoryById.sql | 8 -------- syncany-lib/.gitignore | 2 ++ syncany-lib/build.gradle | 7 ++++++- .../org/syncany/config/to/DaemonConfigTO.java | 0 .../java/org/syncany/config/to/FolderTO.java | 0 .../org/syncany/config/to/WebServerTO.java | 0 .../operations/daemon/ControlServer.java | 0 .../operations/daemon/DaemonOperation.java | 0 .../operations/daemon/LocalEventBus.java | 0 .../daemon/ServiceAlreadyStartedException.java | 0 .../syncany/operations/daemon/WatchRunner.java | 14 ++++++-------- .../syncany/operations/daemon/WatchServer.java | 0 .../syncany/operations/daemon/WebServer.java | 0 .../daemon/auth/MapIdentityManager.java | 0 .../daemon/handlers/InternalRestHandler.java | 0 .../handlers/InternalWebInterfaceHandler.java | 0 .../handlers/InternalWebSocketHandler.java | 0 .../daemon/messages/BadRequestResponse.java | 0 .../operations/daemon/messages/CliRequest.java | 0 .../daemon/messages/CliResponse.java | 0 .../GetDatabaseVersionHeadersRequest.java | 0 .../GetDatabaseVersionHeadersResponse.java | 0 .../daemon/messages/GetFileHistoryRequest.java | 0 .../messages/GetFileHistoryResponse.java | 0 .../daemon/messages/GetFileRequest.java | 0 .../daemon/messages/GetFileResponse.java | 0 .../messages/GetFileResponseInternal.java | 0 .../daemon/messages/GetFileTreeRequest.java | 0 .../daemon/messages/GetFileTreeResponse.java | 0 .../daemon/messages/ListWatchesRequest.java | 0 .../daemon/messages/ListWatchesResponse.java | 0 .../operations/daemon/messages/Message.java | 0 .../daemon/messages/MessageFactory.java | 0 .../operations/daemon/messages/Request.java | 0 .../operations/daemon/messages/Response.java | 0 .../daemon/messages/RestoreRequest.java | 0 .../daemon/messages/RestoreResponse.java | 0 .../daemon/messages/WatchEventResponse.java | 0 .../daemon/messages/WatchRequest.java | 0 .../plugins/web/WebInterfacePlugin.java | 0 .../org/syncany/tests/DaemonTestSuite.java | 0 .../tests/daemon/BasicWatchServerTest.java | 0 .../daemon/NoCliRequestsWhileSyncingTest.java | 0 .../org/syncany/tests/util/TestDaemonUtil.java | 0 .../config/to/daemonOneFolderNoWebServer.xml | 0 .../config/to/daemonTwoFoldersNoWebServer.xml | 0 syncany-messages/build.gradle | 7 ------- 52 files changed, 15 insertions(+), 50 deletions(-) rename {syncany-daemon => syncany-cli}/src/main/java/org/syncany/cli/DaemonCommand.java (100%) delete mode 100644 syncany-daemon/build.gradle delete mode 100644 syncany-daemon/src/main/resources/org/syncany/database/sql/fileversion.select.master.getFileHistoryById.sql create mode 100644 syncany-lib/.gitignore rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/config/to/DaemonConfigTO.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/config/to/FolderTO.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/config/to/WebServerTO.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/ControlServer.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/DaemonOperation.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/LocalEventBus.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/WatchRunner.java (97%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/WatchServer.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/WebServer.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/auth/MapIdentityManager.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/CliRequest.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/CliResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersRequest.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryRequest.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetFileRequest.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetFileResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetFileResponseInternal.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeRequest.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/ListWatchesRequest.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/ListWatchesResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/Message.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/MessageFactory.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/Request.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/Response.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/RestoreRequest.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/RestoreResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/WatchEventResponse.java (100%) rename {syncany-messages => syncany-lib}/src/main/java/org/syncany/operations/daemon/messages/WatchRequest.java (100%) rename {syncany-daemon => syncany-lib}/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java (100%) rename {syncany-daemon => syncany-lib}/src/test/java/org/syncany/tests/DaemonTestSuite.java (100%) rename {syncany-daemon => syncany-lib}/src/test/java/org/syncany/tests/daemon/BasicWatchServerTest.java (100%) rename {syncany-daemon => syncany-lib}/src/test/java/org/syncany/tests/daemon/NoCliRequestsWhileSyncingTest.java (100%) rename {syncany-daemon => syncany-lib}/src/test/java/org/syncany/tests/util/TestDaemonUtil.java (100%) rename {syncany-daemon => syncany-lib}/src/test/resources/org/syncany/config/to/daemonOneFolderNoWebServer.xml (100%) rename {syncany-daemon => syncany-lib}/src/test/resources/org/syncany/config/to/daemonTwoFoldersNoWebServer.xml (100%) delete mode 100644 syncany-messages/build.gradle diff --git a/build.gradle b/build.gradle index 23cce8c75..3a7e2cb76 100644 --- a/build.gradle +++ b/build.gradle @@ -44,12 +44,8 @@ dependencies { compile project(":syncany-lib") compile project(":syncany-cli") compile project(":syncany-util") - compile project(":syncany-daemon") - compile project(":syncany-messages") testCompile project(path: ":syncany-lib", configuration: "tests") testCompile project(path: ":syncany-cli", configuration: "tests") testCompile project(path: ":syncany-util", configuration: "tests") - testCompile project(path: ":syncany-daemon", configuration: "tests") - testCompile project(path: ":syncany-messages", configuration: "tests") } diff --git a/settings.gradle b/settings.gradle index af3a8979f..50dbcaee1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,3 @@ include 'syncany-lib' include 'syncany-cli' -include 'syncany-util' -include 'syncany-daemon' -include 'syncany-messages' +include 'syncany-util' \ No newline at end of file diff --git a/syncany-cli/build.gradle b/syncany-cli/build.gradle index 33a62b920..f6bac2c73 100644 --- a/syncany-cli/build.gradle +++ b/syncany-cli/build.gradle @@ -6,7 +6,6 @@ import java.io.File; dependencies { compile project(":syncany-lib") compile project(":syncany-util") - compile project(":syncany-messages") compile "net.sf.jopt-simple:jopt-simple:4.5" compile "org.apache.httpcomponents:httpclient:4.3.4" diff --git a/syncany-daemon/src/main/java/org/syncany/cli/DaemonCommand.java b/syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/cli/DaemonCommand.java rename to syncany-cli/src/main/java/org/syncany/cli/DaemonCommand.java diff --git a/syncany-daemon/build.gradle b/syncany-daemon/build.gradle deleted file mode 100644 index 2a9eb3043..000000000 --- a/syncany-daemon/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -apply plugin: 'java' -apply plugin: 'eclipse' - -dependencies { - compile project(':syncany-lib') - compile project(':syncany-util') - compile project(':syncany-cli') - compile project(':syncany-messages') - - compile "io.undertow:undertow-servlet:1.0.15.Final" - compile "io.undertow:undertow-websockets-jsr:1.0.15.Final" - compile "commons-io:commons-io:2.4" - - - testCompile project(path: ":syncany-lib", configuration: "tests") - testCompile project(path: ":syncany-util", configuration: "tests") - testCompile "junit:junit:4.9" -} diff --git a/syncany-daemon/src/main/resources/org/syncany/database/sql/fileversion.select.master.getFileHistoryById.sql b/syncany-daemon/src/main/resources/org/syncany/database/sql/fileversion.select.master.getFileHistoryById.sql deleted file mode 100644 index 2b475629a..000000000 --- a/syncany-daemon/src/main/resources/org/syncany/database/sql/fileversion.select.master.getFileHistoryById.sql +++ /dev/null @@ -1,8 +0,0 @@ -select * -from fileversion -where - filehistory_id=? - and databaseversion_id in ( - select id from databaseversion where status='MASTER' - ) -order by version asc diff --git a/syncany-lib/.gitignore b/syncany-lib/.gitignore new file mode 100644 index 000000000..ff3e2543b --- /dev/null +++ b/syncany-lib/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/bin/ diff --git a/syncany-lib/build.gradle b/syncany-lib/build.gradle index 3fc870b8b..85c5c7fc7 100644 --- a/syncany-lib/build.gradle +++ b/syncany-lib/build.gradle @@ -11,6 +11,7 @@ repositories { dependencies { compile project(':syncany-util') +// compile project(':syncany-messages') compile "commons-io:commons-io:2.4" compile "org.bouncycastle:bcprov-jdk15on:1.51" @@ -20,7 +21,11 @@ dependencies { compile "commons-codec:commons-codec:1.8" compile "org.hsqldb:hsqldb:2.3.1" compile "com.github.zafarkhaja:java-semver:0.7.2" - + + compile "io.undertow:undertow-servlet:1.0.15.Final" + compile "io.undertow:undertow-websockets-jsr:1.0.15.Final" + compile "commons-io:commons-io:2.4" + testCompile project(path: ':syncany-util', configuration: 'tests') testCompile "junit:junit:4.9" } diff --git a/syncany-daemon/src/main/java/org/syncany/config/to/DaemonConfigTO.java b/syncany-lib/src/main/java/org/syncany/config/to/DaemonConfigTO.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/config/to/DaemonConfigTO.java rename to syncany-lib/src/main/java/org/syncany/config/to/DaemonConfigTO.java diff --git a/syncany-daemon/src/main/java/org/syncany/config/to/FolderTO.java b/syncany-lib/src/main/java/org/syncany/config/to/FolderTO.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/config/to/FolderTO.java rename to syncany-lib/src/main/java/org/syncany/config/to/FolderTO.java diff --git a/syncany-daemon/src/main/java/org/syncany/config/to/WebServerTO.java b/syncany-lib/src/main/java/org/syncany/config/to/WebServerTO.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/config/to/WebServerTO.java rename to syncany-lib/src/main/java/org/syncany/config/to/WebServerTO.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/ControlServer.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/ControlServer.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/ControlServer.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/ControlServer.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/DaemonOperation.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperation.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/DaemonOperation.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/DaemonOperation.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/LocalEventBus.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/LocalEventBus.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/LocalEventBus.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/LocalEventBus.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/ServiceAlreadyStartedException.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchRunner.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java similarity index 97% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchRunner.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java index 9ccd6bb25..5a0870d61 100644 --- a/syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchRunner.java +++ b/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchRunner.java @@ -1,5 +1,5 @@ /* - * Syncany, www.syncany.org + * Syncany, www.syncany.org * Copyright (C) 2011-2014 Philipp C. Heckel * * This program is free software: you can redistribute it and/or modify @@ -31,8 +31,6 @@ import org.simpleframework.xml.core.Persister; import org.syncany.Client; -import org.syncany.cli.Command; -import org.syncany.cli.CommandFactory; import org.syncany.config.Config; import org.syncany.config.ConfigException; import org.syncany.config.to.PortTO; @@ -243,7 +241,7 @@ private void handleCliRequestSyncRunning(CliRequest cliRequest) { private void handleCliRequestNoSyncRunning(CliRequest cliRequest) { try { - Command command = CommandFactory.getInstance(cliRequest.getCommand()); + //Command command = CommandFactory.getInstance(cliRequest.getCommand()); String[] commandArgs = cliRequest.getCommandArgs().toArray(new String[0]); ByteArrayOutputStream cliOutputStream = new ByteArrayOutputStream(); @@ -251,11 +249,11 @@ private void handleCliRequestNoSyncRunning(CliRequest cliRequest) { Client client = new Client(); client.setConfig(config); - command.setOut(new PrintStream(cliOutputStream)); - command.setClient(client); - command.setLocalDir(config.getLocalDir()); + //command.setOut(new PrintStream(cliOutputStream)); + //command.setClient(client); + //command.setLocalDir(config.getLocalDir()); - command.execute(commandArgs); + //command.execute(commandArgs); String cliOutput = cliOutputStream.toString(); diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchServer.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchServer.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/WatchServer.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/WebServer.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/WebServer.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/WebServer.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/WebServer.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/auth/MapIdentityManager.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/auth/MapIdentityManager.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/auth/MapIdentityManager.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/auth/MapIdentityManager.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalRestHandler.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/BadRequestResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/CliRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CliRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/CliRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CliRequest.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/CliResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CliResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/CliResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/CliResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersRequest.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetDatabaseVersionHeadersResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryRequest.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileHistoryResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileRequest.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileResponseInternal.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileResponseInternal.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileResponseInternal.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileResponseInternal.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeRequest.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/GetFileTreeResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/ListWatchesRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/ListWatchesRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesRequest.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/ListWatchesResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/ListWatchesResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/ListWatchesResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/Message.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/Message.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/Message.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/Message.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/MessageFactory.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/MessageFactory.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/MessageFactory.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/MessageFactory.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/Request.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/Request.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/Request.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/Request.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/Response.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/Response.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/Response.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/Response.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/RestoreRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/RestoreRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreRequest.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/RestoreResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/RestoreResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/RestoreResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/WatchEventResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEventResponse.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/WatchEventResponse.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEventResponse.java diff --git a/syncany-messages/src/main/java/org/syncany/operations/daemon/messages/WatchRequest.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchRequest.java similarity index 100% rename from syncany-messages/src/main/java/org/syncany/operations/daemon/messages/WatchRequest.java rename to syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchRequest.java diff --git a/syncany-daemon/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java b/syncany-lib/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java similarity index 100% rename from syncany-daemon/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java rename to syncany-lib/src/main/java/org/syncany/plugins/web/WebInterfacePlugin.java diff --git a/syncany-daemon/src/test/java/org/syncany/tests/DaemonTestSuite.java b/syncany-lib/src/test/java/org/syncany/tests/DaemonTestSuite.java similarity index 100% rename from syncany-daemon/src/test/java/org/syncany/tests/DaemonTestSuite.java rename to syncany-lib/src/test/java/org/syncany/tests/DaemonTestSuite.java diff --git a/syncany-daemon/src/test/java/org/syncany/tests/daemon/BasicWatchServerTest.java b/syncany-lib/src/test/java/org/syncany/tests/daemon/BasicWatchServerTest.java similarity index 100% rename from syncany-daemon/src/test/java/org/syncany/tests/daemon/BasicWatchServerTest.java rename to syncany-lib/src/test/java/org/syncany/tests/daemon/BasicWatchServerTest.java diff --git a/syncany-daemon/src/test/java/org/syncany/tests/daemon/NoCliRequestsWhileSyncingTest.java b/syncany-lib/src/test/java/org/syncany/tests/daemon/NoCliRequestsWhileSyncingTest.java similarity index 100% rename from syncany-daemon/src/test/java/org/syncany/tests/daemon/NoCliRequestsWhileSyncingTest.java rename to syncany-lib/src/test/java/org/syncany/tests/daemon/NoCliRequestsWhileSyncingTest.java diff --git a/syncany-daemon/src/test/java/org/syncany/tests/util/TestDaemonUtil.java b/syncany-lib/src/test/java/org/syncany/tests/util/TestDaemonUtil.java similarity index 100% rename from syncany-daemon/src/test/java/org/syncany/tests/util/TestDaemonUtil.java rename to syncany-lib/src/test/java/org/syncany/tests/util/TestDaemonUtil.java diff --git a/syncany-daemon/src/test/resources/org/syncany/config/to/daemonOneFolderNoWebServer.xml b/syncany-lib/src/test/resources/org/syncany/config/to/daemonOneFolderNoWebServer.xml similarity index 100% rename from syncany-daemon/src/test/resources/org/syncany/config/to/daemonOneFolderNoWebServer.xml rename to syncany-lib/src/test/resources/org/syncany/config/to/daemonOneFolderNoWebServer.xml diff --git a/syncany-daemon/src/test/resources/org/syncany/config/to/daemonTwoFoldersNoWebServer.xml b/syncany-lib/src/test/resources/org/syncany/config/to/daemonTwoFoldersNoWebServer.xml similarity index 100% rename from syncany-daemon/src/test/resources/org/syncany/config/to/daemonTwoFoldersNoWebServer.xml rename to syncany-lib/src/test/resources/org/syncany/config/to/daemonTwoFoldersNoWebServer.xml diff --git a/syncany-messages/build.gradle b/syncany-messages/build.gradle deleted file mode 100644 index 2f9035aec..000000000 --- a/syncany-messages/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -apply plugin: 'java' -apply plugin: 'eclipse' - -dependencies { - compile project(':syncany-lib') - compile project(':syncany-util') -}