date:20180313

[isis] 01/02: ISIS-1899: bumps versions down to 1.16.3-SNAPSHOT

2018-03-13 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit b45336391cbc62bea259be1f7db0e4b985934660
Author: Dan Haywood 
AuthorDate: Tue Mar 13 07:04:26 2018 +

ISIS-1899: bumps versions down to 1.16.3-SNAPSHOT
---
 core/applib/pom.xml|  2 +-
 core/integtestsupport/pom.xml  |  2 +-
 core/log4j/pom.xml |  2 +-
 core/maven-plugin/pom.xml  |  2 +-
 core/mavendeps/intellij/pom.xml|  2 +-
 core/mavendeps/testing/pom.xml |  2 +-
 core/mavendeps/webapp/pom.xml  |  2 +-
 core/metamodel/pom.xml |  2 +-
 core/pom.xml   | 70 +++---
 core/runtime/pom.xml   |  2 +-
 core/schema/pom.xml|  2 +-
 core/security-shiro/pom.xml|  6 +-
 core/security/pom.xml  |  2 +-
 core/specsupport/pom.xml   |  2 +-
 core/unittestsupport/pom.xml   |  2 +-
 core/viewer-restfulobjects-applib/pom.xml  |  2 +-
 core/viewer-restfulobjects-rendering/pom.xml   |  2 +-
 core/viewer-restfulobjects-server/pom.xml  |  2 +-
 core/viewer-wicket-applib/pom.xml  |  2 +-
 core/viewer-wicket-impl/pom.xml|  2 +-
 core/viewer-wicket-model/pom.xml   |  2 +-
 core/viewer-wicket-ui/pom.xml  |  2 +-
 core/webserver/pom.xml |  2 +-
 core/wrapper/pom.xml   |  2 +-
 example/application/helloworld/pom.xml |  4 +-
 example/application/simpleapp/application/pom.xml  |  2 +-
 .../application/simpleapp/module-simple/pom.xml|  2 +-
 example/application/simpleapp/pom.xml  |  4 +-
 example/application/simpleapp/webapp/pom.xml   |  2 +-
 example/archetype/simpleapp/pom.xml|  2 +-
 30 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 86dbc37..aa53e3b 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT
 
 
 isis-core-applib
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 50e15c1..4da3b4a 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -23,7 +23,7 @@

org.apache.isis.core
isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT

 
isis-core-integtestsupport
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
index 115312e..ba12672 100644
--- a/core/log4j/pom.xml
+++ b/core/log4j/pom.xml
@@ -15,7 +15,7 @@
 
 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT
 
 
 isis-core-log4j
diff --git a/core/maven-plugin/pom.xml b/core/maven-plugin/pom.xml
index 3e3646b..3a46de9 100644
--- a/core/maven-plugin/pom.xml
+++ b/core/maven-plugin/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT
 
 
 org.apache.isis.tool
diff --git a/core/mavendeps/intellij/pom.xml b/core/mavendeps/intellij/pom.xml
index 7a387b6..f6bd385 100644
--- a/core/mavendeps/intellij/pom.xml
+++ b/core/mavendeps/intellij/pom.xml
@@ -24,7 +24,7 @@

 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT
 ../../pom.xml
 
 
diff --git a/core/mavendeps/testing/pom.xml b/core/mavendeps/testing/pom.xml
index 6504f20..1011014 100644
--- a/core/mavendeps/testing/pom.xml
+++ b/core/mavendeps/testing/pom.xml
@@ -24,7 +24,7 @@

 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT
 ../../pom.xml
 
 
diff --git a/core/mavendeps/webapp/pom.xml b/core/mavendeps/webapp/pom.xml
index ddeecf4..3b5b254 100644
--- a/core/mavendeps/webapp/pom.xml
+++ b/core/mavendeps/webapp/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT
 ../../pom.xml
 
 
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 697eb3d..38d3180 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+1.16.3-SNAPSHOT
 
 
 isis-core-metamodel
diff --git a/core/pom.xml b/core/pom.xml
index a049146..e9b3a6e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@
 
 org.apache.isis.core
 isis
-2.0.0-M1-SNAPSHOT
+

[isis] 02/02: ISIS-1913: adds support for object-icon link in REST API

2018-03-13 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit b9175ae6d95485561d48e7f12f6f879b75908345
Author: Dan Haywood 
AuthorDate: Tue Mar 13 07:05:00 2018 +

ISIS-1913: adds support for object-icon link in REST API
---
 .../guides/ugvro/_ugvro_layout-resources.adoc  | 27 ++-
 .../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 +
 9 files changed, 200 insertions(+), 3 deletions(-)

diff --git 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_layout-resources.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_layout-resources.adoc
index 8bc924a..75025c3 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_layout-resources.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/ugvro/_ugvro_layout-resources.adoc
@@ -110,6 +110,30 @@ This can also be obtained in JSON format in the usual way 
(by specifying an HTTP
 
 
 
+[[_ugvro_layout-resources_domain-object-icon]]
+== Domain Object Icon
+
+The representation returned by the domain object resource (section 14.4 of the 
RO spec v1.0) has been extended to provide a link to the icon image (`.png`) to 
use:
+
+[source,javascript]
+
+{
+  "links": [
+...
+{
+  "rel": "urn:org.apache.isis.restfulobjects:rels/object-layout",
+  "href": 
"http://localhost:8080/restful/objects/helloworld.HelloWorldObject/0/object-icon;,
+  "method": "GET",
+  "type": "image/png",
+},
+  ],
+  ...
+}
+
+
+Note that because of dynamic icons (the 
xref:../../guides/rgcms/rgcms.adoc#_rgcms_methods_reserved_iconName[`iconName()`]
 supporting method) the image returned can vary on an instance-by-instance 
basis.
+
+
 [[_ugvro_layout-resources_domain-object-layout]]
 == Domain Object Layout
 
@@ -129,8 +153,7 @@ The representation returned by the domain object resource 
(section 14.4 of the R
   "rel": "urn:org.apache.isis.restfulobjects:rels/object-layout",
   "href": 
"http://localhost:8080/restful/objects/helloworld.HelloWorldObject/0/object-layout;,
   "method": "GET",
-  "type": 
"application/json;profile='urn:org.restfulobjects:repr-types/object'",
-  "title": "Object: a"
+  "type": 
"application/json;profile='urn:org.restfulobjects:repr-types/object-layout-bs3'",
 },
   ],
   ...
