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 2018/03/15 12:56:50 UTC
[isis] branch master updated (f39fc20 -> 0339373)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
discard f39fc20 ISIS-1887 pull in java.sql.Timestamp support from -legacy
add b453363 ISIS-1899: bumps versions down to 1.16.3-SNAPSHOT
add b9175ae ISIS-1913: adds support for object-icon link in REST API
add eababc5 ISIS-1902: adds in OSGI bundle attributes
add bfd2014 ISIS-1904: ignore .flattened-pom.xml from git
add c9f563e ISIS-1916: adds support to setup within gitlab CI
add f03484c ISIS-1916: updates script to recreate an archetype for SNAPSHOT
add 9cc64a3 ISIS-1916: recreating simpleapp archetype
add 32f8228 ISIS-1916: updates from testing that example simpleapp works with gitlab-ci
add 529112d ISIS-1916: updates docs for gitlab-ci support
new d3c7bf8 Merge branch 'maint-1.16.2'
new b7c4192 fixes a couple of merge issues
new 84caf8c adds workaround for use of flattened poms
new d2ca2d2 disable archetypes from build by default
new 0339373 ISIS-1887 pull in java.sql.Timestamp support from -legacy
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f39fc20)
\
N -- N -- N refs/heads/master (0339373)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
..._ugfun_getting-started_simpleapp-archetype.adoc | 69 +-
.../images/getting-started/dockerhub-tags.png | Bin 0 -> 52693 bytes
.../guides/ugvro/_ugvro_layout-resources.adoc | 27 +-
core/mavendeps/webapp/pom.xml | 5 -
core/pom.xml | 37 +-
.../isis/viewer/restfulobjects/applib/Rel.java | 1 +
.../restfulobjects/applib/RepresentationType.java | 4 +
.../restfulobjects/applib/RestfulMediaType.java | 2 +
.../applib/domainobjects/DomainObjectResource.java | 17 +
.../domainobjects/DomainObjectReprRenderer.java | 18 +-
.../server/RestfulObjectsApplication.java | 2 +
.../resources/DomainObjectResourceServerside.java | 81 +++
.../server/resources/ImageResourceServerside.java} | 31 +-
example/application/helloworld/pom.xml | 1 +
example/application/simpleapp/.gitignore | 2 +
example/application/simpleapp/.gitlab-ci.yml | 52 ++
example/application/simpleapp/.m2/settings.xml | 15 +
example/application/simpleapp/application/pom.xml | 16 +-
.../application/simpleapp/module-simple/pom.xml | 30 +-
example/application/simpleapp/pom.xml | 118 ++-
example/application/simpleapp/webapp/pom.xml | 127 ++--
example/archetype/simpleapp/pom.xml | 13 +-
.../META-INF/maven/archetype-metadata.xml | 7 +
.../resources/archetype-resources/.gitattributes | 51 --
.../main/resources/archetype-resources/.gitignore | 41 --
.../resources/archetype-resources/.gitlab-ci.yml | 49 ++
.../resources/archetype-resources/.m2/settings.xml | 18 +
.../archetype-resources/application/.gitignore | 1 -
.../application/translations.pot | 790 +++++++++++++++++++++
.../archetype-resources/module-simple/.gitignore | 6 -
.../archetype-resources/module-simple/pom.xml | 1 -
.../module-simple/translations.pot | 780 ++++++++++++++++++++
.../src/main/resources/archetype-resources/pom.xml | 100 ++-
.../archetype-resources/webapp/lib/.gitignore | 5 -
.../resources/archetype-resources/webapp/pom.xml | 112 +--
.../webapp/src/main/resources/docker/Dockerfile | 0
.../resources/projects/basic/archetype.properties | 2 +-
pom.xml | 2 +-
recreate_archetype_RELEASE.sh | 11 +-
recreate_archetype_SNAPSHOT.sh | 14 +-
scripts/recreate-archetype.sh | 7 +-
41 files changed, 2255 insertions(+), 410 deletions(-)
create mode 100644 adocs/documentation/src/main/asciidoc/guides/ugfun/images/getting-started/dockerhub-tags.png
copy core/{viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/boot/BootstrapResource.java => viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ImageResourceServerside.java} (54%)
create mode 100644 example/application/simpleapp/.gitlab-ci.yml
create mode 100644 example/application/simpleapp/.m2/settings.xml
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/.gitlab-ci.yml
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/.m2/settings.xml
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/.gitignore
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/.gitignore
create mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot
delete mode 100644 example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore
copy example/{application/simpleapp => archetype/simpleapp/src/main/resources/archetype-resources}/webapp/src/main/resources/docker/Dockerfile (100%)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/05: fixes a couple of merge issues
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b7c4192fbfa1645cd07a0d13fce4dd4a1ee35f66
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 12:22:13 2018 +0000
fixes a couple of merge issues
---
core/pom.xml | 28 +++++++++++++++++++++-
.../resources/DomainObjectResourceServerside.java | 1 -
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3c741d1..c0c77f7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1442,7 +1442,33 @@ ${license.additional-notes}
<version>${revision}</version>
</dependency>
-
+
+ <!-- plugins -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-eventbus-guava</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
+ <version>${revision}</version>
+ </dependency>
+
+
<!-- also for benefit of application developers, using scope=import -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
index 3fb6f63..a8a6a68 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
@@ -251,7 +251,6 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
@Produces({
"image/png"
})
- @PrettyPrinting
public Response image(
@PathParam("domainType")
final String domainType,
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/05: Merge branch 'maint-1.16.2'
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d3c7bf86604e003e192f788cf43b06fba9a0baa3
Merge: 345e2c7 529112d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 12:13:06 2018 +0000
Merge branch 'maint-1.16.2'
# Conflicts:
# core/applib/pom.xml
# core/integtestsupport/pom.xml
# core/log4j/pom.xml
# core/maven-plugin/pom.xml
# core/mavendeps/intellij/pom.xml
# core/mavendeps/testing/pom.xml
# core/mavendeps/webapp/pom.xml
# core/metamodel/pom.xml
# core/pom.xml
# core/runtime/pom.xml
# core/schema/pom.xml
# core/security-shiro/pom.xml
# core/security/pom.xml
# core/specsupport/pom.xml
# core/unittestsupport/pom.xml
# core/viewer-restfulobjects-applib/pom.xml
# core/viewer-restfulobjects-rendering/pom.xml
# core/viewer-restfulobjects-server/pom.xml
# core/viewer-wicket-applib/pom.xml
# core/viewer-wicket-impl/pom.xml
# core/viewer-wicket-model/pom.xml
# core/viewer-wicket-ui/pom.xml
# core/webserver/pom.xml
# core/wrapper/pom.xml
# example/application/helloworld/pom.xml
# example/application/simpleapp/module-simple/pom.xml
# example/application/simpleapp/pom.xml
# example/application/simpleapp/webapp/pom.xml
..._ugfun_getting-started_simpleapp-archetype.adoc | 69 +-
.../images/getting-started/dockerhub-tags.png | Bin 0 -> 52693 bytes
.../guides/ugvro/_ugvro_layout-resources.adoc | 27 +-
core/pom.xml | 9 +
.../isis/viewer/restfulobjects/applib/Rel.java | 1 +
.../restfulobjects/applib/RepresentationType.java | 4 +
.../restfulobjects/applib/RestfulMediaType.java | 2 +
.../applib/domainobjects/DomainObjectResource.java | 17 +
.../domainobjects/DomainObjectReprRenderer.java | 18 +-
.../server/RestfulObjectsApplication.java | 2 +
.../resources/DomainObjectResourceServerside.java | 82 +++
.../server/resources/ImageResourceServerside.java | 50 ++
example/application/helloworld/pom.xml | 1 +
example/application/simpleapp/.gitignore | 2 +
example/application/simpleapp/.gitlab-ci.yml | 52 ++
example/application/simpleapp/.m2/settings.xml | 15 +
.../application/simpleapp/module-simple/pom.xml | 75 +-
example/application/simpleapp/pom.xml | 115 ++-
example/application/simpleapp/webapp/pom.xml | 134 ++--
example/archetype/simpleapp/pom.xml | 13 +-
.../META-INF/maven/archetype-metadata.xml | 7 +
.../resources/archetype-resources/.gitattributes | 51 --
.../main/resources/archetype-resources/.gitignore | 41 --
.../resources/archetype-resources/.gitlab-ci.yml | 49 ++
.../resources/archetype-resources/.m2/settings.xml | 18 +
.../archetype-resources/application/.gitignore | 1 -
.../application/translations.pot | 790 +++++++++++++++++++++
.../archetype-resources/module-simple/.gitignore | 6 -
.../archetype-resources/module-simple/pom.xml | 1 -
.../module-simple/translations.pot | 780 ++++++++++++++++++++
.../src/main/resources/archetype-resources/pom.xml | 100 ++-
.../archetype-resources/webapp/lib/.gitignore | 5 -
.../resources/archetype-resources/webapp/pom.xml | 112 +--
.../webapp/src/main/resources/docker/Dockerfile | 4 +
.../resources/projects/basic/archetype.properties | 2 +-
recreate_archetype_RELEASE.sh | 11 +-
recreate_archetype_SNAPSHOT.sh | 14 +-
scripts/recreate-archetype.sh | 7 +-
38 files changed, 2219 insertions(+), 468 deletions(-)
diff --cc core/pom.xml
index 81aacfc,0d1caa7..3c741d1
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -867,8 -848,16 +867,17 @@@
<Automatic-Module-Name>${jar-plugin.automaticModuleName}</Automatic-Module-Name>
<Implementation-Vendor-Id>org.apache.isis</Implementation-Vendor-Id>
<Implementation-Vendor>Apache Isis™ Project</Implementation-Vendor>
+ <Bundle-SymbolicName>${jar-plugin.automaticModuleName}</Bundle-SymbolicName>
<SCM-Revision>${git.commit.id.abbrev}</SCM-Revision>
+ <!-- required for DN plugin.xml loading -->
+ <Bundle-SymbolicName>${jar-plugin.automaticModuleName}</Bundle-SymbolicName>
+ <!--
+ no requirement as of yet.
+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+ <Bundle-Name>${jar-plugin.automaticModuleName}</Bundle-Name>
+ <Bundle-Version>${revision}</Bundle-Version>
+ <Bundle-Vendor>Apache Isis™ Project</Bundle-Vendor>
+ -->
</manifestEntries>
</archive>
</configuration>
diff --cc example/application/helloworld/pom.xml
index 01ff078,087fae9..a8ead94
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@@ -36,7 -36,7 +36,8 @@@
<packaging>war</packaging>
<properties>
- <isis.version>1.16.3-SNAPSHOT</isis.version>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
++ <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
diff --cc example/application/simpleapp/module-simple/pom.xml
index 81d22c2,a1bac12..48c5bca
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@@ -145,35 -142,13 +145,31 @@@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
-
+
+ <!-- ISIS CORE PLUGINS -->
+
<dependency>
- <groupId>org.axonframework</groupId>
- <artifactId>axon-core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-discovery-reflections</artifactId>
- <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
- <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-eventbus-guava</artifactId>
- <version>${revision}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
- <version>${revision}</version>
</dependency>
- <!-- test -->
+ <!-- TESTS -->
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
@@@ -181,72 -156,17 +177,11 @@@
<scope>test</scope>
</dependency>
+ <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <!--
- specifying -Drevision means that scope=pom dependencies are not resolved.
- This is a workaround for that issue
- -->
- <id>revision</id>
- <activation>
- <property>
- <name>revision</name>
- </property>
- </activation>
- <properties>
- <hamcrest.version>1.3</hamcrest.version>
- <assertj.version>3.6.2</assertj.version>
- <objenesis.version>2.4</objenesis.version>
- <hsqldb.version>2.3.4</hsqldb.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <version>${revision}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-integtestsupport</artifactId>
- <version>${revision}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-specsupport</artifactId>
- <version>${revision}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>${objenesis.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>${assertj.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --cc example/application/simpleapp/pom.xml
index 07fa027,fc54732..d58f4e2
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@@ -24,7 -24,7 +24,7 @@@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>4</version>
- <version>2.4</version>
++ <version>6</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
@@@ -36,8 -36,9 +36,8 @@@
<packaging>pom</packaging>
<properties>
- <revision>1.16.3-SNAPSHOT</revision>
-
- <isis.version>1.16.2</isis.version>
+ <revision>2.0.0-M1-SNAPSHOT</revision>
- <isis.version>${revision}</isis.version>
++ <isis.version>2.0.0-M1-SNAPSHOT</isis.version>
<lombok.version>1.16.20</lombok.version>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/05: adds workaround for use of flattened poms
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 84caf8c97dc97be798b2ea804b65a44e9a7f48d5
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 12:48:14 2018 +0000
adds workaround for use of flattened poms
---
core/mavendeps/webapp/pom.xml | 5 --
example/application/simpleapp/application/pom.xml | 16 ++---
.../application/simpleapp/module-simple/pom.xml | 73 ++++++++++++++++++++++
example/application/simpleapp/pom.xml | 3 +-
example/application/simpleapp/webapp/pom.xml | 35 +++++++++++
5 files changed, 119 insertions(+), 13 deletions(-)
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index cd99aeb..8e1f738 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -64,11 +64,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
-
-<!-- <dependency> -->
-<!-- <groupId>org.apache.geronimo.specs</groupId> -->
-<!-- <artifactId>geronimo-servlet_3.0_spec</artifactId> -->
-<!-- </dependency> -->
</dependencies>
</profile>
<profile>
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 0bd1c24..abce8c1 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -104,11 +104,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>simpleapp-module-simple</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
+ <version>${isis.version}</version>
</dependency>
<!-- test -->
@@ -122,6 +124,7 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
+ <version>${isis.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -131,38 +134,37 @@
<profiles>
<profile>
<!--
- specifying -Drevision means that scope=pom dependencies are not resolved.
+ The flattened pom plugin seems to interfere with isis-mavendeps-testing type=pom dependency
This is a workaround for that issue
-->
- <id>revision</id>
+ <id>flattened-pom</id>
<activation>
<property>
- <name>revision</name>
+ <name>!skip.flattened-pom</name>
</property>
</activation>
<properties>
<hamcrest.version>1.3</hamcrest.version>
<assertj.version>3.6.2</assertj.version>
<objenesis.version>2.4</objenesis.version>
- <hsqldb.version>2.3.4</hsqldb.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
- <version>${revision}</version>
+ <version>${isis.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-integtestsupport</artifactId>
- <version>${revision}</version>
+ <version>${isis.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
- <version>${revision}</version>
+ <version>${isis.version}</version>
<scope>test</scope>
</dependency>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 48c5bca..1bb68c2 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -144,6 +144,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
+ <version>${isis.version}</version>
</dependency>
<!-- ISIS CORE PLUGINS -->
@@ -151,21 +152,25 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-eventbus-guava</artifactId>
+ <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
+ <version>${isis.version}</version>
</dependency>
<!-- TESTS -->
@@ -173,15 +178,83 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
+ <version>${isis.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <!--
+ The flattened pom plugin seems to interfere with isis-mavendeps-testing type=pom dependency
+ This is a workaround for that issue
+ -->
+ <id>flattened-pom</id>
+ <activation>
+ <property>
+ <name>!skip.flattened-pom</name>
+ </property>
+ </activation>
+ <properties>
+ <hamcrest.version>1.3</hamcrest.version>
+ <assertj.version>3.6.2</assertj.version>
+ <objenesis.version>2.4</objenesis.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <version>${isis.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-integtestsupport</artifactId>
+ <version>${isis.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-specsupport</artifactId>
+ <version>${isis.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>${objenesis.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>${hsqldb.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index d58f4e2..0dc7dda 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -48,6 +48,8 @@
<!-- override incode-build -->
<datanucleus-core.version>5.1.6</datanucleus-core.version>
+ <hsqldb.version>2.3.4</hsqldb.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -212,7 +214,6 @@
</dependencies>
</dependencyManagement>
<properties>
- <hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
</properties>
</profile>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index b7b6701..634e501 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -118,6 +118,7 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
+ <version>${isis.version}</version>
<type>pom</type>
</dependency>
@@ -125,6 +126,40 @@
<profiles>
<profile>
+ <!--
+ The flattened pom plugin seems to interfere with isis-mavendeps-webapp type=pom dependency
+ This is a workaround for that issue
+ -->
+ <id>flattened-pom</id>
+ <activation>
+ <property>
+ <name>!skip.flattened-pom</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-wicket-impl</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-security-shiro</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-security</artifactId>
+ <version>${isis.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>isis-swagger</id>
<activation>
<property>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 04/05: disable archetypes from build by default
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d2ca2d2171e36501ba3e132d3a1293bbf02465cb
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 15 12:56:06 2018 +0000
disable archetypes from build by default
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4ef666a..e40ac15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
<id>arch</id>
<activation>
<property>
- <name>!skip.arch</name>
+ <name>arch</name>
</property>
</activation>
<modules>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 05/05: ISIS-1887 pull in java.sql.Timestamp support from
-legacy
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 033937307364d0ccd83bffb148b14bac85543c51
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 15 13:23:45 2018 +0100
ISIS-1887 pull in java.sql.Timestamp support from -legacy
refactoring: no longer depending on deprecated Isis time value types
---
.../plugins/ProgrammingModelIsisTimePlugin.java | 3 -
.../facets/value/timestampsql/EpochMillis.java | 40 +++++++++
.../EpochMillisValueSemanticsProviderAbstract.java | 98 ++++++++++++++++++++++
...ampValueFacetUsingSemanticsProviderFactory.java | 0
.../JavaSqlTimeStampValueSemanticsProvider.java | 11 +--
.../dflt/ProgrammingModelFacetsJava5.java | 2 +
6 files changed, 144 insertions(+), 10 deletions(-)
diff --git a/core/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelIsisTimePlugin.java b/core/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelIsisTimePlugin.java
index e9588ff..a4e3d6d 100644
--- a/core/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelIsisTimePlugin.java
+++ b/core/metamodel-legacy/src/main/java/org/apache/isis/progmodels/plugins/ProgrammingModelIsisTimePlugin.java
@@ -4,7 +4,6 @@ import org.apache.isis.core.metamodel.facets.value.date.DateValueFacetUsingSeman
import org.apache.isis.core.metamodel.facets.value.datetime.DateTimeValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.time.TimeValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.timestamp.TimeStampValueFacetUsingSemanticsProviderFactory;
-import org.apache.isis.core.metamodel.facets.value.timestampsql.JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelPlugin;
public class ProgrammingModelIsisTimePlugin implements ProgrammingModelPlugin {
@@ -17,8 +16,6 @@ public class ProgrammingModelIsisTimePlugin implements ProgrammingModelPlugin {
collector.addFactory(new TimeStampValueFacetUsingSemanticsProviderFactory(), FacetFactoryCategory.VALUE);
collector.addFactory(new TimeValueFacetUsingSemanticsProviderFactory(), FacetFactoryCategory.VALUE);
-
- collector.addFactory(new JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory(), FacetFactoryCategory.VALUE);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillis.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillis.java
new file mode 100644
index 0000000..0d5b883
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillis.java
@@ -0,0 +1,40 @@
+/*
+ * 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.core.metamodel.facets.value.timestampsql;
+
+import java.util.Date;
+
+class EpochMillis {
+
+ private final long epochMillis;
+
+ public EpochMillis(long epochMillis) {
+ this.epochMillis = epochMillis;
+ }
+
+ public long epochMillis() {
+ return epochMillis;
+ }
+
+ public Date toJavaUtilDate() {
+ return new Date(epochMillis);
+ }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillisValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillisValueSemanticsProviderAbstract.java
new file mode 100644
index 0000000..c9d5525
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillisValueSemanticsProviderAbstract.java
@@ -0,0 +1,98 @@
+/*
+ * 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.core.metamodel.facets.value.timestampsql;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
+
+import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+
+abstract class EpochMillisValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
+
+ private static final Object DEFAULT_VALUE = null; // no default
+ private static final int TYPICAL_LENGTH = 25;
+
+ protected static void initFormats(final Map<String, DateFormat> formats) {
+ formats.put(ISO_ENCODING_FORMAT, createDateEncodingFormat("yyyyMMdd'T'HHmmssSSS"));
+ formats.put("short", DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG));
+ }
+
+ @SuppressWarnings("unchecked")
+ public EpochMillisValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final ServicesInjector context) {
+ super("timestamp", holder, adaptedClass, TYPICAL_LENGTH, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, (T) DEFAULT_VALUE, context);
+ final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.timestamp");
+ if (formatRequired == null) {
+ format = formats().get(defaultFormat());
+ } else {
+ setMask(formatRequired);
+ }
+ }
+
+ @Override
+ protected T add(final T original, final int years, final int months, final int days, final int hours, final int minutes) {
+ return original;
+ }
+
+ @Override
+ protected String defaultFormat() {
+ return "short";
+ }
+
+ @Override
+ public String toString() {
+ return "TimeStampValueSemanticsProvider: " + format;
+ }
+
+ @Override
+ protected DateFormat format() {
+
+ final Locale locale = Locale.getDefault();
+ final TimeZone timeZone = TimeZone.getDefault();
+
+ final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG, locale);
+ dateFormat.setTimeZone(timeZone);
+
+ return dateFormat;
+ }
+
+ protected List<DateFormat> formatsToTry() {
+ final List<DateFormat> formats = new ArrayList<DateFormat>();
+
+ final Locale locale = Locale.getDefault();
+ final TimeZone timeZone = TimeZone.getDefault();
+
+ formats.add(DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG, locale));
+ formats.add(DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG, locale));
+ formats.add(createDateFormat("yyyy-MM-dd HH:mm:ss.SSS"));
+
+ for (final DateFormat format : formats) {
+ format.setTimeZone(timeZone);
+ }
+
+ return formats;
+ }
+}
diff --git a/core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory.java
similarity index 100%
rename from core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory.java
diff --git a/core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
similarity index 88%
rename from core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
index c43e4f4..6f0d3a9 100644
--- a/core/metamodel-legacy/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
@@ -24,25 +24,22 @@ import java.text.DateFormat;
import java.util.Date;
import java.util.Map;
-import com.google.common.collect.Maps;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
+import org.apache.isis.applib.internal.collections._Maps;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.InvalidEntryException;
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
-
-import org.apache.isis.core.metamodel.facets.value.timestamp.TimeStampValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.services.ServicesInjector;
public class JavaSqlTimeStampValueSemanticsProvider
-extends TimeStampValueSemanticsProviderAbstract<java.sql.Timestamp> {
+extends EpochMillisValueSemanticsProviderAbstract<java.sql.Timestamp> {
public static final boolean isAPropertyDefaultFacet() {
return PropertyDefaultFacet.class.isAssignableFrom(JavaSqlTimeStampValueSemanticsProvider.class);
}
- private static Map<String, DateFormat> formats = Maps.newHashMap();
+ private static Map<String, DateFormat> formats = _Maps.newHashMap();
static {
initFormats(formats);
@@ -66,7 +63,7 @@ extends TimeStampValueSemanticsProviderAbstract<java.sql.Timestamp> {
@Override
protected Date dateValue(final Object value) {
- return new Date(((Timestamp) value).getTime());
+ return ((EpochMillis) value).toJavaUtilDate();
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 88ae176..6656023 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -160,6 +160,7 @@ import org.apache.isis.core.metamodel.facets.value.shortint.ShortPrimitiveValueF
import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.string.StringValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueFacetUsingSemanticsProviderFactory;
+import org.apache.isis.core.metamodel.facets.value.timestampsql.JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.url.URLValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.facets.value.uuid.UUIDValueFacetUsingSemanticsProviderFactory;
import org.apache.isis.core.metamodel.postprocessors.param.ActionCollectionParameterDefaultsAndChoicesPostProcessor;
@@ -372,6 +373,7 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new BigDecimalValueFacetUsingSemanticsProviderFactory());
addFactory(new JavaSqlDateValueFacetUsingSemanticsProviderFactory());
addFactory(new JavaSqlTimeValueFacetUsingSemanticsProviderFactory());
+ addFactory(new JavaSqlTimeStampValueFacetUsingSemanticsProviderFactory());
addFactory(new JavaUtilDateValueFacetUsingSemanticsProviderFactory());
addFactory(new StringValueFacetUsingSemanticsProviderFactory());
addFactory(new URLValueFacetUsingSemanticsProviderFactory());
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.