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/07/22 14:18:07 UTC
[isis] branch ISIS-3091 updated: ISIS-3091: more compile fixes
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3091
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3091 by this push:
new 8d07f194e6 ISIS-3091: more compile fixes
8d07f194e6 is described below
commit 8d07f194e61349e861e267493e8c052676fb16b5
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 22 15:17:53 2022 +0100
ISIS-3091: more compile fixes
---
.../appfeat/ApplicationFeatureDefault.java | 3 +-
extensions/core/commandlog/persistence-jpa/pom.xml | 15 ++++---
.../jpa/IsisModuleExtCommandLogPersistenceJpa.java | 17 +++++++-
.../IsisModuleExtExecutionLogPersistenceJpa.java | 17 +++++++-
...IsisModuleExtExecutionOutboxPersistenceJpa.java | 17 +++++++-
.../jdo/IsisModuleExtAuditTrailPersistenceJdo.java | 6 +--
...uditTrailEntry.java => AuditTrailEntryJdo.java} | 51 ++++++++--------------
.../jpa/IsisModuleExtAuditTrailPersistenceJpa.java | 21 +++++----
.../jpa/IsisModuleExtSecmanPersistenceJpa.java | 20 ++++++++-
.../applib/IsisModuleExtFullCalendarApplib.java | 1 +
.../fullcalendar/applib/value/CalendarEvent.java | 3 +-
.../applib/IsisModuleValAsciidocApplib.java | 1 +
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 3 +-
.../applib/IsisModuleValMarkdownApplib.java | 1 +
.../valuetypes/markdown/applib/value/Markdown.java | 3 +-
.../IsisModuleViewerRestfulObjectsApplib.java | 3 ++
.../webmodule/WebModuleJaxrsResteasy4.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../rendering/service/RepresentationService.java | 3 +-
.../acceptheader/AcceptHeaderServiceForRest.java | 2 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../ContentNegotiationServiceOrgApacheIsisV1.java | 4 +-
.../ContentNegotiationServiceOrgApacheIsisV2.java | 2 +-
.../ContentNegotiationServiceXRoDomainType.java | 2 +-
.../service/swagger/SwaggerServiceDefault.java | 3 +-
.../swagger/internal/ClassExcluderDefault.java | 4 +-
.../swagger/internal/SwaggerSpecGenerator.java | 3 +-
.../service/swagger/internal/TaggerDefault.java | 3 +-
.../internal/ValuePropertyFactoryDefault.java | 3 +-
29 files changed, 144 insertions(+), 73 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java
index 2444d3240c..0d835c167b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureDefault.java
@@ -37,6 +37,7 @@ import org.apache.isis.applib.util.Hashing;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import lombok.AccessLevel;
import lombok.Getter;
@@ -52,7 +53,7 @@ import lombok.Setter;
* {@link ApplicationFeatureRepository}.
* </p>
*/
-@Named(IsisModuleApplib.NAMESPACE + ".services.appfeat.ApplicationFeature")
+@Named(IsisModuleCoreMetamodel.NAMESPACE + ".services.appfeat.ApplicationFeature")
@Value
public class ApplicationFeatureDefault
implements
diff --git a/extensions/core/commandlog/persistence-jpa/pom.xml b/extensions/core/commandlog/persistence-jpa/pom.xml
index 634085fcd3..526120a724 100644
--- a/extensions/core/commandlog/persistence-jpa/pom.xml
+++ b/extensions/core/commandlog/persistence-jpa/pom.xml
@@ -81,11 +81,16 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
- <scope>test</scope>
- </dependency>
+ <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>
+ </dependency>
</dependencies>
diff --git a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java
index 17c3b5abb7..2f5ba7e2eb 100644
--- a/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java
+++ b/extensions/core/commandlog/persistence-jpa/src/main/java/org/apache/isis/extensions/commandlog/jpa/IsisModuleExtCommandLogPersistenceJpa.java
@@ -27,6 +27,10 @@ import org.apache.isis.extensions.commandlog.jpa.dom.CommandLogEntry;
import org.apache.isis.extensions.commandlog.jpa.dom.CommandLogEntryPK;
import org.apache.isis.extensions.commandlog.jpa.dom.CommandLogEntryRepository;
import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
+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.jpa.TeardownFixtureJpaAbstract;
/**
* @since 2.0 {@index}
@@ -34,6 +38,7 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
@Configuration
@Import({
// modules
+ IsisModuleTestingFixturesApplib.class,
IsisModuleExtCommandLogApplib.class,
IsisModulePersistenceJpaEclipselink.class,
@@ -47,10 +52,20 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
@EntityScan(basePackageClasses = {
CommandLogEntry.class
})
-public class IsisModuleExtCommandLogPersistenceJpa {
+public class IsisModuleExtCommandLogPersistenceJpa implements ModuleWithFixtures {
public static final String NAMESPACE = IsisModuleExtCommandLogApplib.NAMESPACE;
public static final String SCHEMA = IsisModuleExtCommandLogApplib.SCHEMA;
+ @Override
+ public FixtureScript getTeardownFixture() {
+ return new TeardownFixtureJpaAbstract() {
+ @Override
+ protected void execute(final ExecutionContext executionContext) {
+ deleteFrom(CommandLogEntry.class);
+ }
+ };
+ }
+
}
diff --git a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/IsisModuleExtExecutionLogPersistenceJpa.java b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/IsisModuleExtExecutionLogPersistenceJpa.java
index b6ea1fc584..608a73f72a 100644
--- a/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/IsisModuleExtExecutionLogPersistenceJpa.java
+++ b/extensions/core/executionlog/persistence-jpa/src/main/java/org/apache/isis/extensions/executionlog/jpa/IsisModuleExtExecutionLogPersistenceJpa.java
@@ -27,6 +27,10 @@ import org.apache.isis.extensions.executionlog.jpa.dom.ExecutionLogEntry;
import org.apache.isis.extensions.executionlog.jpa.dom.ExecutionLogEntryPK;
import org.apache.isis.extensions.executionlog.jpa.dom.ExecutionLogEntryRepository;
import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
+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.jpa.TeardownFixtureJpaAbstract;
/**
* @since 2.0 {@index}
@@ -34,6 +38,7 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
@Configuration
@Import({
// modules
+ IsisModuleTestingFixturesApplib.class,
IsisModuleExtExecutionLogApplib.class,
IsisModulePersistenceJpaEclipselink.class,
@@ -47,9 +52,19 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
@EntityScan(basePackageClasses = {
ExecutionLogEntry.class
})
-public class IsisModuleExtExecutionLogPersistenceJpa {
+public class IsisModuleExtExecutionLogPersistenceJpa implements ModuleWithFixtures {
public static final String NAMESPACE = IsisModuleExtExecutionLogApplib.NAMESPACE;
public static final String SCHEMA = IsisModuleExtExecutionLogApplib.SCHEMA;
+ @Override
+ public FixtureScript getTeardownFixture() {
+ return new TeardownFixtureJpaAbstract() {
+ @Override
+ protected void execute(final ExecutionContext executionContext) {
+ deleteFrom(ExecutionLogEntry.class);
+ }
+ };
+ }
+
}
diff --git a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java
index 2bca342cb2..c7929ec451 100644
--- a/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java
+++ b/extensions/core/executionoutbox/persistence-jpa/src/main/java/org/apache/isis/extensions/executionoutbox/jpa/IsisModuleExtExecutionOutboxPersistenceJpa.java
@@ -27,6 +27,10 @@ import org.apache.isis.extensions.executionoutbox.jpa.dom.ExecutionOutboxEntry;
import org.apache.isis.extensions.executionoutbox.jpa.dom.ExecutionOutboxEntryPK;
import org.apache.isis.extensions.executionoutbox.jpa.dom.ExecutionOutboxEntryRepository;
import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
+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.jpa.TeardownFixtureJpaAbstract;
/**
* @since 2.0 {@index}
@@ -34,6 +38,7 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
@Configuration
@Import({
// modules
+ IsisModuleTestingFixturesApplib.class,
IsisModuleExtExecutionOutboxApplib.class,
IsisModulePersistenceJpaEclipselink.class,
@@ -47,9 +52,19 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
@EntityScan(basePackageClasses = {
ExecutionOutboxEntry.class
})
-public class IsisModuleExtExecutionOutboxPersistenceJpa {
+public class IsisModuleExtExecutionOutboxPersistenceJpa implements ModuleWithFixtures {
public static final String NAMESPACE = IsisModuleExtExecutionOutboxApplib.NAMESPACE;
public static final String SCHEMA = IsisModuleExtExecutionOutboxApplib.SCHEMA;
+ @Override
+ public FixtureScript getTeardownFixture() {
+ return new TeardownFixtureJpaAbstract() {
+ @Override
+ protected void execute(final ExecutionContext executionContext) {
+ deleteFrom(ExecutionOutboxEntry.class);
+ }
+ };
+ }
+
}
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
index ee75372760..e1d05f9e5c 100644
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
+++ b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.audittrail.applib.IsisModuleExtAuditTrailApplib;
-import org.apache.isis.audittrail.jdo.dom.AuditTrailEntry;
+import org.apache.isis.audittrail.jdo.dom.AuditTrailEntryJdo;
import org.apache.isis.audittrail.jdo.dom.AuditTrailEntryRepository;
import org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -44,7 +44,7 @@ import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAb
AuditTrailEntryRepository.class,
// entities, eager meta-model introspection
- AuditTrailEntry.class,
+ AuditTrailEntryJdo.class,
})
public class IsisModuleExtAuditTrailPersistenceJdo implements ModuleWithFixtures {
@@ -53,7 +53,7 @@ public class IsisModuleExtAuditTrailPersistenceJdo implements ModuleWithFixtures
return new TeardownFixtureJdoAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
- deleteFrom(AuditTrailEntry.class);
+ deleteFrom(AuditTrailEntryJdo.class);
}
};
}
diff --git a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntry.java b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntryJdo.java
similarity index 81%
rename from extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntry.java
rename to extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntryJdo.java
index 627e2358b4..b7152b0304 100644
--- a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntry.java
+++ b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntryJdo.java
@@ -20,8 +20,6 @@
package org.apache.isis.audittrail.jdo.dom;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
import java.util.UUID;
import javax.inject.Named;
@@ -33,37 +31,24 @@ import javax.jdo.annotations.Index;
import javax.jdo.annotations.Indices;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent;
-import javax.jdo.annotations.PrimaryKey;
import javax.jdo.annotations.Queries;
import javax.jdo.annotations.Query;
-import javax.jdo.annotations.Unique;
-import javax.jdo.annotations.Uniques;
import javax.jdo.annotations.Version;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
-import org.apache.isis.applib.mixins.system.DomainChangeRecord;
import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.util.ObjectContracts;
-import org.apache.isis.applib.util.TitleBuffer;
-import org.apache.isis.audittrail.applib.IsisModuleExtAuditTrailApplib;
-import org.apache.isis.audittrail.applib.dom.AuditTrailEntry;
import org.apache.isis.audittrail.applib.dom.AuditTrailEntry.Nq;
import lombok.Getter;
import lombok.Setter;
@PersistenceCapable(
identityType = IdentityType.DATASTORE,
- schema = AuditTrailEntry.SCHEMA,
- table = AuditTrailEntry.TABLE)
+ schema = AuditTrailEntryJdo.SCHEMA,
+ table = AuditTrailEntryJdo.TABLE)
@Indices({
@Index(name = "target_propertyId_timestamp_IDX", members = { "target", "propertyId", "timestamp" }, unique = "false"),
@Index(name = "target_timestamp_IDX", members = { "target", "timestamp" }, unique = "false"),
@@ -74,26 +59,26 @@ import lombok.Setter;
@Query(
name = Nq.FIND_BY_INTERACTION_ID,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE interactionId == :interactionId"),
@Query(
name = Nq.FIND_FIRST_BY_TARGET,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE target == :target "
+ " ORDER BY timestamp ASC "
+ " RANGE 0,2"),
@Query(
name = Nq.FIND_RECENT_BY_TARGET,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE targetStr == :targetStr "
+ " ORDER BY timestamp DESC "
+ " RANGE 0,100"),
@Query(
name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BETWEEN,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE targetStr == :targetStr "
+ " && timestamp >= :from "
+ " && timestamp <= :to "
@@ -101,51 +86,51 @@ import lombok.Setter;
@Query(
name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_AFTER,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE target == :target "
+ " && timestamp >= :from "
+ " ORDER BY this.timestamp DESC"),
@Query(
name = Nq.FIND_BY_TARGET_AND_TIMESTAMP_BEFORE,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE target == :target "
+ " && timestamp <= :to "
+ " ORDER BY this.timestamp DESC"),
@Query(
name = Nq.FIND_BY_TARGET,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE target == :target "
+ " ORDER BY timestamp DESC"),
@Query(
name = Nq.FIND_BY_TIMESTAMP_BETWEEN,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE timestamp >= :from "
+ " && timestamp <= :to "
+ " ORDER BY this.timestamp DESC"),
@Query(
name = Nq.FIND_BY_TIMESTAMP_AFTER,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE timestamp >= :from "
+ " ORDER BY this.timestamp DESC"),
@Query(
name = Nq.FIND_BY_TIMESTAMP_BEFORE,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE timestamp <= :to "
+ " ORDER BY this.timestamp DESC"),
@Query(
name = Nq.FIND,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " ORDER BY this.timestamp DESC"),
@Query(
name = Nq.FIND_RECENT_BY_TARGET_AND_PROPERTY_ID,
value = "SELECT "
- + " FROM " + AuditTrailEntry.FQCN + " "
+ + " FROM " + AuditTrailEntryJdo.FQCN + " "
+ " WHERE target == :target "
+ " && propertyId == :propertyId "
+ " ORDER BY timestamp DESC "
@@ -154,16 +139,16 @@ import lombok.Setter;
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@Version(column = "version")
-@Named(AuditTrailEntry.LOGICAL_TYPE_NAME)
+@Named(AuditTrailEntryJdo.LOGICAL_TYPE_NAME)
@DomainObject(
editing = Editing.DISABLED
)
-public class AuditTrailEntry
+public class AuditTrailEntryJdo
extends org.apache.isis.audittrail.applib.dom.AuditTrailEntry {
- static final String FQCN = "org.apache.isis.audittrail.jdo.dom.AuditTrailEntry";
+ static final String FQCN = "org.apache.isis.audittrail.jdo.dom.AuditTrailEntryJdo";
- public AuditTrailEntry(
+ public AuditTrailEntryJdo(
final java.sql.Timestamp timestamp,
final String username,
final Bookmark target,
diff --git a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java
index a2b8bc5afd..44eec06f3b 100644
--- a/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java
+++ b/extensions/security/audittrail/persistence-jpa/src/main/java/org/apache/isis/audittrail/jpa/IsisModuleExtAuditTrailPersistenceJpa.java
@@ -24,42 +24,41 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.audittrail.applib.IsisModuleExtAuditTrailApplib;
+import org.apache.isis.audittrail.jpa.dom.AuditTrailEntry;
+import org.apache.isis.audittrail.jpa.dom.AuditTrailEntryRepository;
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.SessionLogEntryPK;
-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;
+import org.apache.isis.testing.fixtures.applib.teardown.jpa.TeardownFixtureJpaAbstract;
@Configuration
@Import({
// modules
IsisModuleTestingFixturesApplib.class,
- IsisModuleExtSessionLogApplib.class,
+ IsisModuleExtAuditTrailApplib.class,
IsisModulePersistenceJpaEclipselink.class,
// services
- SessionLogEntryRepository.class,
- SessionLogEntryPK.Stringifier.class,
+ AuditTrailEntryRepository.class,
// entities, eager meta-model introspection
- SessionLogEntry.class,
+ AuditTrailEntry.class,
})
@EntityScan(basePackageClasses = {
- SessionLogEntry.class,
+ AuditTrailEntry.class,
})
public class IsisModuleExtAuditTrailPersistenceJpa implements ModuleWithFixtures {
@Override
public FixtureScript getTeardownFixture() {
- return new TeardownFixtureJdoAbstract() {
+ return new TeardownFixtureJpaAbstract() {
@Override
protected void execute(final ExecutionContext executionContext) {
- deleteFrom(SessionLogEntry.class);
+ deleteFrom(AuditTrailEntry.class);
}
};
}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
index 6a0b54f191..35ccd1ffc8 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/IsisModuleExtSecmanPersistenceJpa.java
@@ -33,6 +33,10 @@ import org.apache.isis.extensions.secman.jpa.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.jpa.user.dom.ApplicationUserRepository;
import org.apache.isis.extensions.secman.jpa.util.RegexReplacer;
import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
+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.jpa.TeardownFixtureJpaAbstract;
/**
* @since 2.0 {@index}
@@ -40,6 +44,7 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
@Configuration
@Import({
// Modules
+ IsisModuleTestingFixturesApplib.class,
IsisModuleExtSecmanIntegration.class,
IsisModulePersistenceJpaEclipselink.class,
@@ -63,6 +68,19 @@ import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclip
ApplicationTenancy.class,
ApplicationUser.class,
})
-public class IsisModuleExtSecmanPersistenceJpa {
+public class IsisModuleExtSecmanPersistenceJpa implements ModuleWithFixtures {
+
+ @Override
+ public FixtureScript getTeardownFixture() {
+ return new TeardownFixtureJpaAbstract() {
+ @Override
+ protected void execute(final ExecutionContext executionContext) {
+ deleteFrom(ApplicationPermission.class);
+ deleteFrom(ApplicationUser.class);
+ deleteFrom(ApplicationRole.class);
+ deleteFrom(ApplicationTenancy.class);
+ }
+ };
+ }
}
diff --git a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/IsisModuleExtFullCalendarApplib.java b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/IsisModuleExtFullCalendarApplib.java
index 761b7c4e88..29312781b6 100644
--- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/IsisModuleExtFullCalendarApplib.java
+++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/IsisModuleExtFullCalendarApplib.java
@@ -31,4 +31,5 @@ import org.apache.isis.extensions.fullcalendar.applib.value.CalendarEventSemanti
CalendarEventSemantics.class
})
public class IsisModuleExtFullCalendarApplib {
+ public static final String NAMESPACE = "isis.ext.fullcalendar";
}
diff --git a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java
index adb926c9d8..eb4a12c63a 100644
--- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java
+++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/isis/extensions/fullcalendar/applib/value/CalendarEvent.java
@@ -32,6 +32,7 @@ import org.springframework.lang.Nullable;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.value.semantics.ValueDecomposition;
+import org.apache.isis.extensions.fullcalendar.applib.IsisModuleExtFullCalendarApplib;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
@@ -45,7 +46,7 @@ import lombok.With;
* @since 2.0 {@index}
* @apiNote implements Comparable<CalendarEvent> based on epochMillis
*/
-@Named(IsisModuleApplib.NAMESPACE + ".value.CalendarEvent")
+@Named(IsisModuleExtFullCalendarApplib.NAMESPACE + ".value.CalendarEvent")
@org.apache.isis.applib.annotation.Value
@XmlJavaTypeAdapter(CalendarEvent.JaxbAdapter.class)
@Getter @With
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
index 9a8c477a69..472668241b 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
@@ -25,4 +25,5 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class IsisModuleValAsciidocApplib {
+ public static final String NAMESPACE = "isis.value.asciidoc";
}
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
index 9af1c1d493..5e6fe54dae 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.value.Markup;
+import org.apache.isis.valuetypes.asciidoc.applib.IsisModuleValAsciidocApplib;
import org.apache.isis.valuetypes.asciidoc.applib.jaxb.AsciiDocJaxbAdapter;
import lombok.AccessLevel;
@@ -38,7 +39,7 @@ import lombok.experimental.Accessors;
*
* @since 2.0 {@index}
*/
-@Named(IsisModuleApplib.NAMESPACE + ".value.AsciiDoc")
+@Named(IsisModuleValAsciidocApplib.NAMESPACE + ".AsciiDoc")
@org.apache.isis.applib.annotation.Value
@EqualsAndHashCode
@XmlJavaTypeAdapter(AsciiDocJaxbAdapter.class) // for JAXB view model support
diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
index 70bc3417ac..5c839caecc 100644
--- a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
@@ -25,4 +25,5 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class IsisModuleValMarkdownApplib {
+ public static final String NAMESPACE = "isis.value.markdown";
}
diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
index 829fb99fc7..e76dc84ebf 100644
--- a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.value.Markup;
+import org.apache.isis.valuetypes.markdown.applib.IsisModuleValMarkdownApplib;
import org.apache.isis.valuetypes.markdown.applib.jaxb.MarkdownJaxbAdapter;
import lombok.AccessLevel;
@@ -38,7 +39,7 @@ import lombok.experimental.Accessors;
*
* @since 2.0 {@index}
*/
-@Named(IsisModuleApplib.NAMESPACE + ".value.Markdown")
+@Named(IsisModuleValMarkdownApplib.NAMESPACE + ".Markdown")
@org.apache.isis.applib.annotation.Value
@EqualsAndHashCode
@XmlJavaTypeAdapter(MarkdownJaxbAdapter.class) // for JAXB view model support
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.java
index 595ec4077e..d03626a28a 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/IsisModuleViewerRestfulObjectsApplib.java
@@ -25,4 +25,7 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class IsisModuleViewerRestfulObjectsApplib {
+
+
+ public static final String NAMESPACE = "isis.viewer.ro";
}
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 56897bdddf..d65a4c9557 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -55,7 +55,7 @@ import lombok.val;
*
*/
@Service
-@Named("isis.viewer.ro.WebModuleJaxrsRestEasy4") // CAUTION: SwaggerServiceMenu refers to this name
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".WebModuleJaxrsRestEasy4") // CAUTION: SwaggerServiceMenu refers to this name
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 80)
@Qualifier("JaxrsRestEasy4")
public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 9411afaeb2..9d9afffc5a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -57,7 +57,7 @@ import lombok.extern.log4j.Log4j2;
* primitives.
*/
@Service
-@Named("isis.viewer.ro.JsonValueEncoder")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".JsonValueEncoder")
@Priority(PriorityPrecedence.EARLY)
@Qualifier("Default")
@Log4j2
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
index 6704901231..acbc67bfa4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationService.java
@@ -34,6 +34,7 @@ import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndActionInvocation;
import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationService;
@@ -63,7 +64,7 @@ import lombok.extern.log4j.Log4j2;
* @since 1.x {@index}
*/
@Service
-@Named("isis.viewer.ro.RepresentationService")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".RepresentationService")
@Priority(PriorityPrecedence.EARLY)
@Log4j2
public class RepresentationService {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
index f91123cb4c..d5bcbdc62c 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
@@ -43,7 +43,7 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
* @since 1.x {@index}
*/
@Service
-@Named("isis.viewer.ro.AcceptHeaderServiceForRest")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".AcceptHeaderServiceForRest")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("ForRest")
@InteractionScope
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index b2353bcd66..d54ae3290a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -68,7 +68,7 @@ import lombok.val;
* @since 1.x {@index}
*/
@Service
-@Named("isis.viewer.ro.ContentNegotiationServiceForRestfulObjectsV1_0")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".ContentNegotiationServiceForRestfulObjectsV1_0")
@Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("RestfulObjectsV1_0")
public class ContentNegotiationServiceForRestfulObjectsV1_0
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index 319f57abc5..76a86b60c4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -33,6 +33,7 @@ import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
import org.apache.isis.core.metamodel.interactions.managed.ManagedCollection;
import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.IResourceContext;
import org.apache.isis.viewer.restfulobjects.rendering.Responses;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndActionInvocation;
@@ -43,12 +44,13 @@ import lombok.extern.log4j.Log4j2;
* @since 1.x {@index}
*/
@Service
-@Named("isis.viewer.ro.ContentNegotiationServiceOrgApacheIsisV1")
+@Named(ContentNegotiationServiceOrgApacheIsisV1.LOGICAL_TYPE_NAME)
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 200)
@Qualifier("OrgApacheIsisV1")
@Log4j2
public class ContentNegotiationServiceOrgApacheIsisV1 extends ContentNegotiationServiceAbstract {
+ static final String LOGICAL_TYPE_NAME = IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".ContentNegotiationServiceOrgApacheIsisV1";
public static final String ACCEPT_PROFILE = "urn:org.apache.isis/v1";
@Override
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
index 53cb0e5907..bf9cd93fc4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
@@ -57,7 +57,7 @@ import lombok.val;
* @since 1.x {@index}
*/
@Service
-@Named("isis.viewer.ro.ContentNegotiationServiceOrgApacheIsisV2")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".ContentNegotiationServiceOrgApacheIsisV2")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 200)
@Qualifier("OrgApacheIsisV2")
public class ContentNegotiationServiceOrgApacheIsisV2 extends ContentNegotiationServiceAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index 14dbe1ac9b..e41bf9808a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -54,7 +54,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndAc
* @since 1.x {@index}
*/
@Service
-@Named("isis.viewer.ro.ContentNegotiationServiceXRoDomainType")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".ContentNegotiationServiceXRoDomainType")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 100)
@Qualifier("XRoDomainType")
public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationServiceAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
index 0e9e9e9166..3b0bd0a95e 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
@@ -28,6 +28,7 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.config.RestEasyConfiguration;
import org.apache.isis.core.config.viewer.web.WebAppContextPath;
import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@ import javax.inject.Inject;
import javax.inject.Named;
@Service
-@Named(IsisModuleCoreMetamodel.NAMESPACE + ".swaggerServiceDefault")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".swaggerServiceDefault")
@Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("Default")
public class SwaggerServiceDefault implements SwaggerService {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
index ed4927c542..6cb3420054 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
@@ -22,8 +22,10 @@ import javax.inject.Named;
import org.springframework.stereotype.Component;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
+
@Component
-@Named(IsisModuleCoreMetamodel.NAMESPACE + ".ClassExcluderDefault")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".ClassExcluderDefault")
public class ClassExcluderDefault extends ClassExcluderAbstract {
public ClassExcluderDefault() {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
index 1bfa128745..3cc6ee5cd4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
@@ -28,13 +28,14 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.swagger.Format;
import org.apache.isis.applib.services.swagger.Visibility;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
import io.swagger.models.Swagger;
import io.swagger.util.Json;
import io.swagger.util.Yaml;
@Component
-@Named(IsisModuleCoreMetamodel.NAMESPACE + ".SwaggerSpecGenerator")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".SwaggerSpecGenerator")
public class SwaggerSpecGenerator {
private final SpecificationLoader specificationLoader;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index ab8b6aa82b..613cc9cbb7 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -29,9 +29,10 @@ import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
@Component
-@Named(IsisModuleCoreMetamodel.NAMESPACE + ".TaggerDefault")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".TaggerDefault")
public class TaggerDefault implements Tagger {
static Pattern tagPatternForFqcn = Pattern.compile("^.*\\.([^\\.]+)\\.([^\\.]+)$");
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
index 3d893f9335..6e8597d5a2 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
@@ -37,6 +37,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.viewer.restfulobjects.applib.IsisModuleViewerRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyPlugin.ValuePropertyCollector;
import io.swagger.models.properties.BooleanProperty;
@@ -53,7 +54,7 @@ import io.swagger.models.properties.StringProperty;
import io.swagger.models.properties.UUIDProperty;
@Component
-@Named(IsisModuleCoreMetamodel.NAMESPACE + ".ValuePropertyFactoryDefault")
+@Named(IsisModuleViewerRestfulObjectsApplib.NAMESPACE + ".ValuePropertyFactoryDefault")
public class ValuePropertyFactoryDefault implements ValuePropertyFactory {
private final Map<Class<?>, Factory> propertyFactoryByClass = _Maps.newHashMap();