Merge pull request #59 from lodygens/12.2.1-docker-apps

12.2.1 docker apps
lodygens · Jan 8, 2018 · ee717d9 · ee717d9
2 parents 678ad45 + 4151e7c
commit ee717d9
Show file tree

Hide file tree

Showing 29 changed files with 89 additions and 123 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,4 @@ jdk:
 notifications:
   - email: false
 script:
-  - pwd
-  - ls -l
-  - cd ./build/
-  - chmod +x travis-ci.sh build.sh
-  - ./travis-ci.sh
+  - gradle build install
diff --git a/build.gradle b/build.gradle
@@ -19,6 +19,8 @@ dependencies {
     compile "antlr:antlr:2.7.2"// ? https://mvnrepository.com/artifact/antlr/antlr
     compile "org.json:json:20160810" // ? https://mvnrepository.com/artifact/org.json/json
 
+    compile ('org.web3j:core:3.2.0')
+
     api 'org.apache.commons:commons-math3:3.6.1'
 
     implementation 'com.google.guava:guava:23.0'
@@ -147,7 +149,7 @@ task copyMiscToDist(type: Copy) {
 
 task mkdirKeystore(type: Exec) {
     commandLine("sh", "-c",
-            "mkdir " + dist + "/keystore"
+            "mkdir -p " + dist + "/keystore"
     )
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=12.0.1
+version=12.2.1
diff --git a/libXtremWeb/web3j-abi-3.2.0.jar b/libXtremWeb/web3j-abi-3.2.0.jar
diff --git a/libXtremWeb/web3j-core-3.2.0.jar b/libXtremWeb/web3j-core-3.2.0.jar
diff --git a/libXtremWeb/web3j-crypto-3.2.0.jar b/libXtremWeb/web3j-crypto-3.2.0.jar
diff --git a/libXtremWeb/web3j-rlp-3.2.0.jar b/libXtremWeb/web3j-rlp-3.2.0.jar
diff --git a/libXtremWeb/web3j-tuples-3.2.0.jar b/libXtremWeb/web3j-tuples-3.2.0.jar
diff --git a/libXtremWeb/web3j-utils-3.2.0.jar b/libXtremWeb/web3j-utils-3.2.0.jar
diff --git a/src/main/java/xtremweb/client/Client.java b/src/main/java/xtremweb/client/Client.java
@@ -287,6 +287,7 @@ public CommClient commClient(final URI uri) throws IOException {
 			}
 		}
 
+		logger.debug("commClients.put(" + uri.getScheme() + ")");
 		commClients.put(uri.getScheme(), client);
 
 		client.setAutoClose(false);

diff --git a/src/main/java/xtremweb/common/XWTools.java b/src/main/java/xtremweb/common/XWTools.java
@@ -807,19 +807,21 @@ public static final X509Certificate[] retrieveCertificates(final String host, fi
 
 		final X509Certificate[] certs = (X509Certificate[]) socket.getSession().getPeerCertificates();
 		final Logger logger = new Logger("XWTools");
-		logger.info(host + " : certs retrieved = " + certs.length);
+		logger.debug(host + " : certs retrieved = " + certs.length);
 		int i = 0;
 		for (final X509Certificate cert : certs) {
 			PrintStream out = System.out;
-			logger.info("CN        = " + cert.getSubjectX500Principal().getName());
-			logger.info("Issuer CN = " + cert.getIssuerX500Principal().getName());
+			logger.debug("CN        = " + cert.getSubjectX500Principal().getName());
+			logger.debug("Issuer CN = " + cert.getIssuerX500Principal().getName());
 			if (sav) {
-				logger.info("Saving to " + host + "_" + i + ".pem");
+				logger.debug("Saving to " + host + "_" + i + ".pem");
 				out = new PrintStream(new File(host + "_" + i++ + ".pem"));
 			}
-			out.println("-----BEGIN CERTIFICATE-----");
-			out.println(new sun.misc.BASE64Encoder().encode(cert.getEncoded()));
-			out.println("-----END CERTIFICATE-----");
+			if((sav) || (logger.debug())) {
+				out.println("-----BEGIN CERTIFICATE-----");
+				out.println(new sun.misc.BASE64Encoder().encode(cert.getEncoded()));
+				out.println("-----END CERTIFICATE-----");
+			}
 			if (sav) {
 				out.close();
 			}

diff --git a/src/main/java/xtremweb/communications/CommClient.java b/src/main/java/xtremweb/communications/CommClient.java
@@ -163,8 +163,8 @@ protected void mileStone(final String msg) {
 	 * @see xtremweb.communications.URI#URI(String, UID)
 	 */
 	public URI newURI(final UID uid) throws URISyntaxException {
-		logger.finest("CommClient#newURI " + config.getCurrentDispatcher() + ":" + getPort() + "/" + uid);
 		final URI ret = new URI(config.getCurrentDispatcher(), uid);
+		logger.finest("CommClient#newURI : " + ret);
 		return ret;
 	}
 
@@ -325,7 +325,6 @@ public static void changeConfig(final XWConfigurator c) throws IOException {
 		try {
 			if (commHandlers.get(Connection.xwScheme()) == null) {
 				final String defaultLayer = config.getProperty(XWPropertyDefs.COMMLAYER);
-
 				addHandler(Connection.xwScheme(), defaultLayer);
 			}
 			if (commHandlers.get(Connection.xwsScheme()) == null) {
@@ -377,6 +376,7 @@ public static CommClient getClient(final String scheme) throws InstantiationExce
 			throw new InstantiationException("Comm Handlers not initialized");
 		}
 		try {
+			CommClient ret = (CommClient) (Class.forName((String) commHandlers.get(scheme))).newInstance();
 			return (CommClient) (Class.forName((String) commHandlers.get(scheme))).newInstance();
 		} catch (final IllegalAccessException e) {
 			throw new InstantiationException(e.getMessage());

diff --git a/src/main/java/xtremweb/communications/XMLRPCCommand.java b/src/main/java/xtremweb/communications/XMLRPCCommand.java
@@ -766,7 +766,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command version");
 		try {
@@ -778,7 +778,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command ping");
 		try {
@@ -790,7 +790,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command disconnect");
 		try {
@@ -802,7 +802,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getuserby login");
 		try {
@@ -814,7 +814,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command get");
 		try {
@@ -826,7 +826,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a XMLRPCCommandGetWorkByExternalId");
 		try {
@@ -838,7 +838,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command gettask");
 		try {
@@ -850,7 +850,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getworks");
 		try {
@@ -862,7 +862,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command gethubaddr");
 		try {
@@ -874,7 +874,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command send");
 		try {
@@ -886,7 +886,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command gettasks");
 		try {
@@ -898,7 +898,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command download data");
 		try {
@@ -910,7 +910,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getapps");
 		try {
@@ -922,7 +922,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getdatas");
 		try {
@@ -934,7 +934,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getgroupworks");
 		try {
@@ -946,7 +946,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getgroups");
 		try {
@@ -958,7 +958,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command gethosts");
 		try {
@@ -970,7 +970,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getsessionworks");
 		try {
@@ -982,7 +982,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getsessions");
 		try {
@@ -994,7 +994,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command activatehost");
 		try {
@@ -1006,7 +1006,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command broadcastwork");
 		try {
@@ -1018,7 +1018,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getusergroups");
 		try {
@@ -1030,7 +1030,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command getusers");
 		try {
@@ -1042,7 +1042,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command remove");
 		try {
@@ -1054,7 +1054,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command uploaddata");
 		try {
@@ -1066,7 +1066,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command chmod");
 		try {
@@ -1078,7 +1078,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command workrequest");
 		try {
@@ -1090,7 +1090,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command workalive");
 		try {
@@ -1102,7 +1102,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 		logger.finest("not a command workalivebyuid");
 		try {
@@ -1114,7 +1114,7 @@ public static XMLRPCCommand newCommand(final InputStream in) throws IOException
 				return ret;
 			}
 		} catch (final InvalidKeyException e) {
-			e.printStackTrace();
+			logger.exception(e);
 		}
 
 		throw new IOException("Unknown XMLRPCCommand");

diff --git a/src/main/java/xtremweb/communications/XMLRPCCommandSend.java b/src/main/java/xtremweb/communications/XMLRPCCommandSend.java
@@ -287,7 +287,7 @@ public static XMLRPCCommand newCommandSend(final InputStream in) throws IOExcept
 		}
 		logger.finest("not a command sendwork");
 
-		throw new InvalidKeyException("Unknown XMLRPCCommandSend");
+		throw new SAXException("Unknown XMLRPCCommandSend");
 	}
 
 }
diff --git a/src/main/resources/docker/client/Dockerfile b/src/main/resources/docker/client/Dockerfile
@@ -38,7 +38,7 @@ LABEL description="This creates a Docker image for the XWHEP client"
 
 EXPOSE 4327
 
-ENV XWVERSION "12.2.0"
+ENV XWVERSION "12.2.1"
 
 
 RUN apt-get update