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 2017/11/05 10:07:01 UTC
[isis] branch master updated (8814a04 -> 467e6ed)
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.
from 8814a04 ISIS-1766: changes ServiceActionLayoutData#oid to just #objectType
new cd10d06 ISIS-1766: fixes case when there is no menubars.layout.xml to load
new 467e6ed bumps simpleapp to 1.1.6.0-SNAPSHOT
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:
.../core/runtime/services/menu/MenuBarsLoaderServiceDefault.java | 5 ++---
example/application/simpleapp/pom.xml | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
[isis] 01/02: ISIS-1766: fixes case when there is no
menubars.layout.xml to load
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 cd10d064bacf5be3669907321253c9033401ccb7
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Nov 5 10:06:22 2017 +0000
ISIS-1766: fixes case when there is no menubars.layout.xml to load
---
.../core/runtime/services/menu/MenuBarsLoaderServiceDefault.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsLoaderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsLoaderServiceDefault.java
index 07f55ce..3d43355 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsLoaderServiceDefault.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.core.runtime.services.menu;
-import java.io.IOException;
import java.net.URL;
import com.google.common.base.Charsets;
@@ -44,12 +43,12 @@ public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
@Override
public MenuBars menuBars() {
final AppManifest appManifest = isisSessionFactory.getAppManifest();
- final URL resource = Resources.getResource(appManifest.getClass(), "menubars.layout.xml");
try {
+ final URL resource = Resources.getResource(appManifest.getClass(), "menubars.layout.xml");
String xml = Resources.toString(resource, Charsets.UTF_8);
return jaxbService.fromXml(MenuBars.class, xml);
- } catch (IOException e) {
+ } catch (Exception e) {
return null;
}
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 02/02: bumps simpleapp to 1.1.6.0-SNAPSHOT
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 467e6ed4d7c854063b4df527b880a5d645feac16
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Nov 5 10:06:40 2017 +0000
bumps simpleapp to 1.1.6.0-SNAPSHOT
---
example/application/simpleapp/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 9ee473a..bbe8d71 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -40,7 +40,7 @@
</prerequisites>
<properties>
- <isis.version>1.15.1</isis.version>
+ <isis.version>1.16.0-SNAPSHOT</isis.version>
<lombok.version>1.16.18</lombok.version>
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.