isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mgrigo...@apache.org
Subject [24/50] isis git commit: ISIS-1333: removing references to jetty-console in the docs. Also improvements to website home page layout (screenshots), and fixing ref to archetype page, and improving the archetype page. Also ...
Date Fri, 25 Mar 2016 14:18:02 GMT
ISIS-1333: removing references to jetty-console in the docs.  Also improvements to website
home page layout (screenshots), and fixing ref to archetype page, and improving the archetype
page.  Also ...

... also moved sections in the developers guide for lombok and agileJ into appendices of that
guide.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e62eacff
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e62eacff
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e62eacff

Branch: refs/heads/ISIS-1224-select2-v4
Commit: e62eacfff73114b8a9dd1b1c770f270521771ec3
Parents: 192dd0c
Author: Dan Haywood <dan@haywood-associates.co.uk>
Authored: Sun Mar 20 17:01:22 2016 +0000
Committer: Dan Haywood <dan@haywood-associates.co.uk>
Committed: Sun Mar 20 17:01:22 2016 +0000

----------------------------------------------------------------------
 adocs/documentation/Gemfile.lock                |  3 ++
 .../guides/_cgcom_cutting-a-release.adoc        | 24 ++++++---
 .../src/main/asciidoc/guides/_dg_agilej.adoc    | 55 ++++++++++++++++++++
 .../src/main/asciidoc/guides/_dg_ide.adoc       |  2 -
 .../main/asciidoc/guides/_dg_ide_agilej.adoc    | 55 --------------------
 .../asciidoc/guides/_dg_ide_project-lombok.adoc | 50 ------------------
 .../asciidoc/guides/_dg_project-lombok.adoc     | 50 ++++++++++++++++++
 ...fun_getting-started_simpleapp-archetype.adoc | 50 +++++-------------
 .../src/main/asciidoc/guides/dg.adoc            |  6 ++-
 .../asciidoc/guides/simpleapp-archetype.adoc    | 49 ++---------------
 .../documentation/src/main/asciidoc/index.html  | 29 +++++++----
 11 files changed, 165 insertions(+), 208 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/Gemfile.lock
----------------------------------------------------------------------
diff --git a/adocs/documentation/Gemfile.lock b/adocs/documentation/Gemfile.lock
index 0d4f467..9b483db 100644
--- a/adocs/documentation/Gemfile.lock
+++ b/adocs/documentation/Gemfile.lock
@@ -45,3 +45,6 @@ DEPENDENCIES
   tilt
   wdm (>= 0.1.0)
   webrick
+
+BUNDLED WITH
+   1.10.6

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
index 454af5e..8f581e0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
@@ -418,22 +418,33 @@ for a in `/bin/find . -name rat.txt -print`; do grep '!AL' $a; done
 ----
 
 
-Finally, double check that the app is running satisfactorily:
+Finally, double check that the app
 
