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 2021/05/02 09:09:47 UTC
[isis] branch master updated: ISIS-2620: Demo: start adding profile
annotations
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 af5eee2 ISIS-2620: Demo: start adding profile annotations
af5eee2 is described below
commit af5eee2e32e48b9e3ebb323550a85ec5a658ac73
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Sun May 2 11:09:29 2021 +0200
ISIS-2620: Demo: start adding profile annotations
---
examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java | 2 +-
examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java | 2 +-
.../DomainObject/nature/viewmodels/jaxbrefentity/ChildJdo.java | 3 +++
.../demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java | 3 +++
.../domain/objects/other/embedded/NumberConstantJdoRepository.java | 2 ++
.../demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java | 3 +++
.../dom/services/core/eventbusservice/EventLogEntryJdoRepository.java | 2 ++
.../dom/services/extensions/secman/apptenancy/AppTenancyVm.java | 3 +++
.../secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java | 2 ++
.../services/extensions/secman/apptenancy/entities/TenantedJdo.java | 3 +++
.../extensions/secman/apptenancy/entities/TenantedJdoEntities.java | 2 ++
.../secman/apptenancy/entities/seed/TenantedJdoSeedService.java | 2 ++
examples/demo/wicket/jdo/pom.xml | 1 +
.../jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java | 2 ++
examples/demo/wicket/jpa/pom.xml | 4 +---
.../jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 3 +++
16 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java
index b78daec..c394472 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJdo.java
@@ -29,7 +29,7 @@ import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogJdo;
import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
@Configuration
-@Profile("!jpa")
+@Profile("demo-jdo")
@Import({
DemoModuleCommon.class,
IsisModuleJdoDatanucleus.class,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
index 995d52a..f2a9c94 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
@@ -26,7 +26,7 @@ import org.apache.isis.extensions.commandlog.jpa.IsisModuleExtCommandLogJpa;
import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
@Configuration
-@Profile("jpa")
+@Profile("demo-jpa")
@Import({
DemoModuleCommon.class,
IsisModuleJpaEclipselink.class,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/ChildJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/ChildJdo.java
index 5cb2595..2248839 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/ChildJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/ChildJdo.java
@@ -24,6 +24,8 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.springframework.context.annotation.Profile;
+
import org.apache.isis.applib.annotation.Bounding;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Title;
@@ -32,6 +34,7 @@ import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import lombok.Getter;
import lombok.Setter;
+@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java
index 1c4821f..d91d9d5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdo.java
@@ -25,6 +25,8 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent;
+import org.springframework.context.annotation.Profile;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Property;
@@ -34,6 +36,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdoRepository.java
index b35a41b..bee3175 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdoRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/NumberConstantJdoRepository.java
@@ -23,6 +23,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Repository;
import org.apache.isis.applib.services.factory.FactoryService;
@@ -30,6 +31,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import lombok.val;
+@Profile("demo-jdo")
@Repository
@Named("demo.numberConstantRepository")
public class NumberConstantJdoRepository {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
index a62d1e9..036f401 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
@@ -26,6 +26,8 @@ import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
+import org.springframework.context.annotation.Profile;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
@@ -37,6 +39,7 @@ import lombok.val;
import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm.UiButtonEvent;
+@Profile("demo-jdo")
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
index 1c13191..e922223 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdoRepository.java
@@ -23,12 +23,14 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Repository;
import org.apache.isis.applib.services.repository.RepositoryService;
import lombok.RequiredArgsConstructor;
+@Profile("demo-jdo")
@Repository
@Named("demo.eventLogRepository")
@RequiredArgsConstructor(onConstructor_ = { @Inject })
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java
index bfc8d94..e926f7c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java
@@ -27,6 +27,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+import org.springframework.context.annotation.Profile;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
@@ -39,6 +41,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdo;
import demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdoEntities;
+@Profile("demo-jdo")
//tag::class[]
@XmlRootElement(name = "root")
@XmlType()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
index 29fbd61..b769058 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
@@ -20,6 +20,7 @@ package demoapp.dom.services.extensions.secman.apptenancy;
import java.util.regex.Pattern;
+import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
import org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyEvaluator;
@@ -30,6 +31,7 @@ import lombok.val;
import demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdo;
+@Profile("demo-jdo")
//tag::class[]
@Service
public class ApplicationTenancyEvaluatorForDemo
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java
index 598b978..2211ef9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java
@@ -23,6 +23,8 @@ import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
+import org.springframework.context.annotation.Profile;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Editing;
@@ -34,6 +36,7 @@ import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
+@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdoEntities.java
index 6239f82..dde2b72 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdoEntities.java
@@ -22,12 +22,14 @@ import java.util.List;
import javax.inject.Inject;
+import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.repository.RepositoryService;
import lombok.RequiredArgsConstructor;
+@Profile("demo-jdo")
@Service
@RequiredArgsConstructor(onConstructor_ = { @Inject })
public class TenantedJdoEntities {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/seed/TenantedJdoSeedService.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/seed/TenantedJdoSeedService.java
index 5338084..5f29158 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/seed/TenantedJdoSeedService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/seed/TenantedJdoSeedService.java
@@ -20,6 +20,7 @@ package demoapp.dom.services.extensions.secman.apptenancy.entities.seed;
import javax.inject.Inject;
+import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -29,6 +30,7 @@ import demoapp.dom._infra.seed.SeedServiceAbstract;
import demoapp.dom._infra.samples.NameSamples;
import demoapp.dom.services.extensions.secman.apptenancy.entities.TenantedJdo;
+@Profile("demo-jdo")
@Service
public class TenantedJdoSeedService extends SeedServiceAbstract {
diff --git a/examples/demo/wicket/jdo/pom.xml b/examples/demo/wicket/jdo/pom.xml
index 6d53ec9..8ad333c 100644
--- a/examples/demo/wicket/jdo/pom.xml
+++ b/examples/demo/wicket/jdo/pom.xml
@@ -30,6 +30,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<sonar.skip>true</sonar.skip>
+ <spring.profiles.active>demo-jdo</spring.profiles.active>
</properties>
<dependencies>
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 d5d2427..d54a8b4 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
@@ -76,6 +76,8 @@ public class DemoAppWicketJdo extends SpringBootServletInitializer {
//IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
+ System.setProperty("spring.profiles.active", "demo-jdo");
+
SpringApplication.run(new Class[] { DemoAppWicketJdo.class }, args);
}
diff --git a/examples/demo/wicket/jpa/pom.xml b/examples/demo/wicket/jpa/pom.xml
index 16c4dd8..b8fa87e 100644
--- a/examples/demo/wicket/jpa/pom.xml
+++ b/examples/demo/wicket/jpa/pom.xml
@@ -30,9 +30,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<sonar.skip>true</sonar.skip>
-
- <!-- we have configuration with the demo, that is sensitive to the 'jpa' profile -->
- <spring.profiles.active>jpa</spring.profiles.active>
+ <spring.profiles.active>demo-jpa</spring.profiles.active>
</properties>
<build>
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 44620a6..887c96c 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
@@ -75,6 +75,9 @@ public class DemoAppWicketJpa extends SpringBootServletInitializer {
//IsisPresets.prototyping();
//IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
+
+ System.setProperty("spring.profiles.active", "demo-jpa");
+
SpringApplication.run(new Class[] { DemoAppWicketJpa.class }, args);
}