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/03/08 14:10:20 UTC
[isis] branch master updated: fixing simpleapp issues (while not
touching archetype!)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new bb7fcb0 fixing simpleapp issues (while not touching archetype!)
bb7fcb0 is described below
commit bb7fcb0ed9176e87bd229b984988c9870219f655
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 8 15:10:16 2018 +0100
fixing simpleapp issues (while not touching archetype!)
1) upgrade web-descriptor (web.xml) to version 3.1
2) make 'commons-io' a scope=compile dependency for 'viewer-wicket-impl'
3) let SimpleObject use the new IsisJdoSupport_v3_2
4) remove configured option: isis.services.eventbus.implementation=axon
5) remove datanucleus from isis-mavendeps-testing (its now the
responsibility of developers to pick a JDO plugin to include with their
app)
6) update lombok version to latest (1.16.20)
---
core/mavendeps/testing/pom.xml | 6 ----
core/pom.xml | 6 ++++
core/viewer-wicket-impl/pom.xml | 13 ++++----
.../manifest/isis-non-changing.properties | 4 +--
.../application/simpleapp/module-simple/pom.xml | 38 +++++++++++++++++-----
.../modules/simple/dom/impl/SimpleObjects.java | 11 +++----
example/application/simpleapp/pom.xml | 2 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 7 ++--
8 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 344865f..6256139 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -78,12 +78,6 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
- <!-- [ahuber] TODO by now defaulting to dn-4, but have also dn-5 -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-plugins-jdo-datanucleus-4</artifactId>
- <version>${isis-core.version}</version>
- </dependency>
</dependencies>
</profile>
diff --git a/core/pom.xml b/core/pom.xml
index a78f1b9..d5b9767 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -142,6 +142,7 @@
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-email.version>1.4</commons-email.version>
+ <commons-io.version>2.6</commons-io.version>
<com-sun-mail.version>1.5.2</com-sun-mail.version>
<axon-core.version>2.4.4</axon-core.version>
@@ -1549,6 +1550,11 @@ ${license.additional-notes}
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
<!-- Dependency injection -->
<dependency>
diff --git a/core/viewer-wicket-impl/pom.xml b/core/viewer-wicket-impl/pom.xml
index a3e938b..03868d4 100644
--- a/core/viewer-wicket-impl/pom.xml
+++ b/core/viewer-wicket-impl/pom.xml
@@ -71,13 +71,6 @@
<artifactId>isis-core-runtime</artifactId>
</dependency>
-<!-- replaced by javaee-api -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-servlet_3.0_spec</artifactId> -->
-<!-- <scope>provided</scope> -->
-<!-- </dependency> -->
-
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId>
@@ -88,6 +81,12 @@
<artifactId>wicket-source</artifactId>
</dependency>
+ <!-- as required by wicket -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice-parent</artifactId>
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
index fed265a..41aad5d 100644
--- a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
@@ -18,9 +18,9 @@
-
+# -- auto wired by plugins --
#isis.services.eventbus.implementation=guava
-isis.services.eventbus.implementation=axon
+#isis.services.eventbus.implementation=axon
#################################################################################
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 4910509..d54ed58 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -138,14 +138,34 @@
</build>
<dependencies>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
+ <artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <version>${isis.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-eventbus-guava</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+
<dependency>
- <groupId>org.axonframework</groupId>
- <artifactId>axon-core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<!-- test -->
@@ -156,11 +176,11 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <scope>test</scope>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.datanucleus</groupId> -->
+<!-- <artifactId>datanucleus-core</artifactId> -->
+<!-- <scope>test</scope> -->
+<!-- </dependency> -->
<dependency>
<groupId>org.hsqldb</groupId>
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index 335f9d0..83eeed1 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@ -20,7 +20,7 @@ package domainapp.modules.simple.dom.impl;
import java.util.List;
-import org.datanucleus.query.typesafe.TypesafeQuery;
+import javax.jdo.JDOQLTypedQuery;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -33,9 +33,8 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
+import org.apache.isis.applib.services.jdosupport.IsisJdoSupport_v3_2;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.applib.services.xactn.TransactionService;
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
@@ -63,7 +62,7 @@ public class SimpleObjects {
@ParameterLayout(named="Name")
final String name
) {
- TypesafeQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
+ JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject cand = QSimpleObject.candidate();
q = q.filter(
cand.name.indexOf(q.stringParameter("name")).ne(-1)
@@ -74,7 +73,7 @@ public class SimpleObjects {
@Programmatic
public SimpleObject findByNameExact(final String name) {
- TypesafeQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
+ JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject cand = QSimpleObject.candidate();
q = q.filter(
cand.name.eq(q.stringParameter("name"))
@@ -97,6 +96,6 @@ public class SimpleObjects {
RepositoryService repositoryService;
@javax.inject.Inject
- IsisJdoSupport isisJdoSupport;
+ IsisJdoSupport_v3_2 isisJdoSupport;
}
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 84de916..2876899 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -37,7 +37,7 @@
<properties>
<isis.version>2.0.0-M1-SNAPSHOT</isis.version>
- <lombok.version>1.16.18</lombok.version>
+ <lombok.version>1.16.20</lombok.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
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 1adf47b..885e0c9 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
@@ -17,9 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<web-app id="WebApp_ID" version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ id="WebApp_ID" version="3.1">
<display-name>Simple app</display-name>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.