You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/04 17:28:54 UTC
[isis] branch master updated: ISIS-2158: fixes Demo source links
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new be0440a ISIS-2158: fixes Demo source links
be0440a is described below
commit be0440a0768c517ac81b199fc2c1fd2844ded325
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 4 18:28:43 2020 +0100
ISIS-2158: fixes Demo source links
and further removes references to Money (commented out)
---
core/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml | 3 +++
examples/demo/src/main/java/demoapp/utils/DemoStub.java | 2 +-
.../demo/src/main/java/demoapp/utils/LibraryPreloadingService.java | 2 --
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml b/core/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml
index 31200e1..6c00209 100644
--- a/core/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml
+++ b/core/persistence/jdo/datanucleus-5/src/main/resources/plugin.xml
@@ -32,9 +32,12 @@
<mapping
java-type="org.apache.isis.applib.value.Clob"
mapping-class="org.apache.isis.persistence.jdo.datanucleus5.datanucleus.valuetypes.IsisClobMapping"/>
+
+ <!-- TODO[2249] deprecated
<mapping
java-type="org.apache.isis.applib.value.Money"
mapping-class="org.apache.isis.persistence.jdo.datanucleus5.datanucleus.valuetypes.IsisMoneyMapping"/>
+ -->
</extension>
diff --git a/examples/demo/src/main/java/demoapp/utils/DemoStub.java b/examples/demo/src/main/java/demoapp/utils/DemoStub.java
index cfaf0ce..2477957 100644
--- a/examples/demo/src/main/java/demoapp/utils/DemoStub.java
+++ b/examples/demo/src/main/java/demoapp/utils/DemoStub.java
@@ -49,7 +49,7 @@ public abstract class DemoStub {
private static Map<String, String> createConstants() {
val map = new HashMap<String, String>();
map.put("SOURCES_ISIS", "https://github.com/apache/isis/blob/master/core/applib/src/main/java");
- map.put("SOURCES_DEMO", "https://github.com/apache/isis/tree/master/examples/apps/demo/src/main/java");
+ map.put("SOURCES_DEMO", "https://github.com/apache/isis/tree/master/examples/demo/src/main/java");
map.put("ISSUES_DEMO", "https://issues.apache.org/jira/");
return map;
}
diff --git a/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java b/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
index 1e61c12..04bb61d 100644
--- a/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
+++ b/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
@@ -28,11 +28,9 @@ import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.isis.extensions.asciidoc.applib.value.AsciiDoc;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("demoapp.LibraryPreloadingService")
-@Log4j2
public class LibraryPreloadingService {
@PostConstruct