merge daemon in lib

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")	
 }

settings.gradle

@@ -1,5 +1,3 @@
 include 'syncany-lib'
 include 'syncany-cli'
-include 'syncany-util'
-include 'syncany-daemon'
-include 'syncany-messages'
+include 'syncany-util'

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"
 

syncany-lib/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/bin/

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"
 }

syncany-daemon/src/main/java/org/syncany/operations/daemon/WatchRunner.java → 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 <philipp.heckel@gmail.com> 
  *
  * 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,19 +241,19 @@ 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();
 
 			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();