-* first, as self-hosted webconsole (browse to http://localhost:8080[http://localhost:8080]):
+
+* builds:
 +
 [source,bash]
 ----
-mvn clean install && \
-mvn antrun:run -P self-host
+mvn clean install
 ----
 
-* then using mvn jetty plugin (browse to http://localhost:8080[http://localhost:8080]): +
+* can be run from an IDE
+** mainClass=`org.apache.isis.WebServer`
+** args=`-m domainapp.app.DomainAppAppManifestWithFixtures`
+
+* can be run using the mvn jetty plugin:
 +
 [source,bash]
 ----
-cd webapp
+pushd webapp
 mvn jetty:run
+popd
+----
+
+* can be deployed as a WAR
++
+[source,bash]
+----
+cp webapps/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
 ----
 
 Check the about page and confirm built against non-SNAPSHOT versions of the Apache Isis jars.
@@ -516,7 +527,6 @@ Build the newly generated app and test:
 ----
 cd myapp
 mvn clean install
-mvn antrun:run -P self-host    # runs as standalone app using webconsole
 cd webapp
 mvn jetty:run                  # runs as mvn jetty plugin
 ----

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc
new file mode 100644
index 0000000..d3d58e9
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc
@@ -0,0 +1,55 @@
+[[_dg_agilej]]
+= Appendix: AgileJ
+:Notice: 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.
+:_basedir: ../../../
+:_imagesdir: images/
+:toc: right
+
+
+[NOTE]
+====
+This material does not constitute an endorsement; AgileJ Structure Views is not affiliated
to Apache Software Foundation in any way.
+====
+
+link:http://www.agilej.com/[AgileJ Structure Views] is a commercial product to reverse engineer
and visualize Java classes from source code.
+
+The key to using the tool is in developing a suitable filter script, a DSL.  You can use
the following script as a starting point for visualizing Apache Isis domain models:
+
+[source,AgileJ]
+----
+// use CTRL+SPACE for completion suggestions
+hide all fields
+hide setter methods
+hide private methods
+hide methods named compareTo
+hide methods named toString
+hide methods named inject*
+hide methods named disable*
+hide methods named default*
+hide methods named hide*
+hide methods named autoComplete*
+hide methods named choices*
+hide methods named title
+hide methods named iconName
+hide methods named validate*
+hide methods named modify*
+hide protected methods
+hide types annotated as DomainService
+hide types named Constants
+hide types named InvoicingInterval
+hide enums
+hide constructors
+hide inner types named *Event
+hide inner types named *Functions
+hide inner types named *Predicates
+show getter methods in green
+show methods annotated as Programmatic in orange
+show methods annotated as Action in largest
+hide dependency lines
+hide call lines
+hide method lines
+----
+
+For more information on AgileJ, see Paul Wells' 8-part tutorial series on Youtube; the first
can be found link:https://www.youtube.com/watch?v=YrZQ7lMSsH0[here] (view the "show more"
comments to click through to other parts).
+
+

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/_dg_ide.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_ide.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_ide.adoc
index d7b4cd7..db76f89 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_ide.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_ide.adoc
@@ -14,6 +14,4 @@ This chapter shows how to setup and use two of the most popular IDEs, IntelliJ
I
 
 include::_dg_ide_intellij.adoc[leveloffset=+1]
 include::_dg_ide_eclipse.adoc[leveloffset=+1]
-include::_dg_ide_project-lombok.adoc[leveloffset=+1]
-include::_dg_ide_agilej.adoc[leveloffset=+1]
 

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/_dg_ide_agilej.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_agilej.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_agilej.adoc
deleted file mode 100644
index 42c0dab..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_agilej.adoc
+++ /dev/null
@@ -1,55 +0,0 @@
-[[_dg_ide_agilej]]
-= AgileJ
-:Notice: 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.
-:_basedir: ../../../
-:_imagesdir: images/
-:toc: right
-
-
-[NOTE]
-====
-This material does not constitute an endorsement; AgileJ Structure Views is not affiliated
to Apache Software Foundation in any way.
-====
-
-link:http://www.agilej.com/[AgileJ Structure Views] is a commercial product to reverse engineer
and visualize Java classes from source code.
-
-The key to using the tool is in developing a suitable filter script, a DSL.  You can use
the following script as a starting point for visualizing Apache Isis domain models:
-
-[source,AgileJ]
-----
-// use CTRL+SPACE for completion suggestions
-hide all fields
-hide setter methods
-hide private methods
-hide methods named compareTo
-hide methods named toString
-hide methods named inject*
-hide methods named disable*
-hide methods named default*
-hide methods named hide*
-hide methods named autoComplete*
-hide methods named choices*
-hide methods named title
-hide methods named iconName
-hide methods named validate*
-hide methods named modify*
-hide protected methods
-hide types annotated as DomainService
-hide types named Constants
-hide types named InvoicingInterval
-hide enums
-hide constructors
-hide inner types named *Event
-hide inner types named *Functions
-hide inner types named *Predicates
-show getter methods in green
-show methods annotated as Programmatic in orange
-show methods annotated as Action in largest
-hide dependency lines
-hide call lines
-hide method lines
-----
-
-For more information on AgileJ, see Paul Wells' 8-part tutorial series on Youtube; the first
can be found link:https://www.youtube.com/watch?v=YrZQ7lMSsH0[here] (view the "show more"
comments to click through to other parts).
-
-

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/_dg_ide_project-lombok.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_project-lombok.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_project-lombok.adoc
deleted file mode 100644
index 5b52cce..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_project-lombok.adoc
+++ /dev/null
@@ -1,50 +0,0 @@
-[[_dg_ide_project-lombok]]
-= Project Lombok
-:Notice: 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.
-:_basedir: ../
-:_imagesdir: images/
-
-
-
-link:https://projectlombok.org/[Project Lombok] is an open source project to reduce the amount
of boilerplate in
-your code.
-
-For example, rather than write:
-
-[source,java]
-----
-private String name;
-public String getName() {
-    return name;
-}
-public void setName(String name) {
-    this.name = name;
-}
-----
-
-you can instead write simply:
-
-[source,java]
-----
-@Getter @Setter
-private String name;
-----
-
-Under the covers it is implemented as an annotation processor; it basically hooks into the
Java compiler
-so that it can emit additional bytecode (eg for the getter and setter).  See xref:_cg_ide_intellij_other-settings-compiler[here]
for details of setting up in IntelliJ (Eclipse has very similar support).
-
-Apache Isis supports link:https://projectlombok.org/[Project Lombok], in that the annotations
that would normally be placed on the getter (namely xref:rgant.adoc#_rgant-Property[`Property`],
xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:rgant.adoc#_rgant-Collection[`@Collection`],
xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`] and xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`])
can be placed on the field instead.
-
-
-There are plugins for Lombok for maven; it's just a matter of adding the required dependency.
 To compile the code
