This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3091
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3091 by this push:
new 2b25e3d8a3 ISIS-3091: more moves under 'extensions' subpackage; integ
test compile issues
2b25e3d8a3 is described below
commit 2b25e3d8a38a604c529011aa462e4bfbf77e1318
Author: Dan Haywood <[email protected]>
AuthorDate: Fri Jul 22 16:23:40 2022 +0100
ISIS-3091: more moves under 'extensions' subpackage; integ test compile
issues
---
.../jdo/IsisModuleExtAuditTrailPersistenceJdo.java | 6 +++---
.../audittrail/jdo/dom/AuditTrailEntry.java | 4 ++--
.../audittrail/jdo/dom/AuditTrailEntryRepository.java | 2 +-
.../jdo/integtests/AuditTrail_IntegTest.java | 18 +++++++++++-------
.../jpa/integtests/model/CounterRepository.java | 2 +-
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
similarity index 91%
rename from
extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
rename to
extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
index 3e77926c9b..2a0a7be5ab 100644
---
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
+++
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/IsisModuleExtAuditTrailPersistenceJdo.java
@@ -18,14 +18,14 @@
*
*/
-package org.apache.isis.audittrail.jdo;
+package org.apache.isis.extensions.audittrail.jdo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import
org.apache.isis.extensions.audittrail.applib.IsisModuleExtAuditTrailApplib;
-import org.apache.isis.audittrail.jdo.dom.AuditTrailEntry;
-import org.apache.isis.audittrail.jdo.dom.AuditTrailEntryRepository;
+import org.apache.isis.extensions.audittrail.jdo.dom.AuditTrailEntry;
+import org.apache.isis.extensions.audittrail.jdo.dom.AuditTrailEntryRepository;
import
org.apache.isis.persistence.jdo.datanucleus.IsisModulePersistenceJdoDatanucleus;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntry.java
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java
similarity index 98%
rename from
extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntry.java
rename to
extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java
index 81ec27d41b..fa8195c68f 100644
---
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntry.java
+++
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntry.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.isis.audittrail.jdo.dom;
+package org.apache.isis.extensions.audittrail.jdo.dom;
import java.util.UUID;
@@ -147,7 +147,7 @@ import lombok.Setter;
public class AuditTrailEntry
extends org.apache.isis.extensions.audittrail.applib.dom.AuditTrailEntry {
- static final String FQCN =
"org.apache.isis.audittrail.jdo.dom.AuditTrailEntry";
+ static final String FQCN =
"org.apache.isis.extensions.audittrail.jdo.dom.AuditTrailEntry";
@Column(allowsNull = Username.ALLOWS_NULL, length = Username.MAX_LENGTH)
diff --git
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntryRepository.java
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntryRepository.java
similarity index 95%
rename from
extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntryRepository.java
rename to
extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntryRepository.java
index 3fcc3bb3ed..53297089ab 100644
---
a/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/audittrail/jdo/dom/AuditTrailEntryRepository.java
+++
b/extensions/security/audittrail/persistence-jdo/src/main/java/org/apache/isis/extensions/audittrail/jdo/dom/AuditTrailEntryRepository.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.isis.audittrail.jdo.dom;
+package org.apache.isis.extensions.audittrail.jdo.dom;
import org.springframework.stereotype.Service;
diff --git
a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/isis/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/isis/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
index f4629b8d03..42114393f2 100644
---
a/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/isis/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
+++
b/extensions/security/audittrail/persistence-jdo/src/test/java/org/apache/isis/extensions/audittrail/jdo/integtests/AuditTrail_IntegTest.java
@@ -21,16 +21,19 @@ package
org.apache.isis.extensions.audittrail.jdo.integtests;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ActiveProfiles;
-import
org.apache.isis.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
-import org.apache.isis.audittrail.jdo.IsisModuleExtAuditTrailPersistenceJdo;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import
org.apache.isis.extensions.audittrail.applib.integtests.AuditTrail_IntegTestAbstract;
+import
org.apache.isis.extensions.audittrail.jdo.IsisModuleExtAuditTrailPersistenceJdo;
+import
org.apache.isis.extensions.audittrail.applib.integtests.model.AuditTrailTestDomainModel;
import org.apache.isis.extensions.audittrail.jdo.integtests.model.Counter;
+import
org.apache.isis.extensions.audittrail.jdo.integtests.model.CounterRepository;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
@SpringBootTest(
@@ -40,11 +43,6 @@ import
org.apache.isis.security.bypass.IsisModuleSecurityBypass;
public class AuditTrail_IntegTest extends AuditTrail_IntegTestAbstract {
- @Override
- protected
org.apache.isis.extensions.audittrail.applib.integtests.model.Counter
newCounter(String name) {
- return Counter.builder().name(name).build();
- }
-
@SpringBootConfiguration
@EnableAutoConfiguration
@Import({
@@ -55,8 +53,14 @@ public class AuditTrail_IntegTest extends
AuditTrail_IntegTestAbstract {
@PropertySources({
@PropertySource(IsisPresets.UseLog4j2Test),
})
+ @ComponentScan(basePackageClasses = {AppManifest.class,
AuditTrailTestDomainModel.class, CounterRepository.class})
public static class AppManifest {
}
+ @Override
+ protected
org.apache.isis.extensions.audittrail.applib.integtests.model.Counter
newCounter(String name) {
+ return Counter.builder().name(name).build();
+ }
+
}
diff --git
a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/isis/extensions/audittrail/jpa/integtests/model/CounterRepository.java
b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/isis/extensions/audittrail/jpa/integtests/model/CounterRepository.java
index e50a02554a..de2fbb45f4 100644
---
a/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/isis/extensions/audittrail/jpa/integtests/model/CounterRepository.java
+++
b/extensions/security/audittrail/persistence-jpa/src/test/java/org/apache/isis/extensions/audittrail/jpa/integtests/model/CounterRepository.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Repository;
@Repository
public class CounterRepository
- extends
org.apache.isis.extensions.commandlog.applib.integtest.model.CounterRepository<Counter>
{
+ extends
org.apache.isis.extensions.audittrail.applib.integtests.model.CounterRepository<Counter>
{
public CounterRepository() {
super(Counter.class);
