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 2022/04/13 16:10:34 UTC
[isis] branch master updated: ISIS-3003: allow demo apps to set primary/secondary replay role via env vars
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 71ee377d19 ISIS-3003: allow demo apps to set primary/secondary replay role via env vars
71ee377d19 is described below
commit 71ee377d1999752a81ac391fecf851ff21281aaa
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 13 18:10:28 2022 +0200
ISIS-3003: allow demo apps to set primary/secondary replay role via env
vars
---
.../main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java | 3 +++
.../main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 3 +++
.../commandlog/model/IsisModuleExtCommandLogApplib.java | 11 +++++++++++
3 files changed, 17 insertions(+)
diff --git a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
index 5200292899..9bc7048436 100644
--- a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
+++ b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.commons.internal.os._OsUtil;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
+import org.apache.isis.extensions.commandlog.model.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.viewer.wicket.pdfjs.ui.IsisModuleExtPdfjsUi;
import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import org.apache.isis.valuetypes.asciidoc.persistence.jdo.dn5.IsisModuleValAsciidocPersistenceJdoDn5;
@@ -87,6 +88,8 @@ public class DemoAppWicketJdo extends SpringBootServletInitializer {
SpringProfileUtil.removeActiveProfile("demo-jpa"); // just in case
SpringProfileUtil.addActiveProfile("demo-jdo");
+ IsisModuleExtCommandLogApplib.honorSystemEnvironment();
+
SpringApplication.run(new Class[] { DemoAppWicketJdo.class }, args);
}
diff --git a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 392b4193a7..d6ce84b864 100644
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.commons.internal.os._OsUtil;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
+import org.apache.isis.extensions.commandlog.model.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.viewer.wicket.pdfjs.ui.IsisModuleExtPdfjsUi;
import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import org.apache.isis.valuetypes.asciidoc.persistence.jpa.IsisModuleValAsciidocPersistenceJpa;
@@ -91,6 +92,8 @@ public class DemoAppWicketJpa extends SpringBootServletInitializer {
SpringProfileUtil.removeActiveProfile("demo-jdo"); // just in case
SpringProfileUtil.addActiveProfile("demo-jpa");
+ IsisModuleExtCommandLogApplib.honorSystemEnvironment();
+
SpringApplication.run(new Class[] { DemoAppWicketJpa.class }, args);
}
diff --git a/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
index a391895c4f..c7c3fbfbb2 100644
--- a/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
+++ b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/model/IsisModuleExtCommandLogApplib.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.extensions.commandlog.model;
+import org.apache.isis.core.config.util.SpringProfileUtil;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
public interface IsisModuleExtCommandLogApplib
@@ -50,4 +51,14 @@ extends ModuleWithFixtures {
public static final String COMMAND_REPLAY_ON_PRIMARY_SERVICE =
NAMESPACE_PRIMARY + ".CommandReplayOnPrimaryService";
+ public static void honorSystemEnvironment() {
+ if("true".equalsIgnoreCase(System.getenv("PRIMARY"))) {
+ SpringProfileUtil.removeActiveProfile("command-replay-secondary"); // just in case
+ SpringProfileUtil.addActiveProfile("command-replay-primary");
+ } else if("true".equalsIgnoreCase(System.getenv("SECONDARY"))) {
+ SpringProfileUtil.removeActiveProfile("command-replay-primary"); // just in case
+ SpringProfileUtil.addActiveProfile("command-replay-secondary");
+ }
+ }
+
}