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/04 15:17:38 UTC

[isis-app-helloworld] branch master updated (4631e77 -> 24c09f4)

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-helloworld.git.


    from 4631e77  changes order of H2 and HSQLDB in prototyping menu
     new 0c4e7f8  changes the groupId.
     new 5e6c248  uses H2Console (now an extension)
     new 6b5b7b1  updates README, quick start
     new 24c09f4  updates index.html (Restful + Swagger wording)

The 4 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:
 README.adoc                                        | 29 +++++++++++++++++-----
 pom.xml                                            |  6 ++---
 src/main/java/domainapp/webapp/HelloWorldApp.java  |  3 +++
 .../webapp/application/menubars.layout.xml         |  5 +---
 src/main/resources/static/index.html               | 25 +++++++++++--------
 5 files changed, 45 insertions(+), 23 deletions(-)


[isis-app-helloworld] 03/04: updates README, quick start

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-helloworld.git

commit 6b5b7b1150ea70369c4592ed17eb862f80a361a3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:14:54 2019 +0000

    updates README, quick start
---
 README.adoc | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/README.adoc b/README.adoc
index 9da86f6..4092440 100644
--- a/README.adoc
+++ b/README.adoc
@@ -8,24 +8,41 @@ For real-world development, we recommend you start with the link:https://github.
 
 == Quick start
 
-Build using:
+* install prereqs:
 
+** Java 8 LTS (eg link:https://adoptopenjdk.net/[Adopt OpenJDK] distribution)
+** Maven 3.6 or later (http://maven.apache.org/download.cgi[download])
+* download and unzip
++
 [source,bash]
 ----
-mvn clean install
+REPO=isis-app-helloworld
+BRANCH=master
+
+curl "https://codeload.github.com/apache/$REPO/zip/$BRANCH" > $REPO-$BRANCH.zip
+unzip $REPO-$BRANCH.zip
+mv $REPO-$BRANCH $REPO
+cd $REPO
 ----
 
-Run using:
+* Build using Maven:
++
+[source,bash]
+----
+mvn clean install
+----
 
+* Run from Maven:
++
 [source,bash]
 ----
 mvn spring-boot:run
 ----
 
-Login using: 
+* Login using:
 
-* username: `sven`
-* password: `pass`
+** username: `sven`
+** password: `pass`
 
 The app runs with H2 running in-memory.
 


[isis-app-helloworld] 04/04: updates index.html (Restful + Swagger wording)

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-helloworld.git

commit 24c09f4b540099cd44ce4925d0e24dcb10f6da36
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:15:09 2019 +0000

    updates index.html (Restful + Swagger wording)
---
 src/main/resources/static/index.html | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index 3f66a40..ae71d23 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -39,7 +39,8 @@ th, td {
             <img alt="Isis Logo" src="images/apache-isis/logo.png" />
              
             <p>
-                This is a minimal Apache Isis application, intended as a starting point to learn what Apache Isis is all about.
+                This is a minimal <a href="https://isis.apache.org">Apache Isis</a> application, intended as a starting
+                point to learn what the framework is all about.
                 <br/>
             </p>
 
@@ -50,24 +51,28 @@ th, td {
                         <b><a href="wicket/">wicket/</a></b>
                     </p>
                     <p>
-                        provides access to a generic UI for end-users,
-                        Apache Isis' <a href="http://isis.apache.org/guides/ugvw/ugvw.html" target="_blank">Wicket Viewer</a>.
-                        As its name suggests, this viewer is built on top of <a href="http://wicket.apache.org" target="_blank">Apache Wicket</a>&trade;.
+                        provides access to a generic UI for end-users, Apache Isis'
+                        <a href="http://isis.apache.org/guides/ugvw/ugvw.html" target="_blank">Wicket Viewer</a>.
+                        As its name suggests, this viewer is built on top of
+                        <a href="http://wicket.apache.org" target="_blank">Apache Wicket</a>&trade;.
                     </p>
                 </li>
                 <li>
                     <p>
                         <b>
-                            <a href="swagger-ui/index.thtml">swagger-ui/</a>
+                            <a href="swagger-ui/index.thtml">RESTful API (Swagger)</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>).
+                        provides access to a Swagger UI for convenient access to a subset of the framework's RESTful
+                        API, automatically generated by the
+                        <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.
+                    <p>
+                        The full backend API (at <a href="restful/">restful/</a>) renders both simple and also richer
+                        hypermedia representations of domain objects, the latter conformant with the
+                        <a href="http://restfulobjects.org"  target="_blank">Restful Objects</a> spec.
                     </p>
                 </li>
             </ul>


[isis-app-helloworld] 01/04: changes the groupId.

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-helloworld.git

commit 0c4e7f83deb18c8306f1deb04499aa0bd413f148
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:12:21 2019 +0000

    changes the groupId.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 83af5db..6c74f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 		<version>2.0.0-M3-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.apache.isis.examples.apps</groupId>
+	<groupId>org.apache.isis.starters</groupId>
 	<artifactId>helloworld</artifactId>
 
 	<name>Apache Isis App - HelloWorld</name>


[isis-app-helloworld] 02/04: uses H2Console (now an extension)

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-helloworld.git

commit 5e6c2484968480bf64a90a02f7511bfd7c2e18cb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 15:14:46 2019 +0000

    uses H2Console (now an extension)
---
 pom.xml                                                        | 4 ++--
 src/main/java/domainapp/webapp/HelloWorldApp.java              | 3 +++
 src/main/java/domainapp/webapp/application/menubars.layout.xml | 5 +----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c74f27..7110e91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
+			<groupId>org.apache.isis.extensions</groupId>
+			<artifactId>isis-extensions-h2console</artifactId>
 		</dependency>
 
 
diff --git a/src/main/java/domainapp/webapp/HelloWorldApp.java b/src/main/java/domainapp/webapp/HelloWorldApp.java
index 15b71c5..6028945 100644
--- a/src/main/java/domainapp/webapp/HelloWorldApp.java
+++ b/src/main/java/domainapp/webapp/HelloWorldApp.java
@@ -3,6 +3,7 @@ package domainapp.webapp;
 import domainapp.modules.hello.HelloWorldModule;
 
 import org.apache.isis.config.IsisPresets;
+import org.apache.isis.extensions.h2console.IsisExtH2ConsoleModule;
 import org.apache.isis.jdo.IsisBootDataNucleus;
 import org.apache.isis.runtime.spring.IsisBoot;
 import org.apache.isis.security.shiro.IsisBootSecurityShiro;
@@ -30,6 +31,8 @@ public class HelloWorldApp extends SpringBootServletInitializer {
             IsisBootDataNucleus.class,
             IsisBootViewerRestfulObjects.class,
             IsisBootViewerWicket.class,
+
+            IsisExtH2ConsoleModule.class,
             HelloWorldModule.class
     })
     public static class AppManifest {
diff --git a/src/main/java/domainapp/webapp/application/menubars.layout.xml b/src/main/java/domainapp/webapp/application/menubars.layout.xml
index 8409833..0c02509 100644
--- a/src/main/java/domainapp/webapp/application/menubars.layout.xml
+++ b/src/main/java/domainapp/webapp/application/menubars.layout.xml
@@ -75,12 +75,9 @@
                 </mb3:serviceAction>
             </mb3:section>
             <mb3:section>
-                <mb3:serviceAction objectType="isisApplib.H2ManagerMenu" id="openH2Console">
+                <mb3:serviceAction objectType="isisExtH2Console.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>