-within your IDE (eg so that its compiler "knows" that there is, actually, a getter and setter)
will require an
-Lombok plugin appropriate to that IDE.  See the link:https://projectlombok.org/download.html[Lombok
download page] for more information.
-
-
-
-== Future thoughts
-
-In the future we might extend/fork Lombok so that it understands Isis' own annotations (ie
xref:rgant.adoc#_rgant-Property[`@Property`] and xref:rgant.adoc#_rgant-Collection[`@Collection`])
-rather than Lombok's own `@Getter` and `@Setter.
-
-It might also be possible to use Lombok to generate the domain event classes for each member.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/_dg_project-lombok.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_project-lombok.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_project-lombok.adoc
new file mode 100644
index 0000000..367d00b
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_project-lombok.adoc
@@ -0,0 +1,50 @@
+[[_dg_project-lombok]]
+= Appendix: Project Lombok
+:Notice: 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.
+:_basedir: ../
+:_imagesdir: images/
+
+
+
+link:https://projectlombok.org/[Project Lombok] is an open source project to reduce the amount
of boilerplate in
+your code.
+
+For example, rather than write:
+
+[source,java]
+----
+private String name;
+public String getName() {
+    return name;
+}
+public void setName(String name) {
+    this.name = name;
+}
+----
+
+you can instead write simply:
+
+[source,java]
+----
+@Getter @Setter
+private String name;
+----
+
+Under the covers it is implemented as an annotation processor; it basically hooks into the
Java compiler
+so that it can emit additional bytecode (eg for the getter and setter).  See xref:_cg_ide_intellij_other-settings-compiler[here]
for details of setting up in IntelliJ (Eclipse has very similar support).
+
+Apache Isis supports link:https://projectlombok.org/[Project Lombok], in that the annotations
that would normally be placed on the getter (namely xref:rgant.adoc#_rgant-Property[`Property`],
xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:rgant.adoc#_rgant-Collection[`@Collection`],
xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`] and xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`])
can be placed on the field instead.
+
+
+There are plugins for Lombok for maven; it's just a matter of adding the required dependency.
 To compile the code
+within your IDE (eg so that its compiler "knows" that there is, actually, a getter and setter)
will require an
+Lombok plugin appropriate to that IDE.  See the link:https://projectlombok.org/download.html[Lombok
download page] for more information.
+
+
+
+== Future thoughts
+
+In the future we might extend/fork Lombok so that it understands Isis' own annotations (ie
xref:rgant.adoc#_rgant-Property[`@Property`] and xref:rgant.adoc#_rgant-Collection[`@Collection`])
+rather than Lombok's own `@Getter` and `@Setter.
+
+It might also be possible to use Lombok to generate the domain event classes for each member.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
index 83c7ec7..44ab935 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
@@ -7,7 +7,9 @@
 
 The quickest way to get started with Apache Isis is to run the simple archetype.  This will
generate a very simple one-class domain model, called `SimpleObject`, with a single property
`name`.
 
-There is also a corresponding `SimpleObjectRepository` domain service.  From this you can
easily rename these initial classes, and extend to build up your own Apache Isis domain application.
+There is also a corresponding `SimpleObjects` domain service which acts as a repository for
`SimpleObject` entity.  From this you can easily rename these initial classes, and extend
to build up your own Apache Isis domain application.
+
+Finally, the domain service also includes a `HomePageViewModel` which acts as a home page
for the app.
 
 
 
@@ -92,30 +94,9 @@ The `simpleapp` archetype generates a single WAR file, configured to run
both th
 Once you've built the app, you can run the WAR in a variety of ways.
 
 
-=== Self-hosted
-
-The easiest way to run the app, at least while getting started, is to run the self-hosting
version of the WAR.  With this style the app runs up its own internal instance of Jetty web
server.
-
-For example:
-
-
-[source,bash]
-----
-java -jar webapp/target/myapp-webapp-1.0-SNAPSHOT-jetty-console.jar
-----
-
-
-This can also be accomplished using an embedded Ant target provided in the build script:
-
-[source,bash]
-----
-mvn -P self-host antrun:run
-----
-
-
 === Using mvn Jetty plugin
 
