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/04/22 08:17:58 UTC

[isis] branch master updated: ISIS-2620: command-log ext.: prepare a jpa variant (stub)

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 5cbc173  ISIS-2620: command-log ext.: prepare a jpa variant (stub)
5cbc173 is described below

commit 5cbc17398963fc64212cf4458bae0c00ac11b9be
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 22 10:17:45 2021 +0200

    ISIS-2620: command-log ext.: prepare a jpa variant (stub)
---
 .../command-log/{impl => jdo}/logging-dn-enhance.properties |   0
 extensions/core/command-log/{impl => jdo}/pom.xml           |   0
 .../{impl => jdo}/src/main/java/META-INF/persistence.xml    |   0
 .../extensions/commandlog/impl/CommandSubscriberForJdo.java |   0
 .../commandlog/impl/IsisModuleExtCommandLogImpl.java        |   0
 .../isis/extensions/commandlog/impl/jdo/CommandJdo.java     |   0
 .../commandlog/impl/jdo/CommandJdo.layout.fallback.xml      |   0
 .../isis/extensions/commandlog/impl/jdo/CommandJdo.png      | Bin
 .../commandlog/impl/jdo/CommandJdoRepository.java           |   0
 .../commandlog/impl/jdo/CommandJdo_childCommands.java       |   0
 .../commandlog/impl/jdo/CommandJdo_openResultObject.java    |   0
 .../commandlog/impl/jdo/CommandJdo_openTargetObject.java    |   0
 .../extensions/commandlog/impl/jdo/CommandJdo_retry.java    |   0
 .../commandlog/impl/jdo/CommandJdo_siblingCommands.java     |   0
 .../isis/extensions/commandlog/impl/jdo/ReplayState.java    |   0
 .../commandlog/impl/mixins/HasInteractionId_command.java    |   0
 .../impl/mixins/HasUsername_recentCommandsByUser.java       |   0
 .../commandlog/impl/mixins/Object_recentCommands.java       |   0
 .../isis/extensions/commandlog/impl/mixins/T_recent.java    |   0
 .../extensions/commandlog/impl/ui/CommandServiceMenu.java   |   0
 .../extensions/commandlog/impl/util/BigDecimalUtils.java    |   0
 .../isis/extensions/commandlog/impl/util/StringUtils.java   |   0
 .../commandlog/impl/util/StringUtils_trimmed_Test.java      |   0
 extensions/core/command-log/{impl => jpa}/pom.xml           |  10 +++++-----
 extensions/core/command-log/pom.xml                         |   3 ++-
 25 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/core/command-log/impl/logging-dn-enhance.properties b/extensions/core/command-log/jdo/logging-dn-enhance.properties
similarity index 100%
rename from extensions/core/command-log/impl/logging-dn-enhance.properties
rename to extensions/core/command-log/jdo/logging-dn-enhance.properties
diff --git a/extensions/core/command-log/impl/pom.xml b/extensions/core/command-log/jdo/pom.xml
similarity index 100%
copy from extensions/core/command-log/impl/pom.xml
copy to extensions/core/command-log/jdo/pom.xml
diff --git a/extensions/core/command-log/impl/src/main/java/META-INF/persistence.xml b/extensions/core/command-log/jdo/src/main/java/META-INF/persistence.xml
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/META-INF/persistence.xml
rename to extensions/core/command-log/jdo/src/main/java/META-INF/persistence.xml
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.layout.fallback.xml b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.layout.fallback.xml
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.layout.fallback.xml
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.layout.fallback.xml
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.png b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.png
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.png
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.png
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_childCommands.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_childCommands.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_childCommands.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_childCommands.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openResultObject.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openResultObject.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openResultObject.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openResultObject.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openTargetObject.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openTargetObject.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openTargetObject.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openTargetObject.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_siblingCommands.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_siblingCommands.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_siblingCommands.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_siblingCommands.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/ReplayState.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/ReplayState.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/ReplayState.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/ReplayState.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasInteractionId_command.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasInteractionId_command.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasInteractionId_command.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasInteractionId_command.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/Object_recentCommands.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/Object_recentCommands.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/Object_recentCommands.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/Object_recentCommands.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/T_recent.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/T_recent.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/T_recent.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/T_recent.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/util/BigDecimalUtils.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/util/BigDecimalUtils.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/util/BigDecimalUtils.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/util/BigDecimalUtils.java
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils.java b/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils.java
similarity index 100%
rename from extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils.java
rename to extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils.java
diff --git a/extensions/core/command-log/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils_trimmed_Test.java b/extensions/core/command-log/jdo/src/test/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils_trimmed_Test.java
similarity index 100%
rename from extensions/core/command-log/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils_trimmed_Test.java
rename to extensions/core/command-log/jdo/src/test/java/org/apache/isis/extensions/commandlog/impl/util/StringUtils_trimmed_Test.java
diff --git a/extensions/core/command-log/impl/pom.xml b/extensions/core/command-log/jpa/pom.xml
similarity index 92%
rename from extensions/core/command-log/impl/pom.xml
rename to extensions/core/command-log/jpa/pom.xml
index 40afeae..83bf64b 100644
--- a/extensions/core/command-log/impl/pom.xml
+++ b/extensions/core/command-log/jpa/pom.xml
@@ -19,12 +19,12 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>isis-extensions-command-log-jdo</artifactId>
-    <name>Apache Isis Ext - Command Log Implementation (JDO)</name>
+    <artifactId>isis-extensions-command-log-jpa</artifactId>
+    <name>Apache Isis Ext - Command Log Implementation (JPA)</name>
 
     <properties>
-        <jar-plugin.automaticModuleName>org.apache.isis.extensions.commandlog.jdo</jar-plugin.automaticModuleName>
-        <git-plugin.propertiesDir>org/apache/isis/extensions/commandlog/jdo</git-plugin.propertiesDir>
+        <jar-plugin.automaticModuleName>org.apache.isis.extensions.commandlog.jpa</jar-plugin.automaticModuleName>
+        <git-plugin.propertiesDir>org/apache/isis/extensions/commandlog/jpa</git-plugin.propertiesDir>
     </properties>
 
     <build>
@@ -70,7 +70,7 @@
 
 		<dependency>
             <groupId>org.apache.isis.mavendeps</groupId>
-			<artifactId>isis-mavendeps-jdo</artifactId>
+			<artifactId>isis-mavendeps-jpa</artifactId>
 			<type>pom</type>
         </dependency>
 
diff --git a/extensions/core/command-log/pom.xml b/extensions/core/command-log/pom.xml
index 4fd42ca..7f87aee 100644
--- a/extensions/core/command-log/pom.xml
+++ b/extensions/core/command-log/pom.xml
@@ -40,7 +40,8 @@
 	</dependencyManagement>
 
 	<modules>
-		<module>impl</module>
+		<module>jdo</module>
+		<module>jpa</module>
 	</modules>
 
 </project>