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/08 22:48:15 UTC
[1/6] isis git commit: ISIS-789: further tidy up of simpleapp's
pom.xml for DN4 profile
Repository: isis
Updated Branches:
refs/heads/ISIS-789 c053b08b5 -> 61493de43
ISIS-789: further tidy up of simpleapp's pom.xml for DN4 profile
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/447714cc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/447714cc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/447714cc
Branch: refs/heads/ISIS-789
Commit: 447714ccde6e06faf9a6e85549b910baf9358a18
Parents: c053b08
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Apr 7 07:39:38 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Apr 7 07:39:38 2015 +0100
----------------------------------------------------------------------
example/application/simpleapp/dom/pom.xml | 67 +++++++++++++-------------
1 file changed, 33 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/447714cc/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 98a78c3..94d4245 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -46,39 +46,6 @@
</excludes>
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.datanucleus
- </groupId>
- <artifactId>
- datanucleus-maven-plugin
- </artifactId>
- <versionRange>[${datanucleus-maven-plugin.version},)</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
@@ -107,7 +74,39 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <properties>
+ <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
+ </properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <versionRange>[${datanucleus-maven-plugin.version},)</versionRange>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.datanucleus</groupId>
@@ -159,7 +158,7 @@
<dependency>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-dom</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>${isis.version}</version>
</dependency>
<!--
... workaround to avoid conflict with plexus-default
[5/6] isis git commit: ISIS-789: fixing silly mistake in the
plugin.xml
Posted by da...@apache.org.
ISIS-789: fixing silly mistake in the plugin.xml
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/412b2d43
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/412b2d43
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/412b2d43
Branch: refs/heads/ISIS-789
Commit: 412b2d439a9f9652b7e15fe3b6ffa0b0bf5dc739
Parents: fd95012
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 8 21:08:18 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 8 21:08:18 2015 +0100
----------------------------------------------------------------------
core/runtime/src/main/resources/plugin.xml | 40 ++++++++++++-------------
1 file changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/412b2d43/core/runtime/src/main/resources/plugin.xml
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/resources/plugin.xml b/core/runtime/src/main/resources/plugin.xml
index a8f5f6c..ffbcff1 100644
--- a/core/runtime/src/main/resources/plugin.xml
+++ b/core/runtime/src/main/resources/plugin.xml
@@ -56,29 +56,27 @@
default="true"
rdbms-mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuemappings.ByteArrayBlobRdbmsMapping">
</mapping>
+ </extension>
- <!--
- http://www.datanucleus.org/extensions/java_types.html
- -->
- <extension point="org.datanucleus.java_type">
- <java-type
- name="org.apache.isis.applib.value.Password"
- dfg="true"
- converter-name="isis.password-string" />
- </extension>
-
- <!--
- http://www.datanucleus.org/extensions/type_converter.html
- -->
- <extension point="org.datanucleus.type_converter">
- <type-converter
- name="isis.password-string"
- member-type="org.apache.isis.applib.value.Password"
- datastore-type="java.lang.String"
- converter-class="org.apache.isis.objectstore.jdo.datanucleus.typeconverters.IsisPasswordConverter"/>
- </extension>
-
+ <!--
+ http://www.datanucleus.org/extensions/java_types.html
+ -->
+ <extension point="org.datanucleus.java_type">
+ <java-type
+ name="org.apache.isis.applib.value.Password"
+ dfg="true"
+ converter-name="isis.password-string" />
+ </extension>
+ <!--
+ http://www.datanucleus.org/extensions/type_converter.html
+ -->
+ <extension point="org.datanucleus.type_converter">
+ <type-converter
+ name="isis.password-string"
+ member-type="org.apache.isis.applib.value.Password"
+ datastore-type="java.lang.String"
+ converter-class="org.apache.isis.objectstore.jdo.datanucleus.typeconverters.IsisPasswordConverter"/>
</extension>
</plugin>
[3/6] isis git commit: ISIS-789: updated Isis value type mappings for
the new DN4 APIs.
Posted by da...@apache.org.
ISIS-789: updated Isis value type mappings for the new DN4 APIs.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d7999deb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d7999deb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d7999deb
Branch: refs/heads/ISIS-789
Commit: d7999deba1bb23dcf61418f2479a49b6e0f3f9c9
Parents: 238cbb0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 8 16:57:13 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 8 16:57:13 2015 +0100
----------------------------------------------------------------------
.../typeconverters/IsisPasswordConverter.java | 42 ++++++++++
.../ByteArrayBlobRdbmsMapping.java | 48 ++++++++++++
.../valuemappings/IsisBlobRDBMSMapping.java | 48 ------------
.../datanucleus/valuetypes/IsisBlobMapping.java | 4 +-
.../valuetypes/IsisDateConverter.java | 50 ------------
.../datanucleus/valuetypes/IsisDateMapping.java | 47 -----------
.../valuetypes/IsisDateTimeConverter.java | 51 ------------
.../valuetypes/IsisDateTimeMapping.java | 47 -----------
core/runtime/src/main/resources/plugin.xml | 82 +++++++++++---------
.../valuetypes/IsisDateConverterTest.java | 61 ---------------
.../valuetypes/IsisDateMappingTest.java | 50 ------------
recreate_archetype_dn4_SNAPSHOT.sh | 24 ++++++
12 files changed, 164 insertions(+), 390 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/typeconverters/IsisPasswordConverter.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
new file mode 100644
index 0000000..5fb38ea
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/typeconverters/IsisPasswordConverter.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.objectstore.jdo.datanucleus.typeconverters;
+
+import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.isis.applib.value.Password;
+
+public class IsisPasswordConverter implements TypeConverter<Password, String>{
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String toDatastoreType(final Password memberValue) {
+ return memberValue != null
+ ? memberValue.getPassword()
+ : null;
+ }
+
+ @Override
+ public Password toMemberType(final String datastoreValue) {
+ return datastoreValue != null
+ ? new Password(datastoreValue)
+ : null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
new file mode 100644
index 0000000..1083738
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.objectstore.jdo.datanucleus.valuemappings;
+
+import org.datanucleus.store.rdbms.RDBMSStoreManager;
+import org.datanucleus.store.rdbms.mapping.datastore.BlobRDBMSMapping;
+import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
+import org.datanucleus.store.rdbms.table.Column;
+
+public class ByteArrayBlobRdbmsMapping extends BlobRDBMSMapping {
+
+ public ByteArrayBlobRdbmsMapping(JavaTypeMapping mapping, RDBMSStoreManager storeMgr, Column col) {
+ super(mapping, storeMgr, col);
+ }
+
+ @Override
+ public JavaTypeMapping getJavaTypeMapping() {
+ final JavaTypeMapping javaTypeMapping = super.getJavaTypeMapping();
+ return javaTypeMapping;
+ }
+
+ protected Object getObjectForBytes(byte[] bytes, int param) {
+ if(param == 3) {
+ // JDBC is 1-based.
+ return bytes;
+ } else {
+ return super.getObjectForBytes(bytes, param);
+ }
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/IsisBlobRDBMSMapping.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/IsisBlobRDBMSMapping.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/IsisBlobRDBMSMapping.java
deleted file mode 100644
index f729edb..0000000
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/IsisBlobRDBMSMapping.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.objectstore.jdo.datanucleus.valuemappings;
-
-import org.datanucleus.store.rdbms.RDBMSStoreManager;
-import org.datanucleus.store.rdbms.mapping.datastore.BlobRDBMSMapping;
-import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
-import org.datanucleus.store.rdbms.table.Column;
-
-public class IsisBlobRDBMSMapping extends BlobRDBMSMapping {
-
- public IsisBlobRDBMSMapping(JavaTypeMapping mapping, RDBMSStoreManager storeMgr, Column col) {
- super(mapping, storeMgr, col);
- }
-
- @Override
- public JavaTypeMapping getJavaTypeMapping() {
- final JavaTypeMapping javaTypeMapping = super.getJavaTypeMapping();
- return javaTypeMapping;
- }
-
- protected Object getObjectForBytes(byte[] bytes, int param) {
- if(param == 3) {
- // JDBC is 1-based.
- return bytes;
- } else {
- return super.getObjectForBytes(bytes, param);
- }
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
index 0d5e204..515783a 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
@@ -57,10 +57,11 @@ public class IsisBlobMapping extends SingleFieldMultiMapping {
{
addColumns(ClassNameConstants.JAVA_LANG_STRING); // name
addColumns(ClassNameConstants.JAVA_LANG_STRING); // mime type
- // this mapping type isn't supported out-of-the-box by DN, so instead we register IsisBlobRDBMSMapping
+ // this mapping type isn't supported out-of-the-box by DN, but the ByteArayBlobRdbmsMapping that we register supports it
addColumns(ClassNameConstants.BYTE_ARRAY); // bytes
}
+
public Object getValueForDatastoreMapping(NucleusContext nucleusCtx, int index, Object value)
{
Blob blob = ((Blob)value);
@@ -119,4 +120,5 @@ public class IsisBlobMapping extends SingleFieldMultiMapping {
return new Blob(name, mimeTypeBase, bytes);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java
deleted file mode 100644
index 4bcbf23..0000000
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-
-import org.datanucleus.store.types.converters.TypeConverter;
-
-import org.apache.isis.applib.value.Date;
-
-public class IsisDateConverter implements TypeConverter<Date, Long>{
-
- private static final long serialVersionUID = 1L;
-
- public IsisDateConverter() {
- }
-
- @Override
- public Long toDatastoreType(Date memberValue) {
- if(memberValue == null) {
- return null;
- }
-
- Date d = (Date)memberValue;
- return d.getMillisSinceEpoch();
- }
-
- @Override
- public Date toMemberType(Long datastoreValue) {
- if(datastoreValue == null) {
- return null;
- }
- return new Date(datastoreValue);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMapping.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMapping.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMapping.java
deleted file mode 100644
index 3107881..0000000
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMapping.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-
-import org.datanucleus.store.rdbms.mapping.java.ObjectMapping;
-import org.apache.isis.applib.value.Date;
-
-public class IsisDateMapping extends ObjectMapping {
-
- private final IsisDateConverter dateConverter = new IsisDateConverter();
-
- public IsisDateMapping() {
-
- }
-
- @Override
- public Class<?> getJavaType() {
- return org.apache.isis.applib.value.Date.class;
- }
-
- // TODO: Need to check mapping
-
- protected Long objectToLong(Object object) {
- return dateConverter.toDatastoreType((Date) object);
- }
-
- protected Object longToObject(Long datastoreValue) {
- return dateConverter.toMemberType(datastoreValue);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
deleted file mode 100644
index 553e0a3..0000000
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-
-import org.datanucleus.store.types.converters.TypeConverter;
-
-import org.apache.isis.applib.value.DateTime;
-
-public class IsisDateTimeConverter implements TypeConverter<DateTime, Long>{
-
- private static final long serialVersionUID = 1L;
-
- public IsisDateTimeConverter() {
-
- }
-
- @Override
- public Long toDatastoreType(DateTime memberValue) {
- if(memberValue == null) {
- return null;
- }
-
- DateTime d = (DateTime)memberValue;
- return d.getMillisSinceEpoch();
- }
-
- @Override
- public DateTime toMemberType(Long datastoreValue) {
- if(datastoreValue == null) {
- return null;
- }
- return new DateTime(datastoreValue);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeMapping.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeMapping.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeMapping.java
deleted file mode 100644
index 22b6e77..0000000
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeMapping.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-
-import org.apache.isis.applib.value.DateTime;
-import org.datanucleus.store.rdbms.mapping.java.ObjectMapping;
-
-public class IsisDateTimeMapping extends ObjectMapping {
-
- private final IsisDateTimeConverter dateConverter = new IsisDateTimeConverter();
-
- public IsisDateTimeMapping() {
-
- }
-
- //TODO: Configure mapping
-
- @Override
- public Class<?> getJavaType() {
- return org.apache.isis.applib.value.DateTime.class;
- }
-
- protected Long objectToLong(Object object) {
- return dateConverter.toDatastoreType((DateTime) object);
- }
-
- protected Object longToObject(Long datastoreValue) {
- return dateConverter.toMemberType(datastoreValue);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/main/resources/plugin.xml
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/resources/plugin.xml b/core/runtime/src/main/resources/plugin.xml
index 22b1da4..a8f5f6c 100644
--- a/core/runtime/src/main/resources/plugin.xml
+++ b/core/runtime/src/main/resources/plugin.xml
@@ -22,20 +22,15 @@
name="Apache Isis JDO ObjectStore DataNucleus Implementation"
provider-name="Apache Isis">
- <!-- JAVA TYPES MAPPING, for "mapped" datastores -->
- <extension point="org.datanucleus.store_mapping">
- <mapping
- java-type="org.apache.isis.applib.value.Date"
- mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisDateMapping"/>
- <mapping
- java-type="org.apache.isis.applib.value.DateTime"
- mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisDateTimeMapping"/>
-
- <mapping
- java-type="org.apache.isis.applib.value.Blob"
+ <!--
+ http://www.datanucleus.org/extensions/rdbms_java_types.html
+ -->
+ <extension point="org.datanucleus.store.rdbms.java_mapping">
+ <mapping
+ java-type="org.apache.isis.applib.value.Blob"
mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisBlobMapping"/>
- <mapping
- java-type="org.apache.isis.applib.value.Clob"
+ <mapping
+ java-type="org.apache.isis.applib.value.Clob"
mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisClobMapping"/>
<mapping
java-type="org.apache.isis.applib.value.Money"
@@ -43,30 +38,47 @@
</extension>
- <extension point="org.datanucleus.store.rdbms.rdbms_mapping">
- <mapping java-type="[B" jdbc-type="BLOB" sql-type="BLOB" default="true"
- rdbms-mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuemappings.IsisBlobRDBMSMapping">
- </mapping>
- <mapping java-type="[Ljava.lang.Byte;" jdbc-type="BLOB" sql-type="BLOB" default="true"
- rdbms-mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuemappings.IsisBlobRDBMSMapping">
- </mapping>
- </extension>
<!--
- to support http://www.datanucleus.org/products/accessplatform/jdo/types.html#typeconverter
+ http://www.datanucleus.org/documentation/extensions/rdbms_datastore_types.html
-->
- <extension point="org.datanucleus.java_type">
- <java-type
- name="org.apache.isis.applib.value.Date"
- persistent="true"
- dfg="true"
- embedded="true"
- long-converter="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisDateConverter"/>
- <java-type
- name="org.apache.isis.applib.value.DateTime"
- persistent="true"
- dfg="true"
- embedded="true"
- long-converter="org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisDateTimeConverter"/>
+ <extension point="org.datanucleus.store.rdbms.datastore_mapping">
+ <mapping
+ java-type="[B"
+ jdbc-type="BLOB"
+ sql-type="BLOB"
+ default="true"
+ rdbms-mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuemappings.ByteArrayBlobRdbmsMapping">
+ </mapping>
+ <mapping
+ java-type="[Ljava.lang.Byte;"
+ jdbc-type="BLOB"
+ sql-type="BLOB"
+ default="true"
+ rdbms-mapping-class="org.apache.isis.objectstore.jdo.datanucleus.valuemappings.ByteArrayBlobRdbmsMapping">
+ </mapping>
+
+ <!--
+ http://www.datanucleus.org/extensions/java_types.html
+ -->
+ <extension point="org.datanucleus.java_type">
+ <java-type
+ name="org.apache.isis.applib.value.Password"
+ dfg="true"
+ converter-name="isis.password-string" />
+ </extension>
+
+ <!--
+ http://www.datanucleus.org/extensions/type_converter.html
+ -->
+ <extension point="org.datanucleus.type_converter">
+ <type-converter
+ name="isis.password-string"
+ member-type="org.apache.isis.applib.value.Password"
+ datastore-type="java.lang.String"
+ converter-class="org.apache.isis.objectstore.jdo.datanucleus.typeconverters.IsisPasswordConverter"/>
+ </extension>
+
+
</extension>
</plugin>
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java b/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
deleted file mode 100644
index 95f9321..0000000
--- a/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.isis.applib.value.Date;
-
-public class IsisDateConverterTest {
-
- private IsisDateConverter converter;
-
- @Before
- public void setUp() throws Exception {
- converter = new IsisDateConverter();
- }
-
- @Test
- public void roundTrip() {
- Date date = new Date();
- final Long value = converter.toDatastoreType(date);
- Date date2 = (Date) converter.toMemberType(value);
-
- // necessary to use dateValue() because the Isis date (rather poorly) does not
- // override equals() / hashCode()
- assertThat(date.dateValue(), is(equalTo(date2.dateValue())));
- }
-
- @Test
- public void toLong_whenNull() {
- assertNull(converter.toDatastoreType(null));
- }
-
- @Test
- public void toObject_whenNull() {
- assertNull(converter.toMemberType(null));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java b/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
deleted file mode 100644
index 2523f04..0000000
--- a/core/runtime/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.isis.applib.value.Date;
-
-public class IsisDateMappingTest {
-
- private IsisDateMapping dateMapping;
-
- @Before
- public void setUp() throws Exception {
- dateMapping = new IsisDateMapping();
- }
-
- @Test
- public void roundTrip() {
- Date date = new Date();
- final Long datastoreValue = dateMapping.objectToLong(date);
- Date date2 = (Date) dateMapping.longToObject(datastoreValue);
-
- // necessary to use dateValue() because the Isis date (rather poorly) does not
- // override equals() / hashCode()
- assertThat(date.dateValue(), is(equalTo(date2.dateValue())));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d7999deb/recreate_archetype_dn4_SNAPSHOT.sh
----------------------------------------------------------------------
diff --git a/recreate_archetype_dn4_SNAPSHOT.sh b/recreate_archetype_dn4_SNAPSHOT.sh
new file mode 100644
index 0000000..9f19858
--- /dev/null
+++ b/recreate_archetype_dn4_SNAPSHOT.sh
@@ -0,0 +1,24 @@
+export ISISREL=1.9.0_dn4-SNAPSHOT
+export ISISDEV=1.9.0_dn4-SNAPSHOT
+export JIRA=ISIS-789
+
+export ISISTMP=/c/tmp # or as required
+export ISISPAR=$ISISREL
+export ISISRC=RC1
+export ISISCPT=$(echo $ISISART | cut -d- -f2)
+export ISISCPN=$(echo $ISISART | cut -d- -f1)
+
+for a in simpleapp
+do
+ pushd example/application/$a
+ export ISISART=$a-archetype
+
+ env | grep ISIS | sort
+ sh ../../../scripts/recreate-archetype.sh $JIRA
+ popd
+done
+
+
+
+
+
[6/6] isis git commit: ISIS-789: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-789: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/61493de4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/61493de4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/61493de4
Branch: refs/heads/ISIS-789
Commit: 61493de43d1421fcc9dadf6176437f0d01963fa6
Parents: 412b2d4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 8 21:09:49 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 8 21:09:49 2015 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 2 +-
.../src/main/resources/archetype-resources/dom/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 11 -----------
.../test/resources/projects/basic/archetype.properties | 2 +-
4 files changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index e6a4d26..d65e62c 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/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 23a3d55..01e784b 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
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-dom</artifactId>
- <version>${isis.version}</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<!--
... workaround to avoid conflict with plexus-default
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/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 26da89d..8dea042 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -34,17 +34,6 @@
<properties>
<isis.version>1.9.0_dn4-SNAPSHOT</isis.version>
- <!-- must be consistent with the versions defined by the JDO 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-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>
http://git-wip-us.apache.org/repos/asf/isis/blob/61493de4/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index ada4e85..6995dbc 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Tue Apr 07 07:41:20 BST 2015
+#Wed Apr 08 21:09:42 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
[4/6] isis git commit: ISIS-789: minor tidy-up of the simpleapp
pom.xml's
Posted by da...@apache.org.
ISIS-789: minor tidy-up of the simpleapp pom.xml's
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fd950125
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fd950125
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fd950125
Branch: refs/heads/ISIS-789
Commit: fd950125ac86a84880e42bf36630a0c81757d023
Parents: d7999de
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Apr 8 18:50:18 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Apr 8 18:50:18 2015 +0100
----------------------------------------------------------------------
example/application/simpleapp/dom/pom.xml | 4 ++--
example/application/simpleapp/fixture/pom.xml | 2 +-
example/application/simpleapp/integtests/pom.xml | 2 +-
example/application/simpleapp/pom.xml | 13 +------------
example/application/simpleapp/webapp/pom.xml | 2 +-
5 files changed, 6 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fd950125/example/application/simpleapp/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/pom.xml b/example/application/simpleapp/dom/pom.xml
index 94d4245..dfa3a8a 100644
--- a/example/application/simpleapp/dom/pom.xml
+++ b/example/application/simpleapp/dom/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-dom</artifactId>
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-dom</artifactId>
- <version>${isis.version}</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</dependency>
<!--
... workaround to avoid conflict with plexus-default
http://git-wip-us.apache.org/repos/asf/isis/blob/fd950125/example/application/simpleapp/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/pom.xml b/example/application/simpleapp/fixture/pom.xml
index b1435ed..3ae65e2 100644
--- a/example/application/simpleapp/fixture/pom.xml
+++ b/example/application/simpleapp/fixture/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-fixture</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/fd950125/example/application/simpleapp/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/pom.xml b/example/application/simpleapp/integtests/pom.xml
index a61ad76..9238463 100644
--- a/example/application/simpleapp/integtests/pom.xml
+++ b/example/application/simpleapp/integtests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-integtests</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/fd950125/example/application/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 8db489d..565725e 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<name>Simple App</name>
@@ -36,17 +36,6 @@
<properties>
<isis.version>1.9.0_dn4-SNAPSHOT</isis.version>
- <!-- must be consistent with the versions defined by the JDO 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-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>
http://git-wip-us.apache.org/repos/asf/isis/blob/fd950125/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 1b7eac0..d7f8c4f 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-webapp</artifactId>
[2/6] isis git commit: ISIS-789: recreating simpleapp archetype
Posted by da...@apache.org.
ISIS-789: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/238cbb09
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/238cbb09
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/238cbb09
Branch: refs/heads/ISIS-789
Commit: 238cbb09f8ac6a31f5a8e094f334ecc818988ed2
Parents: 447714c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Apr 7 07:41:39 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Apr 7 07:41:39 2015 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 2 +-
.../resources/archetype-resources/.gitignore | 1 +
.../resources/archetype-resources/dom/pom.xml | 125 +++++++++++--------
.../main/resources/archetype-resources/pom.xml | 15 ++-
.../archetype-resources/webapp/pom.xml | 16 +--
.../WEB-INF/persistor_datanucleus.properties | 9 +-
.../projects/basic/archetype.properties | 2 +-
7 files changed, 98 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/238cbb09/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index d65e62c..e6a4d26 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
- <version>1.9.0_dn4-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
http://git-wip-us.apache.org/repos/asf/isis/blob/238cbb09/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
index 2e2f988..0558e54 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
@@ -39,3 +39,4 @@ JArchitectOut/
rebel.xml
+/translations.pot
http://git-wip-us.apache.org/repos/asf/isis/blob/238cbb09/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 79bc279..23a3d55 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
@@ -43,56 +43,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.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>[4.0.0-release,)</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<dependencies>
@@ -117,6 +67,77 @@
<profiles>
<profile>
+ <id>enhance</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <datanucleus-maven-plugin.version>4.0.0-release</datanucleus-maven-plugin.version>
+ </properties>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <versionRange>[${datanucleus-maven-plugin.version},)</versionRange>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </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>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>
</activation>
@@ -125,7 +146,7 @@
<plugin>
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.0_dn4-SNAPSHOT</version>
<configuration>
<isisConfigDir>../webapp/src/main/webapp/WEB-INF</isisConfigDir>
</configuration>
@@ -133,7 +154,7 @@
<dependency>
<groupId>org.apache.isis.example.application</groupId>
<artifactId>simpleapp-dom</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>${isis.version}</version>
</dependency>
<!--
... workaround to avoid conflict with plexus-default
http://git-wip-us.apache.org/repos/asf/isis/blob/238cbb09/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 a0d5f6e..26da89d 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -32,13 +32,19 @@
</prerequisites>
<properties>
- <isis.version>1.9.0-SNAPSHOT</isis.version>
+ <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>
@@ -345,7 +351,6 @@
<version>${version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/238cbb09/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
index d01f061..f9f37d0 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -343,14 +343,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/238cbb09/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index 2be805e..c19892c 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -47,9 +47,9 @@ ${symbol_pound} remainder is passed through to DataNucleus
${symbol_pound}
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}
-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=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
${symbol_pound}
@@ -63,8 +63,7 @@ ${symbol_pound}
${symbol_pound} How column names are identified
${symbol_pound} (http://www.datanucleus.org/products/datanucleus/jdo/orm/datastore_identifiers.html)
${symbol_pound}
-isis.persistor.datanucleus.impl.datanucleus.identifier.case=PreserveCase
-
+isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
${symbol_pound}
${symbol_pound} L2 cache
http://git-wip-us.apache.org/repos/asf/isis/blob/238cbb09/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index c78e3ba..ada4e85 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Sun Mar 29 15:44:24 BST 2015
+#Tue Apr 07 07:41:20 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it