From 345e44ad1659d9d19b15368288c2e3cf37988633 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Mon, 14 Oct 2019 11:58:54 +0200 Subject: [PATCH 1/2] Adapt to refactoring of AtomModelWrapper --- .../action/CreateDebugAtomWithSocketsAction.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/won/bot/debugbot/action/CreateDebugAtomWithSocketsAction.java b/src/main/java/won/bot/debugbot/action/CreateDebugAtomWithSocketsAction.java index 03b4fe1..67aeb6d 100644 --- a/src/main/java/won/bot/debugbot/action/CreateDebugAtomWithSocketsAction.java +++ b/src/main/java/won/bot/debugbot/action/CreateDebugAtomWithSocketsAction.java @@ -10,10 +10,14 @@ */ package won.bot.debugbot.action; +import java.lang.invoke.MethodHandles; +import java.net.URI; + import org.apache.commons.lang3.StringUtils; import org.apache.jena.query.Dataset; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import won.bot.debugbot.enums.HintType; import won.bot.debugbot.event.AtomCreatedEventForDebugConnect; import won.bot.debugbot.event.AtomCreatedEventForDebugHint; @@ -39,9 +43,6 @@ import won.protocol.util.WonRdfUtils; import won.protocol.vocabulary.WONMATCH; -import java.lang.invoke.MethodHandles; -import java.net.URI; - /** * Creates an atom with the specified sockets. If no socket is specified, the * chatSocket will be used. @@ -115,7 +116,7 @@ protected void doRun(Event event, EventListener executingListener) throws Except atomModelWrapper.addSocket(atomURI + "#socket" + i, socket.toString()); i++; } - final Dataset debugAtomDataset = atomModelWrapper.copyDataset(); + final Dataset debugAtomDataset = atomModelWrapper.copyDatasetWithoutSysinfo(); final Event origEvent = event; logger.debug("creating atom on won node {} with content {} ", wonNodeUri, StringUtils.abbreviate(RdfUtils.toString(debugAtomDataset), 150)); From 87938105924cd4178b35e9af360caa825ca6a910 Mon Sep 17 00:00:00 2001 From: Florian Kleedorfer Date: Mon, 14 Oct 2019 11:59:32 +0200 Subject: [PATCH 2/2] Set fixedPrivateKeyAlias --- .gitignore | 1 + pom.xml | 2 +- src/main/resources/application.properties | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 55a3cec..c6fb163 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +/target/ diff --git a/pom.xml b/pom.xml index 3acede5..da8b876 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ at.researchstudio.sat won-bot - 0.5 + 0.6-SNAPSHOT diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 76a9888..cfe4d11 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -35,6 +35,7 @@ botContext.impl=memoryBotContext keystores.password=changeit keystores.directory=${WON_KEYSTORE_DIR} +owner.fixedPrivateKeyAlias= # keystore properties keystore.password=${keystores.password}