From 05e4b352781918a8a9eae1aaed5839b95b30664a Mon Sep 17 00:00:00 2001
From: Alan Liddeke <aliddeke@netflix.com>
Date: Tue, 4 Oct 2016 15:14:15 -0700
Subject: [PATCH 1/2] Separate out MSLCLI client and server to their own
 subprojects.

---
 examples/mslcli/{ => client}/build.gradle     |  0
 .../{ => client}/src/dist/bin/mslcli.cfg      |  0
 .../{ => client}/src/dist/bin/mslclient.sh    |  0
 .../src/dist/bin/mslclient_eas-none.sh        |  0
 .../dist/bin/mslclient_eas-none_suffixed.sh   |  0
 .../src/dist/bin/mslclient_interactive.sh     |  0
 .../src/dist/bin/mslclient_single_send.sh     |  0
 .../src/dist/bin/mslclient_with_mslstore.sh   |  0
 .../src/main/java/mslcli/client/Client.java   |  0
 .../main/java/mslcli/client/ClientApp.java    |  0
 .../java/mslcli/client/ClientMslConfig.java   |  0
 .../msg/ClientRequestMessageContext.java      |  0
 .../util/ClientAuthenticationUtils.java       |  0
 .../mslcli/client/util/ClientMslContext.java  |  0
 .../main/java/mslcli/common/CmdArguments.java |  0
 .../common/IllegalCmdArgumentException.java   |  0
 .../IllegalCmdArgumentRuntimeException.java   |  0
 .../main/java/mslcli/common/MslConfig.java    |  0
 .../src/main/java/mslcli/common/Pair.java     |  0
 .../src/main/java/mslcli/common/Triplet.java  |  0
 .../EntityAuthenticationHandle.java           |  0
 .../PresharedEntityAuthenticationHandle.java  |  0
 .../RsaEntityAuthenticationHandle.java        |  0
 .../entityauth/SimplePresharedKeyStore.java   |  0
 .../common/entityauth/SimpleRsaStore.java     |  0
 ...thenticatedEntityAuthenticationHandle.java |  0
 ...tedSuffixedEntityAuthenticationHandle.java |  0
 .../keyx/AsymmetricWrappedExchangeHandle.java |  0
 .../keyx/DiffieHellmanExchangeHandle.java     |  0
 ...JsonWebEncryptionLadderExchangeHandle.java |  0
 .../keyx/JsonWebKeyLadderExchangeHandle.java  |  0
 .../mslcli/common/keyx/KeyExchangeHandle.java |  0
 .../SimpleWrapCryptoContextRepository.java    |  0
 .../keyx/SymmetricWrappedExchangeHandle.java  |  0
 .../java/mslcli/common/msg/MessageConfig.java |  0
 .../java/mslcli/common/tokens/SimpleUser.java |  0
 ...EmailPasswordUserAuthenticationHandle.java |  0
 .../userauth/SimpleEmailPasswordStore.java    |  0
 .../userauth/UserAuthenticationHandle.java    |  0
 .../java/mslcli/common/util/AppContext.java   |  0
 .../util/CommonAuthenticationUtils.java       |  0
 .../mslcli/common/util/CommonMslContext.java  |  0
 .../common/util/ConfigurationException.java   |  0
 .../util/ConfigurationRuntimeException.java   |  0
 .../mslcli/common/util/MslProperties.java     |  0
 .../java/mslcli/common/util/MslStoreData.java |  0
 .../mslcli/common/util/MslStoreWrapper.java   |  0
 .../java/mslcli/common/util/SharedUtil.java   |  0
 .../WrapCryptoContextRepositoryHandle.java    |  0
 .../WrapCryptoContextRepositoryWrapper.java   |  0
 .../mslcli/client/mslclient_manual.txt        |  0
 .../main/resources/mslclient_dev_guide.txt    |  0
 examples/mslcli/readme.txt                    | 51 ++++++++++++-------
 examples/mslcli/server/build.gradle           | 15 ++++++
 .../{ => server}/src/dist/bin/mslserver.sh    |  0
 .../{ => server}/src/dist/bin/mslsrv.cfg      |  0
 .../java/mslcli/server/ServerMslConfig.java   |  0
 .../java/mslcli/server/SimpleHttpServer.java  |  0
 .../java/mslcli/server/SimpleMslServer.java   |  0
 .../java/mslcli/server/SimpleServlet.java     |  0
 .../msg/ServerReceiveMessageContext.java      |  0
 .../msg/ServerRespondMessageContext.java      |  0
 .../server/tokens/ServerTokenFactory.java     |  0
 .../util/ServerAuthenticationUtils.java       |  0
 .../mslcli/server/util/ServerMslContext.java  |  0
 .../src/main/webapp/WEB-INF/web.xml           |  0
 settings.gradle                               |  9 ++--
 67 files changed, 54 insertions(+), 21 deletions(-)
 rename examples/mslcli/{ => client}/build.gradle (100%)
 rename examples/mslcli/{ => client}/src/dist/bin/mslcli.cfg (100%)
 rename examples/mslcli/{ => client}/src/dist/bin/mslclient.sh (100%)
 rename examples/mslcli/{ => client}/src/dist/bin/mslclient_eas-none.sh (100%)
 rename examples/mslcli/{ => client}/src/dist/bin/mslclient_eas-none_suffixed.sh (100%)
 rename examples/mslcli/{ => client}/src/dist/bin/mslclient_interactive.sh (100%)
 rename examples/mslcli/{ => client}/src/dist/bin/mslclient_single_send.sh (100%)
 rename examples/mslcli/{ => client}/src/dist/bin/mslclient_with_mslstore.sh (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/client/Client.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/client/ClientApp.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/client/ClientMslConfig.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/client/msg/ClientRequestMessageContext.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/client/util/ClientAuthenticationUtils.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/client/util/ClientMslContext.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/CmdArguments.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/IllegalCmdArgumentException.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/IllegalCmdArgumentRuntimeException.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/MslConfig.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/Pair.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/Triplet.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/entityauth/EntityAuthenticationHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/entityauth/PresharedEntityAuthenticationHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/entityauth/RsaEntityAuthenticationHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/entityauth/SimplePresharedKeyStore.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/entityauth/SimpleRsaStore.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/entityauth/UnauthenticatedEntityAuthenticationHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/entityauth/UnauthenticatedSuffixedEntityAuthenticationHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/keyx/AsymmetricWrappedExchangeHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/keyx/DiffieHellmanExchangeHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/keyx/JsonWebEncryptionLadderExchangeHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/keyx/JsonWebKeyLadderExchangeHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/keyx/KeyExchangeHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/keyx/SimpleWrapCryptoContextRepository.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/keyx/SymmetricWrappedExchangeHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/msg/MessageConfig.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/tokens/SimpleUser.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/userauth/EmailPasswordUserAuthenticationHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/userauth/SimpleEmailPasswordStore.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/userauth/UserAuthenticationHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/AppContext.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/CommonAuthenticationUtils.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/CommonMslContext.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/ConfigurationException.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/ConfigurationRuntimeException.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/MslProperties.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/MslStoreData.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/MslStoreWrapper.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/SharedUtil.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryHandle.java (100%)
 rename examples/mslcli/{ => client}/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryWrapper.java (100%)
 rename examples/mslcli/{ => client}/src/main/resources/mslcli/client/mslclient_manual.txt (100%)
 rename examples/mslcli/{ => client}/src/main/resources/mslclient_dev_guide.txt (100%)
 create mode 100644 examples/mslcli/server/build.gradle
 rename examples/mslcli/{ => server}/src/dist/bin/mslserver.sh (100%)
 rename examples/mslcli/{ => server}/src/dist/bin/mslsrv.cfg (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/ServerMslConfig.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/SimpleHttpServer.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/SimpleMslServer.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/SimpleServlet.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/msg/ServerReceiveMessageContext.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/msg/ServerRespondMessageContext.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/tokens/ServerTokenFactory.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/util/ServerAuthenticationUtils.java (100%)
 rename examples/mslcli/{ => server}/src/main/java/mslcli/server/util/ServerMslContext.java (100%)
 rename examples/mslcli/{ => server}/src/main/webapp/WEB-INF/web.xml (100%)

diff --git a/examples/mslcli/build.gradle b/examples/mslcli/client/build.gradle
similarity index 100%
rename from examples/mslcli/build.gradle
rename to examples/mslcli/client/build.gradle
diff --git a/examples/mslcli/src/dist/bin/mslcli.cfg b/examples/mslcli/client/src/dist/bin/mslcli.cfg
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslcli.cfg
rename to examples/mslcli/client/src/dist/bin/mslcli.cfg
diff --git a/examples/mslcli/src/dist/bin/mslclient.sh b/examples/mslcli/client/src/dist/bin/mslclient.sh
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslclient.sh
rename to examples/mslcli/client/src/dist/bin/mslclient.sh
diff --git a/examples/mslcli/src/dist/bin/mslclient_eas-none.sh b/examples/mslcli/client/src/dist/bin/mslclient_eas-none.sh
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslclient_eas-none.sh
rename to examples/mslcli/client/src/dist/bin/mslclient_eas-none.sh
diff --git a/examples/mslcli/src/dist/bin/mslclient_eas-none_suffixed.sh b/examples/mslcli/client/src/dist/bin/mslclient_eas-none_suffixed.sh
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslclient_eas-none_suffixed.sh
rename to examples/mslcli/client/src/dist/bin/mslclient_eas-none_suffixed.sh
diff --git a/examples/mslcli/src/dist/bin/mslclient_interactive.sh b/examples/mslcli/client/src/dist/bin/mslclient_interactive.sh
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslclient_interactive.sh
rename to examples/mslcli/client/src/dist/bin/mslclient_interactive.sh
diff --git a/examples/mslcli/src/dist/bin/mslclient_single_send.sh b/examples/mslcli/client/src/dist/bin/mslclient_single_send.sh
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslclient_single_send.sh
rename to examples/mslcli/client/src/dist/bin/mslclient_single_send.sh
diff --git a/examples/mslcli/src/dist/bin/mslclient_with_mslstore.sh b/examples/mslcli/client/src/dist/bin/mslclient_with_mslstore.sh
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslclient_with_mslstore.sh
rename to examples/mslcli/client/src/dist/bin/mslclient_with_mslstore.sh
diff --git a/examples/mslcli/src/main/java/mslcli/client/Client.java b/examples/mslcli/client/src/main/java/mslcli/client/Client.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/client/Client.java
rename to examples/mslcli/client/src/main/java/mslcli/client/Client.java
diff --git a/examples/mslcli/src/main/java/mslcli/client/ClientApp.java b/examples/mslcli/client/src/main/java/mslcli/client/ClientApp.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/client/ClientApp.java
rename to examples/mslcli/client/src/main/java/mslcli/client/ClientApp.java
diff --git a/examples/mslcli/src/main/java/mslcli/client/ClientMslConfig.java b/examples/mslcli/client/src/main/java/mslcli/client/ClientMslConfig.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/client/ClientMslConfig.java
rename to examples/mslcli/client/src/main/java/mslcli/client/ClientMslConfig.java
diff --git a/examples/mslcli/src/main/java/mslcli/client/msg/ClientRequestMessageContext.java b/examples/mslcli/client/src/main/java/mslcli/client/msg/ClientRequestMessageContext.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/client/msg/ClientRequestMessageContext.java
rename to examples/mslcli/client/src/main/java/mslcli/client/msg/ClientRequestMessageContext.java
diff --git a/examples/mslcli/src/main/java/mslcli/client/util/ClientAuthenticationUtils.java b/examples/mslcli/client/src/main/java/mslcli/client/util/ClientAuthenticationUtils.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/client/util/ClientAuthenticationUtils.java
rename to examples/mslcli/client/src/main/java/mslcli/client/util/ClientAuthenticationUtils.java
diff --git a/examples/mslcli/src/main/java/mslcli/client/util/ClientMslContext.java b/examples/mslcli/client/src/main/java/mslcli/client/util/ClientMslContext.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/client/util/ClientMslContext.java
rename to examples/mslcli/client/src/main/java/mslcli/client/util/ClientMslContext.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/CmdArguments.java b/examples/mslcli/client/src/main/java/mslcli/common/CmdArguments.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/CmdArguments.java
rename to examples/mslcli/client/src/main/java/mslcli/common/CmdArguments.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/IllegalCmdArgumentException.java b/examples/mslcli/client/src/main/java/mslcli/common/IllegalCmdArgumentException.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/IllegalCmdArgumentException.java
rename to examples/mslcli/client/src/main/java/mslcli/common/IllegalCmdArgumentException.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/IllegalCmdArgumentRuntimeException.java b/examples/mslcli/client/src/main/java/mslcli/common/IllegalCmdArgumentRuntimeException.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/IllegalCmdArgumentRuntimeException.java
rename to examples/mslcli/client/src/main/java/mslcli/common/IllegalCmdArgumentRuntimeException.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/MslConfig.java b/examples/mslcli/client/src/main/java/mslcli/common/MslConfig.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/MslConfig.java
rename to examples/mslcli/client/src/main/java/mslcli/common/MslConfig.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/Pair.java b/examples/mslcli/client/src/main/java/mslcli/common/Pair.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/Pair.java
rename to examples/mslcli/client/src/main/java/mslcli/common/Pair.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/Triplet.java b/examples/mslcli/client/src/main/java/mslcli/common/Triplet.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/Triplet.java
rename to examples/mslcli/client/src/main/java/mslcli/common/Triplet.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/entityauth/EntityAuthenticationHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/entityauth/EntityAuthenticationHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/entityauth/EntityAuthenticationHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/entityauth/EntityAuthenticationHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/entityauth/PresharedEntityAuthenticationHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/entityauth/PresharedEntityAuthenticationHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/entityauth/PresharedEntityAuthenticationHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/entityauth/PresharedEntityAuthenticationHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/entityauth/RsaEntityAuthenticationHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/entityauth/RsaEntityAuthenticationHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/entityauth/RsaEntityAuthenticationHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/entityauth/RsaEntityAuthenticationHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/entityauth/SimplePresharedKeyStore.java b/examples/mslcli/client/src/main/java/mslcli/common/entityauth/SimplePresharedKeyStore.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/entityauth/SimplePresharedKeyStore.java
rename to examples/mslcli/client/src/main/java/mslcli/common/entityauth/SimplePresharedKeyStore.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/entityauth/SimpleRsaStore.java b/examples/mslcli/client/src/main/java/mslcli/common/entityauth/SimpleRsaStore.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/entityauth/SimpleRsaStore.java
rename to examples/mslcli/client/src/main/java/mslcli/common/entityauth/SimpleRsaStore.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/entityauth/UnauthenticatedEntityAuthenticationHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/entityauth/UnauthenticatedEntityAuthenticationHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/entityauth/UnauthenticatedEntityAuthenticationHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/entityauth/UnauthenticatedEntityAuthenticationHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/entityauth/UnauthenticatedSuffixedEntityAuthenticationHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/entityauth/UnauthenticatedSuffixedEntityAuthenticationHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/entityauth/UnauthenticatedSuffixedEntityAuthenticationHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/entityauth/UnauthenticatedSuffixedEntityAuthenticationHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/keyx/AsymmetricWrappedExchangeHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/keyx/AsymmetricWrappedExchangeHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/keyx/AsymmetricWrappedExchangeHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/keyx/AsymmetricWrappedExchangeHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/keyx/DiffieHellmanExchangeHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/keyx/DiffieHellmanExchangeHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/keyx/DiffieHellmanExchangeHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/keyx/DiffieHellmanExchangeHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/keyx/JsonWebEncryptionLadderExchangeHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/keyx/JsonWebEncryptionLadderExchangeHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/keyx/JsonWebEncryptionLadderExchangeHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/keyx/JsonWebEncryptionLadderExchangeHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/keyx/JsonWebKeyLadderExchangeHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/keyx/JsonWebKeyLadderExchangeHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/keyx/JsonWebKeyLadderExchangeHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/keyx/JsonWebKeyLadderExchangeHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/keyx/KeyExchangeHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/keyx/KeyExchangeHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/keyx/KeyExchangeHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/keyx/KeyExchangeHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/keyx/SimpleWrapCryptoContextRepository.java b/examples/mslcli/client/src/main/java/mslcli/common/keyx/SimpleWrapCryptoContextRepository.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/keyx/SimpleWrapCryptoContextRepository.java
rename to examples/mslcli/client/src/main/java/mslcli/common/keyx/SimpleWrapCryptoContextRepository.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/keyx/SymmetricWrappedExchangeHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/keyx/SymmetricWrappedExchangeHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/keyx/SymmetricWrappedExchangeHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/keyx/SymmetricWrappedExchangeHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/msg/MessageConfig.java b/examples/mslcli/client/src/main/java/mslcli/common/msg/MessageConfig.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/msg/MessageConfig.java
rename to examples/mslcli/client/src/main/java/mslcli/common/msg/MessageConfig.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/tokens/SimpleUser.java b/examples/mslcli/client/src/main/java/mslcli/common/tokens/SimpleUser.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/tokens/SimpleUser.java
rename to examples/mslcli/client/src/main/java/mslcli/common/tokens/SimpleUser.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/userauth/EmailPasswordUserAuthenticationHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/userauth/EmailPasswordUserAuthenticationHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/userauth/EmailPasswordUserAuthenticationHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/userauth/EmailPasswordUserAuthenticationHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/userauth/SimpleEmailPasswordStore.java b/examples/mslcli/client/src/main/java/mslcli/common/userauth/SimpleEmailPasswordStore.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/userauth/SimpleEmailPasswordStore.java
rename to examples/mslcli/client/src/main/java/mslcli/common/userauth/SimpleEmailPasswordStore.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/userauth/UserAuthenticationHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/userauth/UserAuthenticationHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/userauth/UserAuthenticationHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/userauth/UserAuthenticationHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/AppContext.java b/examples/mslcli/client/src/main/java/mslcli/common/util/AppContext.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/AppContext.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/AppContext.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/CommonAuthenticationUtils.java b/examples/mslcli/client/src/main/java/mslcli/common/util/CommonAuthenticationUtils.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/CommonAuthenticationUtils.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/CommonAuthenticationUtils.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/CommonMslContext.java b/examples/mslcli/client/src/main/java/mslcli/common/util/CommonMslContext.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/CommonMslContext.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/CommonMslContext.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/ConfigurationException.java b/examples/mslcli/client/src/main/java/mslcli/common/util/ConfigurationException.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/ConfigurationException.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/ConfigurationException.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/ConfigurationRuntimeException.java b/examples/mslcli/client/src/main/java/mslcli/common/util/ConfigurationRuntimeException.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/ConfigurationRuntimeException.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/ConfigurationRuntimeException.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/MslProperties.java b/examples/mslcli/client/src/main/java/mslcli/common/util/MslProperties.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/MslProperties.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/MslProperties.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/MslStoreData.java b/examples/mslcli/client/src/main/java/mslcli/common/util/MslStoreData.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/MslStoreData.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/MslStoreData.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/MslStoreWrapper.java b/examples/mslcli/client/src/main/java/mslcli/common/util/MslStoreWrapper.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/MslStoreWrapper.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/MslStoreWrapper.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/SharedUtil.java b/examples/mslcli/client/src/main/java/mslcli/common/util/SharedUtil.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/SharedUtil.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/SharedUtil.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryHandle.java b/examples/mslcli/client/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryHandle.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryHandle.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryHandle.java
diff --git a/examples/mslcli/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryWrapper.java b/examples/mslcli/client/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryWrapper.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryWrapper.java
rename to examples/mslcli/client/src/main/java/mslcli/common/util/WrapCryptoContextRepositoryWrapper.java
diff --git a/examples/mslcli/src/main/resources/mslcli/client/mslclient_manual.txt b/examples/mslcli/client/src/main/resources/mslcli/client/mslclient_manual.txt
similarity index 100%
rename from examples/mslcli/src/main/resources/mslcli/client/mslclient_manual.txt
rename to examples/mslcli/client/src/main/resources/mslcli/client/mslclient_manual.txt
diff --git a/examples/mslcli/src/main/resources/mslclient_dev_guide.txt b/examples/mslcli/client/src/main/resources/mslclient_dev_guide.txt
similarity index 100%
rename from examples/mslcli/src/main/resources/mslclient_dev_guide.txt
rename to examples/mslcli/client/src/main/resources/mslclient_dev_guide.txt
diff --git a/examples/mslcli/readme.txt b/examples/mslcli/readme.txt
index 682a21de..78938a06 100644
--- a/examples/mslcli/readme.txt
+++ b/examples/mslcli/readme.txt
@@ -2,32 +2,49 @@ MSL Command Line Interface.
 
 This implementation is very basic by intent.
 MSL server is a simple ECHO server accepting arbitrary inputs.
-Passing JSON-formatted payloads and implementing data abstraction
-layer for payload marshalling/unmarshalling was not viewed as an
-essential goal, because it does not help in understanding of MSL
-core; MSL messages in general can carry arbitrary payload data.
+Passing JSON-formatted payloads and implementing data abstraction layer
+for payload marshalling/unmarshalling was not viewed as an essential goal,
+because it does not help in understanding of MSL core; MSL messages in
+general can carry arbitrary payload data.
 
 MSL CLI should be built from the top level directory where the gradlew binary
 is located:
-% ./gradlew -p examples/mslcli compileJava
 
-Build distribution, so all dependencies can be picked up easily:
-% ./gradlew -p examples/mslcli distZip
+Contents:
+========
 
-Then go to the mslcli build directory:
-% cd examples/mslcli/build
+ * client:
+   Client code example, and MSLCLI common library.
 
-Unzip the distribution ZIP into the build directory:
+ * server:
+   Server code example - depends upon client MSLCLI.
+
+
+First build the client/lib and distribution:
+
+% ./gradlew -p examples/mslcli/client compileJava
+% ./gradlew -p examples/mslcli/client distZip
+
+Next, build the Server
+
+% ./gradlew -p examples/mslcli/server compileJava
+% ./gradlew -p examples/mslcli/server distZip
+
+Extract the client and server distributions into their respective build
+directories:
+
+% cd examples/mslcli/client/build
+% unzip distributions/*.zip
+% cd ../../../../examples/mslcli/server/build
 % unzip distributions/*.zip
 
-From the new directory, open two terminal sessions to run the MSL CLI client
-and server.
+From the new client directory, open a new terminal session to run the MSL CLI client
 
 From one, start the client
-% ./bin/mslclient.sh [options]
-% ./bin/mslclient.sh help
+% ./client/build/distributions/*/bin/mslclient.sh [options]
+% ./client/build/distributions/*/bin/mslclient.sh help
 
-From another start the server
-% ./bin/mslserver.sh
+From another terminal start the server
+% ./server/build/distributions/*/bin/mslserver.sh
 
-The server is terminated by pressing Ctrl-C.
\ No newline at end of file
+The server is terminated by pressing Ctrl-C.
diff --git a/examples/mslcli/server/build.gradle b/examples/mslcli/server/build.gradle
new file mode 100644
index 00000000..f3295fd7
--- /dev/null
+++ b/examples/mslcli/server/build.gradle
@@ -0,0 +1,15 @@
+apply plugin: 'java'
+apply plugin: 'application'
+apply plugin: 'war'
+
+dependencies {
+    compile 'javax.servlet:servlet-api:2.5'
+    compile project(':msl-core')
+    compile project(':msl-cli')
+    compile 'org.bouncycastle:bcprov-jdk15on:1.46'
+    compile 'org.json:json:20140107'
+}
+
+mainClassName = "mslcli.server.SimpleHttpServer"
+war.baseName = "mslcli-server"
+jar.enabled = true
diff --git a/examples/mslcli/src/dist/bin/mslserver.sh b/examples/mslcli/server/src/dist/bin/mslserver.sh
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslserver.sh
rename to examples/mslcli/server/src/dist/bin/mslserver.sh
diff --git a/examples/mslcli/src/dist/bin/mslsrv.cfg b/examples/mslcli/server/src/dist/bin/mslsrv.cfg
similarity index 100%
rename from examples/mslcli/src/dist/bin/mslsrv.cfg
rename to examples/mslcli/server/src/dist/bin/mslsrv.cfg
diff --git a/examples/mslcli/src/main/java/mslcli/server/ServerMslConfig.java b/examples/mslcli/server/src/main/java/mslcli/server/ServerMslConfig.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/ServerMslConfig.java
rename to examples/mslcli/server/src/main/java/mslcli/server/ServerMslConfig.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/SimpleHttpServer.java b/examples/mslcli/server/src/main/java/mslcli/server/SimpleHttpServer.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/SimpleHttpServer.java
rename to examples/mslcli/server/src/main/java/mslcli/server/SimpleHttpServer.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/SimpleMslServer.java b/examples/mslcli/server/src/main/java/mslcli/server/SimpleMslServer.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/SimpleMslServer.java
rename to examples/mslcli/server/src/main/java/mslcli/server/SimpleMslServer.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/SimpleServlet.java b/examples/mslcli/server/src/main/java/mslcli/server/SimpleServlet.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/SimpleServlet.java
rename to examples/mslcli/server/src/main/java/mslcli/server/SimpleServlet.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/msg/ServerReceiveMessageContext.java b/examples/mslcli/server/src/main/java/mslcli/server/msg/ServerReceiveMessageContext.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/msg/ServerReceiveMessageContext.java
rename to examples/mslcli/server/src/main/java/mslcli/server/msg/ServerReceiveMessageContext.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/msg/ServerRespondMessageContext.java b/examples/mslcli/server/src/main/java/mslcli/server/msg/ServerRespondMessageContext.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/msg/ServerRespondMessageContext.java
rename to examples/mslcli/server/src/main/java/mslcli/server/msg/ServerRespondMessageContext.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/tokens/ServerTokenFactory.java b/examples/mslcli/server/src/main/java/mslcli/server/tokens/ServerTokenFactory.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/tokens/ServerTokenFactory.java
rename to examples/mslcli/server/src/main/java/mslcli/server/tokens/ServerTokenFactory.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/util/ServerAuthenticationUtils.java b/examples/mslcli/server/src/main/java/mslcli/server/util/ServerAuthenticationUtils.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/util/ServerAuthenticationUtils.java
rename to examples/mslcli/server/src/main/java/mslcli/server/util/ServerAuthenticationUtils.java
diff --git a/examples/mslcli/src/main/java/mslcli/server/util/ServerMslContext.java b/examples/mslcli/server/src/main/java/mslcli/server/util/ServerMslContext.java
similarity index 100%
rename from examples/mslcli/src/main/java/mslcli/server/util/ServerMslContext.java
rename to examples/mslcli/server/src/main/java/mslcli/server/util/ServerMslContext.java
diff --git a/examples/mslcli/src/main/webapp/WEB-INF/web.xml b/examples/mslcli/server/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from examples/mslcli/src/main/webapp/WEB-INF/web.xml
rename to examples/mslcli/server/src/main/webapp/WEB-INF/web.xml
diff --git a/settings.gradle b/settings.gradle
index b52cc953..c07bcadf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,8 +3,8 @@ rootProject.name = 'msl-root'
 include 'core', 'tests', 'integ-tests'
 include 'examples/simple', 'examples/kancolle'
 include 'examples/burp', 'examples/burp-extender'
-include 'examples/mslcli', 'examples/oneshot'
-include 'examples/proxy'
+include 'examples/mslcli/client', 'examples/mslcli/server'
+include 'examples/oneshot', 'examples/proxy'
 
 project(':core').name = 'msl-core'
 project(':tests').name = 'msl-tests'
@@ -13,6 +13,7 @@ project(':examples/simple').name = 'msl-example'
 project(':examples/kancolle').name = 'msl-kancolle'
 project(':examples/burp').name = 'msl-burp'
 project(':examples/burp-extender').name = 'burp-extender'
-project(':examples/mslcli').name = 'msl-cli'
+project(':examples/mslcli/client').name = 'msl-cli'
+project(':examples/mslcli/server').name = 'msl-cli-server'
 project(':examples/oneshot').name = 'msl-oneshot'
-project(':examples/proxy').name = 'msl-proxy'
\ No newline at end of file
+project(':examples/proxy').name = 'msl-proxy'

From c9891929456eec7aabd7bfa7690150840509c9ad Mon Sep 17 00:00:00 2001
From: Alan Liddeke <aliddeke@netflix.com>
Date: Tue, 4 Oct 2016 15:42:37 -0700
Subject: [PATCH 2/2] Remove WAR plugin from client build.

---
 examples/mslcli/client/build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/examples/mslcli/client/build.gradle b/examples/mslcli/client/build.gradle
index 37d90f12..059c97e2 100644
--- a/examples/mslcli/client/build.gradle
+++ b/examples/mslcli/client/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'java'
 apply plugin: 'application'
-apply plugin: 'war'
 
 dependencies {
     compile 'javax.servlet:servlet-api:2.5'
@@ -12,4 +11,3 @@ dependencies {
 mainClassName = "mslcli.client.ClientApp"
 
 jar.baseName "mslcli-core"
-war.baseName = "mslcli-server"