You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/17 19:17:49 UTC
[isis] branch master updated: ISIS-2486: rename module classes (for
symmetry), also fixes regr. t.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f37239f ISIS-2486: rename module classes (for symmetry), also fixes regr. t.
new e81d4f0 merging 2486 (from diverging changes)
f37239f is described below
commit f37239fd77fd5fbb52a4e3798356c1b7a9ed0ea0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 17 20:08:30 2021 +0100
ISIS-2486: rename module classes (for symmetry), also fixes regr. t.
---
examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java | 1 -
.../wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java | 4 ++--
...oduleJdoProviderDatanucleus.java => IsisModuleJdoDatanucleus.java} | 2 +-
.../{IsisModuleJpaEclipseLink.java => IsisModuleJpaEclipselink.java} | 4 ++--
.../java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java | 4 ++--
.../java/org/apache/isis/testdomain/conf/Configuration_usingJpa.java | 4 ++--
.../apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java | 4 ++--
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
index 8121eee..dc95489 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModule.java
@@ -32,7 +32,6 @@ import org.apache.isis.extensions.modelannotation.metamodel.IsisModuleExtModelAn
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
-import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoProviderDatanucleus;
import org.apache.isis.persistence.jdo.integration.IsisModuleJdoIntegration;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
diff --git a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java
index b6cadc8..e71d4af 100644
--- a/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java
+++ b/examples/demo/wicket/src/main/java/demoapp/webapp/wicket/DemoAppWicket.java
@@ -24,7 +24,7 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.viewer.wicket.pdfjs.ui.IsisModuleExtPdfjsUi;
-import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoProviderDatanucleus;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import org.apache.isis.valuetypes.asciidoc.persistence.jdo.dn5.IsisModuleValAsciidocPersistenceJdoDn5;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
@@ -59,7 +59,7 @@ import demoapp.webapp.wicket.ui.custom.WhereInTheWorldPanelFactory;
WhereInTheWorldPanelFactory.class,
// Persistence (JDO/DN5)
- IsisModuleJdoProviderDatanucleus.class,
+ IsisModuleJdoDatanucleus.class,
IsisModuleValAsciidocPersistenceJdoDn5.class,
IsisModuleValMarkdownPersistenceJdoDn5.class,
})
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoDatanucleus.java
similarity index 99%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
rename to persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoDatanucleus.java
index df27253..23afaec 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoProviderDatanucleus.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModuleJdoDatanucleus.java
@@ -73,7 +73,7 @@ import lombok.val;
JdoSupportServiceDefault.class,
JdoSchemaService.class,
})
-public class IsisModuleJdoProviderDatanucleus {
+public class IsisModuleJdoDatanucleus {
// reserved for datanucleus' own config props
@ConfigurationProperties(prefix = "isis.persistence.jdo-datanucleus.impl")
diff --git a/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipseLink.java b/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.java
similarity index 96%
rename from persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipseLink.java
rename to persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.java
index c8c3f0d..f65ba5c 100644
--- a/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipseLink.java
+++ b/persistence/jpa/eclipselink/src/main/java/org/apache/isis/persistence/jpa/eclipselink/IsisModuleJpaEclipselink.java
@@ -49,11 +49,11 @@ import org.apache.isis.persistence.jpa.integration.IsisModuleJpaIntegration;
@Import({
IsisModuleJpaIntegration.class
})
-public class IsisModuleJpaEclipseLink extends JpaBaseConfiguration {
+public class IsisModuleJpaEclipselink extends JpaBaseConfiguration {
@Inject private Provider<ServiceInjector> serviceInjectorProvider;
- protected IsisModuleJpaEclipseLink(
+ protected IsisModuleJpaEclipselink(
DataSource dataSource,
JpaProperties properties,
ObjectProvider<JtaTransactionManager> jtaTransactionManager) {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index b6b40cd..7db0d71 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jdo.integration.IsisModuleJdoIntegration;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
import org.apache.isis.testdomain.model.stereotypes.MyService;
@@ -38,7 +38,7 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
MyService.class, // testing injection into entities
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
- IsisModuleJdoIntegration.class,
+ IsisModuleJdoDatanucleus.class,
IsisModuleTestingFixturesApplib.class,
KVStoreForTesting.class, // Helper for JUnit Tests
})
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJpa.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJpa.java
index bee6362..b0fcd30 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJpa.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipseLink;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jpa.JpaTestDomainModule;
import org.apache.isis.testdomain.model.stereotypes.MyService;
@@ -46,7 +46,7 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
IsisModuleCoreRuntimeServices.class
,IsisModuleSecurityBypass.class
- ,IsisModuleJpaEclipseLink.class
+ ,IsisModuleJpaEclipselink.class
,IsisModuleTestingFixturesApplib.class
,KVStoreForTesting.class, // Helper for JUnit Tests
})
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java
index 2dc5afb..7e52ae0 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingSpringDataJpa.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipseLink;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jpa.springdata.SpringDataJpaTestModule;
import org.apache.isis.testdomain.model.stereotypes.MyService;
@@ -43,7 +43,7 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
IsisModuleCoreRuntimeServices.class
,IsisModuleSecurityBypass.class
- ,IsisModuleJpaEclipseLink.class
+ ,IsisModuleJpaEclipselink.class
,IsisModuleTestingFixturesApplib.class
,KVStoreForTesting.class, // Helper for JUnit Tests
})