You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/01/27 10:14:22 UTC
[isis-app-simpleapp] branch jdo updated (8d027a8 -> 0b1109d)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
from 8d027a8 fix menubars (upstream changes)
new 55a3dc5 fixes compile issue
new 0b1109d adds -jdo suffix for artifacts
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
module-simple/pom.xml | 4 ++--
pom.xml | 10 +++++-----
webapp/pom.xml | 13 +++----------
.../webapp/integtests/ApplicationIntegTestAbstract.java | 3 +--
.../SimpleApplicationTestConfiguration_usingJdo.java | 6 +++---
5 files changed, 14 insertions(+), 22 deletions(-)
copy module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java => webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java (95%)
[isis-app-simpleapp] 01/02: fixes compile issue
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 55a3dc53d572a2b7e3c42996abade60ff51eae6c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 27 10:10:21 2021 +0000
fixes compile issue
---
webapp/pom.xml | 7 ---
.../integtests/ApplicationIntegTestAbstract.java | 3 +-
.../SimpleWebAppTestConfiguration_usingJdo.java | 56 ++++++++++++++++++++++
3 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/webapp/pom.xml b/webapp/pom.xml
index bc012c6..da6aba1 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -176,13 +176,6 @@
<!-- TESTING -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>simpleapp-module-simple</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-integtests</artifactId>
<type>pom</type>
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index 082f5da..5d85838 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -4,13 +4,12 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-import domainapp.modules.simple.integtests.SimpleModuleTestConfiguration_usingJdo;
import domainapp.webapp.application.ApplicationModule;
import domainapp.webapp.bdd.stepdefs.BddStepDefsModule;
@SpringBootTest(
classes = {
- SimpleModuleTestConfiguration_usingJdo.class,
+ SimpleWebAppTestConfiguration_usingJdo.class,
BddStepDefsModule.class,
ApplicationModule.class,
},
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/SimpleWebAppTestConfiguration_usingJdo.java b/webapp/src/test/java/domainapp/webapp/integtests/SimpleWebAppTestConfiguration_usingJdo.java
new file mode 100644
index 0000000..eaebce4
--- /dev/null
+++ b/webapp/src/test/java/domainapp/webapp/integtests/SimpleWebAppTestConfiguration_usingJdo.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package domainapp.webapp.integtests;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.persistence.jdo.datanucleus.IsisModuleJdoDatanucleus;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
+
+import domainapp.modules.simple.SimpleModule;
+
+/**
+ * Compared to the production app manifest <code>domainapp.webapp.AppManifest</code>,
+ * here we in effect disable security checks, and we exclude any web/UI modules.
+ */
+@SpringBootConfiguration
+@Import({
+
+ IsisModuleCoreRuntimeServices.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDatanucleus.class,
+ IsisModuleTestingFixturesApplib.class,
+
+ SimpleModule.class
+})
+@PropertySources({
+ @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+ @PropertySource(IsisPresets.DataNucleusAutoCreate),
+ @PropertySource(IsisPresets.UseLog4j2Test),
+})
+public class SimpleWebAppTestConfiguration_usingJdo {
+
+
+}
[isis-app-simpleapp] 02/02: adds -jdo suffix for artifacts
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 0b1109d5715614413ef84490821135305011986c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 27 10:14:08 2021 +0000
adds -jdo suffix for artifacts
---
module-simple/pom.xml | 4 ++--
pom.xml | 10 +++++-----
webapp/pom.xml | 6 +++---
.../webapp/integtests/ApplicationIntegTestAbstract.java | 2 +-
...o.java => SimpleApplicationTestConfiguration_usingJdo.java} | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 2e9668e..7790873 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>simpleapp-module-simple</artifactId>
+ <artifactId>simpleapp-module-simple-jdo</artifactId>
<name>SimpleApp - Simple Module</name>
<build>
diff --git a/pom.xml b/pom.xml
index d4b6d28..aee49cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
</parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>SimpleApp - Parent</name>
@@ -24,24 +24,24 @@
<!-- this project's own modules -->
<dependency>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-module-simple</artifactId>
+ <artifactId>simpleapp-module-simple-jdo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-module-simple</artifactId>
+ <artifactId>simpleapp-module-simple-jdo</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-application</artifactId>
+ <artifactId>simpleapp-application-jdo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp-webapp</artifactId>
+ <artifactId>simpleapp-webapp-jdo</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index da6aba1..1a667bb 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -4,11 +4,11 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
- <artifactId>simpleapp</artifactId>
+ <artifactId>simpleapp-jdo</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>simpleapp-webapp</artifactId>
+ <artifactId>simpleapp-webapp-jdo</artifactId>
<name>SimpleApp - Webapp</name>
<description>
@@ -136,7 +136,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>simpleapp-module-simple</artifactId>
+ <artifactId>simpleapp-module-simple-jdo</artifactId>
</dependency>
<!-- isis -->
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index 5d85838..8a5199f 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -9,7 +9,7 @@ import domainapp.webapp.bdd.stepdefs.BddStepDefsModule;
@SpringBootTest(
classes = {
- SimpleWebAppTestConfiguration_usingJdo.class,
+ SimpleApplicationTestConfiguration_usingJdo.class,
BddStepDefsModule.class,
ApplicationModule.class,
},
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/SimpleWebAppTestConfiguration_usingJdo.java b/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
similarity index 97%
rename from webapp/src/test/java/domainapp/webapp/integtests/SimpleWebAppTestConfiguration_usingJdo.java
rename to webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
index eaebce4..f509a33 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/SimpleWebAppTestConfiguration_usingJdo.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
@@ -50,7 +50,7 @@ import domainapp.modules.simple.SimpleModule;
@PropertySource(IsisPresets.DataNucleusAutoCreate),
@PropertySource(IsisPresets.UseLog4j2Test),
})
-public class SimpleWebAppTestConfiguration_usingJdo {
+public class SimpleApplicationTestConfiguration_usingJdo {
}