date:20171112

[isis] 02/03: ISIS-1775 added license

2017-11-12 Thread ahuber

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

ahuber pushed a commit to branch dev/2.0.0/ISIS-1767-jee-7
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 50ac7648bcf61d3873bdef9b2b35e8f408bec41c
Author: Andi Huber 
AuthorDate: Sun Nov 12 19:55:13 2017 +0100

ISIS-1775 added license
---
 .../apache/isis/core/webapp/WebAppContextSupport.java | 19 +++
 1 file changed, 19 insertions(+)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
index 044fe67..10aa314 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
@@ -1,3 +1,22 @@
+/*
+ *  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.webapp;
 
 import javax.servlet.ServletContext;

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

[isis] 03/03: Merge branch 'dev/2.0.0/ISIS-1767-jee-7' of https://github.com/apache/isis into dev/2.0.0/ISIS-1767-jee-7

2017-11-12 Thread ahuber

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

ahuber pushed a commit to branch dev/2.0.0/ISIS-1767-jee-7
in repository https://gitbox.apache.org/repos/asf/isis.git

commit e4e5203dcffe0517169150525f9d884d9399a770
Merge: 50ac764 aec3f28
Author: Andi Huber 
AuthorDate: Sun Nov 12 20:04:53 2017 +0100

Merge branch 'dev/2.0.0/ISIS-1767-jee-7' of
https://github.com/apache/isis into dev/2.0.0/ISIS-1767-jee-7

Conflicts:

core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java


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

[isis] branch dev/2.0.0/ISIS-1767-jee-7 updated (aec3f28 -> e4e5203)

2017-11-12 Thread ahuber

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

ahuber pushed a change to branch dev/2.0.0/ISIS-1767-jee-7
in repository https://gitbox.apache.org/repos/asf/isis.git.


from aec3f28  ISIS-1775 Honor web-app's context path when configuring 
swagger.
 new 3f98234  ISIS-1775 added License
 new 50ac764  ISIS-1775 added license
 new e4e5203  Merge branch 'dev/2.0.0/ISIS-1767-jee-7' of 
https://github.com/apache/isis into dev/2.0.0/ISIS-1767-jee-7

The 3 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:
 .../apache/isis/core/webapp/WebAppContextSupport.java | 19 +++
 1 file changed, 19 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" '].

[isis] branch dev/2.0.0/ISIS-1632-meta-annotations updated (1c05c0e -> fe425d8)

2017-11-12 Thread danhaywood

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

danhaywood pushed a change to branch dev/2.0.0/ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git.


from 1c05c0e  ISIS-1632: removes @Meta annotation, since not required.
 add 8db551a  ISIS-1766: adds new resources to allow menuBars and layout to 
be requested as json
 add 241ff41  ISIS-1765, ISIS-1766, ISIS-1770: new object-layout resource 
with links; adds links for menuBars repr also; fix for actions with 
ARE_YOU_SURE semantics.
 add 8c8ef66  ISIS-1766: adds docs on new layout resources
 add 5bad9fa  adds discussion on using view models in REST APIs
 add 3f49af7  adds link to imworld video
 add 8c72924  fixes title for presentation
 add b7b9083  fixes image size in cgcom
 add 724dc03  ISIS-1766: adds new method to LayoutService to download 
menubars.layout.xml.  Also...
 add 42000bb  ISIS-1766: adds MenuBarsLoaderService, support for reading 
menu bars layout from file (overriding facets)
 add c1d590c  ISIS-1766: adds some documentation about MenuBarsSevice and 
MenuBarsLoaderService and the new MenuBars layout classes.  Also...
 add 6c83e36  ISIS-1766: adds the ability to download a fallback 
menubars.layout.xml.
 add 8814a04  ISIS-1766: changes ServiceActionLayoutData#oid to just 
#objectType
 add cd10d06  ISIS-1766: fixes case when there is no menubars.layout.xml to 
load
 add 467e6ed  bumps simpleapp to 1.1.6.0-SNAPSHOT
 add 4396b97  ISIS-1766: adds Menu#unreferencedActions as a flag.
 add 78d48f1  ISIS-1766: renames ActionLayoutDataOwner to 
ServiceActionLoayoutDataOwner
 add da8e039  ISIS-1766: wip, introduce bs3 for menubars
 add a3ac2ba  ISIS-1766: refactors to introduce bs3 for menubars (work in 
progress)
 add 7f04498  ISIS-1766: removes the properties from the MenuBar 
interfaces, messes up JAXB serialization; recreates the .xsd schema files
 add affdba6  ISIS-1766: adds support for 'unreferencedActions' menu, with 
validation to ensure that there is precisely one such.
 add c19fa8f  ISIS-1766: updates docs for menubars
 add 56c0195  ISIS-1766: updates docs for menubars, and fixes an NPE
 add 46a8716  ISIS-1728, ISIS-1776: updates helloworld and simpleapp to use 
typesafe queries; removes lombok from helloworld
 add c7d4292  ISIS-1465: fixes bad link in index.html for archetypes
 add acbcc5c  ISIS-1465: fixes bad appender reference in logging.properties 
of the two archetypes
 new fe425d8  Merge branch 'master' into 
dev/2.0.0/ISIS-1632-meta-annotations

The 1 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:
 .../asciidoc/applib/layout/component/component.xsd |  59 --
 .../applib/layout/grid/bootstrap3/bootstrap3.xsd   |  19 +-
 .../main/asciidoc/applib/layout/links/links.xsd|  16 ++
 .../applib/layout/menubars/bootstrap3/menubars.xsd |  50 +
 .../guides/cgcom/_cgcom_cutting-a-release.adoc |   2 +-
 .../main/asciidoc/guides/rgcms/_rgcms_classes.adoc |   1 +
 .../guides/rgcms/_rgcms_classes_layout.adoc|  53 +++--
 .../guides/rgcms/_rgcms_classes_menubars.adoc  |  90 
 .../rgsvc/_rgsvc_presentation-layer-spi.adoc   |   2 +
 ...esentation-layer-spi_MenuBarsLoaderService.adoc |  32 +++
 ...svc_presentation-layer-spi_MenuBarsService.adoc |  30 ++-
 ...blocks_types-of-domain-objects_view-models.adoc |  44 +++-
 .../guides/ugvro/_ugvro_hints-and-tips.adoc|   2 +
 ...vro_hints-and-tips_view-model-as-parameter.adoc |  70 ++
 .../guides/ugvro/_ugvro_layout-resources.adoc  | 235 +
 .../src/main/asciidoc/guides/ugvro/ugvro.adoc  |   1 +
 .../main/asciidoc/guides/ugvw/_ugvw_layout.adoc|   6 +-
 .../guides/ugvw/_ugvw_layout_application-menu.adoc | 165 ---
 .../guides/ugvw/_ugvw_layout_file-based.adoc   |  62 +++---
 .../guides/ugvw/_ugvw_menubars-layout.adoc |  39 
 .../_ugvw_menubars-layout_annotation-based.adoc| 126 +++
 .../ugvw/_ugvw_menubars-layout_file-based.adoc | 105 +
 .../guides/ugvw/images/menubars/010-download.png   | Bin 0 -> 21017 bytes
 .../guides/ugvw/images/menubars/020-download.png   | Bin 0 -> 15727 bytes
 .../src/main/asciidoc/guides/ugvw/ugvw.adoc|   1 +
 .../articles-and-presentations.adoc|   3 +-
 .../applib/layout/component/ActionLayoutData.java  |  22 ++
 .../layout/component/CollectionLayoutData.java |  20 ++
 .../layout/component/DomainObjectLayoutData.java   |  22 ++
 .../layout/component/PropertyLayoutData.java   |  22 ++
 .../ServiceActionLayoutData.java}  |  64 --
 .../ServiceActionLayoutDataOwner.java} |  10 +-
 .../applib/layout/{component => grid}/Grid.java|   7 +-

[isis] 01/01: Merge branch 'master' into dev/2.0.0/ISIS-1632-meta-annotations

2017-11-12 Thread danhaywood

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

danhaywood pushed a commit to branch dev/2.0.0/ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git

commit fe425d86d3b4445c694e1997bac05b3dbdb2da2a
Merge: 1c05c0e acbcc5c
Author: Dan Haywood 
AuthorDate: Sun Nov 12 18:40:14 2017 +

Merge branch 'master' into dev/2.0.0/ISIS-1632-meta-annotations

# Conflicts:
#   
core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
#   
core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
#   
core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/InvokeKeys.java
#   
core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
#   
example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
#   
example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObjects.java
#   
example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
#   
example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java
#   
example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository_Test.java
#   example/application/simpleapp/pom.xml

 .../asciidoc/applib/layout/component/component.xsd |  59 --
 .../applib/layout/grid/bootstrap3/bootstrap3.xsd   |  19 +-
 .../main/asciidoc/applib/layout/links/links.xsd|  16 ++
 .../applib/layout/menubars/bootstrap3/menubars.xsd |  50 +
 .../guides/cgcom/_cgcom_cutting-a-release.adoc |   2 +-
 .../main/asciidoc/guides/rgcms/_rgcms_classes.adoc |   1 +
 .../guides/rgcms/_rgcms_classes_layout.adoc|  53 +++--
 .../guides/rgcms/_rgcms_classes_menubars.adoc  |  90 
 .../rgsvc/_rgsvc_presentation-layer-spi.adoc   |   2 +
 ...esentation-layer-spi_MenuBarsLoaderService.adoc |  32 +++
 ...svc_presentation-layer-spi_MenuBarsService.adoc |  30 ++-
 ...blocks_types-of-domain-objects_view-models.adoc |  44 +++-
 .../guides/ugvro/_ugvro_hints-and-tips.adoc|   2 +
 ...vro_hints-and-tips_view-model-as-parameter.adoc |  70 ++
 .../guides/ugvro/_ugvro_layout-resources.adoc  | 235 +
 .../src/main/asciidoc/guides/ugvro/ugvro.adoc  |   1 +
 .../main/asciidoc/guides/ugvw/_ugvw_layout.adoc|   6 +-
 .../guides/ugvw/_ugvw_layout_application-menu.adoc | 165 ---
 .../guides/ugvw/_ugvw_layout_file-based.adoc   |  62 +++---
 .../guides/ugvw/_ugvw_menubars-layout.adoc |  39 
 .../_ugvw_menubars-layout_annotation-based.adoc| 126 +++
 .../ugvw/_ugvw_menubars-layout_file-based.adoc | 105 +
 .../guides/ugvw/images/menubars/010-download.png   | Bin 0 -> 21017 bytes
 .../guides/ugvw/images/menubars/020-download.png   | Bin 0 -> 15727 bytes
 .../src/main/asciidoc/guides/ugvw/ugvw.adoc|   1 +
 .../articles-and-presentations.adoc|   3 +-
 .../applib/layout/component/ActionLayoutData.java  |  22 ++
 .../layout/component/CollectionLayoutData.java |  20 ++
 .../layout/component/DomainObjectLayoutData.java   |  22 ++
 .../layout/component/PropertyLayoutData.java   |  22 ++
 .../ServiceActionLayoutData.java}  |  64 --
 .../ServiceActionLayoutDataOwner.java} |  10 +-
 .../applib/layout/{component => grid}/Grid.java|   7 +-
 .../layout/{component => grid}/GridAbstract.java   |  10 +-
 .../applib/layout/grid/bootstrap3/BS3Grid.java |   4 +-
 .../org/apache/isis/applib/layout/links/Link.java  |  93 
 .../layout/{menus => links}/package-info.java  |   6 +-
 .../Menu.java} |  12 +-
 .../MenuBar.java}  |  11 +-
 .../isis/applib/layout/menubars/MenuBars.java  |  36 ++--
 .../applib/layout/menubars/MenuBarsAbstract.java   |  42 
 .../MenuSection.java}  |  12 +-
 .../Menu.java => menubars/bootstrap3/BS3Menu.java} |  36 +++-
 .../bootstrap3/BS3MenuBar.java}|  15 +-
 .../layout/menubars/bootstrap3/BS3MenuBars.java| 201 ++
 .../bootstrap3/BS3MenuSection.java}|  25 ++-
 .../bootstrap3}/package-info.java  |   6 +-
 .../apache/isis/applib/layout/menus/MenuBars.java  | 111 --
 .../applib/services/grid/GridLoaderService.java|   2 +-
 .../isis/applib/services/grid/GridService.java |   4 +-
 .../applib/services/grid/GridSystemService.java|   4 +-
 .../isis/applib/services/layout/LayoutService.java |   1 -
 .../applib/services/layout/LayoutService2.java}|  28 +--

[isis] branch master updated (56c0195 -> acbcc5c)

2017-11-12 Thread danhaywood

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 56c0195  ISIS-1766: updates docs for menubars, and fixes an NPE
 new 46a8716  ISIS-1728, ISIS-1776: updates helloworld and simpleapp to use 
typesafe queries; removes lombok from helloworld
 new c7d4292  ISIS-1465: fixes bad link in index.html for archetypes
 new acbcc5c  ISIS-1465: fixes bad appender reference in logging.properties 
of the two archetypes

The 3 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:
 example/application/helloworld/pom.xml |  8 
 .../java/domainapp/dom/impl/HelloWorldObject.java  | 41 --
 .../java/domainapp/dom/impl/HelloWorldObjects.java | 24 +--
 .../src/main/webapp/WEB-INF/logging.properties |  2 +-
 .../helloworld/src/main/webapp/about/index.html|  2 +-
 .../dom/impl/HelloWorldObjectTest_delete.java  |  2 +-
 .../dom/impl/HelloWorldObjectTest_updateName.java  |  2 +-
 .../modules/simple/dom/impl/SimpleObject.java  | 50 ++
 .../modules/simple/dom/impl/SimpleObjectMenu.java  |  3 ++
 .../simple/dom/impl/SimpleObjectRepository.java| 22 ++
 .../dom/impl/SimpleObjectRepository_Test.java  |  5 ---
 .../modules/simple/dom/impl/SimpleObject_Test.java |  2 +-
 .../src/main/webapp/WEB-INF/logging.properties |  2 +-
 .../webapp/src/main/webapp/about/index.html|  2 +-
 14 files changed, 76 insertions(+), 91 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" '].

[isis] 01/03: ISIS-1728, ISIS-1776: updates helloworld and simpleapp to use typesafe queries; removes lombok from helloworld

2017-11-12 Thread danhaywood

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 46a8716b7a80c2e968802fe83dce3f8d1fe5fcae
Author: Dan Haywood 
AuthorDate: Sun Nov 12 18:26:00 2017 +

ISIS-1728, ISIS-1776: updates helloworld and simpleapp to use typesafe 
queries; removes lombok from helloworld

Also, reduces differences between helloworld and simpleapp, don't use 
ObjectContracts (instead ComparisonChain), don't use static constructor method.
---
 example/application/helloworld/pom.xml |  8 
 .../java/domainapp/dom/impl/HelloWorldObject.java  | 41 --
 .../java/domainapp/dom/impl/HelloWorldObjects.java | 24 +--
 .../dom/impl/HelloWorldObjectTest_delete.java  |  2 +-
 .../dom/impl/HelloWorldObjectTest_updateName.java  |  2 +-
 .../modules/simple/dom/impl/SimpleObject.java  | 50 ++
 .../modules/simple/dom/impl/SimpleObjectMenu.java  |  3 ++
 .../simple/dom/impl/SimpleObjectRepository.java| 22 ++
 .../dom/impl/SimpleObjectRepository_Test.java  |  5 ---
 .../modules/simple/dom/impl/SimpleObject_Test.java |  2 +-
 10 files changed, 72 insertions(+), 87 deletions(-)

diff --git a/example/application/helloworld/pom.xml 
b/example/application/helloworld/pom.xml
index ecbd029..d13f547 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -38,8 +38,6 @@
 
 1.16.0-SNAPSHOT
 
-1.16.18
-
 1.8
 1.8
 
@@ -133,12 +131,6 @@
 hsqldb
 
 
-
-org.projectlombok
-lombok
-${lombok.version}
-provided
-
 
 
 
diff --git 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
index 40708dd..672a528 100644
--- 
a/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
+++ 
b/example/application/helloworld/src/main/java/domainapp/dom/impl/HelloWorldObject.java
@@ -22,7 +22,7 @@ import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.IdentityType;
 import javax.jdo.annotations.VersionStrategy;
 
-import com.google.common.collect.Ordering;
+import com.google.common.collect.ComparisonChain;
 
 import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.Auditing;
@@ -40,36 +40,30 @@ import 
org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.applib.services.repository.RepositoryService;
 import org.apache.isis.applib.services.title.TitleService;
 
-import lombok.AccessLevel;
-
 @javax.jdo.annotations.PersistenceCapable(identityType = 
IdentityType.DATASTORE, schema = "helloworld" )
 @javax.jdo.annotations.DatastoreIdentity(strategy = 
IdGeneratorStrategy.IDENTITY, column = "id")
 @javax.jdo.annotations.Version(strategy= VersionStrategy.DATE_TIME, column 
="version")
-@javax.jdo.annotations.Queries({
-@javax.jdo.annotations.Query(
-name = "findByName",
-value = "SELECT "
-+ "FROM domainapp.dom.impl.HelloWorldObject "
-+ "WHERE name.indexOf(:name) >= 0 ")
-})
 @javax.jdo.annotations.Unique(name="HelloWorldObject_name_UNQ", members = 
{"name"})
 @DomainObject(auditing = Auditing.ENABLED)
-@DomainObjectLayout()  // trigger events etc.
-@lombok.RequiredArgsConstructor(staticName = "create")
-@lombok.Getter @lombok.Setter
+@DomainObjectLayout()  // causes UI events to be triggered
 public class HelloWorldObject implements Comparable {
 
+public HelloWorldObject(final String name) {
+this.name = name;
+}
 
 @javax.jdo.annotations.Column(allowsNull = "false", length = 40)
-@lombok.NonNull
 @Property(editing = Editing.DISABLED)
 @Title(prepend = "Object: ")
 private String name;
-
+public String getName() { return name; }
+public void setName(final String name) { this.name = name; }
 
 @javax.jdo.annotations.Column(allowsNull = "true", length = 4000)
 @Property(editing = Editing.ENABLED)
 private String notes;
+public String getNotes() { return notes; }
+public void setNotes(final String notes) { this.notes = notes; }
 
 
 @Action(semantics = SemanticsOf.IDEMPOTENT, command = 
CommandReification.ENABLED, publishing = Publishing.ENABLED)
@@ -80,7 +74,6 @@ public class HelloWorldObject implements 
Comparable {
 setName(name);
 return this;
 }
-
 public String default0UpdateName() {
 return getName();
 }
@@ -93,25 +86,29 @@ public class HelloWorldObject implements 
Comparable {
 repositoryService.removeAndFlush(this);
 }
 
+@Override
+public String toString() {
+return getName();
+}

[isis] 03/03: ISIS-1465: fixes bad appender reference in logging.properties of the two archetypes

2017-11-12 Thread danhaywood

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 acbcc5c95f62b0df5a7102b5e67768563f0b8403
Author: Dan Haywood 
AuthorDate: Sun Nov 12 18:27:13 2017 +

ISIS-1465: fixes bad appender reference in logging.properties of the two 
archetypes
---
 .../application/helloworld/src/main/webapp/WEB-INF/logging.properties   | 2 +-
 .../simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties 
b/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties
index bbd7477..53bb3da 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties
@@ -225,5 +225,5 @@ log4j.additivity.dom.simple.SimpleObject=false
 
 
 # ERROR to suppress the WARNings we get as of 1.15.0
-log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,console
+log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,Console
 log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false
diff --git 
a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
 
b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
index bbd7477..53bb3da 100644
--- 
a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
+++ 
b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
@@ -225,5 +225,5 @@ log4j.additivity.dom.simple.SimpleObject=false
 
 
 # ERROR to suppress the WARNings we get as of 1.15.0
-log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,console
+log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,Console
 log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false

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

[isis] 02/03: ISIS-1465: fixes bad link in index.html for archetypes

2017-11-12 Thread danhaywood

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 c7d4292e027253d73055a147f00656d8ecc180f1
Author: Dan Haywood 
AuthorDate: Sun Nov 12 18:26:18 2017 +

ISIS-1465: fixes bad link in index.html for archetypes
---
 example/application/helloworld/src/main/webapp/about/index.html   | 2 +-
 example/application/simpleapp/webapp/src/main/webapp/about/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/application/helloworld/src/main/webapp/about/index.html 
b/example/application/helloworld/src/main/webapp/about/index.html
index fe526f3..190a156 100644
--- a/example/application/helloworld/src/main/webapp/about/index.html
+++ b/example/application/helloworld/src/main/webapp/about/index.html
@@ -58,7 +58,7 @@ th, td {
  
 
 This app has been generated using Apache Isis'
-http://isis.apache.org/guides/ugfun.html#_ugfun_getting-started_hellow%6Frld-archetype;
 target="_blank">Hello World archetype.  Hello World is a tiny application, 
intended to make it easy to start learning how to write apps on top of the 
framework.
+http://isis.apache.org/guides/ugfun/ugfun.html#_ugfun_getting-started_hellow%6Frld-archetype;
 target="_blank">Hello World archetype.  Hello World is a tiny application, 
intended to make it easy to start learning how to write apps on top of the 
framework.
 
 
 
diff --git 
a/example/application/simpleapp/webapp/src/main/webapp/about/index.html 
b/example/application/simpleapp/webapp/src/main/webapp/about/index.html
index d85066e..b2980ef 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/about/index.html
+++ b/example/application/simpleapp/webapp/src/main/webapp/about/index.html
@@ -58,7 +58,7 @@ th, td {
  
 
 This app has been generated using Apache Isis'
-http://isis.apache.org/guides/ugfun.html#_ugfun_getting-started_simple%61pp-archetype;
 target="_blank">SimpleApp archetype,
+http://isis.apache.org/guides/ugfun/ugfun.html#_ugfun_getting-started_simple%61pp-archetype;
 target="_blank">SimpleApp archetype,
 to create a purposefully minimal application that nevertheless 
includes fixture data, integration tests and BDD specs.
 
 

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

[isis] branch dev/2.0.0/ISIS-1767-jee-7 updated: ISIS-1775 Honor web-app's context path when configuring swagger.

2017-11-12 Thread ahuber

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

ahuber pushed a commit to branch dev/2.0.0/ISIS-1767-jee-7
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/dev/2.0.0/ISIS-1767-jee-7 by 
this push:
 new aec3f28  ISIS-1775 Honor web-app's context path when configuring 
swagger.
aec3f28 is described below

commit aec3f286ca96381ba0c7e8e40cc95896408a5dba
Author: Andi Huber 
AuthorDate: Sun Nov 12 19:13:37 2017 +0100

ISIS-1775 Honor web-app's context path when configuring swagger.
---
 .../services/swagger/SwaggerServiceDefault.java| 15 +++-
 .../isis/core/webapp/WebAppContextSupport.java | 31 +++
 .../wicket/viewer/IsisWicketApplication.java   | 95 +++---
 3 files changed, 91 insertions(+), 50 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
index 968a93c..192b5f6 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
@@ -22,15 +22,15 @@ import java.util.Map;
 
 import javax.annotation.PostConstruct;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.swagger.SwaggerService;
 import 
org.apache.isis.core.metamodel.services.swagger.internal.SwaggerSpecGenerator;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.webapp.WebAppContextSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @DomainService(
 nature = NatureOfService.DOMAIN,
@@ -48,7 +48,14 @@ public class SwaggerServiceDefault implements SwaggerService 
{
 
 @PostConstruct
 public void init(final Map properties) {
-this.basePath = getPropertyElse(properties, KEY_RESTFUL_BASE_PATH, 
KEY_RESTFUL_BASE_PATH_DEFAULT);
+   
+   final String webappContextPath = 
+   getPropertyElse(properties, 
WebAppContextSupport.WEB_APP_CONTEXT_PATH, "/");
+   
+   final String basePath = 
+   getPropertyElse(properties, KEY_RESTFUL_BASE_PATH, 
KEY_RESTFUL_BASE_PATH_DEFAULT);
+   
+   this.basePath = 
WebAppContextSupport.prependContextPathIfPresent(webappContextPath, basePath);
 }
 
 static String getPropertyElse(final Map properties, final 
String key, final String dflt) {
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
new file mode 100644
index 000..044fe67
--- /dev/null
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/webapp/WebAppContextSupport.java
@@ -0,0 +1,31 @@
+package org.apache.isis.core.webapp;
+
+import javax.servlet.ServletContext;
+
+import com.google.common.base.Strings;
+
+public class WebAppContextSupport {
+
+/**
+ * Property name given to the context path of the web application as 
returned by 
+ * {@link ServletContext#getContextPath()}.
+ */
+   public static final String WEB_APP_CONTEXT_PATH = 
"application.webapp.context-path";
+   
+   
+   public static String prependContextPathIfPresent(String contextPath, 
String path) {
+   if(Strings.isNullOrEmpty(contextPath) || 
contextPath.equals("/"))
+   return path;
+   
+   if(!contextPath.startsWith("/"))
+   throw new IllegalArgumentException(
+   "contextPath must start with a slash 
'/' character, got '"+contextPath+"'");
+
+   if(!path.startsWith("/"))
+   throw new IllegalArgumentException(
+   "path must start with a slash '/' 
character, got '"+path+"'");
+   
+   return contextPath + path;
+   }
+   
+}
diff --git 
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
 
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 612b346..d15ac12 100644
--- 
a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ 
b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -30,52 +30,6 @@ import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
-import

[isis] 02/03: ISIS-1775 added license

[isis] 03/03: Merge branch 'dev/2.0.0/ISIS-1767-jee-7' of https://github.com/apache/isis into dev/2.0.0/ISIS-1767-jee-7

[isis] branch dev/2.0.0/ISIS-1767-jee-7 updated (aec3f28 -> e4e5203)

[isis] branch dev/2.0.0/ISIS-1632-meta-annotations updated (1c05c0e -> fe425d8)

[isis] 01/01: Merge branch 'master' into dev/2.0.0/ISIS-1632-meta-annotations

[isis] branch master updated (56c0195 -> acbcc5c)

[isis] 01/03: ISIS-1728, ISIS-1776: updates helloworld and simpleapp to use typesafe queries; removes lombok from helloworld

[isis] 03/03: ISIS-1465: fixes bad appender reference in logging.properties of the two archetypes

[isis] 02/03: ISIS-1465: fixes bad link in index.html for archetypes

[isis] branch dev/2.0.0/ISIS-1767-jee-7 updated: ISIS-1775 Honor web-app's context path when configuring swagger.

10 matches

Site Navigation

Mail list logo

Footer information