-Alternatively, you could run the WAR in a Maven-hosted Jetty instance, though you need to
`cd` into the `webapp` module:
+First, you could run the WAR in a Maven-hosted Jetty instance, though you need to `cd` into
the `webapp` module:
 
 [source,bash]
 ----
@@ -123,8 +104,6 @@ cd webapp
 mvn jetty:run
 ----
 
-If you use `mvn jetty:run`, then the context path changes; check the console output (eg link:http://localhost:8080/myapp-webapp
[http://localhost:8080/myapp-webapp]).
-
 
 You can also provide a system property to change the port:
 
@@ -155,25 +134,22 @@ image::{_imagesdir}getting-started/simpleapp-webapp.png[width="600px",link="{_im
 
 It is also possible to start the application with a pre-defined set of data; useful for demos
or manual exploratory testing.  This is done by specifying a xref:ugtst.adoc#_ugtst_fixture-scripts[fixture
script] on the command line.
 
-If running the self-hosted console, you can specify the fixtures using the `--initParam`
flag:
+If you are running the app from an IDE, then you can specify the fixture script using the
`--fixture` flag.  The archetype provides the `domainapp.fixture.scenarios.RecreateSimpleObjects`
fixture script, for example:
 
-[source,bash]
-----
-java -jar webapp/target/myapp-webapp-1.0-SNAPSHOT-jetty-console.jar \
-     --initParam isis.persistor.datanucleus.install-fixtures=true  \
-     --initParam isis.fixtures=domainapp.fixture.scenarios.RecreateSimpleObjects
-----
+image::{_imagesdir}getting-started/simpleapp-webapp-with-fixtures.png[width="600px",link="{_imagesdir}getting-started/simpleapp-webapp-with-fixtures.png"]
 
-where (in the above example) `domainapp.fixture.scenarios.RecreateSimpleObjects` is the fully
qualified class name of the fixture
-script to be run.
+Alternatively, you can run with a different xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`]
using the `--appManifest` (or `-m`) flag.  The archetype provides
+`domainapp.app.DomainAppAppManifestWithFixtures` which specifies the aforementioned `RecreateSimpleObjects`
fixture.
 
-If you are running the app from an IDE, then you can specify the fixture script using the
`--fixture` flag:
 
-image::{_imagesdir}getting-started/simpleapp-webapp-with-fixtures.png[width="600px",link="{_imagesdir}getting-started/simpleapp-webapp-with-fixtures.png"]
 
+== Using the App
 
+[NOTE]
+====
+These screenshots are for v1.10.0.
+====
 
-== Using the App
 
 When you start the app, you'll be presented with a welcome page from which you can access
the webapp using either the xref:ugvw.adoc#[Wicket viewer] or the xref:ugvro.adoc#[Restful
Objects viewer]:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/dg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg.adoc b/adocs/documentation/src/main/asciidoc/guides/dg.adoc
index 1d1ca4f..c6fa99c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg.adoc
@@ -54,9 +54,13 @@ include::_dg_ide.adoc[leveloffset=+1]
 include::_dg_ide-templates.adoc[leveloffset=+1]
 
 include::_dg_building-isis.adoc[leveloffset=+1]
-include::_dg_contributing.adoc[leveloffset=+1]
 
 include::_dg_asciidoc.adoc[leveloffset=+1]
 
+include::_dg_contributing.adoc[leveloffset=+1]
+
 include::_dg_git-cookbook.adoc[leveloffset=+1]
 include::_dg_asciidoc-templates.adoc[leveloffset=+1]
+include::_dg_project-lombok.adoc[leveloffset=+1]
+include::_dg_agilej.adoc[leveloffset=+1]
+

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/guides/simpleapp-archetype.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/simpleapp-archetype.adoc b/adocs/documentation/src/main/asciidoc/guides/simpleapp-archetype.adoc
index 49c8f23..be437c1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/simpleapp-archetype.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/simpleapp-archetype.adoc
@@ -99,29 +99,7 @@ The `simpleapp` archetype generates a single WAR file, configured to run
both th
 
 Once you've built the app, you can run the WAR in a variety of ways. 
 
-The recommended approach when getting started is to run the self-hosting version of the WAR,
allowing Apache Isis to run as a standalone app; for example:
-
-[source,bash]
-----
-java -jar webapp/target/myapp-webapp-1.0-SNAPSHOT-jetty-console.jar
-----
-
-
-
-This can also be accomplished using an embedded Ant target provided in the build script:
-
-
-[source,bash]
-----
-mvn -P self-host antrun:run
-----
-
-
-    
-The first is to simply deploying the generated WAR (`webapp/target/myapp-webapp-1.0-SNAPSHOT.war`)
to a servlet container.
-
-
-Alternatively, you could run the WAR in a Maven-hosted Jetty instance, though you need to
`cd` into the `webapp` module:
+First, you could run the WAR in a Maven-hosted Jetty instance:
 
 [source,bash]
 ----
@@ -129,32 +107,11 @@ cd webapp
 mvn jetty:run -D jetty.port=9090
 ----
 
-
 In the above, we've passed in a property to indicate a different port from the default port
(8080).
 
-Note that if you use `mvn jetty:run`, then the context path changes; check the console output
(eg [http://localhost:9090/myapp-webapp](http://localhost:9090/myapp-webapp)).
-
-Finally, you can also run the app by deploying to a standalone servlet container such as
[Tomcat](http://tomcat.apache.org).
-
-
-
-
-=== With Fixtures
-
-It is also possible to start the application with a pre-defined set of data; useful for demos
or manual exploratory
-testing.  This is done by specifying a _fixture script_ on the command line:
-
-
-[source,bash]
-----
-java -jar webapp/target/myapp-webapp-1.0-SNAPSHOT-jetty-console.jar \
-     --initParam isis.persistor.datanucleus.install-fixtures=true  \
-     --initParam isis.fixtures=fixture.simple.SimpleObjectsFixture
-----
+Second, you could also run the app by deploying the generated WAR (`webapp/target/myapp-webapp-1.0-SNAPSHOT.war`)
to a standalone servlet container such as [Tomcat](http://tomcat.apache.org).
 
-    
-where (in the above example) `fixture.simple.SimpleObjectsFixture` is the fully qualified
class name of the fixture 
-script to be run.
+Alternatively, you can run the app from within an IDE, using the main class is `org.apache.isis.WebServer`.
 The classpath should be that of the `myapp-webapp` submodule.  The `WebServer` takes a number
of parameters, most useful being `--appManifest` (or `-m`), which allows the app manifest
to be specified.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/e62eacff/adocs/documentation/src/main/asciidoc/index.html
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/index.html b/adocs/documentation/src/main/asciidoc/index.html
index 8022e15..3593f0e 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -644,27 +644,36 @@ And I must say this: "Great Support from the development team"</p>
                         <p>Like all Apache Isis apps, the UI is dynamically built from
the domain model.  The screenshot below
                         shows a demo "todoapp" (source code available on <a href="http://github.com/isisaddons/isis-app-todoapp">github</a>)</p>
 
-                        <a href="./images/todoapp/todoitem.png"><img src="./images/todoapp/todoitem.png"
style="width: 75%"/></a>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="large-offset-1 large-10 medium-offset-1 medium-10 columns">
+                        <a href="./images/todoapp/todoitem.png"><img src="./images/todoapp/todoitem.png"
+                            style="padding: 2px;border: 1px solid #021a40;"
+                        /></a>
+                    </div>
+                </div>
 
+                <div class="row">
+                    <div class="large-12 medium-12 columns">
                         <br/>
-                        <div class="center">
-                            <br/>
-                            <p>The above screenshot shows the <code>ToDoItem</code>
entity; an (optional) XML layout file provides metadata dividing the object members into rows,
columns and tabs.  Apache Isis also supports view models as well as entities, so you can also
create dashboards and support for similar use cases:</p>
-                        </div>
                         <br/>
-
-                        <a href="./images/todoapp/dashboard.png"><img src="./images/todoapp/dashboard.png"
style="width: 75%"/></a>
-
+                        <p>The above screenshot shows the <code>ToDoItem</code>
entity; an (optional) XML layout file provides metadata dividing the object members into rows,
columns and tabs.  Apache Isis also supports view models as well as entities, so you can also
create dashboards and support for similar use cases:</p>
                     </div>
                 </div>
 
-                <br/>
+                <div class="row">
+                    <div class="large-offset-1 large-10 medium-offset-1 medium-10 columns">
+                        <a href="./images/todoapp/dashboard.png"><img src="./images/todoapp/dashboard.png"
style="padding: 2px;border: 1px solid #021a40;" /></a>
+                    </div>
+                </div>
 
                 <div class="row">
                     <div class="large-12 medium-12 columns">
                         <h4>Getting started</h4>
                         <br/>
-                        <p>Start developing your own Apache Isis application using
our <a href="guides/ug.html#_ug_getting-started_simpleapp-archetype">simpleapp archetype</a>:</p>
+                        <p>Start developing your own Apache Isis application using
our <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">simpleapp
archetype</a>:</p>
                     </div>
                 </div>
                 <div class="row">


Mime
View raw message