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 2019/12/03 12:32:59 UTC
[isis-app-simpleapp] branch master updated (f21d636 -> f2bdddf)
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-app-simpleapp.git.
from f21d636 translations, lockdowns and README
new 2076f74 removes validate0UpdateName - this duplicates the business rule in @Name type
new b08e6da makes SimpleObjects#ping programmatic
new e46dce2 changes order of H2 and HSQLDB in prototyping menu
new bd907db changes application settings to kebab-case.
new f2bdddf fixes link to swagger UI
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:
.../modules/simple/dom/impl/SimpleObject.java | 3 --
.../modules/simple/dom/impl/SimpleObjects.java | 9 ++----
.../webapp/application/layout/menubars.layout.xml | 6 ++--
webapp/src/main/resources/application.yml | 37 +++++++++++-----------
.../main/resources/config/application.properties | 7 +++-
webapp/src/main/resources/static/index.html | 26 +++------------
6 files changed, 34 insertions(+), 54 deletions(-)
[isis-app-simpleapp] 02/05: makes SimpleObjects#ping programmatic
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-app-simpleapp.git
commit b08e6da733c65e21426fb135969e72bb67d83554
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 12:30:32 2019 +0000
makes SimpleObjects#ping programmatic
---
.../java/domainapp/modules/simple/dom/impl/SimpleObjects.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index 1db1890..a2696ff 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@ -5,13 +5,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.jdo.JDOQLTypedQuery;
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.BookmarkPolicy;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.*;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.jdo.jdosupport.IsisJdoSupport_v3_2;
@@ -64,6 +58,7 @@ public class SimpleObjects {
return repositoryService.allInstances(SimpleObject.class);
}
+ @Programmatic
public void ping() {
JDOQLTypedQuery<SimpleObject> q = isisJdoSupport.newTypesafeQuery(SimpleObject.class);
final QSimpleObject candidate = QSimpleObject.candidate();
[isis-app-simpleapp] 01/05: removes validate0UpdateName - this
duplicates the business rule in @Name type
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-app-simpleapp.git
commit 2076f74b6cf5078f4badc3fee0de0fc6d6145eef
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 12:30:07 2019 +0000
removes validate0UpdateName - this duplicates the business rule in @Name type
---
.../src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index c198177..4da7a9f 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -60,9 +60,6 @@ public class SimpleObject implements Comparable<SimpleObject> {
public String default0UpdateName() {
return getName();
}
- public String validate0UpdateName(String name) {
- return name.contains("!") ? "Exclamation mark is not allowed" : null;
- }
@Action(semantics = NON_IDEMPOTENT_ARE_YOU_SURE)
[isis-app-simpleapp] 05/05: fixes link to swagger UI
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-app-simpleapp.git
commit f2bdddf48e77e942df6db7abfe551d932cab8285
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 12:32:43 2019 +0000
fixes link to swagger UI
---
webapp/src/main/resources/static/index.html | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/webapp/src/main/resources/static/index.html b/webapp/src/main/resources/static/index.html
index 33578d5..7d09260 100644
--- a/webapp/src/main/resources/static/index.html
+++ b/webapp/src/main/resources/static/index.html
@@ -39,18 +39,8 @@ th, td {
<img alt="Isis Logo" src="images/apache-isis/logo.png" />
<p>
- This app has been generated using Apache Isis'
- <a href="http://isis.apache.org/arch/simlpe%61pp/about.html" target="_blank">SimpleApp</a> archetype,
- to create a purposefully minimal application that nevertheless includes fixture data, integration tests and BDD specs.
+ This is a simple <a href="http://isis.apache.org">Apache Isis</a> application, but structured so it can be used as a starting point for developing your own applications.
<br/>
- <br/>
- The application's business logic resides in a single (maven) module, <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple" target="_blank">module-simple</a>, that in turn contains a single domain entity, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java" target="_blank">SimpleObject</a>. The module has its own <a [...]
- <br/>
- <br/>
- The app also defines the <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/application" target="_blank">application</a> (maven) module; this holds <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/application/src/main/java/domainapp/application/fixture" target="_blank">fixtures</a>, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/ap [...]
- <br/>
- <br/>
- The app's <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/webapp" target="_blank">webapp</a> (maven) module is used to assemble the application into a WAR file.
</p>
<p>To access the app:</p>
@@ -68,30 +58,22 @@ th, td {
<li>
<p>
<b>
- <a href="swagger-ui/index.template.html">swagger-ui/</a>
+ <a href="swagger-ui/index.thtml">swagger-ui/</a>
</b>
</p>
<p>
provides access to a Swagger UI which uses a subset of the framework's automatically
generated <a href="restful/">RESTful API</a> (provided by the
- <a href="http://isis.apache.org/guides/ugvro/ugvro.html" target="_blank">Restful Objects viewer</a>). There are
- three versions of the Swagger spec files (that drive the UI):
- <a href="restful/swagger/public">public</a> (for use by "third-party" apps),
- <a href="restful/swagger/private">private</a> (for use by internal apps), and
- <a href="restful/swagger/prototyping">prototyping</a> (an extended version of the private
- API). The Swagger spec files are themselves dynamically generated and can be used to generate
- client-side stubs.
+ <a href="http://isis.apache.org/guides/ugvro/ugvro.html" target="_blank">Restful Objects viewer</a>).
</p>
<p>The RESTful API can return both simple representations and also richer hypermedia representations
that are conformant with the <a href="http://restfulobjects.org" target="_blank">Restful Objects</a> spec.
- The HTTP <code>Accept</code> header is used to select which representation should be generated.
</p>
</li>
</ul>
<p>
- The default user/password is <b><i>sven/pass</i></b> (as configured in the
- <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/webapp/src/main/webapp/WEB-INF/shiro.ini" target="_blank">shiro.ini</a> file).
+ The default user/password is <b><i>sven/pass</i></b>.
</p>
</div>
[isis-app-simpleapp] 03/05: changes order of H2 and HSQLDB in
prototyping menu
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-app-simpleapp.git
commit e46dce275537e29e46c2b1254b8b1a8f3b16e2fa
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 12:31:35 2019 +0000
changes order of H2 and HSQLDB in prototyping menu
workaround ... if HSQLDB is hidden, then no separator is shown.
---
.../java/domainapp/webapp/application/layout/menubars.layout.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml b/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
index 46c44d6..fdb68ab 100644
--- a/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
+++ b/webapp/src/main/java/domainapp/webapp/application/layout/menubars.layout.xml
@@ -72,12 +72,12 @@
</mb3:serviceAction>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isisApplib.HsqlDbManagerMenu" id="hsqlDbManager">
- <cpt:named>HSQL DB Manager</cpt:named>
- </mb3:serviceAction>
<mb3:serviceAction objectType="isisApplib.H2ManagerMenu" id="openH2Console">
<cpt:named>H2 Console</cpt:named>
</mb3:serviceAction>
+ <mb3:serviceAction objectType="isisApplib.HsqlDbManagerMenu" id="hsqlDbManager">
+ <cpt:named>HSQL DB Manager</cpt:named>
+ </mb3:serviceAction>
</mb3:section>
</mb3:menu>
</mb3:secondary>
[isis-app-simpleapp] 04/05: changes application settings to
kebab-case.
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-app-simpleapp.git
commit bd907db75def2cc2cb225ae262fe132f8bcbb40b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 12:32:30 2019 +0000
changes application settings to kebab-case.
---
webapp/src/main/resources/application.yml | 37 +++++++++++-----------
.../main/resources/config/application.properties | 7 +++-
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 94e008f..9c055d4 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -5,15 +5,17 @@
#
isis:
reflector:
+ explicit-annotations:
+ action: true
validator:
- allowDeprecated: false
- noParamsOnly: true
- explicitObjectType: true
- serviceActionsOnly: true
- mixinsOnly: true
+ allow-deprecated: false
+ no-params-only: true
+ explicit-object-type: true
+ service-actions-only: true
+ mixins-only: true
facet:
- cssClassFa:
+ css-class-fa:
patterns:
new.*:fa-plus,\
add.*:fa-plus-square,\
@@ -62,14 +64,12 @@ isis:
approve.*:fa-thumbs-o-up,\
decline.*:fa-thumbs-o-down
- cssClass:
+ css-class:
patterns:
delete.*:btn-danger,\
discard.*:btn-warning,\
remove.*:btn-warning
- explicitAnnotations:
- action: true
objects:
editing: false
@@ -86,7 +86,7 @@ isis:
properties: all
injector:
- setPrefix: false
+ set-prefix: false
value:
format:
@@ -95,9 +95,9 @@ isis:
viewer:
wicket:
application:
- menubarsLayoutXml: domainapp/webapp/application/layout/menubars.layout.xml
- brandLogoHeader: /images/apache-isis/logo-48x48.png
- faviconUrl: /images/favicon.png
+ menubars-layout-xml: domainapp/webapp/application/layout/menubars.layout.xml
+ brand-logo-header: /images/apache-isis/logo-48x48.png
+ favicon-url: /images/favicon.png
name: Simple App
css: css/application.css
js: scripts/application.js
@@ -115,15 +115,18 @@ isis:
showChooser: true
enabled: bootstrap-theme, Cerulean, Cosmo, Cyborg, Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, Spacelab, Superhero, United, Yeti
- maxTitleLengthInStandaloneTables: 0
- maxTitleLengthInParentedTables: 0
+ max-title-length-in-standalone-tables: 0
+ max-title-length-in-parented-tables: 0
- developmentUtilities:
+ development-utilities:
enable: true
+
persistor:
datanucleus:
impl:
+ # note that properties under 'isis.persistor.datanucleus.impl' are passed through directly
+ # to DataNucleus, and must use camelCase rather than kebab-case
datanucleus:
schema:
validateTables: true
@@ -138,8 +141,6 @@ isis:
type: none
mode: ENABLE_SELECTIVE
- standaloneCollection:
- bulkLoad: false
spring:
banner:
location: banner.txt
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 13ec292..80ff092 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -6,7 +6,12 @@
#
# See also /application.yml
#
+
+
+# note that properties under 'isis.persistor.datanucleus.impl' are passed through directly
+# to DataNucleus, and must use camelCase rather than kebab-case
+
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL = jdbc:h2:mem:test
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName = org.h2.Driver
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName = sa
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword =
\ No newline at end of file
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword =