Change structure of project to allow Gradle import from IDEs and chan…

…ge build to produce Jar as library and do copy dependencies

README.md

@@ -32,6 +32,18 @@ Written in Java 8.
 
 Built with Gradle.
 
+# Installation
+
+Get the code and build:
+
+```
+git clone https://github.com/maxmale/GDH.git
+cd GDH
+gradle clean build    
+```
+
+Get the generated Jar from the root of the project. Add it to the build path of your project and start using it.
+
 # Usage
 
 The basic usage of the library is spinning up verticles and initiating a key exchange between them.

build.gradle

@@ -16,7 +16,7 @@ apply plugin: 'findbugs'
 }
 
 libsDirName = '../'
-version = '0.91'
+version = '0.92'
 archivesBaseName = 'GDH'
 
 repositories {
@@ -48,14 +48,15 @@ clean {
 	delete "libs/"
 	delete "build/"
 	delete "bin/"
-	delete "GDH-1.1.jar"
+	delete project.name+"-"+project.version+".jar"
 }
 
 jar {
 	dependsOn configurations.runtime
 	from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     manifest {
-        attributes 'Main-Class': 'main.java.gdh.Main'
+        attributes 'Implementation-Title': project.name,
+                   'Implementation-Version': project.version
     }
     exclude "META-INF/*.SF"
     exclude "META-INF/*.DSA"
@@ -65,14 +66,10 @@ jar {
 task testSuite(type: Test) {
 	include '**VertxTestSuite.class'
 }
-task copyDeps(type: Copy) {
-	into 'libs'
-  	from configurations.testRuntime
-}
+
 task deleteBuild(type: Delete) {
 	delete "build/"
 	delete "bin/"
  }
-copyDeps.dependsOn(testSuite)
+
 build.dependsOn(deleteBuild)
-deleteBuild.dependsOn(copyDeps)

src/main/java/crypto/CipherAgent.java → src/main/java/com/gdh/crypto/CipherAgent.java

@@ -1,4 +1,4 @@
-package main.java.crypto;
+package com.gdh.crypto;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

src/main/java/crypto/CipherAgentImpl.java → src/main/java/com/gdh/crypto/CipherAgentImpl.java

@@ -1,4 +1,4 @@
-package main.java.crypto;
+package com.gdh.crypto;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -17,7 +17,7 @@
 import javax.crypto.spec.IvParameterSpec;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import main.java.gdh.Constants;
+import com.gdh.main.Constants;
 
 /**
  * 

src/main/java/gdh/Configuration.java → src/main/java/com/gdh/main/Configuration.java

@@ -1,4 +1,4 @@
-package main.java.gdh;
+package com.gdh.main;
 
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -37,7 +37,7 @@
  */
 public class Configuration {
     private String IP = "localhost";
-    private String port = "1080";
+    private String port = "1090";
     private int retries = 5;
     private int exchangeTimeout = 60000;
     private String prime = "AD107E1E9123A9D0D660FAA79559C51FA20D64E5683B9FD1B54B1597B61D0A75E6FA141DF95A56DBAF9A3C"

src/main/java/gdh/Constants.java → src/main/java/com/gdh/main/Constants.java

@@ -1,4 +1,4 @@
-package main.java.gdh;
+package com.gdh.main;
 
 public final class Constants {
 

src/main/java/gdh/ExchangeState.java → src/main/java/com/gdh/main/ExchangeState.java

@@ -1,4 +1,4 @@
-package main.java.gdh;
+package com.gdh.main;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;

src/main/java/gdh/GDHVertex.java → src/main/java/com/gdh/main/GDHVertex.java

@@ -1,4 +1,4 @@
-package main.java.gdh;
+package com.gdh.main;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,9 +17,9 @@
 import io.vertx.core.net.NetServer;
 import io.vertx.core.net.NetServerOptions;
 import io.vertx.core.net.NetSocket;
-import main.java.parser.JsonMessageParser;
-import main.java.parser.MessageConstructor;
-import main.java.parser.MessageParser;
+import com.gdh.parser.JsonMessageParser;
+import com.gdh.parser.MessageConstructor;
+import com.gdh.parser.MessageParser;
 
 import java.math.BigInteger;
 
@@ -86,7 +86,7 @@ public void start(Future<Void> future) throws Exception {
                 conf.getLogger().info(getNode().toString() + " started listening on: " + conf.getPort());
             } else {
                 future.fail(res.cause());
-                conf.getLogger().info(getNode().toString() + " startup failure: " + conf.getPort());
+                conf.getLogger().info(getNode().toString() + " startup failure: " + conf.getPort() + " " + res.cause().getMessage());
             }
         });
 
@@ -251,13 +251,13 @@ private CompletableFuture<Boolean> sendMessage(Node n, JsonObject msg) {
                 if (timingAndRetries[1] == conf.getRetries()) {
                     // No more retries left. Exit...
                     conf.getLogger().error(getNode().toString() + " Retry parameter exceeded " + conf.getRetries());
+                    future.completeExceptionally(
+                            new TimeoutException(Constants.EXCEPTIONRETRIESEXCEEDED + conf.getRetries()));
                     if (socket != null)
                         socket.close();
                     vertx.cancelTimer(timingAndRetries[0]);
                     tcpClient.close();
                     server.close();
-                    future.completeExceptionally(
-                            new TimeoutException(Constants.EXCEPTIONRETRIESEXCEEDED + conf.getRetries()));
                 }
             }));
         }));