diff --git 
a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
 
b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
index b2d123e..b0794d2 100644
--- 
a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
+++ 
b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/Rel.java
@@ -60,6 +60,7 @@ public enum Rel {
 // implementation specific
 CONTRIBUTED_BY(RelDefinition.IMPL, "contributed-by"),
 OBJECT_LAYOUT(RelDefinition.IMPL, "object-layout"),
+OBJECT_ICON(RelDefinition.IMPL, "object-icon"),
 LAYOUT(RelDefinition.IMPL, "layout"),
 MENUBARS(RelDefinition.IMPL, "menuBars"),
 LOGOUT(RelDefinition.IMPL, "logout");
diff --git 
a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
 
b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
index 1a6cf5d..b1fea7b 100644
--- 
a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
+++ 
b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
@@ -101,6 +101,10 @@ public enum RepresentationType {
 RestfulMediaType.APPLICATION_JSON_OBJECT_LAYOUT_BS3,
 RestfulMediaType.APPLICATION_XML_OBJECT_LAYOUT_BS3,
 null),
+OBJECT_IMAGE(
+"image/png",
+"image/png",
+null),
 MENUBARS(
 RestfulMediaType.APPLICATION_JSON_LAYOUT_MENUBARS,
 RestfulMediaType.APPLICATION_XML_LAYOUT_MENUBARS,
diff --git 
a/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
 
b/core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
index 7199e32..99d5a17 100644
---

[isis] branch maint-1.16.2 updated (0f6bbf5 -> b9175ae)

2018-03-13 Thread danhaywood

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git.


from 0f6bbf5  ISIS-1875: updates release procedures
 new b453363  ISIS-1899: bumps versions down to 1.16.3-SNAPSHOT
 new b9175ae  ISIS-1913: adds support for object-icon link in REST API

The 2 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:
 .../guides/ugvro/_ugvro_layout-resources.adoc  | 27 ++-
 core/applib/pom.xml|  2 +-
 core/integtestsupport/pom.xml  |  2 +-
 core/log4j/pom.xml |  2 +-
 core/maven-plugin/pom.xml  |  2 +-
 core/mavendeps/intellij/pom.xml|  2 +-
 core/mavendeps/testing/pom.xml |  2 +-
 core/mavendeps/webapp/pom.xml  |  2 +-
 core/metamodel/pom.xml |  2 +-
 core/pom.xml   | 70 +-
 core/runtime/pom.xml   |  2 +-
 core/schema/pom.xml|  2 +-
 core/security-shiro/pom.xml|  6 +-
 core/security/pom.xml  |  2 +-
 core/specsupport/pom.xml   |  2 +-
 core/unittestsupport/pom.xml   |  2 +-
 core/viewer-restfulobjects-applib/pom.xml  |  2 +-
 .../isis/viewer/restfulobjects/applib/Rel.java |  1 +
 .../restfulobjects/applib/RepresentationType.java  |  4 ++
 .../restfulobjects/applib/RestfulMediaType.java|  2 +
 .../applib/domainobjects/DomainObjectResource.java | 17 +
 core/viewer-restfulobjects-rendering/pom.xml   |  2 +-
 .../domainobjects/DomainObjectReprRenderer.java| 18 -
 core/viewer-restfulobjects-server/pom.xml  |  2 +-
 .../server/RestfulObjectsApplication.java  |  2 +
 .../resources/DomainObjectResourceServerside.java  | 82 ++
 .../server/resources/ImageResourceServerside.java} | 31 ++--
 core/viewer-wicket-applib/pom.xml  |  2 +-
 core/viewer-wicket-impl/pom.xml|  2 +-
 core/viewer-wicket-model/pom.xml   |  2 +-
 core/viewer-wicket-ui/pom.xml  |  2 +-
 core/webserver/pom.xml |  2 +-
 core/wrapper/pom.xml   |  2 +-
 example/application/helloworld/pom.xml |  4 +-
 example/application/simpleapp/application/pom.xml  |  2 +-
 .../application/simpleapp/module-simple/pom.xml|  2 +-
 example/application/simpleapp/pom.xml  |  4 +-
 example/application/simpleapp/webapp/pom.xml   |  2 +-
 example/archetype/simpleapp/pom.xml|  2 +-
 39 files changed, 242 insertions(+), 78 deletions(-)
 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%)

-- 
To stop receiving notification emails like this one, please contact
danhayw...@apache.org.

[isis] 01/02: ISIS-1899: bumps versions down to 1.16.3-SNAPSHOT

[isis] 02/02: ISIS-1913: adds support for object-icon link in REST API

[isis] branch maint-1.16.2 updated (0f6bbf5 -> b9175ae)

3 matches

Site Navigation

Mail list logo

Footer information