You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/06/25 07:29:50 UTC
[isis] branch v2 updated: ISIS-2125: fixes 'helloworld' and 'demo'
maven build and test issues
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new e2a08dc ISIS-2125: fixes 'helloworld' and 'demo' maven build and test issues
e2a08dc is described below
commit e2a08dcd87881ff306038ebce771dbe8b32079b8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jun 25 09:29:38 2019 +0200
ISIS-2125: fixes 'helloworld' and 'demo' maven build and test issues
---
core/mavendeps/testing/pom.xml | 14 ++++++++++----
core/unittestsupport/pom.xml | 2 +-
.../main/java/domainapp/application/DemoAppManifest.java | 4 +++-
.../java/domainapp/application/HelloWorldAppManifest.java | 4 +++-
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 223748c..3e49634 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -65,10 +65,16 @@
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.assertj</groupId> -->
-<!-- <artifactId>assertj-core</artifactId> -->
-<!-- </dependency> -->
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index dd35a15..ac91d83 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -42,7 +42,7 @@
<version>${slf4j-api.version}</version>
<scope>test</scope>
</dependency>
-
+
<!-- framework default core-codegen-plugin for tests -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java b/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java
index 96c422a..c28769c 100644
--- a/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java
+++ b/example/application/demo/src/main/java/domainapp/application/DemoAppManifest.java
@@ -33,6 +33,7 @@ import org.springframework.core.io.ClassPathResource;
import org.apache.isis.config.Presets;
import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
+import org.apache.isis.jdo.transaction.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.security.shiro.IsisSecurityBootUsingShiro;
import org.apache.isis.viewer.wicket.viewer.IsisWebWicketBoot;
@@ -49,7 +50,8 @@ import domainapp.dom.DemoModule;
})
@Import({
IsisWebWicketBoot.class,
- IsisSecurityBootUsingShiro.class
+ IsisSecurityBootUsingShiro.class,
+ IsisPlatformTransactionManagerForJdo.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index 4eed83a..e2a186c 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -33,6 +33,7 @@ import org.springframework.core.io.ClassPathResource;
import org.apache.isis.config.Presets;
import org.apache.isis.config.beans.IsisBeanScanInterceptorForSpring;
import org.apache.isis.config.beans.WebAppConfigBean;
+import org.apache.isis.jdo.transaction.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.security.shiro.IsisSecurityBootUsingShiro;
import org.apache.isis.viewer.restfulobjects.IsisWebRestfulBoot;
import org.apache.isis.viewer.wicket.viewer.IsisWebWicketBoot;
@@ -52,7 +53,8 @@ import domainapp.dom.HelloWorldModule;
@Import({
IsisWebRestfulBoot.class,
IsisWebWicketBoot.class,
- IsisSecurityBootUsingShiro.class
+ IsisSecurityBootUsingShiro.class,
+ IsisPlatformTransactionManagerForJdo.class
})
@ComponentScan(
basePackageClasses= {