@@ -272,7 +272,7 @@ public void stop(Future<Void> future) throws Exception {
                 conf.getLogger().info(getNode().toString() + " stopped listening on: " + conf.getPort());
             } else {
                 future.fail(res.cause());
-                conf.getLogger().info(getNode().toString() + " stoppage failure: " + conf.getPort());
+                conf.getLogger().info(getNode().toString() + " stoppage failure: " + conf.getPort() + res.cause().getMessage());
             }
         });
     }

src/main/java/gdh/Group.java → src/main/java/com/gdh/main/Group.java

@@ -1,4 +1,4 @@
-package main.java.gdh;
+package com.gdh.main;
 
 import java.math.BigInteger;
 import java.util.Arrays;

src/main/java/gdh/Node.java → src/main/java/com/gdh/main/Node.java

@@ -1,4 +1,4 @@
-package main.java.gdh;
+package com.gdh.main;
 
 /**
  *

src/main/java/gdh/PrimaryVertex.java → src/main/java/com/gdh/main/PrimaryVertex.java

@@ -1,4 +1,4 @@
-package main.java.gdh;
+package com.gdh.main;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
@@ -19,7 +19,7 @@ public void run(GDHVertex gdh) {
     }
 
     /**
-     * Deploy a gdh verticle and register a handler for the result
+     * Deploy a com.gdh.main verticle and register a handler for the result
      * 
      * @param gdh
      *            the GDHVertex to be deployed

src/main/java/parser/JsonMessageParser.java → src/main/java/com/gdh/parser/JsonMessageParser.java

@@ -1,4 +1,4 @@
-package main.java.parser;
+package com.gdh.parser;
 
 import java.math.BigInteger;
 import java.util.Iterator;
@@ -7,10 +7,10 @@
 
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import main.java.gdh.Constants;
-import main.java.gdh.ExchangeState;
-import main.java.gdh.Group;
-import main.java.gdh.Node;
+import com.gdh.main.Constants;
+import com.gdh.main.ExchangeState;
+import com.gdh.main.Group;
+import com.gdh.main.Node;
 
 /**
  * 

src/main/java/parser/MessageConstructor.java → src/main/java/com/gdh/parser/MessageConstructor.java

@@ -1,11 +1,11 @@
-package main.java.parser;
+package com.gdh.parser;
 
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import main.java.gdh.Constants;
-import main.java.gdh.ExchangeState;
-import main.java.gdh.Group;
-import main.java.gdh.Node;
+import com.gdh.main.Constants;
+import com.gdh.main.ExchangeState;
+import com.gdh.main.Group;
+import com.gdh.main.Node;
 
 /**
  * 

src/main/java/parser/MessageParser.java → src/main/java/com/gdh/parser/MessageParser.java

@@ -1,4 +1,4 @@
-package main.java.parser;
+package com.gdh.parser;
 
 public interface MessageParser {
     public int parse(String msg);

src/test/java/gdh/AsyncKeyExchangeTest.java → src/test/java/com/gdh/test/AsyncKeyExchangeTest.java

@@ -1,4 +1,4 @@
-package test.java.gdh;
+package com.gdh.test;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -16,10 +16,10 @@
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import main.java.gdh.Configuration;
-import main.java.gdh.GDHVertex;
-import main.java.gdh.Group;
-import main.java.gdh.PrimaryVertex;
+import com.gdh.main.Configuration;
+import com.gdh.main.GDHVertex;
+import com.gdh.main.Group;
+import com.gdh.main.PrimaryVertex;
 
 @RunWith(VertxUnitRunner.class)
 public class AsyncKeyExchangeTest {
@@ -51,7 +51,7 @@ private void testAsyncNegotiation(int amount, TestContext context) {
         for (int i = 0; i < amount; i++) {
             verticles[i] = new GDHVertex();
             confs[i] = new Configuration();
-            String port = (amount * 2) + "08" + i;
+            String port = (amount * 2) + "09" + i;
             confs[i].setIP("localhost").setPort(port).setLogLevel(Level.DEBUG);
             verticles[i].setConfiguration(confs[i]);
         }

src/test/java/gdh/ConfigurationTest.java → src/test/java/com/gdh/test/ConfigurationTest.java

@@ -1,10 +1,10 @@
-package test.java.gdh;
+package com.gdh.test;
 
 import org.apache.log4j.ConsoleAppender;
 import org.junit.Assert;
 import org.junit.Test;
 
-import main.java.gdh.Configuration;
+import com.gdh.main.Configuration;
 
 @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
 public class ConfigurationTest {

src/test/java/gdh/EncDecTest.java → src/test/java/com/gdh/test/EncDecTest.java

@@ -1,4 +1,4 @@
-package test.java.gdh;
+package com.gdh.test;
 
 import java.security.SecureRandom;
 import java.util.Random;
@@ -9,10 +9,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import main.java.crypto.CipherAgent;
-import main.java.crypto.CipherAgentImpl;
+import com.gdh.crypto.CipherAgent;
+import com.gdh.crypto.CipherAgentImpl;
 
-@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
 public class EncDecTest {
     @Test
     public void testEncryption1() {

src/test/java/gdh/ExceptionTest.java → src/test/java/com/gdh/test/ExceptionTest.java

@@ -1,4 +1,4 @@
-package test.java.gdh;
+package com.gdh.test;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -16,11 +16,11 @@
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import main.java.gdh.Configuration;
-import main.java.gdh.Constants;
-import main.java.gdh.GDHVertex;
-import main.java.gdh.Group;
-import main.java.gdh.PrimaryVertex;
+import com.gdh.main.Configuration;
+import com.gdh.main.Constants;
+import com.gdh.main.GDHVertex;
+import com.gdh.main.Group;
+import com.gdh.main.PrimaryVertex;
 
 @RunWith(VertxUnitRunner.class)
 public class ExceptionTest {

src/test/java/gdh/ForgedMessagesKeyExchangeTest.java → src/test/java/com/gdh/test/ForgedMessagesKeyExchangeTest.java

@@ -1,4 +1,4 @@
-package test.java.gdh;
+package com.gdh.test;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -19,13 +19,13 @@
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import main.java.gdh.Configuration;
-import main.java.gdh.ExchangeState;
-import main.java.gdh.GDHVertex;
-import main.java.gdh.Group;
-import main.java.gdh.Node;
-import main.java.gdh.PrimaryVertex;
-import main.java.parser.MessageConstructor;
+import com.gdh.main.Configuration;
+import com.gdh.main.ExchangeState;
+import com.gdh.main.GDHVertex;
+import com.gdh.main.Group;
+import com.gdh.main.Node;
+import com.gdh.main.PrimaryVertex;
+import com.gdh.parser.MessageConstructor;
 
 @RunWith(VertxUnitRunner.class)
 public class ForgedMessagesKeyExchangeTest {

src/test/java/gdh/GroupNodeTest.java → src/test/java/com/gdh/test/GroupNodeTest.java

@@ -1,13 +1,13 @@
-package test.java.gdh;
+package com.gdh.test;
 
 import java.util.TreeSet;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import main.java.gdh.Configuration;
-import main.java.gdh.Group;
-import main.java.gdh.Node;
+import com.gdh.main.Configuration;
+import com.gdh.main.Group;
+import com.gdh.main.Node;
 
 @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
 public class GroupNodeTest {

src/test/java/gdh/KeyExchangeTest.java → src/test/java/com/gdh/test/KeyExchangeTest.java

@@ -1,4 +1,4 @@
-package test.java.gdh;
+package com.gdh.test;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -15,10 +15,10 @@
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import main.java.gdh.Configuration;
-import main.java.gdh.GDHVertex;
-import main.java.gdh.Group;
-import main.java.gdh.PrimaryVertex;
+import com.gdh.main.Configuration;
+import com.gdh.main.GDHVertex;
+import com.gdh.main.Group;
+import com.gdh.main.PrimaryVertex;
 
 @RunWith(VertxUnitRunner.class)
 public class KeyExchangeTest {