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 2018/10/24 19:23:01 UTC
[isis] branch v2 updated: ISIS-1905: bump axon 3.3.5 -> 3.4,
which no longer requires dummy persistence unit on JEE
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 8d3b3a8 ISIS-1905: bump axon 3.3.5 -> 3.4, which no longer requires dummy persistence unit on JEE
8d3b3a8 is described below
commit 8d3b3a8ea70e12ee51b286ef04b0a9bcea62f958
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Oct 24 21:22:25 2018 +0200
ISIS-1905: bump axon 3.3.5 -> 3.4, which no longer requires dummy
persistence unit on JEE
also removing outdated entries from web.xml examples
---
core/plugins/eventbus-axon/pom.xml | 7 ++-----
.../isis/core/webapp/jee/PersistenceUnitNoopProvider.java | 11 +++++------
.../application/helloworld/src/main/webapp/WEB-INF/web.xml | 14 --------------
.../simpleapp/webapp/src/main/webapp/WEB-INF/web.xml | 14 --------------
4 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/core/plugins/eventbus-axon/pom.xml b/core/plugins/eventbus-axon/pom.xml
index 8b6e47d..30e3fa7 100644
--- a/core/plugins/eventbus-axon/pom.xml
+++ b/core/plugins/eventbus-axon/pom.xml
@@ -30,7 +30,7 @@
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.plugins.eventbus-axon</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/plugins/eventbus-axon</git-plugin.propertiesDir>
- <axon-core.version>3.3.5</axon-core.version>
+ <axon-core.version>3.4</axon-core.version>
</properties>
<build>
@@ -59,10 +59,7 @@
<groupId>org.axonframework</groupId>
<artifactId>axon-core</artifactId>
<version>${axon-core.version}</version>
- <!-- <classifier>ee-compat</classifier>
- seems not available yet
- see https://github.com/AxonFramework/AxonFramework/issues/534
- -->
+ <classifier>ee-compat</classifier>
</dependency>
<dependency>
diff --git a/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/webapp/jee/PersistenceUnitNoopProvider.java b/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/webapp/jee/PersistenceUnitNoopProvider.java
index 8131797..94b5b99 100644
--- a/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/webapp/jee/PersistenceUnitNoopProvider.java
+++ b/core/plugins/eventbus-axon/src/main/java/org/apache/isis/core/webapp/jee/PersistenceUnitNoopProvider.java
@@ -34,12 +34,11 @@ import javax.persistence.spi.ProviderUtil;
import javax.resource.NotSupportedException;
/**
- * [ahuber] still work in progress, some information given here might be wrong ... <br/><br/>
- *
- * Implements a PersistenceProvider that does nothing.
+ * Implements a PersistenceProvider that does nothing. (no longer required)
* <p>
- * Note: the axon framework on JEE requires at least a dummy persistence unit.
- * This requires that the {@code web.xml} includes a {@code persistence-context-ref} entry as follows:
+ * Note: the axon framework on JEE required at least a dummy persistence unit.
+ * That was before release of axon-framework 3.4.
+ * This required that the {@code web.xml} includes a {@code persistence-context-ref} entry as follows:
*
* <pre>{@code
* <persistence-context-ref>
@@ -54,7 +53,7 @@ import javax.resource.NotSupportedException;
* is bundled with this module.
* </p>
*
- * @since 2.0.0
+ * @since 2.0.0-M1
*
*/
@SuppressWarnings("rawtypes")
diff --git a/example/application/helloworld/src/main/webapp/WEB-INF/web.xml b/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
index 6e3de7e..1965e7c 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -28,22 +28,8 @@
<welcome-file>about/index.html</welcome-file>
</welcome-file-list>
- <!-- can be removed with axon >= 3.5 -->
- <persistence-context-ref>
- <persistence-context-ref-name>org.axonframework.common.jpa.ContainerManagedEntityManagerProvider/entityManager</persistence-context-ref-name>
- <persistence-unit-name>noop</persistence-unit-name>
- </persistence-context-ref>
-
<listener>
<listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class>
</listener>
-
- <!--
- this config value wins over that provided via environment variable PROTOTYPING=true/false
- -->
- <context-param>
- <param-name>isis.viewer.wicket.mode</param-name>
- <param-value>development</param-value>
- </context-param>
</web-app>
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
index 4f7fcc2..bfaaebb 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
@@ -28,22 +28,8 @@
<welcome-file>about/index.html</welcome-file>
</welcome-file-list>
- <!-- can be removed with axon >= 3.5 -->
- <persistence-context-ref>
- <persistence-context-ref-name>org.axonframework.common.jpa.ContainerManagedEntityManagerProvider/entityManager</persistence-context-ref-name>
- <persistence-unit-name>noop</persistence-unit-name>
- </persistence-context-ref>
-
<listener>
<listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class>
</listener>
- <!--
- this config value wins over that provided via environment variable PROTOTYPING=true/false
- -->
- <context-param>
- <param-name>isis.viewer.wicket.mode</param-name>
- <param-value>development</param-value>
- </context-param>
-
</web-app>