From 7aa20dfbe4b43d9456684b7eda9f198732af0955 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Tue, 29 Nov 2016 10:59:00 +0000 Subject: [PATCH] Move sandbox code into the experimental module to reflect its status --- {core => experimental}/sandbox/README.md | 0 {core => experimental}/sandbox/build.gradle | 0 .../net/corda/sandbox/CandidacyStatus.java | 0 .../net/corda/sandbox/CandidateMethod.java | 0 .../sandbox/SandboxAwareClassWriter.java | 0 .../net/corda/sandbox/SandboxRemapper.java | 0 .../main/java/net/corda/sandbox/Utils.java | 0 .../corda/sandbox/WhitelistClassLoader.java | 0 .../WhitelistClassloadingException.java | 0 .../net/corda/sandbox/costing/Contract.java | 0 .../sandbox/costing/ContractExecutor.java | 0 .../sandbox/costing/RuntimeCostAccounter.java | 0 .../corda/sandbox/tools/SandboxCreator.java | 0 .../CostInstrumentingMethodVisitor.java | 0 .../DefinitelyDisallowedMethodVisitor.java | 0 .../sandbox/visitors/SandboxPathVisitor.java | 0 .../WhitelistCheckingClassVisitor.java | 0 .../WhitelistCheckingMethodVisitor.java | 0 .../sandbox/costing/RuntimeCostAccounter.java | 0 .../main/resources/java.base.deterministic | 0 .../src/main/resources/java.base.disallowed | 0 .../src/main/resources/java.base.hand-picked | 0 .../resources/java8.interfaces_for_compat | 0 .../src/main/resources/java8.scan.java.lang | 0 .../java8.scan.java.lang_and_reflect | 0 .../resources/java8.scan.java.lang_and_util | 0 .../sandbox/src/main/resources/logback.xml | 0 .../corda/sandbox/CandidateMethodTest.java | 0 .../java/net/corda/sandbox/Constants.java | 0 .../java/net/corda/sandbox/TestUtils.java | 14 +++++------ .../sandbox/WhitelistClassLoaderTest.java | 0 .../DeterministicClassInstrumenterTest.java | 23 +++++++++--------- .../costing/SandboxedRewritingTest.java | 0 .../sandbox/greymalkin/StringReturner.java | 0 .../test/resources/java/lang/Exception.class | Bin .../test/resources/java/lang/Throwable.class | Bin .../resources/java/lang/reflect/Array.class | Bin .../test/resources/java/util/ArrayList.class | Bin .../src/test/resources/java/util/Arrays.class | Bin .../src/test/resources/logback-test.xml | 0 .../sandbox/src/test/resources/resource.jar | Bin .../sandbox/src/test/resources/sandbox.jar | Bin settings.gradle | 2 +- 43 files changed, 18 insertions(+), 21 deletions(-) rename {core => experimental}/sandbox/README.md (100%) rename {core => experimental}/sandbox/build.gradle (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/Utils.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java (100%) rename {core => experimental}/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java (100%) rename {core => experimental}/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java (100%) rename {core => experimental}/sandbox/src/main/resources/java.base.deterministic (100%) rename {core => experimental}/sandbox/src/main/resources/java.base.disallowed (100%) rename {core => experimental}/sandbox/src/main/resources/java.base.hand-picked (100%) rename {core => experimental}/sandbox/src/main/resources/java8.interfaces_for_compat (100%) rename {core => experimental}/sandbox/src/main/resources/java8.scan.java.lang (100%) rename {core => experimental}/sandbox/src/main/resources/java8.scan.java.lang_and_reflect (100%) rename {core => experimental}/sandbox/src/main/resources/java8.scan.java.lang_and_util (100%) rename {core => experimental}/sandbox/src/main/resources/logback.xml (100%) rename {core => experimental}/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java (100%) rename {core => experimental}/sandbox/src/test/java/net/corda/sandbox/Constants.java (100%) rename {core => experimental}/sandbox/src/test/java/net/corda/sandbox/TestUtils.java (94%) rename {core => experimental}/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java (100%) rename {core => experimental}/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java (86%) rename {core => experimental}/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java (100%) rename {core => experimental}/sandbox/src/test/java/sandbox/greymalkin/StringReturner.java (100%) rename {core => experimental}/sandbox/src/test/resources/java/lang/Exception.class (100%) rename {core => experimental}/sandbox/src/test/resources/java/lang/Throwable.class (100%) rename {core => experimental}/sandbox/src/test/resources/java/lang/reflect/Array.class (100%) rename {core => experimental}/sandbox/src/test/resources/java/util/ArrayList.class (100%) rename {core => experimental}/sandbox/src/test/resources/java/util/Arrays.class (100%) rename {core => experimental}/sandbox/src/test/resources/logback-test.xml (100%) rename {core => experimental}/sandbox/src/test/resources/resource.jar (100%) rename {core => experimental}/sandbox/src/test/resources/sandbox.jar (100%) diff --git a/core/sandbox/README.md b/experimental/sandbox/README.md similarity index 100% rename from core/sandbox/README.md rename to experimental/sandbox/README.md diff --git a/core/sandbox/build.gradle b/experimental/sandbox/build.gradle similarity index 100% rename from core/sandbox/build.gradle rename to experimental/sandbox/build.gradle diff --git a/core/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java b/experimental/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/CandidacyStatus.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java b/experimental/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/CandidateMethod.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java b/experimental/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/SandboxAwareClassWriter.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java b/experimental/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/SandboxRemapper.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/Utils.java b/experimental/sandbox/src/main/java/net/corda/sandbox/Utils.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/Utils.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/Utils.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java b/experimental/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/WhitelistClassLoader.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java b/experimental/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/WhitelistClassloadingException.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java b/experimental/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/costing/Contract.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java b/experimental/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/costing/ContractExecutor.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java b/experimental/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/costing/RuntimeCostAccounter.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java b/experimental/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/tools/SandboxCreator.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java b/experimental/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/visitors/CostInstrumentingMethodVisitor.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java b/experimental/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/visitors/DefinitelyDisallowedMethodVisitor.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java b/experimental/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/visitors/SandboxPathVisitor.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java b/experimental/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingClassVisitor.java diff --git a/core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java b/experimental/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java similarity index 100% rename from core/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java rename to experimental/sandbox/src/main/java/net/corda/sandbox/visitors/WhitelistCheckingMethodVisitor.java diff --git a/core/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java b/experimental/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java similarity index 100% rename from core/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java rename to experimental/sandbox/src/main/java/sandbox/net/corda/sandbox/costing/RuntimeCostAccounter.java diff --git a/core/sandbox/src/main/resources/java.base.deterministic b/experimental/sandbox/src/main/resources/java.base.deterministic similarity index 100% rename from core/sandbox/src/main/resources/java.base.deterministic rename to experimental/sandbox/src/main/resources/java.base.deterministic diff --git a/core/sandbox/src/main/resources/java.base.disallowed b/experimental/sandbox/src/main/resources/java.base.disallowed similarity index 100% rename from core/sandbox/src/main/resources/java.base.disallowed rename to experimental/sandbox/src/main/resources/java.base.disallowed diff --git a/core/sandbox/src/main/resources/java.base.hand-picked b/experimental/sandbox/src/main/resources/java.base.hand-picked similarity index 100% rename from core/sandbox/src/main/resources/java.base.hand-picked rename to experimental/sandbox/src/main/resources/java.base.hand-picked diff --git a/core/sandbox/src/main/resources/java8.interfaces_for_compat b/experimental/sandbox/src/main/resources/java8.interfaces_for_compat similarity index 100% rename from core/sandbox/src/main/resources/java8.interfaces_for_compat rename to experimental/sandbox/src/main/resources/java8.interfaces_for_compat diff --git a/core/sandbox/src/main/resources/java8.scan.java.lang b/experimental/sandbox/src/main/resources/java8.scan.java.lang similarity index 100% rename from core/sandbox/src/main/resources/java8.scan.java.lang rename to experimental/sandbox/src/main/resources/java8.scan.java.lang diff --git a/core/sandbox/src/main/resources/java8.scan.java.lang_and_reflect b/experimental/sandbox/src/main/resources/java8.scan.java.lang_and_reflect similarity index 100% rename from core/sandbox/src/main/resources/java8.scan.java.lang_and_reflect rename to experimental/sandbox/src/main/resources/java8.scan.java.lang_and_reflect diff --git a/core/sandbox/src/main/resources/java8.scan.java.lang_and_util b/experimental/sandbox/src/main/resources/java8.scan.java.lang_and_util similarity index 100% rename from core/sandbox/src/main/resources/java8.scan.java.lang_and_util rename to experimental/sandbox/src/main/resources/java8.scan.java.lang_and_util diff --git a/core/sandbox/src/main/resources/logback.xml b/experimental/sandbox/src/main/resources/logback.xml similarity index 100% rename from core/sandbox/src/main/resources/logback.xml rename to experimental/sandbox/src/main/resources/logback.xml diff --git a/core/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java b/experimental/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java similarity index 100% rename from core/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java rename to experimental/sandbox/src/test/java/net/corda/sandbox/CandidateMethodTest.java diff --git a/core/sandbox/src/test/java/net/corda/sandbox/Constants.java b/experimental/sandbox/src/test/java/net/corda/sandbox/Constants.java similarity index 100% rename from core/sandbox/src/test/java/net/corda/sandbox/Constants.java rename to experimental/sandbox/src/test/java/net/corda/sandbox/Constants.java diff --git a/core/sandbox/src/test/java/net/corda/sandbox/TestUtils.java b/experimental/sandbox/src/test/java/net/corda/sandbox/TestUtils.java similarity index 94% rename from core/sandbox/src/test/java/net/corda/sandbox/TestUtils.java rename to experimental/sandbox/src/test/java/net/corda/sandbox/TestUtils.java index dd4789f2f5..f3684d094f 100644 --- a/core/sandbox/src/test/java/net/corda/sandbox/TestUtils.java +++ b/experimental/sandbox/src/test/java/net/corda/sandbox/TestUtils.java @@ -1,17 +1,15 @@ package net.corda.sandbox; -import net.corda.sandbox.costing.RuntimeCostAccounter; import net.corda.sandbox.costing.*; import org.junit.*; -import java.io.IOException; -import java.io.InputStream; -import java.net.URISyntaxException; +import javax.xml.bind.*; +import java.io.*; +import java.nio.file.FileSystem; import java.nio.file.*; -import java.nio.file.attribute.BasicFileAttributes; -import java.util.HashSet; -import java.util.Set; -import javax.xml.bind.DatatypeConverter; +import java.nio.file.attribute.*; +import java.util.*; + import static org.junit.Assert.*; public class TestUtils { diff --git a/core/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java b/experimental/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java similarity index 100% rename from core/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java rename to experimental/sandbox/src/test/java/net/corda/sandbox/WhitelistClassLoaderTest.java diff --git a/core/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java b/experimental/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java similarity index 86% rename from core/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java rename to experimental/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java index 0b190ccb51..c276907870 100644 --- a/core/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java +++ b/experimental/sandbox/src/test/java/net/corda/sandbox/costing/DeterministicClassInstrumenterTest.java @@ -1,15 +1,14 @@ package net.corda.sandbox.costing; -import net.corda.sandbox.TestUtils; -import net.corda.sandbox.WhitelistClassLoader; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.URISyntaxException; -import java.util.HashSet; -import org.junit.AfterClass; +import net.corda.sandbox.*; +import org.junit.*; + +import java.io.*; +import java.lang.reflect.*; +import java.net.*; +import java.util.*; + import static org.junit.Assert.*; -import org.junit.BeforeClass; -import org.junit.Test; /** * @@ -29,7 +28,7 @@ public class DeterministicClassInstrumenterTest { @Test public void when_given_simple_code_it_executes() throws Exception { - final Class clz = TestUtils.transformClass("resource/CallObjectMethods.class", 525, 723); + final Class clz = TestUtils.transformClass("resource/CallObjectMethods.class", 525, 731); final Object o = clz.newInstance(); final Method allocObj = clz.getMethod("callBasicMethodsOnObject"); final Object ret = allocObj.invoke(o); @@ -41,13 +40,13 @@ public class DeterministicClassInstrumenterTest { @Test public void when_monitors_are_present_then_they_are_removed() throws Exception { - Class clz = TestUtils.transformClass("resource/SynchronizedBlock.class", 522, 712); + Class clz = TestUtils.transformClass("resource/SynchronizedBlock.class", 522, 720); Object o = clz.newInstance(); Method allocObj = clz.getMethod("exampleBlockSynchronized"); Object ret = allocObj.invoke(o); assertEquals("Synched", ret); - clz = TestUtils.transformClass("resource/SynchronizedMethod.class", 420, 585); + clz = TestUtils.transformClass("resource/SynchronizedMethod.class", 420, 593); o = clz.newInstance(); allocObj = clz.getMethod("exampleSynchronized"); ret = allocObj.invoke(o); diff --git a/core/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java b/experimental/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java similarity index 100% rename from core/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java rename to experimental/sandbox/src/test/java/net/corda/sandbox/costing/SandboxedRewritingTest.java diff --git a/core/sandbox/src/test/java/sandbox/greymalkin/StringReturner.java b/experimental/sandbox/src/test/java/sandbox/greymalkin/StringReturner.java similarity index 100% rename from core/sandbox/src/test/java/sandbox/greymalkin/StringReturner.java rename to experimental/sandbox/src/test/java/sandbox/greymalkin/StringReturner.java diff --git a/core/sandbox/src/test/resources/java/lang/Exception.class b/experimental/sandbox/src/test/resources/java/lang/Exception.class similarity index 100% rename from core/sandbox/src/test/resources/java/lang/Exception.class rename to experimental/sandbox/src/test/resources/java/lang/Exception.class diff --git a/core/sandbox/src/test/resources/java/lang/Throwable.class b/experimental/sandbox/src/test/resources/java/lang/Throwable.class similarity index 100% rename from core/sandbox/src/test/resources/java/lang/Throwable.class rename to experimental/sandbox/src/test/resources/java/lang/Throwable.class diff --git a/core/sandbox/src/test/resources/java/lang/reflect/Array.class b/experimental/sandbox/src/test/resources/java/lang/reflect/Array.class similarity index 100% rename from core/sandbox/src/test/resources/java/lang/reflect/Array.class rename to experimental/sandbox/src/test/resources/java/lang/reflect/Array.class diff --git a/core/sandbox/src/test/resources/java/util/ArrayList.class b/experimental/sandbox/src/test/resources/java/util/ArrayList.class similarity index 100% rename from core/sandbox/src/test/resources/java/util/ArrayList.class rename to experimental/sandbox/src/test/resources/java/util/ArrayList.class diff --git a/core/sandbox/src/test/resources/java/util/Arrays.class b/experimental/sandbox/src/test/resources/java/util/Arrays.class similarity index 100% rename from core/sandbox/src/test/resources/java/util/Arrays.class rename to experimental/sandbox/src/test/resources/java/util/Arrays.class diff --git a/core/sandbox/src/test/resources/logback-test.xml b/experimental/sandbox/src/test/resources/logback-test.xml similarity index 100% rename from core/sandbox/src/test/resources/logback-test.xml rename to experimental/sandbox/src/test/resources/logback-test.xml diff --git a/core/sandbox/src/test/resources/resource.jar b/experimental/sandbox/src/test/resources/resource.jar similarity index 100% rename from core/sandbox/src/test/resources/resource.jar rename to experimental/sandbox/src/test/resources/resource.jar diff --git a/core/sandbox/src/test/resources/sandbox.jar b/experimental/sandbox/src/test/resources/sandbox.jar similarity index 100% rename from core/sandbox/src/test/resources/sandbox.jar rename to experimental/sandbox/src/test/resources/sandbox.jar diff --git a/settings.gradle b/settings.gradle index 9010f550f2..89b4247424 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,11 +7,11 @@ include 'core' include 'node' include 'client' include 'experimental' +include 'experimental:sandbox' include 'test-utils' include 'tools:explorer' include 'tools:loadtest' include 'docs/source/example-code' // Note that we are deliberately choosing to use '/' here. With ':' gradle would treat the directories as actual projects. -include 'core:sandbox' include 'samples:attachment-demo' include 'samples:trader-demo' include 'samples:irs-demo'