Merged develop into release; getting ready for the release

CHANGELOG.md

@@ -1,22 +1,26 @@
 Change Log
 ==========
 
-### Syncany 0.1.8-alpha (Date: 10 Aug 2014)
+### Syncany 0.1.8-alpha (Date: 9 Aug 2014)
 - Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- Breaks compatiblity to 0.1.7-alpha repositories!
 - Features and significant changes:
   + New Samba / Windows share plugin #172
   + Public key authentication for the SFTP plugin #134
-  + Websocket/REST-like daemon with user-password authentication. #171
+  + WebSocket/REST-like daemon with user-password authentication. #171
 - Bugfixes and other things:
   + Fixed cross dependency issue with plugins #162
   + Fixed signed plugin JAR dependency error #161
   + Fixed Windows/Linux attribute bingo #166
   + Fixed Windows batch script; start/stop PID file issue #163
   + Fixed Linux daemon script such that it can be symlinked #183
   + Fixed running CLI commands while sync is running #182
+  + Tests: Added watch server tests for daemon #185
+  + Tests: Implement plugin install test #170
+  + Added 'type' attribute to database header (DEFAULT/PURGE) #181
+  + Prevent standby/hibernate if uploading/downloading #164
   + Altered API backend to include 'conflicts-with' metadata #165
   + Update Arch Linux AUR package #179
-  + Tests: Implement plugin install test #170
 
 ### Syncany 0.1.7-alpha (Date: 28 Jul 2014)
 

README.md

@@ -31,13 +31,13 @@ Download and install Syncany
 You can download the current binary packages and installers from the [releases page](https://github.com/syncany/syncany/releases), or from the Syncany [download site](http://syncany.org/dist/). **Please be aware that this is still ALPHA code! Do not use it for important files.**
 
 **Latest release:**   
-Syncany 0.1.7-alpha, 28 July 2014
+Syncany 0.1.8-alpha, 9 Aug 2014
 
 **Downloads:**   
-- Windows: [Installer (.exe)](https://syncany.org/dist/releases/syncany-0.1.7-alpha.exe)
-- Debian/Ubuntu: [Package (.deb)](https://syncany.org/dist/releases/syncany_0.1.7.alpha_all.deb), or via [Launchpad PPA](https://launchpad.net/~syncany/+archive/release)
+- Windows: [Installer (.exe)](https://syncany.org/dist/releases/syncany-0.1.8-alpha.exe)
+- Debian/Ubuntu: [Package (.deb)](https://syncany.org/dist/releases/syncany_0.1.8.alpha_all.deb), or via [Launchpad PPA](https://launchpad.net/~syncany/+archive/release)
 - Arch Linux: [Package (AUR)](https://aur.archlinux.org/packages/syncany/)
-- other operating systems: [ZIP archive](https://syncany.org/dist/releases/syncany-0.1.7-alpha.zip), or [Tarball (tar.gz)](https://syncany.org/dist/releases/syncany-0.1.7-alpha.tar.gz)
+- other operating systems: [ZIP archive](https://syncany.org/dist/releases/syncany-0.1.8-alpha.zip), or [Tarball (tar.gz)](https://syncany.org/dist/releases/syncany-0.1.8-alpha.tar.gz)
 
 You can also check out the [snapshot releases](https://www.syncany.org/dist/snapshots/), the [PPA for snapshots](https://launchpad.net/~syncany/+archive/snapshot), and the [snapshot AUR package](https://aur.archlinux.org/packages/syncany-git/).
 

syncany-daemon/build.gradle

@@ -10,4 +10,9 @@ dependencies {
 	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"   	 
 }

syncany-daemon/src/main/java/org/syncany/config/to/WebServerTO.java

@@ -40,4 +40,8 @@ public int getPort() {
 	public String getHost() {
 		return host;
 	}
+
+	public void setPort(int port) {
+		this.port = port;
+	}
 }

syncany-daemon/src/main/java/org/syncany/operations/daemon/DaemonOperation.java

@@ -110,7 +110,7 @@ private void startOperation() throws ServiceAlreadyStartedException, ConfigExcep
 
 		enterControlLoop(); // This blocks until SHUTDOWN is received!
 	}
-	
+
 	@Subscribe
 	public void onControlCommand(ControlCommand controlCommand) {
 		switch (controlCommand) {

syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchRunner.java

@@ -220,6 +220,7 @@ private void handleRestoreRequest(RestoreRequest restoreRequest) {
 			eventBus.post(restoreResponse);								
 		}
 		catch (Exception e) {
+			logger.log(Level.WARNING, "BadRequestResponse: Cannot restore file.");
 			eventBus.post(new BadRequestResponse(restoreRequest.getId(), "Cannot restore file."));
 		}
 	}
@@ -264,6 +265,7 @@ private void handleCliRequestNoSyncRunning(CliRequest cliRequest) {
 			cliOutputStream.close();
 		}
 		catch (Exception e) {
+			logger.log(Level.WARNING, "Exception thrown when running CLI command through daemon: " + e, e);
 			eventBus.post(new BadRequestResponse(cliRequest.getId(), e.getMessage()));
 		}		
 	}

syncany-daemon/src/test/java/org/syncany/tests/DaemonTestSuite.java

@@ -0,0 +1,32 @@
+/*
+ * Syncany, www.syncany.org
+ * Copyright (C) 2011-2014 Philipp C. Heckel <philipp.heckel@gmail.com> 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.syncany.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.syncany.tests.daemon.BasicWatchServerTest;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+	BasicWatchServerTest.class
+})
+
+public class DaemonTestSuite {
+	// This class runs all daemon tests
+}