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 2015/04/06 19:28:54 UTC
[1/6] isis git commit: ISIS-789: update wrapper factory to ignore the
"dn" prefix methods from the DN4 Persistable interface.
Repository: isis
Updated Branches:
refs/heads/ISIS-789 10cb91077 -> c053b08b5
ISIS-789: update wrapper factory to ignore the "dn" prefix methods from the DN4 Persistable interface.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/aaf01c11
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/aaf01c11
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/aaf01c11
Branch: refs/heads/ISIS-789
Commit: aaf01c1142ce8e3e897b6d571963d801d0ab9959
Parents: 10cb910
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 1 08:38:27 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 1 08:38:27 2015 +0100
----------------------------------------------------------------------
.../handlers/DomainObjectInvocationHandler.java | 27 +++++++++++++++++---
1 file changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/aaf01c11/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index 58f52f3..9382ebc 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -21,11 +21,17 @@ package org.apache.isis.core.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import org.datanucleus.enhancer.Persistable;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.CollectionAccessEvent;
import org.apache.isis.applib.events.InteractionEvent;
@@ -110,6 +116,8 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
*/
protected Method __isis_executionMode;
+ protected final Set<String> dnPersistableMethods = Sets.newHashSet();
+
public DomainObjectInvocationHandler(
final T delegate,
final WrapperFactory wrapperFactory,
@@ -139,6 +147,18 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
__isis_executionMode = WrapperObject.class.getMethod("__isis_executionMode", new Class[]{});
saveMethod = WrapperObject.class.getMethod("save", new Class[] {});
wrappedMethod = WrapperObject.class.getMethod("wrapped", new Class[] {});
+
+ dnPersistableMethods.addAll(
+ Lists.newArrayList(
+ Iterables.transform(
+ Arrays.asList(Persistable.class.getDeclaredMethods()),
+ new Function<Method, String>() {
+ @Override
+ public String apply(final Method input) {
+ return input.getName();
+ }
+ })));
+
} catch (final NoSuchMethodException nsme) {
throw new IllegalStateException(
"Could not locate reserved declared methods in the WrappingObject and WrappedObject interfaces",
@@ -153,7 +173,6 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
return delegate(method, args);
}
- // workaround for JDO-enhanced..
if(isJdoMethod(method)) {
return delegate(method, args);
}
@@ -296,14 +315,14 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
}
private boolean isJdoMethod(final Method method) {
- return methodStartsWith(method, "jdo");
+ return methodStartsWith(method, "jdo") || dnPersistableMethods.contains(method.getName());
}
- private boolean isInjectMethod(final Method method) {
+ private static boolean isInjectMethod(final Method method) {
return methodStartsWith(method, "inject");
}
- private boolean methodStartsWith(final Method method, final String prefix) {
+ private static boolean methodStartsWith(final Method method, final String prefix) {
return method.getName().startsWith(prefix);
}
[4/6] isis git commit: ISIS-789: disable
datanucleus.schema.validateAll (rather than just *Tables and *Columns)...
Posted by da...@apache.org.
ISIS-789: disable datanucleus.schema.validateAll (rather than just *Tables and *Columns)...
... because otherwise DN4 (unlike DN3) attempts to validate the non-existing view that is created for view models (eg Estatio's InvoiceSummaryForInvoiceRun that is annotated with a @PersistenceCapable(identityType = IdentityType.NONDURABLE, ... extensions = { @Extension(vendorName = "datanucleus", key = "view-definition", ... }
where DN4 was throwng an exception about missing columns, stack trace showing that view validation was being performed.
in full that annotation is:
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.NONDURABLE,
table = "InvoiceSummaryForInvoiceRun",
extensions = {
@Extension(vendorName = "datanucleus", key = "view-definition",
value = "CREATE VIEW \"InvoiceSummaryForInvoiceRun\" " +
"( " +
" {this.runId}, " +
" {this.total}, " +
" {this.netAmount}, " +
" {this.vatAmount}, " +
" {this.grossAmount} " +
") AS " +
"SELECT " +
" \"Invoice\".\"runId\" , " +
" COUNT(DISTINCT(\"Invoice\".\"id\")) AS \"total\", " +
" SUM(\"InvoiceItem\".\"netAmount\") AS \"netAmount\", " +
" SUM(\"InvoiceItem\".\"vatAmount\") AS \"vatAmount\", " +
" SUM(\"InvoiceItem\".\"grossAmount\") AS \"grossAmount\" " +
"FROM \"Invoice\" " +
" INNER JOIN \"Lease\" " +
" ON \"Invoice\".\"leaseId\" = \"Lease\".\"id\" " +
" INNER JOIN \"FixedAsset\" " +
" ON \"FixedAsset\".\"id\" = \"Invoice\".\"fixedAssetId\" " +
" INNER JOIN \"InvoiceItem\" " +
" ON \"InvoiceItem\".\"invoiceId\" = \"Invoice\".\"id\" " +
"WHERE " +
" NOT \"Invoice\".\"runId\" IS NULL " +
"GROUP BY " +
" \"Invoice\".\"runId\"")
})
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/99ab05f5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/99ab05f5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/99ab05f5
Branch: refs/heads/ISIS-789
Commit: 99ab05f5d54b71e3c5f10345d44b512a11f3ff32
Parents: 3ec8620
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 1 11:46:48 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 1 11:46:48 2015 +0100
----------------------------------------------------------------------
.../jdo/datanucleus/IsisConfigurationForJdoIntegTests.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/99ab05f5/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
index 0d9630e..26f4b0d 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
@@ -21,6 +21,7 @@ package org.apache.isis.objectstore.jdo.datanucleus;
import com.google.common.base.Joiner;
+import org.datanucleus.PropertyNames;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,9 +69,8 @@ public class IsisConfigurationForJdoIntegTests extends IsisConfigurationDefault
addDataNucleusProperty("javax.jdo.option.ConnectionPassword", "");
// Don't do validations that consume setup time.
- addDataNucleusProperty("datanucleus.schema.autoCreateAll", "true");
- addDataNucleusProperty("datanucleus.schema.validateTables", "false");
- addDataNucleusProperty("datanucleus.schema.validateConstraints", "false");
+ addDataNucleusProperty(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_ALL, "true");
+ addDataNucleusProperty(PropertyNames.PROPERTY_SCHEMA_VALIDATE_ALL, "false");
// other properties as per WEB-INF/persistor_datanucleus.properties
addDataNucleusProperty("datanucleus.persistenceByReachabilityAtCommit", "false");
[5/6] isis git commit: ISIS-789: bumping to DN 4.0.6.
Posted by da...@apache.org.
ISIS-789: bumping to DN 4.0.6.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2e75d1c6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2e75d1c6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2e75d1c6
Branch: refs/heads/ISIS-789
Commit: 2e75d1c681c3250bb9bac93a544f44eeb145f5bf
Parents: 99ab05f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Apr 2 08:32:28 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 2 08:32:28 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2e75d1c6/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 267be7a..da30495 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -94,8 +94,8 @@
[6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
<!-- from Datanucleus Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>4.0.4</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-jodatime.version>4.0.4</datanucleus-jodatime.version>
+ <datanucleus-accessplatform-jdo-rdbms.version>4.0.6</datanucleus-accessplatform-jdo-rdbms.version>
+ <datanucleus-jodatime.version>4.0.5</datanucleus-jodatime.version>
<datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
<!-- ensure compatible with version aggregated in datanucleus-accessplatform-jdo-rdbms -->
[6/6] isis git commit: ISIS-789: refactoring pom.xml to reduce the
amount of boilerplate in domain apps for datanucleus enhancer
Posted by da...@apache.org.
ISIS-789: refactoring pom.xml to reduce the amount of boilerplate in domain apps for datanucleus enhancer
(put DN enhancer plugin into a profile)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c053b08b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c053b08b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c053b08b
Branch: refs/heads/ISIS-789
Commit: c053b08b51b48f3b9094b425bd777c42898fc399
Parents: 2e75d1c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Apr 6 18:28:35 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Apr 6 18:28:35 2015 +0100
----------------------------------------------------------------------
core/applib/pom.xml | 29 +------------
core/metamodel/pom.xml | 16 ++++++-
core/pom.xml | 39 +++++++++++++----
core/runtime/pom.xml | 10 -----
example/application/simpleapp/dom/pom.xml | 60 +++++++++++++++++---------
example/application/simpleapp/pom.xml | 13 ++++--
tck/pom.xml | 34 ++++++++++++---
tck/tck-dom/pom.xml | 53 +++++++++++++++--------
8 files changed, 158 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 6560317..89fd421 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -84,25 +84,6 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <verbose>true</verbose>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -161,16 +142,10 @@
<!-- DataNucleus (jdo-api, and for enhancer) -->
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index cf23a83..d533cd0 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -107,14 +107,26 @@
<dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
+ <artifactId>datanucleus-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId>
</dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index da30495..d5f60dc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -93,13 +93,15 @@
[5] https://github.com/Eonasdan/bootstrap-datetimepicker/blob/master/LICENSE
[6] https://github.com/moment/moment/blob/develop/LICENSE</license.additional-notes>
- <!-- from Datanucleus Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>4.0.6</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-jodatime.version>4.0.5</datanucleus-jodatime.version>
- <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
-
- <!-- ensure compatible with version aggregated in datanucleus-accessplatform-jdo-rdbms -->
+ <!-- Datanucleus Objectstore -->
<jdo-api.version>3.1-rc1</jdo-api.version>
+ <datanucleus-core.version>4.0.6</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.0.5</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>4.0.11</datanucleus-rdbms.version>
+
+ <datanucleus-jodatime.version>4.0.6</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
<shiro.version>1.2.3</shiro.version>
@@ -1849,10 +1851,29 @@ ${license.additional-notes}
<!-- DataNucleus -->
<dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <version>${datanucleus-accessplatform-jdo-rdbms.version}</version>
- <type>pom</type>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>${datanucleus-api-jdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ <version>${datanucleus-jdo-query.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>${datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 83d17b1..ff97095 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -143,16 +143,6 @@
</dependency>
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jodatime</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 8237b13..98a78c3 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -79,27 +79,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
- <verbose>true</verbose>
- <props>${basedir}/datanucleus.properties</props>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<dependencies>
@@ -124,6 +103,45 @@
<profiles>
<profile>
+ <id>enhance</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <version>${datanucleus-maven-plugin.version}</version>
+ <configuration>
+ <fork>false</fork>
+ <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+ <verbose>true</verbose>
+ <props>${basedir}/datanucleus.properties</props>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>isis-validate</id>
<activation>
<activeByDefault>false</activeByDefault>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 6e7c216..8db489d 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -37,10 +37,16 @@
<isis.version>1.9.0_dn4-SNAPSHOT</isis.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>4.0.4</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-jodatime.version>4.0.4</datanucleus-jodatime.version>
+
+ <!--<jdo-api.version>3.1-rc1</jdo-api.version>-->
+ <datanucleus-core.version>4.0.6</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.0.5</datanucleus-api-jdo.version>
<datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
-
+ <!--<datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>-->
+ <!--<datanucleus-rdbms.version>4.0.11</datanucleus-rdbms.version>-->
+
+ <!--<datanucleus-jodatime.version>4.0.6</datanucleus-jodatime.version>-->
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -358,7 +364,6 @@
<version>${project.version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index 2f564a6..f82522d 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -36,8 +36,13 @@
<properties>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>4.0.4</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-jodatime.version>4.0.4</datanucleus-jodatime.version>
+ <jdo-api.version>3.1-rc1</jdo-api.version>
+ <datanucleus-core.version>4.0.6</datanucleus-core.version>
+ <datanucleus-api-jdo.version>4.0.5</datanucleus-api-jdo.version>
+ <datanucleus-jdo-query.version>4.0.4</datanucleus-jdo-query.version>
+ <datanucleus-rdbms.version>4.0.11</datanucleus-rdbms.version>
+
+ <datanucleus-jodatime.version>4.0.6</datanucleus-jodatime.version>
<datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
</properties>
@@ -152,10 +157,29 @@
<!-- DataNucleus -->
<dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>${datanucleus-api-jdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ <version>${datanucleus-jdo-query.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <version>${datanucleus-accessplatform-jdo-rdbms.version}</version>
- <type>pom</type>
+ <artifactId>datanucleus-rdbms</artifactId>
+ <version>${datanucleus-rdbms.version}</version>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/c053b08b/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/tck/tck-dom/pom.xml b/tck/tck-dom/pom.xml
index a1e3080..0137a64 100644
--- a/tck/tck-dom/pom.xml
+++ b/tck/tck-dom/pom.xml
@@ -16,17 +16,19 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>isis-tck</artifactId>
+ <parent>
+ <groupId>org.apache.isis.tck</groupId>
+ <artifactId>isis-tck</artifactId>
<version>1.9.0_dn4-SNAPSHOT</version>
- </parent>
+ </parent>
- <artifactId>isis-tck-dom</artifactId>
- <name>Isis TCK DOM</name>
+ <artifactId>isis-tck-dom</artifactId>
+ <name>Isis TCK DOM</name>
<profiles>
<profile>
@@ -57,7 +59,7 @@
</execution>
</executions>
</plugin>
-
+
</plugins>
<pluginManagement>
<plugins>
@@ -85,7 +87,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -98,17 +100,32 @@
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-applib</artifactId>
+ </dependency>
<!-- DataNucleus -->
<dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
- <type>pom</type>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-rdbms</artifactId>
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -116,5 +133,5 @@
</dependency>
</dependencies>
-
+
</project>
[3/6] isis git commit: ISIS-789: tidying up
persistor_datanucleus.properties for simpleapp.
Posted by da...@apache.org.
ISIS-789: tidying up persistor_datanucleus.properties for simpleapp.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3ec8620d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3ec8620d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3ec8620d
Branch: refs/heads/ISIS-789
Commit: 3ec8620d690a0439b8c6eac09ab06b28605562a4
Parents: 78c1457
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 1 08:40:08 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 1 08:40:08 2015 +0100
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/persistor_datanucleus.properties | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3ec8620d/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index 638a6c7..675ced3 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -45,9 +45,8 @@ isis.persistor.datanucleus.RegisterEntities.packagePrefix=domainapp.dom.modules
#####################################################################
isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=false
+isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
-#isis.persistor.datanucleus.impl.datanucleus.mapping.Schema="simple"
#
[2/6] isis git commit: ISIS-789: reorganizing the order of
plugins/pluginManagement in simpleapp pom.xml
Posted by da...@apache.org.
ISIS-789: reorganizing the order of plugins/pluginManagement in simpleapp pom.xml
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/78c1457d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/78c1457d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/78c1457d
Branch: refs/heads/ISIS-789
Commit: 78c1457d1b54e9fdf5f42e1a705e2597d2f71880
Parents: aaf01c1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 1 08:39:24 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 1 08:39:24 2015 +0100
----------------------------------------------------------------------
example/application/simpleapp/dom/pom.xml | 42 +++++++++++++-------------
1 file changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/78c1457d/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 0d258b0..8237b13 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -46,27 +46,6 @@
</excludes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
- <verbose>true</verbose>
- <props>${basedir}/datanucleus.properties</props>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -100,6 +79,27 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <version>${datanucleus-maven-plugin.version}</version>
+ <configuration>
+ <fork>false</fork>
+ <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
+ <verbose>true</verbose>
+ <props>${basedir}/datanucleus.properties</props>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>