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/03/30 17:43:53 UTC
[24/59] [abbrv] isis git commit: ISIS-789: updates to simpleapp.
ISIS-789: updates to simpleapp.
Have unstaged some hunks that are obsolete (eg i18n facet decorator)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/859a1350
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/859a1350
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/859a1350
Branch: refs/heads/ISIS-789
Commit: 859a1350ed1c14c131f2959717c524141f65fb20
Parents: 30a4cb6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Mar 30 15:01:52 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Mar 30 15:01:52 2015 +0100
----------------------------------------------------------------------
example/application/simpleapp/.gitignore | 1 +
example/application/simpleapp/dom/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 7 ++++---
example/application/simpleapp/webapp/pom.xml | 19 ++++++++++---------
.../WEB-INF/persistor_datanucleus.properties | 10 +++++-----
.../resources/archetype-resources/dom/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 7 ++++---
7 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/859a1350/example/application/simpleapp/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/.gitignore b/example/application/simpleapp/.gitignore
index 2e2f988..0558e54 100644
--- a/example/application/simpleapp/.gitignore
+++ b/example/application/simpleapp/.gitignore
@@ -39,3 +39,4 @@ JArchitectOut/
rebel.xml
+/translations.pot
http://git-wip-us.apache.org/repos/asf/isis/blob/859a1350/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 11de021..7d159cf 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -86,7 +86,7 @@
datanucleus-maven-plugin
</artifactId>
<versionRange>
- [3.2.0-release,)
+ [4.0.0-release,)
</versionRange>
<goals>
<goal>enhance</goal>
http://git-wip-us.apache.org/repos/asf/isis/blob/859a1350/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 5fad93e..25e735e 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -37,9 +37,10 @@
<isis.version>1.9.0-SNAPSHOT</isis.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
-
+ <datanucleus-accessplatform-jdo-rdbms.version>4.0.4</datanucleus-accessplatform-jdo-rdbms.version>
+ <datanucleus-jodatime.version>4.0.4</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/859a1350/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 5125558..1b7eac0 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -16,7 +16,8 @@
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">
+-->
+<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>
@@ -349,14 +350,14 @@
</build>
</profile>
<profile>
- <id>neo4j</id>
- <dependencies>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-neo4j</artifactId>
- <version>3.2.3</version>
- </dependency>
- </dependencies>
+ <id>neo4j</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-neo4j</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/isis/blob/859a1350/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 6f3aae6c..638a6c7 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
@@ -44,9 +44,10 @@ isis.persistor.datanucleus.RegisterEntities.packagePrefix=domainapp.dom.modules
#
#####################################################################
-isis.persistor.datanucleus.impl.datanucleus.autoCreateSchema=true
-isis.persistor.datanucleus.impl.datanucleus.validateTables=true
-isis.persistor.datanucleus.impl.datanucleus.validateConstraints=true
+isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=false
+isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
+#isis.persistor.datanucleus.impl.datanucleus.mapping.Schema="simple"
#
@@ -60,8 +61,7 @@ isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=fa
# How column names are identified
# (http://www.datanucleus.org/products/datanucleus/jdo/orm/datastore_identifiers.html)
#
-isis.persistor.datanucleus.impl.datanucleus.identifier.case=PreserveCase
-
+isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
#
# L2 cache
http://git-wip-us.apache.org/repos/asf/isis/blob/859a1350/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
index 5eef061..79bc279 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -78,7 +78,7 @@
<pluginExecutionFilter>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>[3.2.0-release,)</versionRange>
+ <versionRange>[4.0.0-release,)</versionRange>
<goals>
<goal>enhance</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/isis/blob/859a1350/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index a5569c2..a0d5f6e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -35,9 +35,10 @@
<isis.version>1.9.0-SNAPSHOT</isis.version>
<!-- must be consistent with the versions defined by the JDO Objectstore -->
- <datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
- <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
-
+ <datanucleus-accessplatform-jdo-rdbms.version>4.0.4</datanucleus-accessplatform-jdo-rdbms.version>
+ <datanucleus-jodatime.version>4.0.4</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>