This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-2222 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 81920a6a96b2d4b164a4dfb71decaa066e9c3500 Author: danhaywood <[email protected]> AuthorDate: Sun Aug 30 14:46:33 2020 +0100 ISIS-2222: moves commandlog classes to correct package --- .../impl}/IsisModuleExtCommandLogImpl.java | 16 +++--- ...ndExecutionFromBackgroundCommandServiceJdo.java | 6 +-- .../background}/BackgroundCommandServiceJdo.java | 16 +++--- .../BackgroundCommandServiceJdoRepository.java | 9 ++-- .../commandlog/impl/jdo}/CommandJdo.java | 59 +++++++++------------ .../impl/jdo}/CommandJdo.layout.fallback.xml | 0 .../extensions/commandlog/impl/jdo}/CommandJdo.png | Bin .../impl/jdo}/CommandJdo_childCommands.java | 6 +-- .../impl/jdo}/CommandJdo_openResultObject.java | 5 +- .../commandlog/impl/jdo}/CommandJdo_retry.java | 6 +-- .../impl/jdo}/CommandJdo_siblingCommands.java | 6 +-- .../commandlog/impl/jdo}/CommandServiceJdo.java | 2 +- .../impl/jdo}/CommandServiceJdoRepository.java | 6 +-- .../commandlog/impl/jdo}/CommandServiceMenu.java | 5 +- .../commandlog/impl/jdo}/ReplayState.java | 2 +- .../impl/mixins}/HasUniqueId_command.java | 17 +++--- .../mixins}/HasUsername_recentCommandsByUser.java | 12 +++-- .../impl/mixins}/Object_recentCommands.java | 15 +++--- .../impl/mixins}/T_backgroundCommands.java | 16 +++--- .../replay/IsisModuleExtCommandReplayImpl.java | 16 +++--- .../impl/CommandExecutorServiceWithTime.java | 4 +- .../impl}/replay/impl/CommandFetcher.java | 2 +- .../impl}/replay/impl/CommandJdo_exclude.java | 12 ++--- .../replay/impl/CommandReplayAnalysisService.java | 12 ++--- .../replay/impl/CommandReplayOnMasterService.java | 10 ++-- .../replay/impl/CommandReplayOnSlaveService.java | 12 ++--- .../impl}/replay/impl/ConfigurationKeys.java | 2 +- .../commandlog/impl/replay/impl/Holder.java | 5 ++ .../replay/impl/ReplayableCommandExecution.java | 13 ++--- ...kgroundCommandsWithReplicationAndReplayJob.java | 12 ++--- .../impl}/replay/impl/SlaveConfiguration.java | 10 +--- .../commandlog/impl}/replay/impl/SlaveStatus.java | 2 +- .../impl}/replay/impl/StatusException.java | 2 +- .../impl}/replay/impl/TickingClockService.java | 7 +-- .../replay/impl/mixins/CommandJdo_download.java | 8 +-- .../impl/mixins/CommandJdo_openOnMaster.java | 11 ++-- .../replay/impl/mixins/CommandJdo_replayNext.java | 23 ++++---- .../replay/impl/mixins/CommandJdo_replayQueue.java | 17 +++--- .../impl}/replay/spi/CommandReplayAnalyser.java | 2 +- .../replay/spi/CommandReplayAnalyserAbstract.java | 2 +- .../spi/CommandReplayAnalyserExceptionStr.java | 2 +- ...mandReplayAnalyserNumberBackgroundCommands.java | 6 +-- .../replay/spi/CommandReplayAnalyserResultStr.java | 4 +- .../spi/ReplayCommandExecutionController.java | 2 +- .../module/command/replay/impl/Holder.java | 5 -- .../CommandReplayAnalysisService_trimmed_Test.java | 2 +- ...ndCommandsWithReplicationAndReplayJob_Test.java | 2 +- .../quartz/dom/jobs/RunBackgroundCommandsJob.java | 2 +- 48 files changed, 184 insertions(+), 229 deletions(-) diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/IsisModuleExtCommandLogImpl.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.java similarity index 73% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/IsisModuleExtCommandLogImpl.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.java index b2d81cf..bcadcbf 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/IsisModuleExtCommandLogImpl.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/IsisModuleExtCommandLogImpl.java @@ -1,19 +1,19 @@ -package org.isisaddons.module.command; +package org.apache.isis.extensions.commandlog.impl; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceMenu; 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.TeardownFixtureAbstract; -import org.isisaddons.module.command.dom.BackgroundCommandExecutionFromBackgroundCommandServiceJdo; -import org.isisaddons.module.command.dom.BackgroundCommandServiceJdo; -import org.isisaddons.module.command.dom.BackgroundCommandServiceJdoRepository; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.CommandServiceJdo; -import org.isisaddons.module.command.dom.CommandServiceJdoRepository; -import org.isisaddons.module.command.dom.CommandServiceMenu; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandExecutionFromBackgroundCommandServiceJdo; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandServiceJdo; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandServiceJdoRepository; @Configuration @Import({ diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java similarity index 87% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java index 2120b95..b1d3313 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java @@ -1,8 +1,8 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.background; import java.util.List; -import org.springframework.stereotype.Service; +import javax.inject.Inject; import org.apache.isis.applib.annotation.DomainService; import org.apache.isis.applib.services.command.Command; @@ -22,6 +22,6 @@ public class BackgroundCommandExecutionFromBackgroundCommandServiceJdo return backgroundCommandRepository.findBackgroundCommandsNotYetStarted(); } - @javax.inject.Inject + @Inject BackgroundCommandServiceJdoRepository backgroundCommandRepository; } \ No newline at end of file diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandServiceJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandServiceJdo.java similarity index 89% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandServiceJdo.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandServiceJdo.java index 25359c2..b47016f 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandServiceJdo.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandServiceJdo.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.background; import java.util.UUID; @@ -6,7 +6,6 @@ import javax.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; import org.apache.isis.applib.annotation.CommandExecuteIn; import org.apache.isis.applib.annotation.DomainService; @@ -16,6 +15,8 @@ import org.apache.isis.applib.services.clock.ClockService; import org.apache.isis.applib.services.command.Command; import org.apache.isis.applib.services.factory.FactoryService; import org.apache.isis.applib.util.schema.CommandDtoUtils; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; import org.apache.isis.schema.cmd.v2.CommandDto; import org.apache.isis.schema.common.v2.OidDto; @@ -83,14 +84,9 @@ public class BackgroundCommandServiceJdo implements BackgroundCommandService { } - @Inject - CommandServiceJdoRepository commandServiceJdoRepository; - - @Inject - FactoryService factoryService; - - @Inject - ClockService clockService; + @Inject CommandServiceJdoRepository commandServiceJdoRepository; + @Inject FactoryService factoryService; + @Inject ClockService clockService; } diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandServiceJdoRepository.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandServiceJdoRepository.java similarity index 81% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandServiceJdoRepository.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandServiceJdoRepository.java index 062e32e..fbaef79 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/BackgroundCommandServiceJdoRepository.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/background/BackgroundCommandServiceJdoRepository.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.background; import java.util.List; @@ -8,8 +8,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.isis.applib.annotation.DomainService; -import org.apache.isis.applib.annotation.NatureOfService; import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; /** * Provides supporting functionality for querying @@ -37,7 +38,5 @@ public class BackgroundCommandServiceJdoRepository { return commandServiceRepository.findBackgroundCommandsNotYetStarted(); } - @Inject - CommandServiceJdoRepository commandServiceRepository; - + @Inject CommandServiceJdoRepository commandServiceRepository; } diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java similarity index 92% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java index ffb37de..827299f 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import java.math.BigDecimal; import java.math.RoundingMode; @@ -14,43 +14,34 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import javax.jdo.annotations.IdentityType; -import javax.jdo.annotations.NotPersistent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.isis.applib.annotation.Action; -import org.apache.isis.applib.annotation.ActionLayout; import org.apache.isis.applib.annotation.CommandExecuteIn; import org.apache.isis.applib.annotation.CommandPersistence; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; import org.apache.isis.applib.annotation.Editing; -import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.annotation.Optionality; 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.SemanticsOf; import org.apache.isis.applib.annotation.Where; import org.apache.isis.applib.services.DomainChangeAbstract; import org.apache.isis.applib.services.HasUsername; import org.apache.isis.applib.services.bookmark.Bookmark; -import org.apache.isis.applib.services.bookmark.BookmarkService; import org.apache.isis.applib.services.command.Command; -import org.apache.isis.applib.services.command.CommandDefault; import org.apache.isis.applib.services.command.CommandWithDto; import org.apache.isis.applib.services.jaxb.JaxbService; -import org.apache.isis.applib.services.message.MessageService; import org.apache.isis.applib.types.MemberIdentifierType; import org.apache.isis.applib.types.TargetActionType; import org.apache.isis.applib.types.TargetClassType; -import org.apache.isis.applib.util.ObjectContracts; import org.apache.isis.applib.util.TitleBuffer; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.jdo.ReplayState; import org.apache.isis.schema.cmd.v2.CommandDto; -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; - import lombok.Getter; import lombok.Setter; import lombok.extern.log4j.Log4j2; @@ -63,31 +54,31 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findByTransactionId", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE transactionId == :transactionId "), @javax.jdo.annotations.Query( name="findBackgroundCommandsByParent", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE parent == :parent " + "&& executeIn == 'BACKGROUND'"), @javax.jdo.annotations.Query( name="findCurrent", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE completedAt == null " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findCompleted", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE completedAt != null " + "&& executeIn == 'FOREGROUND' " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findRecentBackgroundByTarget", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE targetStr == :targetStr " + "&& executeIn == 'BACKGROUND' " + "ORDER BY this.timestamp DESC, transactionId DESC " @@ -95,7 +86,7 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findByTargetAndTimestampBetween", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE targetStr == :targetStr " + "&& timestamp >= :from " + "&& timestamp <= :to " @@ -103,65 +94,65 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findByTargetAndTimestampAfter", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE targetStr == :targetStr " + "&& timestamp >= :from " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findByTargetAndTimestampBefore", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE targetStr == :targetStr " + "&& timestamp <= :to " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findByTarget", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE targetStr == :targetStr " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findByTimestampBetween", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE timestamp >= :from " + "&& timestamp <= :to " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findByTimestampAfter", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE timestamp >= :from " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findByTimestampBefore", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE timestamp <= :to " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="find", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "ORDER BY this.timestamp DESC"), @javax.jdo.annotations.Query( name="findRecentByUser", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE user == :user " + "ORDER BY this.timestamp DESC " + "RANGE 0,30"), @javax.jdo.annotations.Query( name="findRecentByTarget", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE targetStr == :targetStr " + "ORDER BY this.timestamp DESC, transactionId DESC " + "RANGE 0,30"), @javax.jdo.annotations.Query( name="findForegroundFirst", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE executeIn == 'FOREGROUND' " + " && timestamp != null " + " && startedAt != null " @@ -173,7 +164,7 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findForegroundSince", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE executeIn == 'FOREGROUND' " + " && timestamp > :timestamp " + " && startedAt != null " @@ -182,7 +173,7 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findReplayableHwm", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE executeIn == 'REPLAYABLE' " + "ORDER BY this.timestamp DESC " + "RANGE 0,2"), @@ -191,7 +182,7 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findForegroundHwm", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE executeIn == 'FOREGROUND' " + " && startedAt != null " + " && completedAt != null " @@ -202,14 +193,14 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findBackgroundCommandsNotYetStarted", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE executeIn == 'BACKGROUND' " + " && startedAt == null " + "ORDER BY this.timestamp ASC "), @javax.jdo.annotations.Query( name="findReplayableInErrorMostRecent", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE executeIn == 'REPLAYABLE' " + " && (replayState != 'PENDING' || " + " replayState != 'OK' || " @@ -219,7 +210,7 @@ import lombok.extern.log4j.Log4j2; @javax.jdo.annotations.Query( name="findReplayableMostRecentStarted", value="SELECT " - + "FROM org.isisaddons.module.command.dom.CommandJdo " + + "FROM CommandJdo " + "WHERE executeIn == 'REPLAYABLE' " + " && startedAt != null " + "ORDER BY this.timestamp DESC " diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo.layout.fallback.xml b/extensions/core/command-log/impl/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/isisaddons/module/command/dom/CommandJdo.layout.fallback.xml rename to extensions/core/command-log/impl/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/isisaddons/module/command/dom/CommandJdo.png b/extensions/core/command-log/impl/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/isisaddons/module/command/dom/CommandJdo.png rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.png diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_childCommands.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_childCommands.java similarity index 79% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_childCommands.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_childCommands.java index f3a3caf..d30d566 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_childCommands.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_childCommands.java @@ -1,12 +1,12 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import java.util.List; import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.CollectionLayout; import org.apache.isis.applib.annotation.MemberOrder; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandServiceJdoRepository; @Collection(domainEvent = CommandJdo_childCommands.CollectionDomainEvent.class) diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_openResultObject.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openResultObject.java similarity index 92% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_openResultObject.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openResultObject.java index 13133eb..4399841 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_openResultObject.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_openResultObject.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.ActionLayout; @@ -7,8 +7,7 @@ import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.bookmark.Bookmark; import org.apache.isis.applib.services.bookmark.BookmarkService; import org.apache.isis.applib.services.message.MessageService; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; @Action( semantics = SemanticsOf.SAFE diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_retry.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java similarity index 92% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_retry.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java index aa8dee5..7411b97 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_retry.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_retry.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import java.util.Arrays; import java.util.Collections; @@ -12,10 +12,10 @@ import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.command.CommandContext; import org.apache.isis.applib.services.jaxb.JaxbService; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandServiceJdo; import org.apache.isis.schema.cmd.v2.CommandDto; -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; - @Action( semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE , domainEvent = CommandJdo_retry.ActionDomainEvent.class diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_siblingCommands.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_siblingCommands.java similarity index 85% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_siblingCommands.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_siblingCommands.java index 2b13c4c..1f31cb6 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandJdo_siblingCommands.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo_siblingCommands.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import java.util.Collections; import java.util.List; @@ -7,8 +7,8 @@ import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.CollectionLayout; import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.services.command.Command; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandServiceJdoRepository; @Collection(domainEvent = CommandJdo_siblingCommands.CollectionDomainEvent.class) @CollectionLayout(defaultView = "table") diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceJdo.java similarity index 97% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceJdo.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceJdo.java index ffac567..0d10483 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceJdo.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceJdo.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import javax.inject.Inject; diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceJdoRepository.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceJdoRepository.java similarity index 98% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceJdoRepository.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceJdoRepository.java index 02ee5b3..a0cefd4 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceJdoRepository.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceJdoRepository.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import java.sql.Timestamp; import java.util.ArrayList; @@ -7,8 +7,6 @@ import java.util.List; import java.util.Optional; import java.util.UUID; -import javax.jdo.JDOQLTypedQuery; - import org.joda.time.LocalDate; @@ -23,6 +21,8 @@ import org.apache.isis.applib.services.command.CommandContext; import org.apache.isis.applib.services.command.CommandWithDto; import org.apache.isis.applib.services.repository.RepositoryService; import org.apache.isis.applib.util.schema.CommandDtoUtils; +import org.apache.isis.extensions.commandlog.impl.jdo.QCommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.ReplayState; import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2; import org.apache.isis.schema.cmd.v2.CommandDto; import org.apache.isis.schema.cmd.v2.CommandsDto; diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceMenu.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceMenu.java similarity index 96% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceMenu.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceMenu.java index a6b76cd..b61cbb4 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/CommandServiceMenu.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandServiceMenu.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; import java.util.List; import java.util.UUID; @@ -17,8 +17,7 @@ import org.apache.isis.applib.annotation.Parameter; import org.apache.isis.applib.annotation.ParameterLayout; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.clock.ClockService; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; @DomainService( nature = NatureOfService.VIEW, diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/ReplayState.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/ReplayState.java similarity index 71% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/ReplayState.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/ReplayState.java index ddd115f..93dd52f 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/ReplayState.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/ReplayState.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.jdo; public enum ReplayState { PENDING, diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/HasUniqueId_command.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUniqueId_command.java similarity index 78% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/HasUniqueId_command.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUniqueId_command.java index a11a5ac..8deda59 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/HasUniqueId_command.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUniqueId_command.java @@ -1,14 +1,18 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.mixins; import java.util.UUID; +import javax.inject.Inject; + import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.HasUniqueId; import org.apache.isis.applib.services.command.Command; -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; /** @@ -39,10 +43,10 @@ public class HasUniqueId_command { * Hide if the contributee is a {@link Command}, because {@link Command}s already have a * {@link Command#getParent() parent} property. */ - public boolean hide$$() { + public boolean hideAct() { return (hasUniqueId instanceof Command); } - public String disable$$() { + public String disableAct() { return findCommand() == null ? "No command found for unique Id": null; } @@ -53,8 +57,5 @@ public class HasUniqueId_command { .orElse(null); } - - @javax.inject.Inject - CommandServiceJdoRepository commandServiceRepository; - + @Inject CommandServiceJdoRepository commandServiceRepository; } diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/HasUsername_recentCommandsByUser.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.java similarity index 75% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/HasUsername_recentCommandsByUser.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.java index d46108b..adacb08 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/HasUsername_recentCommandsByUser.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/HasUsername_recentCommandsByUser.java @@ -1,14 +1,17 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.mixins; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.CollectionLayout; import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.services.HasUsername; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; @Collection( @@ -38,6 +41,5 @@ public class HasUsername_recentCommandsByUser { return hasUsername.getUsername() == null; } - @javax.inject.Inject - private CommandServiceJdoRepository commandServiceRepository; + @Inject CommandServiceJdoRepository commandServiceRepository; } diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/Object_recentCommands.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/Object_recentCommands.java similarity index 82% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/Object_recentCommands.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/Object_recentCommands.java index be918b3..2be947a 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/Object_recentCommands.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/Object_recentCommands.java @@ -1,7 +1,9 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.mixins; import java.util.List; +import javax.inject.Inject; + import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.ActionLayout; import org.apache.isis.applib.annotation.MemberOrder; @@ -10,8 +12,9 @@ import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.HasUniqueId; import org.apache.isis.applib.services.bookmark.Bookmark; import org.apache.isis.applib.services.bookmark.BookmarkService; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; /** * This mixin contributes a <tt>recentCommands</tt> action to any domain object @@ -49,10 +52,8 @@ public class Object_recentCommands { return (domainObject instanceof HasUniqueId); } - @javax.inject.Inject + @Inject CommandServiceJdoRepository commandServiceRepository; - - @javax.inject.Inject - BookmarkService bookmarkService; + @Inject BookmarkService bookmarkService; } diff --git a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/T_backgroundCommands.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/T_backgroundCommands.java similarity index 74% rename from extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/T_backgroundCommands.java rename to extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/T_backgroundCommands.java index f2507cb..e997ab1 100644 --- a/extensions/core/command-log/impl/src/main/java/org/isisaddons/module/command/dom/T_backgroundCommands.java +++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/mixins/T_backgroundCommands.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.dom; +package org.apache.isis.extensions.commandlog.impl.mixins; import java.util.List; @@ -9,8 +9,9 @@ import org.apache.isis.applib.annotation.CollectionLayout; import org.apache.isis.applib.services.bookmark.Bookmark; import org.apache.isis.applib.services.bookmark.BookmarkService; import org.apache.isis.applib.services.queryresultscache.QueryResultsCache; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; @Collection( domainEvent = T_backgroundCommands.CollectionDomainEvent.class @@ -40,11 +41,8 @@ public abstract class T_backgroundCommands<T> { , domainObject); } - @Inject - CommandServiceJdoRepository commandServiceJdoRepository; - @Inject - BookmarkService bookmarkService; - @Inject - QueryResultsCache queryResultsCache; + @Inject CommandServiceJdoRepository commandServiceJdoRepository; + @Inject BookmarkService bookmarkService; + @Inject QueryResultsCache queryResultsCache; } diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/IsisModuleExtCommandReplayImpl.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/IsisModuleExtCommandReplayImpl.java similarity index 59% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/IsisModuleExtCommandReplayImpl.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/IsisModuleExtCommandReplayImpl.java index e9e308a..e93191d 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/IsisModuleExtCommandReplayImpl.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/IsisModuleExtCommandReplayImpl.java @@ -1,16 +1,16 @@ -package org.isisaddons.module.command.replay; +package org.apache.isis.extensions.commandlog.impl.replay; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; -import org.isisaddons.module.command.replay.impl.CommandExecutorServiceWithTime; -import org.isisaddons.module.command.replay.impl.CommandReplayAnalysisService; -import org.isisaddons.module.command.replay.impl.CommandReplayOnMasterService; -import org.isisaddons.module.command.replay.impl.CommandReplayOnSlaveService; -import org.isisaddons.module.command.replay.impl.SlaveConfiguration; -import org.isisaddons.module.command.replay.impl.TickingClockService; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.replay.impl.CommandExecutorServiceWithTime; +import org.apache.isis.extensions.commandlog.impl.replay.impl.SlaveConfiguration; +import org.apache.isis.extensions.commandlog.impl.replay.impl.TickingClockService; +import org.apache.isis.extensions.commandlog.impl.replay.impl.CommandReplayAnalysisService; +import org.apache.isis.extensions.commandlog.impl.replay.impl.CommandReplayOnMasterService; +import org.apache.isis.extensions.commandlog.impl.replay.impl.CommandReplayOnSlaveService; @Configuration @Import({ diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandExecutorServiceWithTime.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandExecutorServiceWithTime.java similarity index 95% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandExecutorServiceWithTime.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandExecutorServiceWithTime.java index ac9d2e8..5374128 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandExecutorServiceWithTime.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandExecutorServiceWithTime.java @@ -14,17 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.sql.Timestamp; import java.util.concurrent.Callable; import javax.inject.Named; -import javax.xml.datatype.XMLGregorianCalendar; import org.apache.isis.applib.annotation.DomainService; import org.apache.isis.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling; -import org.apache.isis.applib.services.MethodReferences; import org.apache.isis.applib.services.bookmark.Bookmark; import org.apache.isis.applib.services.command.Command; import org.apache.isis.applib.services.command.CommandExecutorService; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandFetcher.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandFetcher.java similarity index 98% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandFetcher.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandFetcher.java index 591e7f0..93ec6d8 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandFetcher.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandFetcher.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.net.URI; import java.util.List; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandJdo_exclude.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandJdo_exclude.java similarity index 77% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandJdo_exclude.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandJdo_exclude.java index f09b2d8..f6bb390 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandJdo_exclude.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandJdo_exclude.java @@ -1,16 +1,12 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import org.apache.isis.applib.annotation.Action; -import org.apache.isis.applib.annotation.ActionLayout; import org.apache.isis.applib.annotation.CommandPersistence; -import org.apache.isis.applib.annotation.Contributed; import org.apache.isis.applib.annotation.MemberOrder; -import org.apache.isis.applib.annotation.Mixin; import org.apache.isis.applib.annotation.SemanticsOf; - -import org.isisaddons.module.command.IsisModuleExtCommandLogImpl; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.ReplayState; +import org.apache.isis.extensions.commandlog.impl.IsisModuleExtCommandLogImpl; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.ReplayState; import lombok.extern.log4j.Log4j2; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayAnalysisService.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayAnalysisService.java similarity index 86% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayAnalysisService.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayAnalysisService.java index 224d713..c68809d 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayAnalysisService.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayAnalysisService.java @@ -1,20 +1,16 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.util.List; import javax.inject.Inject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.isis.applib.annotation.DomainService; import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.ReplayState; +import org.apache.isis.extensions.commandlog.impl.replay.spi.CommandReplayAnalyser; import org.apache.isis.schema.cmd.v2.CommandDto; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.ReplayState; -import org.isisaddons.module.command.replay.spi.CommandReplayAnalyser; - import lombok.extern.log4j.Log4j2; @DomainService() diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayOnMasterService.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayOnMasterService.java similarity index 96% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayOnMasterService.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayOnMasterService.java index 3e81f1f..82c5318 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayOnMasterService.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayOnMasterService.java @@ -1,7 +1,6 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.util.List; -import java.util.Optional; import java.util.UUID; import javax.annotation.Nullable; @@ -21,13 +20,12 @@ import org.apache.isis.applib.services.conmap.command.ContentMappingServiceForCo import org.apache.isis.applib.services.jaxb.JaxbService; import org.apache.isis.applib.services.message.MessageService; import org.apache.isis.applib.value.Clob; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; +import org.apache.isis.extensions.commandlog.impl.replay.IsisModuleExtCommandReplayImpl; import org.apache.isis.schema.cmd.v2.CommandDto; import org.apache.isis.schema.cmd.v2.CommandsDto; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.CommandServiceJdoRepository; -import org.isisaddons.module.command.replay.IsisModuleExtCommandReplayImpl; - import lombok.Getter; import lombok.extern.log4j.Log4j2; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayOnSlaveService.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayOnSlaveService.java similarity index 87% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayOnSlaveService.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayOnSlaveService.java index bed0561..7181983 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/CommandReplayOnSlaveService.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayOnSlaveService.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.util.Collections; import java.util.List; @@ -15,13 +15,12 @@ import org.apache.isis.applib.annotation.NatureOfService; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.jaxb.JaxbService; import org.apache.isis.applib.value.Clob; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; +import org.apache.isis.extensions.commandlog.impl.replay.IsisModuleExtCommandReplayImpl; import org.apache.isis.schema.cmd.v2.CommandDto; import org.apache.isis.schema.cmd.v2.CommandsDto; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.CommandServiceJdoRepository; -import org.isisaddons.module.command.replay.IsisModuleExtCommandReplayImpl; - import lombok.extern.log4j.Log4j2; @DomainService( @@ -77,7 +76,8 @@ public class CommandReplayOnSlaveService { - @Inject CommandServiceJdoRepository commandServiceJdoRepository; + @Inject + CommandServiceJdoRepository commandServiceJdoRepository; @Inject JaxbService jaxbService; } diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/ConfigurationKeys.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/ConfigurationKeys.java similarity index 94% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/ConfigurationKeys.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/ConfigurationKeys.java index 0019938..2a4894f 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/ConfigurationKeys.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/ConfigurationKeys.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import lombok.experimental.UtilityClass; diff --git a/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/Holder.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/Holder.java new file mode 100644 index 0000000..d5f700f --- /dev/null +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/Holder.java @@ -0,0 +1,5 @@ +package org.apache.isis.extensions.commandlog.impl.replay.impl; + +import lombok.Data; + +@Data class Holder<T> { T object; } diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/ReplayableCommandExecution.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/ReplayableCommandExecution.java similarity index 93% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/ReplayableCommandExecution.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/ReplayableCommandExecution.java index 1803e33..fe63c5b 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/ReplayableCommandExecution.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/ReplayableCommandExecution.java @@ -1,21 +1,18 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.util.List; import javax.inject.Inject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.isis.applib.services.command.CommandExecutorService; import org.apache.isis.applib.services.xactn.TransactionService; import org.apache.isis.core.runtimeservices.background.CommandExecutionAbstract; +import org.apache.isis.extensions.commandlog.impl.jdo.ReplayState; +import org.apache.isis.extensions.commandlog.impl.replay.spi.ReplayCommandExecutionController; import org.apache.isis.schema.cmd.v2.CommandDto; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.CommandServiceJdoRepository; -import org.isisaddons.module.command.dom.ReplayState; -import org.isisaddons.module.command.replay.spi.ReplayCommandExecutionController; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; import lombok.extern.log4j.Log4j2; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java similarity index 90% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java index 2a6b8be..c446f08 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import javax.inject.Inject; @@ -16,12 +16,12 @@ import org.apache.isis.core.runtime.iactn.template.AbstractIsisInteractionTempla import org.apache.isis.core.security.authentication.AuthenticationSession; import org.apache.isis.core.security.authentication.standard.SimpleSession; -import org.isisaddons.module.command.dom.BackgroundCommandExecutionFromBackgroundCommandServiceJdo; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandExecutionFromBackgroundCommandServiceJdo; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.SLAVE_ROLES_DEFAULT; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.SLAVE_ROLES_QUARTZ_KEY; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.SLAVE_USER_DEFAULT; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.SLAVE_USER_QUARTZ_KEY; +import static org.apache.isis.extensions.commandlog.impl.replay.impl.ConfigurationKeys.SLAVE_ROLES_DEFAULT; +import static org.apache.isis.extensions.commandlog.impl.replay.impl.ConfigurationKeys.SLAVE_ROLES_QUARTZ_KEY; +import static org.apache.isis.extensions.commandlog.impl.replay.impl.ConfigurationKeys.SLAVE_USER_DEFAULT; +import static org.apache.isis.extensions.commandlog.impl.replay.impl.ConfigurationKeys.SLAVE_USER_QUARTZ_KEY; import lombok.val; import lombok.extern.log4j.Log4j2; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/SlaveConfiguration.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/SlaveConfiguration.java similarity index 64% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/SlaveConfiguration.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/SlaveConfiguration.java index b43c296..6a47f56 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/SlaveConfiguration.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/SlaveConfiguration.java @@ -1,6 +1,4 @@ -package org.isisaddons.module.command.replay.impl; - -import java.util.Map; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import javax.validation.constraints.NotNull; @@ -8,12 +6,6 @@ import org.springframework.stereotype.Service; import org.apache.isis.core.config.IsisConfiguration; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_BASE_URL_ISIS_KEY; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_BATCH_SIZE_ISIS_DEFAULT; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_BATCH_SIZE_ISIS_KEY; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_PASSWORD_ISIS_KEY; -import static org.isisaddons.module.command.replay.impl.ConfigurationKeys.MASTER_USER_ISIS_KEY; - import lombok.val; import lombok.extern.log4j.Log4j2; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/SlaveStatus.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/SlaveStatus.java similarity index 73% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/SlaveStatus.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/SlaveStatus.java index fa1dce8..2ed4a74 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/SlaveStatus.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/SlaveStatus.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; enum SlaveStatus { TICKING_CLOCK_STATUS_UNKNOWN, diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/StatusException.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/StatusException.java similarity index 83% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/StatusException.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/StatusException.java index 4460869..7f67376 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/StatusException.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/StatusException.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; public class StatusException extends Exception { diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/TickingClockService.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/TickingClockService.java similarity index 95% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/TickingClockService.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/TickingClockService.java index e0cfca0..82ed844 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/TickingClockService.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/TickingClockService.java @@ -1,19 +1,14 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.sql.Timestamp; -import java.util.Map; import java.util.Optional; import java.util.concurrent.Callable; import javax.annotation.PostConstruct; import javax.inject.Inject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.isis.applib.ApplicationException; import org.apache.isis.applib.annotation.DomainService; -import org.apache.isis.applib.annotation.NatureOfService; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.clock.Clock; import org.apache.isis.core.config.IsisConfiguration; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_download.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_download.java similarity index 81% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_download.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_download.java index b610306..369961f 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_download.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_download.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl.mixins; +package org.apache.isis.extensions.commandlog.impl.replay.impl.mixins; import javax.inject.Inject; @@ -9,10 +9,10 @@ import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.annotation.ParameterLayout; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.value.Clob; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.replay.IsisModuleExtCommandReplayImpl; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.replay.IsisModuleExtCommandReplayImpl; -import org.isisaddons.module.command.replay.impl.CommandReplayOnMasterService; +import org.apache.isis.extensions.commandlog.impl.replay.impl.CommandReplayOnMasterService; @Action( semantics = SemanticsOf.NON_IDEMPOTENT, diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_openOnMaster.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_openOnMaster.java similarity index 81% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_openOnMaster.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_openOnMaster.java index ca2e765..8cacb46 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_openOnMaster.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_openOnMaster.java @@ -1,23 +1,18 @@ -package org.isisaddons.module.command.replay.impl.mixins; +package org.apache.isis.extensions.commandlog.impl.replay.impl.mixins; import java.net.MalformedURLException; import java.net.URL; -import java.util.Optional; import javax.inject.Inject; import org.apache.isis.applib.ApplicationException; import org.apache.isis.applib.annotation.Action; -import org.apache.isis.applib.annotation.ActionLayout; -import org.apache.isis.applib.annotation.Contributed; import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.bookmark.BookmarkService; import org.apache.isis.core.config.IsisConfiguration; - -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.replay.IsisModuleExtCommandReplayImpl; -import org.isisaddons.module.command.replay.impl.ConfigurationKeys; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.replay.IsisModuleExtCommandReplayImpl; @Action( semantics = SemanticsOf.SAFE, diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_replayNext.java similarity index 82% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_replayNext.java index cb80f01..ae0de95 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayNext.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_replayNext.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl.mixins; +package org.apache.isis.extensions.commandlog.impl.replay.impl.mixins; import java.util.List; @@ -10,16 +10,15 @@ import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.command.CommandExecutorService; import org.apache.isis.applib.services.message.MessageService; -import org.apache.isis.core.config.IsisConfiguration; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; +import org.apache.isis.extensions.commandlog.impl.replay.IsisModuleExtCommandReplayImpl; +import org.apache.isis.extensions.commandlog.impl.replay.impl.SlaveConfiguration; +import org.apache.isis.extensions.commandlog.impl.replay.impl.StatusException; import org.apache.isis.schema.cmd.v2.CommandDto; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.CommandServiceJdoRepository; -import org.isisaddons.module.command.replay.IsisModuleExtCommandReplayImpl; -import org.isisaddons.module.command.replay.impl.CommandFetcher; -import org.isisaddons.module.command.replay.impl.CommandReplayAnalysisService; -import org.isisaddons.module.command.replay.impl.SlaveConfiguration; -import org.isisaddons.module.command.replay.impl.StatusException; +import org.apache.isis.extensions.commandlog.impl.replay.impl.CommandFetcher; +import org.apache.isis.extensions.commandlog.impl.replay.impl.CommandReplayAnalysisService; @Action( semantics = SemanticsOf.NON_IDEMPOTENT, @@ -103,10 +102,12 @@ public class CommandJdo_replayNext { } - @Inject CommandServiceJdoRepository commandServiceJdoRepository; + @Inject + CommandServiceJdoRepository commandServiceJdoRepository; @Inject CommandFetcher commandFetcher; @Inject CommandExecutorService commandExecutorService; - @Inject SlaveConfiguration slaveConfiguration; + @Inject + SlaveConfiguration slaveConfiguration; @Inject MessageService messageService; @Inject CommandReplayAnalysisService analysisService; } diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayQueue.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_replayQueue.java similarity index 66% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayQueue.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_replayQueue.java index 9973d57..81cf1a9 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/mixins/CommandJdo_replayQueue.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/impl/mixins/CommandJdo_replayQueue.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl.mixins; +package org.apache.isis.extensions.commandlog.impl.replay.impl.mixins; import java.util.List; @@ -8,11 +8,10 @@ import org.apache.isis.applib.annotation.Collection; import org.apache.isis.applib.annotation.CollectionLayout; import org.apache.isis.applib.annotation.MemberOrder; import org.apache.isis.applib.annotation.Mixin; - -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.CommandServiceJdoRepository; -import org.isisaddons.module.command.replay.IsisModuleExtCommandReplayImpl; -import org.isisaddons.module.command.replay.impl.SlaveConfiguration; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; +import org.apache.isis.extensions.commandlog.impl.replay.IsisModuleExtCommandReplayImpl; +import org.apache.isis.extensions.commandlog.impl.replay.impl.SlaveConfiguration; @Collection( domainEvent = CommandJdo_replayQueue.CollectionDomainEvent.class @@ -40,7 +39,9 @@ public class CommandJdo_replayQueue { return !slaveConfiguration.isConfigured(); } - @Inject SlaveConfiguration slaveConfiguration; - @Inject CommandServiceJdoRepository commandServiceJdoRepository; + @Inject + SlaveConfiguration slaveConfiguration; + @Inject + CommandServiceJdoRepository commandServiceJdoRepository; } diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyser.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyser.java similarity index 82% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyser.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyser.java index b13c7bc..ff6be99 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyser.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyser.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.spi; +package org.apache.isis.extensions.commandlog.impl.replay.spi; import org.apache.isis.applib.annotation.Programmatic; import org.apache.isis.applib.services.command.Command; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserAbstract.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserAbstract.java similarity index 95% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserAbstract.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserAbstract.java index 152b161..3f5fb75 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserAbstract.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserAbstract.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.spi; +package org.apache.isis.extensions.commandlog.impl.replay.spi; import java.util.Map; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserExceptionStr.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserExceptionStr.java similarity index 96% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserExceptionStr.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserExceptionStr.java index 7313f416..afc19ee 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserExceptionStr.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserExceptionStr.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.spi; +package org.apache.isis.extensions.commandlog.impl.replay.spi; import com.google.common.base.Objects; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserNumberBackgroundCommands.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserNumberBackgroundCommands.java similarity index 93% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserNumberBackgroundCommands.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserNumberBackgroundCommands.java index b998626..9497b64 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserNumberBackgroundCommands.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserNumberBackgroundCommands.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.spi; +package org.apache.isis.extensions.commandlog.impl.replay.spi; import java.util.List; @@ -10,8 +10,8 @@ import org.apache.isis.applib.services.conmap.command.spi.CommandDtoProcessorSer import org.apache.isis.applib.util.schema.CommandDtoUtils; import org.apache.isis.schema.cmd.v2.CommandDto; -import org.isisaddons.module.command.dom.CommandJdo; -import org.isisaddons.module.command.dom.CommandServiceJdoRepository; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandServiceJdoRepository; @DomainService() public class CommandReplayAnalyserNumberBackgroundCommands diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserResultStr.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserResultStr.java similarity index 91% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserResultStr.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserResultStr.java index a0fadcd..71336a5 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/CommandReplayAnalyserResultStr.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/CommandReplayAnalyserResultStr.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.spi; +package org.apache.isis.extensions.commandlog.impl.replay.spi; import com.google.common.base.Objects; @@ -8,7 +8,7 @@ import org.apache.isis.applib.services.command.CommandWithDto; import org.apache.isis.applib.util.schema.CommandDtoUtils; import org.apache.isis.schema.cmd.v2.CommandDto; -import org.isisaddons.module.command.dom.CommandJdo; +import org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo; @DomainService() public class CommandReplayAnalyserResultStr extends CommandReplayAnalyserAbstract { diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/ReplayCommandExecutionController.java b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/ReplayCommandExecutionController.java similarity index 84% rename from extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/ReplayCommandExecutionController.java rename to extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/ReplayCommandExecutionController.java index 5ce80f5..c7ca469 100644 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/spi/ReplayCommandExecutionController.java +++ b/extensions/core/command-replay/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/replay/spi/ReplayCommandExecutionController.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.spi; +package org.apache.isis.extensions.commandlog.impl.replay.spi; import org.apache.isis.applib.annotation.Programmatic; diff --git a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/Holder.java b/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/Holder.java deleted file mode 100644 index 2591bcf..0000000 --- a/extensions/core/command-replay/impl/src/main/java/org/isisaddons/module/command/replay/impl/Holder.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.isisaddons.module.command.replay.impl; - -import lombok.Data; - -@Data class Holder<T> { T object; } diff --git a/extensions/core/command-replay/impl/src/test/java/org/isisaddons/module/command/replay/impl/CommandReplayAnalysisService_trimmed_Test.java b/extensions/core/command-replay/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayAnalysisService_trimmed_Test.java similarity index 91% rename from extensions/core/command-replay/impl/src/test/java/org/isisaddons/module/command/replay/impl/CommandReplayAnalysisService_trimmed_Test.java rename to extensions/core/command-replay/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayAnalysisService_trimmed_Test.java index d500095..d50d7f4 100644 --- a/extensions/core/command-replay/impl/src/test/java/org/isisaddons/module/command/replay/impl/CommandReplayAnalysisService_trimmed_Test.java +++ b/extensions/core/command-replay/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/replay/impl/CommandReplayAnalysisService_trimmed_Test.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/extensions/core/command-replay/impl/src/test/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob_Test.java b/extensions/core/command-replay/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob_Test.java similarity index 94% rename from extensions/core/command-replay/impl/src/test/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob_Test.java rename to extensions/core/command-replay/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob_Test.java index 3408da0..79b8d58 100644 --- a/extensions/core/command-replay/impl/src/test/java/org/isisaddons/module/command/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob_Test.java +++ b/extensions/core/command-replay/impl/src/test/java/org/apache/isis/extensions/commandlog/impl/replay/impl/RunBackgroundCommandsWithReplicationAndReplayJob_Test.java @@ -1,4 +1,4 @@ -package org.isisaddons.module.command.replay.impl; +package org.apache.isis.extensions.commandlog.impl.replay.impl; import java.net.URI; diff --git a/extensions/core/quartz/impl/src/main/java/org/isisaddons/module/quartz/dom/jobs/RunBackgroundCommandsJob.java b/extensions/core/quartz/impl/src/main/java/org/isisaddons/module/quartz/dom/jobs/RunBackgroundCommandsJob.java index d46260f..f4d10da 100644 --- a/extensions/core/quartz/impl/src/main/java/org/isisaddons/module/quartz/dom/jobs/RunBackgroundCommandsJob.java +++ b/extensions/core/quartz/impl/src/main/java/org/isisaddons/module/quartz/dom/jobs/RunBackgroundCommandsJob.java @@ -9,7 +9,7 @@ import org.quartz.JobExecutionContext; import org.apache.isis.core.security.authentication.AuthenticationSession; import org.apache.isis.core.security.authentication.standard.SimpleSession; -import org.isisaddons.module.command.dom.BackgroundCommandExecutionFromBackgroundCommandServiceJdo; +import org.apache.isis.extensions.commandlog.impl.background.BackgroundCommandExecutionFromBackgroundCommandServiceJdo; import lombok.val; import lombok.extern.log4j.Log4j2;
