You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 18:35:38 UTC
[isis] 13/14: ISIS-2259: some further unit tests being fixed.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f6ec8f9cc0b9aeba9f3c4b9009218369ba13be19
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 18:05:48 2020 +0000
ISIS-2259: some further unit tests being fixed.
---
.../isis/core/config/presets/IsisPresets.java | 28 +++++++++++-----------
.../demo/src/main/java/demoapp/utils/DemoStub.java | 2 +-
.../demoapp/utils/LibraryPreloadingService.java | 4 ++--
examples/smoketests/pom.xml | 6 +++++
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
index 0221a90..ff8934a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
@@ -26,33 +26,33 @@ package org.apache.isis.core.config.presets;
*/
public final class IsisPresets {
- public static final String NoTranslations = "classpath:/org/apache/isis/config/presets/NoTranslations.properties";
+ public static final String NoTranslations = "classpath:/org/apache/isis/core/config/presets/NoTranslations.properties";
- public static final String H2InMemory = "classpath:/org/apache/isis/config/presets/H2InMemory.properties";
+ public static final String H2InMemory = "classpath:/org/apache/isis/core/config/presets/H2InMemory.properties";
/** randomized (unique) database name, eg. to allow for concurrent testing */
- public static final String H2InMemory_withUniqueSchema = "classpath:/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties";
+ public static final String H2InMemory_withUniqueSchema = "classpath:/org/apache/isis/core/config/presets/H2InMemory_withUniqueSchema.properties";
- public static final String HsqlDbInMemory = "classpath:/org/apache/isis/config/presets/HsqlDbInMemory.properties";
- public static final String DataNucleusAutoCreate = "classpath:/org/apache/isis/config/presets/DataNucleusAutoCreate.properties";
+ public static final String HsqlDbInMemory = "classpath:/org/apache/isis/core/config/presets/HsqlDbInMemory.properties";
+ public static final String DataNucleusAutoCreate = "classpath:/org/apache/isis/core/config/presets/DataNucleusAutoCreate.properties";
- public static final String DebugPersistence = "classpath:/org/apache/isis/config/presets/DebugPersistence.properties";
- public static final String DebugDiscovery = "classpath:/org/apache/isis/config/presets/DebugDiscovery.properties";
+ public static final String DebugPersistence = "classpath:/org/apache/isis/core/config/presets/DebugPersistence.properties";
+ public static final String DebugDiscovery = "classpath:/org/apache/isis/core/config/presets/DebugDiscovery.properties";
- public static final String DebugProgrammingModel = "classpath:/org/apache/isis/config/presets/DebugProgrammingModel.properties";
- public static final String SilenceProgrammingModel = "classpath:/org/apache/isis/config/presets/SilenceProgrammingModel.properties";
+ public static final String DebugProgrammingModel = "classpath:/org/apache/isis/core/config/presets/DebugProgrammingModel.properties";
+ public static final String SilenceProgrammingModel = "classpath:/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties";
- public static final String DebugMetaModel = "classpath:/org/apache/isis/config/presets/DebugMetaModel.properties";
- public static final String SilenceMetaModel = "classpath:/org/apache/isis/config/presets/SilenceMetaModel.properties";
+ public static final String DebugMetaModel = "classpath:/org/apache/isis/core/config/presets/DebugMetaModel.properties";
+ public static final String SilenceMetaModel = "classpath:/org/apache/isis/core/config/presets/SilenceMetaModel.properties";
- public static final String SilenceWicket = "classpath:/org/apache/isis/config/presets/SilenceWicket.properties";
- public static final String UseLog4j2Test = "classpath:/org/apache/isis/config/presets/UseLog4j2Test.properties";
+ public static final String SilenceWicket = "classpath:/org/apache/isis/core/config/presets/SilenceWicket.properties";
+ public static final String UseLog4j2Test = "classpath:/org/apache/isis/core/config/presets/UseLog4j2Test.properties";
/**
* @deprecated seems no longer required anyway
*/
@Deprecated
- public static final String IsisIntegTest = "classpath:/org/apache/isis/config/presets/IsisIntegTest.properties";
+ public static final String IsisIntegTest = "classpath:/org/apache/isis/core/config/presets/IsisIntegTest.properties";
/**
* Use PROTOTYPING mode as the default. Does not override if the system-property
diff --git a/examples/demo/src/main/java/demoapp/utils/DemoStub.java b/examples/demo/src/main/java/demoapp/utils/DemoStub.java
index 2477957..7d536c9 100644
--- a/examples/demo/src/main/java/demoapp/utils/DemoStub.java
+++ b/examples/demo/src/main/java/demoapp/utils/DemoStub.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.extensions.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.val;
diff --git a/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java b/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
index 70df98e..3e7e8b3 100644
--- a/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
+++ b/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentTaskList;
-import org.apache.isis.extensions.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.val;
@@ -36,7 +36,7 @@ public class LibraryPreloadingService {
@PostConstruct
public void preloadLibraries() {
val tasks = _ConcurrentTaskList.named("LibraryPreloading")
- .addRunnable("Preload JRuby for AsciiDoc", ()->AsciiDoc.valueOfAdoc("Dummy"));
+ .addRunnable("Preload JRuby for AsciiDoc", ()-> AsciiDoc.valueOfAdoc("Dummy"));
tasks.submit(_ConcurrentContext.forkJoin());
}
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 31cd3c2..bc6fb0c 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -139,6 +139,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>