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 2022/05/30 10:41:27 UTC
[isis] branch ISIS-3062 updated (2c5e97ae61 -> f7847a103a)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-3062
in repository https://gitbox.apache.org/repos/asf/isis.git
discard 2c5e97ae61 ISIS-3062: adds tests for sessionlog
add bbb88fad90 Merge pull request #952 from apache/ISIS-3062
add 6fe7c9dbd2 Bump cxf-rt-rs-client from 3.5.2 to 3.5.2-jbossorg-1
add fc707cab2f Merge pull request #954 from apache/dependabot/maven/master/org.apache.cxf-cxf-rt-rs-client-3.5.2-jbossorg-1
add e9438a4fa7 ISIS-3063: adds AliasedFacetForDomainServiceAnnotation
add 261e7aa134 ISIS-3063: adds ObjectSpecification.getAliases()
add ceef97128d Bump maven-invoker-plugin from 3.2.2 to 3.3.0
add a5401722e3 Merge pull request #955 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-invoker-plugin-3.3.0
add 4308c16f88 Bump maven-scm-plugin from 1.12.2 to 1.13.0
add 2598dc1ff5 Merge pull request #956 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-scm-plugin-1.13.0
new f7847a103a ISIS-3062: adds tests for sessionlog
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2c5e97ae61)
\
N -- N -- N refs/heads/ISIS-3062 (f7847a103a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bom/pom.xml | 6 ++---
.../AliasedFacetForDomainObjectAnnotation.java | 7 ++++++
.../AliasedFacetForDomainServiceAnnotation.java} | 21 +++++++++++------
.../DomainServiceFacetAnnotationFactory.java | 6 ++++-
...n.java => DomainServiceFacetForAnnotation.java} | 7 +++---
.../core/metamodel/spec/ObjectSpecification.java | 15 +++++++++++--
.../specimpl/ObjectSpecificationAbstract.java | 26 ++++++++++++++++------
.../DomainServiceFacetAnnotationFactoryTest.java | 4 ++--
.../testspec/ObjectSpecificationStub.java | 5 +++++
9 files changed, 71 insertions(+), 26 deletions(-)
copy core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/{domainobject/AliasedFacetForDomainObjectAnnotation.java => domainservice/annotation/AliasedFacetForDomainServiceAnnotation.java} (71%)
rename core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/{DomainServiceFacetAnnotation.java => DomainServiceFacetForAnnotation.java} (90%)
[isis] 01/01: ISIS-3062: adds tests for sessionlog
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f7847a103a5dfe162fbeabf50aba594a05e8e2e0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon May 30 11:40:56 2022 +0100
ISIS-3062: adds tests for sessionlog
---
.../applib/events/metamodel/MetamodelListener.java | 26 +++-
.../apache/isis/core/config/IsisConfiguration.java | 7 +
extensions/security/secman/applib/pom.xml | 3 +-
extensions/security/secman/integration/pom.xml | 11 +-
extensions/security/secman/persistence-jdo/pom.xml | 26 ++--
extensions/security/secman/persistence-jpa/pom.xml | 16 +--
extensions/security/sessionlog/applib/pom.xml | 10 +-
.../applib/IsisModuleExtSessionLogApplib.java | 6 +-
.../sessionlog/applib/dom/SessionLogEntry.java | 20 ++-
.../applib/dom/SessionLogEntryRepository.java | 1 +
.../applib/spiimpl/SessionLogServiceDefault.java | 23 ++--
.../spiimpl/SessionLogServiceInitializer.java | 45 +++++++
.../applib/SessionLogIntegTestAbstract.java | 143 +++++++++++++++++++++
.../sessionlog/persistence-jdo/log4j2-test.xml | 78 +++++++++++
.../persistence-jdo/logging-dn-enhance.properties | 41 ++++++
.../security/sessionlog/persistence-jdo/pom.xml | 16 ++-
.../jdo/IsisModuleExtSessionLogPersistenceJdo.java | 13 +-
.../isis/sessionlog/jdo/dom/SessionLogEntry.java | 3 +
.../isis/sessionlog/jdo/SessionLog_IntegTest.java | 62 +++++++++
.../src/test/resources/application-test.yml | 26 ++++
.../security/sessionlog/persistence-jpa/pom.xml | 25 +++-
.../jpa/IsisModuleExtSessionLogPersistenceJpa.java | 17 ++-
.../isis/sessionlog/jpa/dom/SessionLogEntry.java | 4 +-
.../isis/sessionlog/jpa/SessionLog_IntegTest.java | 60 +++++++++
.../src/test/resources/application-test.yml | 29 +++++
extensions/security/sessionlog/pom.xml | 7 +
26 files changed, 634 insertions(+), 84 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/events/metamodel/MetamodelListener.java b/api/applib/src/main/java/org/apache/isis/applib/events/metamodel/MetamodelListener.java
index 13af3842dc..42e58f7b34 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/events/metamodel/MetamodelListener.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/events/metamodel/MetamodelListener.java
@@ -26,12 +26,15 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
/**
* Convenience interface to listen on {@link MetamodelEvent}s.
+ *
* <p>
* Provided as an alternative to directly listening to these events.
+ * </p>
+ *
* <p>
- * Using precedence {@link Order} {@link PriorityPrecedence#MIDPOINT}.
- * For fine grained precedence control,
- * services need to directly listen to these events instead.
+ * Uses a precedence {@link Order} of {@link PriorityPrecedence#MIDPOINT}.
+ * For fine grained precedence control, instead listen directly to these events rather than implementing this interface.
+ * </p>
*
* @since 2.0
*/
@@ -40,12 +43,27 @@ public interface MetamodelListener {
/**
* Emitted by the framework, once the <i>Metamodel</i> is populated.
+ *
* <p>
- * Most common use-case is to seed database values,
+ * A common use-case is to seed database values,
* right after the <i>Metamodel</i> was loaded.
+ * </p>
+ *
+ * <p>
+ * NOTE that this callback is called without any
+ * {@link org.apache.isis.applib.services.iactnlayer.InteractionLayer interaction} (aka persistence session)
+ * set up; use {@link org.apache.isis.applib.services.iactnlayer.InteractionService} to create one if required.
+ * </p>
*/
void onMetamodelLoaded();
+ /**
+ * <p>
+ * NOTE that this callback is called without any
+ * {@link org.apache.isis.applib.services.iactnlayer.InteractionLayer interaction} (aka persistence session)
+ * set up; use {@link org.apache.isis.applib.services.iactnlayer.InteractionService} to create one if required.
+ * </p>
+ */
default void onMetamodelAboutToBeLoaded() {}
@EventListener(MetamodelEvent.class)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index d1973308a1..f2bddf4e2c 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -3028,6 +3028,13 @@ public class IsisConfiguration {
*/
private UserMenuMeActionPolicy userMenuMeActionPolicy = UserMenuMeActionPolicy.HIDE;
}
+
+ private final SessionLog sessionLog = new SessionLog();
+ @Data
+ public static class SessionLog {
+ boolean autoLogoutOnRestart = true;
+ }
+
}
private static List<String> listOf(final String ...values) {
diff --git a/extensions/security/secman/applib/pom.xml b/extensions/security/secman/applib/pom.xml
index 841ce5102b..5472f02f33 100644
--- a/extensions/security/secman/applib/pom.xml
+++ b/extensions/security/secman/applib/pom.xml
@@ -29,7 +29,6 @@
<artifactId>isis-extensions-secman-applib</artifactId>
<name>Apache Isis Ext - Sec Man Applib</name>
- <description></description>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.applib</jar-plugin.automaticModuleName>
@@ -49,7 +48,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
diff --git a/extensions/security/secman/integration/pom.xml b/extensions/security/secman/integration/pom.xml
index 4d08dd9ade..d6dba11a31 100644
--- a/extensions/security/secman/integration/pom.xml
+++ b/extensions/security/secman/integration/pom.xml
@@ -29,7 +29,6 @@
<artifactId>isis-extensions-secman-integration</artifactId>
<name>Apache Isis Ext - Sec Man Integration</name>
- <description></description>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.integration</jar-plugin.automaticModuleName>
@@ -39,14 +38,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index 835bbbadcf..261ae1241c 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -29,23 +29,14 @@
<artifactId>isis-extensions-secman-persistence-jdo</artifactId>
<name>Apache Isis Ext - Sec Man Persistence (Using JDO)</name>
- <description></description>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.extensions.secman.persistence.jdo</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/extensions/secman/persistence/jdo</git-plugin.propertiesDir>
-
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-applib</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman-integration</artifactId>
@@ -56,6 +47,11 @@
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
@@ -63,8 +59,10 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman-applib</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
</dependency>
<dependency>
@@ -72,12 +70,6 @@
<artifactId>isis-testing-integtestsupport-applib</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
diff --git a/extensions/security/secman/persistence-jpa/pom.xml b/extensions/security/secman/persistence-jpa/pom.xml
index 54f2b5cf5f..f5c3455ef0 100644
--- a/extensions/security/secman/persistence-jpa/pom.xml
+++ b/extensions/security/secman/persistence-jpa/pom.xml
@@ -39,13 +39,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-secman-applib</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-secman-integration</artifactId>
@@ -75,14 +68,15 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-secman-applib</artifactId>
<scope>test</scope>
+ <type>test-jar</type>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
<scope>test</scope>
</dependency>
diff --git a/extensions/security/sessionlog/applib/pom.xml b/extensions/security/sessionlog/applib/pom.xml
index 5a49ea6112..098fbd5097 100644
--- a/extensions/security/sessionlog/applib/pom.xml
+++ b/extensions/security/sessionlog/applib/pom.xml
@@ -45,14 +45,10 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.isis.persistence</groupId>
- <artifactId>isis-persistence-jdo-applib</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/IsisModuleExtSessionLogApplib.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/IsisModuleExtSessionLogApplib.java
index f500daff8d..dd104f8901 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/IsisModuleExtSessionLogApplib.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/IsisModuleExtSessionLogApplib.java
@@ -1,18 +1,18 @@
package org.apache.isis.sessionlog.applib;
+import org.eclipse.persistence.logging.SessionLog;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.sessionlog.applib.app.SessionLogMenu;
import org.apache.isis.sessionlog.applib.spiimpl.SessionLogServiceDefault;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
+import org.apache.isis.sessionlog.applib.spiimpl.SessionLogServiceInitializer;
@Configuration
@Import({
- IsisModuleTestingFixturesApplib.class,
-
SessionLogMenu.class,
+ SessionLogServiceInitializer.class,
SessionLogServiceDefault.class
})
public class IsisModuleExtSessionLogApplib {
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntry.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntry.java
index a4b4bc3cb5..eeae896f83 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntry.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntry.java
@@ -89,7 +89,7 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session
final String username,
final SessionLogService.CausedBy causedBy,
final Timestamp loginTimestamp) {
- setSessionGuidStr(sessionGuid.toString());
+ setSessionGuidStr(sessionGuid != null ? sessionGuid.toString() : null);
setHttpSessionId(httpSessionId);
setUsername(username);
setCausedBy(causedBy);
@@ -309,12 +309,11 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session
return !after.isEmpty() ? after.get(0) : SessionLogEntry.this;
}
- @MemberSupport public String disableNext() {
- val next = factoryService.mixin(next.class, SessionLogEntry.this);
- return next.act() == SessionLogEntry.this ? "None after": null;
+ @MemberSupport public String disableAct() {
+ return act() == SessionLogEntry.this ? "None after": null;
}
- @Inject FactoryService factoryService;
+ @Inject SessionLogEntryRepository sessionLogEntryRepository;
}
@@ -337,12 +336,11 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session
return !before.isEmpty() ? before.get(0) : SessionLogEntry.this;
}
- @MemberSupport public String disablePrevious() {
- val previous = factoryService.mixin(previous.class, SessionLogEntry.this);
- return previous.act() == SessionLogEntry.this ? "None before": null;
+ @MemberSupport public String disableAct() {
+ return act() == SessionLogEntry.this ? "None before": null;
}
- @Inject FactoryService factoryService;
+ @Inject SessionLogEntryRepository sessionLogEntryRepository;
}
@@ -351,7 +349,8 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session
ObjectContracts.contract(SessionLogEntry.class)
.thenUse("loginTimestamp", SessionLogEntry::getLoginTimestamp)
.thenUse("username", SessionLogEntry::getUsername)
- .thenUse("sessionId", SessionLogEntry::getSessionGuidStr)
+ .thenUse("sessionGuid", SessionLogEntry::getSessionGuidStr)
+ .thenUse("httpSessionId", SessionLogEntry::getHttpSessionId)
.thenUse("logoutTimestamp", SessionLogEntry::getLogoutTimestamp)
.thenUse("causedBy", SessionLogEntry::getCausedBy)
;
@@ -368,6 +367,5 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session
}
- @Inject SessionLogEntryRepository sessionLogEntryRepository;
}
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntryRepository.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntryRepository.java
index 84b503882e..1bcb4587f0 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntryRepository.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/dom/SessionLogEntryRepository.java
@@ -13,6 +13,7 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.session.SessionLogService;
+import org.apache.isis.core.config.IsisConfiguration;
import lombok.NonNull;
import lombok.val;
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/spiimpl/SessionLogServiceDefault.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/spiimpl/SessionLogServiceDefault.java
index b001de0408..e7531e40b3 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/spiimpl/SessionLogServiceDefault.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/spiimpl/SessionLogServiceDefault.java
@@ -1,14 +1,19 @@
package org.apache.isis.sessionlog.applib.spiimpl;
+import java.sql.Timestamp;
import java.util.Date;
import java.util.Optional;
import java.util.UUID;
import javax.annotation.PostConstruct;
+import javax.annotation.Priority;
import javax.inject.Inject;
+import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.session.SessionLogService;
import org.apache.isis.sessionlog.applib.dom.SessionLogEntry;
@@ -16,6 +21,7 @@ import org.apache.isis.sessionlog.applib.dom.SessionLogEntryRepository;
import lombok.RequiredArgsConstructor;
import lombok.val;
+import lombok.extern.log4j.Log4j2;
/**
* Implementation of the Isis {@link SessionLogService} creates a log
@@ -24,27 +30,24 @@ import lombok.val;
*/
@Service
@RequiredArgsConstructor(onConstructor_ = {@Inject})
+@Named("isis.ext.sessionlog.SessionLoggingServiceDefault")
+@Priority(PriorityPrecedence.LATE)
+@Qualifier("default")
+@Log4j2
public class SessionLogServiceDefault implements SessionLogService {
final SessionLogEntryRepository<? extends SessionLogEntry> sessionLogEntryRepository;
final ClockService clockService;
- @PostConstruct
- public void init() {
- val timestamp = clockService.getClock().nowAsJavaSqlTimestamp();
- sessionLogEntryRepository.logoutAllSessions(timestamp);
- }
-
@Override
- public void log(final Type type, final String username, final Date date, final CausedBy causedBy, final UUID sessionGuid, String httpSessionId) {
- val timestamp = clockService.getClock().nowAsJavaSqlTimestamp();
+ public void log(final Type type, final String username, final Date date, final CausedBy causedBy, final UUID sessionGuid, final String httpSessionId) {
if (type == Type.LOGIN) {
- sessionLogEntryRepository.create(username, sessionGuid, httpSessionId, causedBy, timestamp);
+ sessionLogEntryRepository.create(username, sessionGuid, httpSessionId, causedBy, Timestamp.from(date.toInstant()));
} else {
val sessionLogEntryIfAny = sessionLogEntryRepository.findBySessionGuid(sessionGuid);
sessionLogEntryIfAny
.ifPresent(entry -> {
- entry.setLogoutTimestamp(timestamp);
+ entry.setLogoutTimestamp(Timestamp.from(date.toInstant()));
entry.setCausedBy(causedBy);
}
);
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
new file mode 100644
index 0000000000..47c31f3e20
--- /dev/null
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
@@ -0,0 +1,45 @@
+package org.apache.isis.sessionlog.applib.spiimpl;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.events.metamodel.MetamodelEvent;
+import org.apache.isis.applib.events.metamodel.MetamodelListener;
+import org.apache.isis.applib.services.clock.ClockService;
+import org.apache.isis.applib.services.iactnlayer.InteractionService;
+import org.apache.isis.applib.services.session.SessionLogService;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.sessionlog.applib.dom.SessionLogEntry;
+import org.apache.isis.sessionlog.applib.dom.SessionLogEntryRepository;
+
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+
+@Component
+@RequiredArgsConstructor(onConstructor_ = {@Inject})
+public class SessionLogServiceInitializer implements MetamodelListener {
+
+ final SessionLogEntryRepository<? extends SessionLogEntry> sessionLogEntryRepository;
+ final InteractionService interactionService;
+ final ClockService clockService;
+ final IsisConfiguration isisConfiguration;
+
+ @Override
+ public void onMetamodelLoaded() {
+ if (!isisConfiguration.getExtensions().getSessionLog().isAutoLogoutOnRestart()) {
+ return;
+ }
+
+ interactionService.runAnonymous(() -> {
+ val timestamp = clockService.getClock().nowAsJavaSqlTimestamp();
+ sessionLogEntryRepository.logoutAllSessions(timestamp);
+ });
+ }
+
+}
diff --git a/extensions/security/sessionlog/applib/src/test/java/org/apache/isis/sessionlog/applib/SessionLogIntegTestAbstract.java b/extensions/security/sessionlog/applib/src/test/java/org/apache/isis/sessionlog/applib/SessionLogIntegTestAbstract.java
new file mode 100644
index 0000000000..ad8ae82a30
--- /dev/null
+++ b/extensions/security/sessionlog/applib/src/test/java/org/apache/isis/sessionlog/applib/SessionLogIntegTestAbstract.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.sessionlog.applib;
+
+import java.sql.Timestamp;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.TemporalAmount;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.inject.Inject;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import org.apache.isis.applib.annotation.Value;
+import org.apache.isis.applib.services.session.SessionLogService;
+import org.apache.isis.sessionlog.applib.dom.SessionLogEntry;
+import org.apache.isis.sessionlog.applib.dom.SessionLogEntryRepository;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+public abstract class SessionLogIntegTestAbstract extends IsisIntegrationTestAbstract {
+
+
+ @Value
+ @RequiredArgsConstructor
+ static class Session {
+ private static AtomicInteger counter = new AtomicInteger();
+ @Getter final String username;
+ final Instant instant;
+ public Date getDate() { return Date.from(instant); }
+ UUID sessionGuid = UUID.randomUUID();
+ final String httpSessionId = "http-" + counter.incrementAndGet();
+ }
+ @BeforeEach
+ void setUp() {
+ }
+
+ @Test
+ void login_and_logout() {
+
+ List<? extends SessionLogEntry> sessions;
+ SessionLogEntry session;
+ Optional<SessionLogEntry> sessionIfAny;
+
+ // given
+ sessions = sessionLogEntryRepository.findActiveSessions();
+ Assertions.assertThat(sessions).isEmpty();
+
+ // when
+ Session session1 = new Session("fred", Instant.now().minus(Duration.ofDays(2)));
+
+ sessionLogService.log(SessionLogService.Type.LOGIN, session1.username, session1.getDate(), SessionLogService.CausedBy.USER, session1.sessionGuid, session1.httpSessionId);
+
+ // then
+ sessions = sessionLogEntryRepository.findActiveSessions();
+ Assertions.assertThat(sessions).hasSize(1);
+ session = sessions.get(0);
+ Assertions.assertThat(session.getSessionGuid()).isEqualTo(session1.sessionGuid);
+
+ // when
+ Session session2 = new Session("mary", Instant.now().minus(Duration.ofDays(1)));
+
+ sessionLogService.log(SessionLogService.Type.LOGIN, session2.username, session2.getDate(), SessionLogService.CausedBy.USER, session2.sessionGuid, session2.httpSessionId);
+
+ // then
+ sessions = sessionLogEntryRepository.findActiveSessions();
+ Assertions.assertThat(sessions).hasSize(2);
+
+ // then
+ sessions = sessionLogEntryRepository.findByUsername(session1.username);
+ Assertions.assertThat(sessions).hasSize(1);
+ Assertions.assertThat(sessions.get(0)).extracting(SessionLogEntry::getUsername).isEqualTo(session1.username);
+
+ sessionIfAny = sessionLogEntryRepository.findBySessionGuid(session2.sessionGuid);
+ Assertions.assertThat(sessionIfAny).isPresent();
+ Assertions.assertThat(sessionIfAny).get().extracting(SessionLogEntry::getUsername).isEqualTo(session2.username);
+
+ sessionIfAny = sessionLogEntryRepository.findBySessionGuidStr(session1.sessionGuid.toString());
+ Assertions.assertThat(sessionIfAny).isPresent();
+ Assertions.assertThat(sessionIfAny).get().extracting(SessionLogEntry::getUsername).isEqualTo(session1.username);
+
+ sessions = sessionLogEntryRepository.findByUsernameAndStrictlyAfter(session1.username, Timestamp.from(session1.instant.plus(Duration.ofMillis(10))));
+ Assertions.assertThat(sessions).isEmpty();
+
+ sessions = sessionLogEntryRepository.findByUsernameAndStrictlyAfter(session1.username, Timestamp.from(session1.instant.minus(Duration.ofMillis(10))));
+ Assertions.assertThat(sessions).hasSize(1);
+
+ sessions = sessionLogEntryRepository.findByUsernameAndStrictlyBefore(session1.username, Timestamp.from(session1.instant.minus(Duration.ofMillis(10))));
+ Assertions.assertThat(sessions).isEmpty();
+
+ sessions = sessionLogEntryRepository.findByUsernameAndStrictlyBefore(session1.username, Timestamp.from(session1.instant.plus(Duration.ofMillis(10))));
+ Assertions.assertThat(sessions).hasSize(1);
+
+ sessions = sessionLogEntryRepository.findRecentByUsername(session1.username);
+ Assertions.assertThat(sessions).hasSize(1);
+
+ // when
+ sessionLogService.log(SessionLogService.Type.LOGOUT, null, session1.getDate(), SessionLogService.CausedBy.USER, session1.sessionGuid, null);
+
+ // then
+ sessions = sessionLogEntryRepository.findActiveSessions();
+ Assertions.assertThat(sessions).hasSize(1);
+ Assertions.assertThat(sessions.get(0)).extracting(SessionLogEntry::getUsername).isEqualTo(session2.username);
+
+ sessionLogService.log(SessionLogService.Type.LOGOUT, null, session2.getDate(), SessionLogService.CausedBy.USER, session2.sessionGuid, null);
+
+ // then
+ sessions = sessionLogEntryRepository.findActiveSessions();
+ Assertions.assertThat(sessions).isEmpty();
+
+
+ }
+
+ @Inject @Qualifier("default") SessionLogService sessionLogService;
+ @Inject SessionLogEntryRepository sessionLogEntryRepository;
+
+}
diff --git a/extensions/security/sessionlog/persistence-jdo/log4j2-test.xml b/extensions/security/sessionlog/persistence-jdo/log4j2-test.xml
new file mode 100644
index 0000000000..0ed7986e24
--- /dev/null
+++ b/extensions/security/sessionlog/persistence-jdo/log4j2-test.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<Configuration status="WARN">
+ <Properties>
+ <Property name="PID">????</Property>
+ <Property name="LOG_EXCEPTION_CONVERSION_WORD">%xwEx</Property>
+ <Property name="LOG_LEVEL_PATTERN">%5p</Property>
+ <Property name="LOG_DATEFORMAT_PATTERN">yyyy-MM-dd HH:mm:ss.SSS</Property>
+ <Property name="CONSOLE_LOG_PATTERN">%clr{%d{${LOG_DATEFORMAT_PATTERN}}}{faint} %clr{${LOG_LEVEL_PATTERN}} %clr{${sys:PID}}{magenta} %clr{---}{faint} %clr{[%15.15t]}{faint} %clr{%-40.40c{1.}}{cyan} %clr{:}{faint} %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+ <Property name="FILE_LOG_PATTERN">%d{${LOG_DATEFORMAT_PATTERN}} ${LOG_LEVEL_PATTERN} ${sys:PID} --- [%t] %-40.40c{1.} : %m%n${sys:LOG_EXCEPTION_CONVERSION_WORD}</Property>
+ </Properties>
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT" follow="true">
+ <PatternLayout pattern="${sys:CONSOLE_LOG_PATTERN}" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.catalina.startup.DigesterFactory" level="error" />
+ <Logger name="org.apache.catalina.util.LifecycleBase" level="error" />
+ <Logger name="org.apache.coyote.http11.Http11NioProtocol" level="warn" />
+ <logger name="org.apache.sshd.common.util.SecurityUtils" level="warn"/>
+ <Logger name="org.apache.tomcat.util.net.NioSelectorPool" level="warn" />
+ <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="error" />
+ <Logger name="org.hibernate.validator.internal.util.Version" level="warn" />
+ <logger name="org.springframework.boot.actuate.endpoint.jmx" level="warn"/>
+
+ <logger name="org.apache.directory" level="warn"/>
+ <logger name="org.apache.directory.api.ldap.model.entry.Value" level="off"/>
+
+ <logger name="DataNucleus.Persistence" level="info"/>
+ <logger name="DataNucleus.Transaction" level="info"/>
+ <logger name="DataNucleus.Datastore.Schema" level="info"/>
+ <logger name="DataNucleus.Datastore.Native" level="info"/>
+
+ <Root level="info">
+ <AppenderRef ref="Console" />
+ </Root>
+ </Loggers>
+</Configuration>
+
+<!-- # DataNucleus Logging Categories -->
+<!-- DataNucleus.Persistence - All messages relating to the persistence process -->
+<!-- DataNucleus.Transaction - All messages relating to transactions -->
+<!-- DataNucleus.Connection - All messages relating to Connections. -->
+<!-- DataNucleus.Query - All messages relating to queries -->
+<!-- DataNucleus.Cache - All messages relating to the DataNucleus Cache -->
+<!-- DataNucleus.MetaData - All messages relating to MetaData -->
+<!-- DataNucleus.Datastore - All general datastore messages -->
+<!-- DataNucleus.Datastore.Schema - All schema related datastore log messages -->
+<!-- DataNucleus.Datastore.Persist - All datastore persistence messages -->
+<!-- DataNucleus.Datastore.Retrieve - All datastore retrieval messages -->
+<!-- DataNucleus.Datastore.Native - Log of all 'native' statements sent to the datastore -->
+<!-- DataNucleus.General - All general operational messages -->
+<!-- DataNucleus.Lifecycle - All messages relating to object lifecycle changes -->
+<!-- DataNucleus.ValueGeneration - All messages relating to value generation -->
+<!-- DataNucleus.Enhancer - All messages from the DataNucleus Enhancer. -->
+<!-- DataNucleus.SchemaTool - All messages from DataNucleus SchemaTool -->
+<!-- DataNucleus.JDO - All messages general to JDO -->
+<!-- DataNucleus.JPA - All messages general to JPA -->
+<!-- DataNucleus.JCA - All messages relating to Connector JCA. -->
+<!-- DataNucleus.IDE - Messages from the DataNucleus IDE. -->
\ No newline at end of file
diff --git a/extensions/security/sessionlog/persistence-jdo/logging-dn-enhance.properties b/extensions/security/sessionlog/persistence-jdo/logging-dn-enhance.properties
new file mode 100644
index 0000000000..ca165acc78
--- /dev/null
+++ b/extensions/security/sessionlog/persistence-jdo/logging-dn-enhance.properties
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# LOG4J Configuration
+# ===================
+
+# Basic logging goes to "datanucleus.log"
+log4j.appender.A1=org.apache.log4j.FileAppender
+log4j.appender.A1.File=datanucleus.log
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
+#log4j.appender.A1.Threshold=INFO
+
+# Categories
+# Each category can be set to a "level", and to direct to an appender
+
+# Default to DEBUG level for all DataNucleus categories
+log4j.logger.DataNucleus = DEBUG, A1
+
+log4j.category.com.mchange.v2.c3p0=INFO, A1
+log4j.category.com.mchange.v2.resourcepool=INFO, A1
+log4j.category.org.logicalcobwebs.proxool=INFO,A1
+
+
+# Hbase libs logging
+log4j.category.org.apache.hadoop=INFO,A1
+log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
diff --git a/extensions/security/sessionlog/persistence-jdo/pom.xml b/extensions/security/sessionlog/persistence-jdo/pom.xml
index e3bb284469..ea7aa4feb6 100644
--- a/extensions/security/sessionlog/persistence-jdo/pom.xml
+++ b/extensions/security/sessionlog/persistence-jdo/pom.xml
@@ -47,16 +47,30 @@
<artifactId>isis-persistence-jdo-datanucleus</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-sessionlog-applib</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
diff --git a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java
index 8245cd3475..58f44f4e2e 100644
--- a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java
+++ b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/IsisModuleExtSessionLogPersistenceJdo.java
@@ -3,9 +3,11 @@ package org.apache.isis.sessionlog.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
import org.apache.isis.sessionlog.applib.IsisModuleExtSessionLogApplib;
import org.apache.isis.sessionlog.jdo.dom.SessionLogEntry;
import org.apache.isis.sessionlog.jdo.dom.SessionLogEntryRepository;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
@@ -13,9 +15,16 @@ import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAb
@Configuration
@Import({
- IsisModuleExtSessionLogApplib.class,
+ // modules
+ IsisModuleTestingFixturesApplib.class,
+ IsisModuleExtSessionLogApplib.class,
+ IsisModulePersistenceJdoDatanucleus.class,
- SessionLogEntryRepository.class
+ // services
+ SessionLogEntryRepository.class,
+
+ // entities, eager meta-model introspection
+ SessionLogEntry.class,
})
public class IsisModuleExtSessionLogPersistenceJdo implements ModuleWithFixtures {
diff --git a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/dom/SessionLogEntry.java b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/dom/SessionLogEntry.java
index 2e79a3636c..e1e6176682 100644
--- a/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/dom/SessionLogEntry.java
+++ b/extensions/security/sessionlog/persistence-jdo/src/main/java/org/apache/isis/sessionlog/jdo/dom/SessionLogEntry.java
@@ -131,6 +131,9 @@ public class SessionLogEntry extends org.apache.isis.sessionlog.applib.dom.Sessi
super(sessionGuid, httpSessionId, username, causedBy, loginTimestamp);
}
+ public SessionLogEntry() {
+ super(null, null, null, null, null);
+ }
@PrimaryKey
@Column(allowsNull = SessionGuidStr.ALLOWS_NULL, length = SessionGuidStr.MAX_LENGTH)
diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/isis/sessionlog/jdo/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/isis/sessionlog/jdo/SessionLog_IntegTest.java
new file mode 100644
index 0000000000..0ae5371dea
--- /dev/null
+++ b/extensions/security/sessionlog/persistence-jdo/src/test/java/org/apache/isis/sessionlog/jdo/SessionLog_IntegTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.sessionlog.jdo;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+import org.springframework.test.context.ActiveProfiles;
+
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
+import org.apache.isis.sessionlog.applib.SessionLogIntegTestAbstract;
+import org.apache.isis.sessionlog.jdo.dom.SessionLogEntryRepository;
+
+import lombok.Getter;
+
+@SpringBootTest(
+ classes = SessionLog_IntegTest.AppManifest.class
+)
+@ActiveProfiles("test")
+public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
+
+
+ @SpringBootConfiguration
+ @EnableAutoConfiguration
+ @Import({
+ IsisModuleCoreRuntimeServices.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleExtSessionLogPersistenceJdo.class,
+ })
+ @PropertySources({
+ @PropertySource(IsisPresets.UseLog4j2Test),
+ })
+ public static class AppManifest {
+ }
+
+
+}
diff --git a/extensions/security/sessionlog/persistence-jdo/src/test/resources/application-test.yml b/extensions/security/sessionlog/persistence-jdo/src/test/resources/application-test.yml
new file mode 100644
index 0000000000..7300d77584
--- /dev/null
+++ b/extensions/security/sessionlog/persistence-jdo/src/test/resources/application-test.yml
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+isis:
+ persistence:
+ schema:
+ auto-create-schemas: "ISISEXTSESSIONLOG"
+
+
+datanucleus:
+ schema:
+ generate-database:
+ mode: "create"
diff --git a/extensions/security/sessionlog/persistence-jpa/pom.xml b/extensions/security/sessionlog/persistence-jpa/pom.xml
index ce80988730..0b97445544 100644
--- a/extensions/security/sessionlog/persistence-jpa/pom.xml
+++ b/extensions/security/sessionlog/persistence-jpa/pom.xml
@@ -47,12 +47,6 @@
<artifactId>isis-persistence-jpa-eclipselink</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-fixtures-applib</artifactId>
@@ -64,6 +58,25 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-sessionlog-applib</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java
index 7a10a1c2c1..d1fed23d91 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/IsisModuleExtSessionLogPersistenceJpa.java
@@ -1,11 +1,14 @@
package org.apache.isis.sessionlog.jpa;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
import org.apache.isis.sessionlog.applib.IsisModuleExtSessionLogApplib;
import org.apache.isis.sessionlog.jpa.dom.SessionLogEntry;
import org.apache.isis.sessionlog.jpa.dom.SessionLogEntryRepository;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
@@ -13,9 +16,19 @@ import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAb
@Configuration
@Import({
- IsisModuleExtSessionLogApplib.class,
+ // modules
+ IsisModuleTestingFixturesApplib.class,
+ IsisModuleExtSessionLogApplib.class,
+ IsisModulePersistenceJpaEclipselink.class,
- SessionLogEntryRepository.class
+ // services
+ SessionLogEntryRepository.class,
+
+ // entities, eager meta-model introspection
+ SessionLogEntry.class,
+})
+@EntityScan(basePackageClasses = {
+ SessionLogEntry.class,
})
public class IsisModuleExtSessionLogPersistenceJpa implements ModuleWithFixtures {
diff --git a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/dom/SessionLogEntry.java b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/dom/SessionLogEntry.java
index 8b2d337f06..181ebf8e2d 100644
--- a/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/dom/SessionLogEntry.java
+++ b/extensions/security/sessionlog/persistence-jpa/src/main/java/org/apache/isis/sessionlog/jpa/dom/SessionLogEntry.java
@@ -24,8 +24,8 @@ import lombok.Setter;
@Entity
@Table(
schema = SessionLogEntry.SCHEMA,
- name = SessionLogEntry.TABLE)
-
+ name = SessionLogEntry.TABLE
+)
@NamedQueries( {
@NamedQuery(
name = Nq.FIND_BY_SESSION_GUID_STR,
diff --git a/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/isis/sessionlog/jpa/SessionLog_IntegTest.java b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/isis/sessionlog/jpa/SessionLog_IntegTest.java
new file mode 100644
index 0000000000..f10ee7b58f
--- /dev/null
+++ b/extensions/security/sessionlog/persistence-jpa/src/test/java/org/apache/isis/sessionlog/jpa/SessionLog_IntegTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.sessionlog.jpa;
+
+import javax.inject.Inject;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+import org.springframework.test.context.ActiveProfiles;
+
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
+import org.apache.isis.sessionlog.applib.SessionLogIntegTestAbstract;
+import org.apache.isis.sessionlog.jpa.dom.SessionLogEntryRepository;
+
+import lombok.Getter;
+
+@SpringBootTest(
+ classes = SessionLog_IntegTest.AppManifest.class
+)
+@ActiveProfiles("test")
+public class SessionLog_IntegTest extends SessionLogIntegTestAbstract {
+
+
+ @SpringBootConfiguration
+ @EnableAutoConfiguration
+ @Import({
+ IsisModuleCoreRuntimeServices.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleExtSessionLogPersistenceJpa.class,
+ })
+ @PropertySources({
+ @PropertySource(IsisPresets.UseLog4j2Test),
+ })
+ public static class AppManifest {
+ }
+
+
+}
diff --git a/extensions/security/sessionlog/persistence-jpa/src/test/resources/application-test.yml b/extensions/security/sessionlog/persistence-jpa/src/test/resources/application-test.yml
new file mode 100644
index 0000000000..22324a031a
--- /dev/null
+++ b/extensions/security/sessionlog/persistence-jpa/src/test/resources/application-test.yml
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+isis:
+ persistence:
+ schema:
+ auto-create-schemas: "ISISEXTSESSIONLOG"
+
+ extensions:
+ session-log:
+ auto-logout-on-restart: false
+
+spring:
+ jpa:
+ show-sql: true
+
diff --git a/extensions/security/sessionlog/pom.xml b/extensions/security/sessionlog/pom.xml
index 21f78a86b0..a3bcbea4e0 100644
--- a/extensions/security/sessionlog/pom.xml
+++ b/extensions/security/sessionlog/pom.xml
@@ -44,6 +44,13 @@
<artifactId>isis-extensions-sessionlog-applib</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-sessionlog-applib</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>