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 2020/01/10 18:35:28 UTC
[isis] 03/14: ISIS-2259: fixes up some module names
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1769a6667f3837750f82960a579de4e54422d343
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:30:42 2020 +0000
ISIS-2259: fixes up some module names
---
core/metamodel/pom.xml | 4 ++--
.../{IsisModuleMetamodel.java => IsisModuleCoreMetamodel.java} | 2 +-
core/runtime/pom.xml | 4 ++--
.../java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java | 6 +++---
.../org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java | 4 ++--
.../src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java | 4 ++--
.../persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java | 4 ++--
.../restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index deca218..705045b 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -30,8 +30,8 @@
<name>Apache Isis Core - MetaModel</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.metamodel</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/metamodel</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.metamodel</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/metamodel</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
index 4b68215..4a1affd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
@@ -96,6 +96,6 @@ import org.apache.isis.security.api.IsisModuleSecurityApi;
ApplicationFeatureRepositoryDefault.class,
})
-public class IsisModuleMetamodel {
+public class IsisModuleCoreMetamodel {
}
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 823b1ec..2b72eac 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -30,8 +30,8 @@
<name>Apache Isis Core - Runtime</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.runtime</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.runtime</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/runtime</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
index 5f6c635..5a70cfd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.runtime;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.metamodel.IsisModuleMetamodel;
+import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.runtime.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.context.session.RuntimeEventSupport_Spring;
import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService;
@@ -34,7 +34,7 @@ import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
@Configuration
@Import({
// modules
- IsisModuleMetamodel.class,
+ IsisModuleCoreMetamodel.class,
// @Service's
RuntimeEventService.class,
@@ -49,6 +49,6 @@ import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
PersistenceEventService_Spring.class,
})
-public class IsisModuleRuntime {
+public class IsisCoreModuleRuntime {
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index c7cdcbe..9143047 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
import org.apache.isis.runtimeservices.command.CommandDtoServiceInternalDefault;
@@ -53,7 +53,7 @@ import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
@Configuration
@Import({
// modules
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
IsisModuleCoreCodegenByteBuddy.class,
// @Service's
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
index 1ac3dec..697f3a7 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
@@ -21,7 +21,7 @@ package org.apache.isis.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
@@ -30,7 +30,7 @@ import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
@Configuration
@Import({
// modules
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
// @Service's
WebModuleLogOnExceptionLogger.class,
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
index 9aecb35..bafa317 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
@@ -39,12 +39,12 @@ import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoProgrammingMode
import org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory5;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
@Configuration
@Import({
// modules
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
IsisModuleJdoApplib.class,
// @Component's
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
index 51b0874..f1bc2a4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
import org.apache.isis.viewer.restfulobjects.applib.IsisModuleRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceContentNegotiator;
@@ -22,7 +22,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.
@Import({
// modules
IsisModuleRestfulObjectsApplib.class,
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
// @Component's
ClassExcluderDefault.class,