From 298d8ba69c5575fb490f889fc1d1a09a65aacdea Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Thu, 26 Sep 2019 10:20:49 +0100 Subject: [PATCH] CORDA-3024 Rename the webserver (#5489) --- build.gradle | 8 ++++---- constants.properties | 2 +- docs/source/aws-vm.rst | 4 ++-- docs/source/azure-vm.rst | 2 +- docs/source/changelog.rst | 2 ++ docs/source/clientrpc.rst | 2 +- docs/source/cordapp-build-systems.rst | 4 +--- docs/source/demobench.rst | 2 +- docs/source/deploying-a-node.rst | 4 ++-- docs/source/example-code/build.gradle | 4 ++-- samples/attachment-demo/build.gradle | 6 +++--- samples/bank-of-corda-demo/build.gradle | 6 +++--- samples/cordapp-configuration/build.gradle | 2 +- samples/notary-demo/build.gradle | 2 +- samples/simm-valuation-demo/build.gradle | 6 +++--- settings.gradle | 4 ++-- {webserver => testing/testserver}/build.gradle | 2 +- .../net/corda/webserver/WebserverDriverTests.kt | 0 .../src/main/java/CordaWebserverCaplet.java | 0 .../main/kotlin/net/corda/webserver/WebArgsParser.kt | 0 .../src/main/kotlin/net/corda/webserver/WebServer.kt | 0 .../kotlin/net/corda/webserver/WebServerConfig.kt | 0 .../main/kotlin/net/corda/webserver/api/APIServer.kt | 0 .../src/main/kotlin/net/corda/webserver/api/Query.kt | 0 .../net/corda/webserver/converters/Converters.kt | 0 .../net/corda/webserver/internal/APIServerImpl.kt | 0 .../corda/webserver/internal/AllExceptionMapper.kt | 0 .../net/corda/webserver/internal/NodeWebServer.kt | 0 .../webserver/services/WebServerPluginRegistry.kt | 0 .../webserver/servlets/AttachmentDownloadServlet.kt | 0 .../corda/webserver/servlets/CorDappInfoServlet.kt | 0 .../corda/webserver/servlets/DataUploadServlet.kt | 0 .../corda/webserver/servlets/ObjectMapperConfig.kt | 0 .../net/corda/webserver/servlets/ResponseFilter.kt | 0 .../src/main/resources/web-reference.conf | 0 .../testserver/testcapsule}/build.gradle | 12 ++++++------ tools/demobench/build.gradle | 8 ++++---- .../net/corda/demobench/web/WebServerController.kt | 2 +- 38 files changed, 42 insertions(+), 42 deletions(-) rename {webserver => testing/testserver}/build.gradle (98%) rename {webserver => testing/testserver}/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt (100%) rename {webserver => testing/testserver}/src/main/java/CordaWebserverCaplet.java (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/WebArgsParser.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/WebServer.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/WebServerConfig.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/api/APIServer.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/api/Query.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/converters/Converters.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/services/WebServerPluginRegistry.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/servlets/CorDappInfoServlet.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt (100%) rename {webserver => testing/testserver}/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt (100%) rename {webserver => testing/testserver}/src/main/resources/web-reference.conf (100%) rename {webserver/webcapsule => testing/testserver/testcapsule}/build.gradle (82%) diff --git a/build.gradle b/build.gradle index b7dcc8227b..99e3df0645 100644 --- a/build.gradle +++ b/build.gradle @@ -384,7 +384,7 @@ dependencies { // Set to corda compile to ensure it exists now deploy nodes no longer relies on build compile project(path: ":node:capsule", configuration: 'runtimeArtifacts') - compile project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') + compile project(path: ":testing:testserver:testcapsule:", configuration: 'runtimeArtifacts') // For the buildCordappDependenciesJar task runtime project(':client:jfx') @@ -394,7 +394,7 @@ dependencies { runtime project(':confidential-identities') runtime project(':finance:workflows') runtime project(':finance:contracts') - runtime project(':webserver') + runtime project(':testing:testserver') testCompile project(':test-utils') detekt 'io.gitlab.arturbosch.detekt:detekt-cli:1.0.1' } @@ -481,8 +481,8 @@ bintrayConfig { 'corda-test-utils', 'corda-test-db', 'corda-jackson', - 'corda-webserver-impl', - 'corda-webserver', + 'corda-testserver-impl', + 'corda-testserver', 'corda-node-driver', 'corda-confidential-identities', 'corda-shell', diff --git a/constants.properties b/constants.properties index 76a28281a7..da271ea9c9 100644 --- a/constants.properties +++ b/constants.properties @@ -3,7 +3,7 @@ # their own projects. So don't get fancy with syntax! cordaVersion=4.3-SNAPSHOT -gradlePluginsVersion=5.0.2 +gradlePluginsVersion=5.0.3 kotlinVersion=1.2.71 java8MinUpdateVersion=171 # ***************************************************************# diff --git a/docs/source/aws-vm.rst b/docs/source/aws-vm.rst index 571620463c..742411f170 100644 --- a/docs/source/aws-vm.rst +++ b/docs/source/aws-vm.rst @@ -53,11 +53,11 @@ For example: with cordapp-example (IOU app) the following commands would be run: ./gradlew deployNodes ./kotlin-source/build/nodes/runnodes -Then start the Corda webserver +Then start the Corda test webserver .. sourcecode:: shell - find ~/dev/cordapp-example/kotlin-source/ -name corda-webserver.jar -execdir sh -c 'java -jar {} &' \; + find ~/dev/cordapp-example/kotlin-source/ -name corda-testserver.jar -execdir sh -c 'java -jar {} &' \; You can now interact with your running CorDapp. See the instructions `here `__. diff --git a/docs/source/azure-vm.rst b/docs/source/azure-vm.rst index 0a00f46855..0624492f76 100644 --- a/docs/source/azure-vm.rst +++ b/docs/source/azure-vm.rst @@ -103,7 +103,7 @@ Connect to one of your Corda nodes (make sure this is not the Notary node) using Build the yo cordapp sample which you can find here: |os_samples_branch|/yo-cordapp and install it in the cordapp directory. -Now restart Corda and the Corda webserver using the following commands or restart your Corda VM from the Azure portal: +Now restart Corda and the Corda test webserver using the following commands or restart your Corda VM from the Azure portal: .. sourcecode:: shell diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index dc00f37cfc..6ecc400635 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -6,6 +6,8 @@ release, see :doc:`app-upgrade-notes`. Unreleased ---------- +* Moved and renamed the testing web server to the ``testing`` subproject. Also renamed the published artifact to ``corda-testserver.jar``. + * Support for Java 11 (compatibility mode). Please read https://github.com/corda/corda/pull/5356. * Removed the RPC exception privacy feature. Previously, in production mode, the exceptions thrown on the node were stripped of all content diff --git a/docs/source/clientrpc.rst b/docs/source/clientrpc.rst index 7e5cf7b19b..02e00552b2 100644 --- a/docs/source/clientrpc.rst +++ b/docs/source/clientrpc.rst @@ -16,7 +16,7 @@ This class allows you to connect to your node via a message queue protocol and p interacting with the node. You make calls on a JVM object as normal, and the marshalling back-and-forth is handled for you. -.. warning:: The built-in Corda webserver is deprecated and unsuitable for production use. If you want to interact with +.. warning:: The built-in Corda test webserver is deprecated and unsuitable for production use. If you want to interact with your node via HTTP, you will need to stand up your own webserver that connects to your node using the `CordaRPCClient`_ class. You can find an example of how to do this using the popular Spring Boot server `here `_. diff --git a/docs/source/cordapp-build-systems.rst b/docs/source/cordapp-build-systems.rst index abec6d02bd..715c1ce604 100644 --- a/docs/source/cordapp-build-systems.rst +++ b/docs/source/cordapp-build-systems.rst @@ -126,8 +126,6 @@ Here is an overview of the various Corda dependencies: * ``corda-tools-explorer`` - The Node Explorer tool. Do not depend on * ``corda-tools-network-bootstrapper`` - The Network Builder tool. Useful in build scripts * ``corda-tools-shell-cli`` - The Shell CLI tool. Useful in build scripts -* ``corda-webserver-impl`` - The Corda webserver fat JAR. Deprecated. Usually only used by build scripts -* ``corda-websever`` - The Corda webserver library. Deprecated. Use a standard webserver library such as Spring instead Dependencies on other CorDapps ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -308,7 +306,7 @@ Below is a sample CorDapp Gradle dependencies block. When building your own CorD cordaCompile "net.corda:corda-node-api:$corda_release_version" cordaCompile "net.corda:corda-webserver-impl:$corda_release_version" cordaRuntime "net.corda:corda:$corda_release_version" - cordaRuntime "net.corda:corda-webserver:$corda_release_version" + cordaRuntime "net.corda:corda-testserver:$corda_release_version" testCompile "net.corda:corda-test-utils:$corda_release_version" // Corda Plugins: dependent flows and services diff --git a/docs/source/demobench.rst b/docs/source/demobench.rst index b079804f8e..36c7cdbf0d 100644 --- a/docs/source/demobench.rst +++ b/docs/source/demobench.rst @@ -126,7 +126,7 @@ current working directory of the JVM): corda/ corda.jar - corda-webserver.jar + corda-testserver.jar explorer/ node-explorer.jar cordapps/ diff --git a/docs/source/deploying-a-node.rst b/docs/source/deploying-a-node.rst index 4d9ae2fd4a..85d0fed967 100644 --- a/docs/source/deploying-a-node.rst +++ b/docs/source/deploying-a-node.rst @@ -9,7 +9,7 @@ Deploying a node to a server Linux: Installing and running Corda as a system service ------------------------------------------------------- -We recommend creating system services to run a node and the optional webserver. This provides logging and service +We recommend creating system services to run a node and the optional test webserver. This provides logging and service handling, and ensures the Corda service is run at boot. **Prerequisites**: @@ -123,7 +123,7 @@ handling, and ensures the Corda service is run at boot. * ``sudo chown root:root /etc/init/corda.conf`` * ``sudo chmod 644 /etc/init/corda.conf`` -.. note:: The Corda webserver provides a simple interface for interacting with your installed CorDapps in a browser. +.. note:: The Corda test webserver provides a simple interface for interacting with your installed CorDapps in a browser. Running the webserver is optional. 10. **SystemD**: Create a ``corda-webserver.service`` file based on the example below and save it in the ``/etc/systemd/system/`` diff --git a/docs/source/example-code/build.gradle b/docs/source/example-code/build.gradle index 92e63567ba..0a4143ea28 100644 --- a/docs/source/example-code/build.gradle +++ b/docs/source/example-code/build.gradle @@ -40,7 +40,7 @@ dependencies { compile project(':core') compile project(':client:jfx') compile project(':node-driver') - compile project(':webserver') + compile project(':testing:testserver') testCompile project(':test-utils') @@ -51,7 +51,7 @@ dependencies { } cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts') - cordaRuntime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') + cordaRuntime project(path: ":testing:testserver:testcapsule:", configuration: 'runtimeArtifacts') // CorDapps: dependent flows and services compile project(':finance:contracts') diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle index 9501fd8335..b12af585b6 100644 --- a/samples/attachment-demo/build.gradle +++ b/samples/attachment-demo/build.gradle @@ -44,7 +44,7 @@ dependencies { // Corda integration dependencies cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts') - cordaRuntime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') + cordaRuntime project(path: ":testing:testserver:testcapsule:", configuration: 'runtimeArtifacts') cordapp project(':samples:attachment-demo:contracts') cordapp project(':samples:attachment-demo:workflows') @@ -64,7 +64,7 @@ dependencies { testCompile "org.assertj:assertj-core:$assertj_version" - integrationTestCompile project(':webserver') + integrationTestCompile project(':testing:testserver') } task integrationTest(type: Test, dependsOn: []) { @@ -73,7 +73,7 @@ task integrationTest(type: Test, dependsOn: []) { } def nodeTask = tasks.getByPath(':node:capsule:assemble') -def webTask = tasks.getByPath(':webserver:webcapsule:assemble') +def webTask = tasks.getByPath(':testing:testserver:testcapsule::assemble') task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask, webTask]) { ext.rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.attachmentdemo.AttachmentDemoFlow", "InvokeRpc.partiesFromName", diff --git a/samples/bank-of-corda-demo/build.gradle b/samples/bank-of-corda-demo/build.gradle index a810f598c8..2fc0b17e52 100644 --- a/samples/bank-of-corda-demo/build.gradle +++ b/samples/bank-of-corda-demo/build.gradle @@ -19,11 +19,11 @@ dependencies { // Corda integration dependencies cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts') - cordaRuntime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') + cordaRuntime project(path: ":testing:testserver:testcapsule:", configuration: 'runtimeArtifacts') cordaCompile project(':core') cordaCompile project(':client:jfx') cordaCompile project(':client:rpc') - cordaCompile (project(':webserver')) { + cordaCompile(project(':testing:testserver')) { exclude group: "org.apache.logging.log4j" } cordaCompile (project(':node-driver')) { @@ -43,7 +43,7 @@ dependencies { } def nodeTask = tasks.getByPath(':node:capsule:assemble') -def webTask = tasks.getByPath(':webserver:webcapsule:assemble') +def webTask = tasks.getByPath(':testing:testserver:testcapsule::assemble') task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask, webTask]) { nodeDefaults { cordapp project(':finance:workflows') diff --git a/samples/cordapp-configuration/build.gradle b/samples/cordapp-configuration/build.gradle index 3d1843b1c1..9d466ed986 100644 --- a/samples/cordapp-configuration/build.gradle +++ b/samples/cordapp-configuration/build.gradle @@ -16,7 +16,7 @@ dependencies { } def nodeTask = tasks.getByPath(':node:capsule:assemble') -def webTask = tasks.getByPath(':webserver:webcapsule:assemble') +def webTask = tasks.getByPath(':testing:testserver:testcapsule::assemble') task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask, webTask]) { directory file("$buildDir/nodes") nodeDefaults { diff --git a/samples/notary-demo/build.gradle b/samples/notary-demo/build.gradle index b32344b049..a5a7a40117 100644 --- a/samples/notary-demo/build.gradle +++ b/samples/notary-demo/build.gradle @@ -31,7 +31,7 @@ dependencies { } def nodeTask = tasks.getByPath(':node:capsule:assemble') -def webTask = tasks.getByPath(':webserver:webcapsule:assemble') +def webTask = tasks.getByPath(':testing:testserver:testcapsule::assemble') task deployNodes(dependsOn: ['deployNodesSingle', 'deployNodesRaft', 'deployNodesBFT', 'deployNodesCustom']) diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle index 2844d9ebe7..f95a10716b 100644 --- a/samples/simm-valuation-demo/build.gradle +++ b/samples/simm-valuation-demo/build.gradle @@ -41,9 +41,9 @@ dependencies { // Corda integration dependencies cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts') - cordaRuntime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts') + cordaRuntime project(path: ":testing:testserver:testcapsule:", configuration: 'runtimeArtifacts') cordaCompile project(':core') - cordaCompile (project(':webserver')) { + cordaCompile(project(':testing:testserver')) { exclude group: "org.apache.logging.log4j" } @@ -82,7 +82,7 @@ jar { } def nodeTask = tasks.getByPath(':node:capsule:assemble') -def webTask = tasks.getByPath(':webserver:webcapsule:assemble') +def webTask = tasks.getByPath(':testing:testserver:testcapsule::assemble') task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', nodeTask, webTask]) { directory file("$buildDir/nodes") nodeDefaults { diff --git a/settings.gradle b/settings.gradle index 07ee58e75a..37526a0581 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,8 +25,8 @@ include 'client:jfx' include 'client:mock' include 'client:rpc' include 'docker' -include 'webserver' -include 'webserver:webcapsule' +include 'testing:testserver' +include 'testing:testserver:testcapsule:' include 'experimental' include 'experimental:avalanche' include 'experimental:blobwriter' diff --git a/webserver/build.gradle b/testing/testserver/build.gradle similarity index 98% rename from webserver/build.gradle rename to testing/testserver/build.gradle index 77193ad81e..5496288d78 100644 --- a/webserver/build.gradle +++ b/testing/testserver/build.gradle @@ -76,7 +76,7 @@ task integrationTest(type: Test) { } jar { - baseName 'corda-webserver-impl' + baseName 'corda-testserver-impl' } publish { diff --git a/webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt b/testing/testserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt similarity index 100% rename from webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt rename to testing/testserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt diff --git a/webserver/src/main/java/CordaWebserverCaplet.java b/testing/testserver/src/main/java/CordaWebserverCaplet.java similarity index 100% rename from webserver/src/main/java/CordaWebserverCaplet.java rename to testing/testserver/src/main/java/CordaWebserverCaplet.java diff --git a/webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/WebArgsParser.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/WebServer.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/WebServer.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/WebServer.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/WebServer.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/api/APIServer.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/api/Query.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/api/Query.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/api/Query.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/api/Query.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/converters/Converters.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/converters/Converters.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/converters/Converters.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/converters/Converters.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/internal/APIServerImpl.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/internal/AllExceptionMapper.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/services/WebServerPluginRegistry.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/services/WebServerPluginRegistry.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/services/WebServerPluginRegistry.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/services/WebServerPluginRegistry.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/servlets/AttachmentDownloadServlet.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/servlets/CorDappInfoServlet.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/servlets/CorDappInfoServlet.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/servlets/CorDappInfoServlet.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/servlets/CorDappInfoServlet.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/servlets/DataUploadServlet.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/servlets/ObjectMapperConfig.kt diff --git a/webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt b/testing/testserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt similarity index 100% rename from webserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt rename to testing/testserver/src/main/kotlin/net/corda/webserver/servlets/ResponseFilter.kt diff --git a/webserver/src/main/resources/web-reference.conf b/testing/testserver/src/main/resources/web-reference.conf similarity index 100% rename from webserver/src/main/resources/web-reference.conf rename to testing/testserver/src/main/resources/web-reference.conf diff --git a/webserver/webcapsule/build.gradle b/testing/testserver/testcapsule/build.gradle similarity index 82% rename from webserver/webcapsule/build.gradle rename to testing/testserver/testcapsule/build.gradle index 746e8c1206..69dff8cfcd 100644 --- a/webserver/webcapsule/build.gradle +++ b/testing/testserver/testcapsule/build.gradle @@ -26,12 +26,12 @@ capsule { task buildWebserverJar(type: FatCapsule, dependsOn: project(':node').tasks.jar) { applicationClass 'net.corda.webserver.WebServer' - archiveName "corda-webserver-${corda_release_version}.jar" + archiveName "corda-testserver-${corda_release_version}.jar" applicationSource = files( - project(':webserver').configurations.runtimeClasspath, - project(':webserver').tasks.jar, - project(':webserver').sourceSets.main.java.outputDir.toString() + '/CordaWebserverCaplet.class', - project(':webserver').sourceSets.main.java.outputDir.toString() + '/CordaWebserverCaplet$1.class', + project(':testing:testserver').configurations.runtimeClasspath, + project(':testing:testserver').tasks.jar, + project(':testing:testserver').sourceSets.main.java.outputDir.toString() + '/CordaWebserverCaplet.class', + project(':testing:testserver').sourceSets.main.java.outputDir.toString() + '/CordaWebserverCaplet$1.class', project(':node').buildDir.toString() + '/resources/main/reference.conf', "$rootDir/config/dev/log4j2.xml", project(':node:capsule').projectDir.toString() + '/NOTICE' // Copy CDDL notice @@ -66,5 +66,5 @@ artifacts { publish { disableDefaultJar = true - name 'corda-webserver' + name 'corda-testserver' } diff --git a/tools/demobench/build.gradle b/tools/demobench/build.gradle index 1a307e1e63..a53039babd 100644 --- a/tools/demobench/build.gradle +++ b/tools/demobench/build.gradle @@ -31,7 +31,7 @@ apply plugin: 'kotlin' apply plugin: 'application' evaluationDependsOn(':tools:explorer:capsule') -evaluationDependsOn(':webserver:webcapsule') +evaluationDependsOn(':testing:testserver:testcapsule:') mainClassName = 'net.corda.demobench.DemoBench' applicationDefaultJvmArgs = [ @@ -85,7 +85,7 @@ dependencies { compile ':purejavacomm-0.0.18' testCompile project(':test-utils') - testCompile project(':webserver') + testCompile project(':testing:testserver') testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}" testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}" @@ -139,8 +139,8 @@ distributions { into 'corda' fileMode = 0444 } - from(project(':webserver:webcapsule').tasks.buildWebserverJar) { - rename 'corda-webserver-(.*)', 'corda-webserver.jar' + from(project(':testing:testserver:testcapsule:').tasks.buildWebserverJar) { + rename 'corda-testserver-(.*)', 'corda-testserver.jar' into 'corda' fileMode = 0444 } diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/web/WebServerController.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/web/WebServerController.kt index 6760547adc..4fd46146a3 100644 --- a/tools/demobench/src/main/kotlin/net/corda/demobench/web/WebServerController.kt +++ b/tools/demobench/src/main/kotlin/net/corda/demobench/web/WebServerController.kt @@ -5,7 +5,7 @@ import tornadofx.* class WebServerController : Controller() { private val jvm by inject() - private val webserverPath = jvm.applicationDir.resolve("corda").resolve("corda-webserver.jar") + private val webserverPath = jvm.applicationDir.resolve("corda").resolve("corda-testserver.jar") init { log.info("Web Server JAR: $webserverPath")