cli was remaned to distribution

Author: r41d

BUILD.md

@@ -26,5 +26,5 @@ after checking out.
 
 After the build find the distribution and the WAR at:
 
-	../cli/target/membrane-service-proxy-X.X.X.zip
+	../distribution/target/membrane-service-proxy-X.X.X.zip
 	../war/target/service-proxy-war-X.X.X.war

README.md

@@ -1,7 +1,7 @@
 Membrane Service Proxy
 ======================
 
-Check the [Repository at GitHub](https://github.com/membrane/service-proxy) for the latest source code. Read the [CHANGELOG](https://github.com/membrane/service-proxy/blob/master/cli/router/CHANGELOG.txt) for recent changes.
+Check the [Repository at GitHub](https://github.com/membrane/service-proxy) for the latest source code. Read the [CHANGELOG](https://github.com/membrane/service-proxy/blob/master/distribution/router/CHANGELOG.txt) for recent changes.
 
 What is Membrane?
 -----------------

core/src/test/java/com/predic8/membrane/core/resolver/SingleResolverTest.java

@@ -20,7 +20,7 @@ public class SingleResolverTest {
 
 	@Test
 	public void combineWithWindowsAbsolute() {
-		String parent = "C:/git/membrane/service-proxy/cli/conf/proxies.xml";
+		String parent = "C:/git/membrane/service-proxy/distribution/conf/proxies.xml";
 		String absChild = "C:\\Desktop\\predic8.keystore";
 		Assert.assertEquals(absChild, ResolverMap.combine(parent, absChild).replaceAll("/", "\\\\"));
 	}