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/04/03 23:29:24 UTC
[10/59] [abbrv] [partial] isis-site git commit: ISIS-1521: deletes
content-OLDSITE
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/getting-started/images/screenshots/530-extensible-map.png
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/getting-started/images/screenshots/530-extensible-map.png b/content-OLDSITE/intro/getting-started/images/screenshots/530-extensible-map.png
deleted file mode 100644
index 3276bc6..0000000
Binary files a/content-OLDSITE/intro/getting-started/images/screenshots/530-extensible-map.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.pdn
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.pdn b/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.pdn
deleted file mode 100644
index d47cc5c..0000000
Binary files a/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.png
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.png b/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.png
deleted file mode 100644
index fd4a3db..0000000
Binary files a/content-OLDSITE/intro/getting-started/images/screenshots/540-extensible-charts.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/getting-started/images/screenshots/screenshot-captions.pptx
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/getting-started/images/screenshots/screenshot-captions.pptx b/content-OLDSITE/intro/getting-started/images/screenshots/screenshot-captions.pptx
deleted file mode 100644
index 0cea77b..0000000
Binary files a/content-OLDSITE/intro/getting-started/images/screenshots/screenshot-captions.pptx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/getting-started/simpleapp-archetype.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/getting-started/simpleapp-archetype.md b/content-OLDSITE/intro/getting-started/simpleapp-archetype.md
deleted file mode 100644
index df1ed03..0000000
--- a/content-OLDSITE/intro/getting-started/simpleapp-archetype.md
+++ /dev/null
@@ -1,139 +0,0 @@
-Title: SimpleApp Archetype
-
-[//]: # (content copied to _user-guide_getting-started_simpleapp-archetype)
-
-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 Isis domain application.
-
-
-
-## Generating the App (stable release)
-
-Create a new directory, and `cd` into that directory.
-
-Then run the following command:
-
- mvn archetype:generate \
- -D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.8.0 \
- -D groupId=com.mycompany \
- -D artifactId=myapp \
- -D version=1.0-SNAPSHOT \
- -B
-
-where:
-
-- `groupId` represents your own organization, and
-- `artifactId` is a unique identifier for this app within your organization.
-- `version` is the initial (snapshot) version of your app
-
-The archetype generation process will then run; it only takes a few seconds.
-
-## Generating the App (snapshot release)
-
-We also maintain the archetype for the most current `-SNAPSHOT`; an app generated with this archetype will contain the latest features of Isis, but the usual caveats apply: some features still in development may be unstable.
-
-The process is almost identical to that for stable releases, however the `archetype:generate` goal is called with slightly different arguments:
-
- mvn archetype:generate \
- -D archetypeGroupId=org.apache.isis.archetype \
- -D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.9.0-SNAPSHOT \
- -D groupId=com.mycompany \
- -D artifactId=myapp \
- -D version=1.0-SNAPSHOT \
- -D archetypeRepository=http://repository-estatio.forge.cloudbees.com/snapshot/ \
- -B
-
-where as before:
-
-- `groupId` represents your own organization, and
-- `artifactId` is a unique identifier for this app within your organization.
-- `version` is the initial (snapshot) version of your app
-
-but also:
-
-- `archetypeVersion` is the SNAPSHOT version of Isis.
-- `archetypeRepository` specifies the location of our snapshot repo (hosted on [CloudBees](http://www.cloudbees.com)), and
-
-The archetype generation process will then run; it only takes a few seconds.
-
-## Building the App
-
-Switch into the root directory of your newly generated app, and build your app:
-
-<pre>
-cd myapp
-mvn clean install
-</pre>
-
-where `myapp` is the `artifactId` entered above.
-
-## Running the App
-
-The `simpleapp` archetype generates a single WAR file, configured to run both the [Wicket viewer](../../components/viewers/wicket/about.html) and the [Restful Objects viewer](../../components/viewers/wicket/about.html). The archetype also configures the [JDO Objectstore](../../components/objectstores/jdo/about.html) to use an in-memory HSQLDB connection.
-
-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 Isis to run as a standalone app; for example:
-
- 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:
-
- mvn -P self-host antrun:run
-
-> prior to v1.5.0, this was simply: mvn 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:
-
- 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).
-
-## Running the App 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:
-
- 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
-
-where (in the above example) `fixture.simple.SimpleObjectsFixture` is the fully qualified class name of the fixture
-script to be run.
-
-## Using the App
-
-The archetype provides a welcome page that explains the classes and files generated, and provides detailed guidance and what to do next.
-
-The app itself is configured to run using shiro security, as configured in the `WEB-INF/shiro.ini` config file. To log in, use `sven/pass`.
-
-## Modifying the App
-
-Once you are familiar with the generated app, you'll want to start modifying it. There is plenty of guidance on this site; check out the 'programming model how-tos' section on the main [documentation](../../documentation.html) page first).
-
-If you use Eclipse, do also install the [Eclipse templates](../resources/editor-templates.html); these will help you follow the Isis naming conventions.
-
-## App Structure
-
-As noted above, the generated app is a very simple application consisting of a single domain object that can be easily renamed and extended. The intention is not to showcase all of Isis' capabilities; rather it is to allow you to very easily modify the generated application (eg rename `SimpleObject` to `Customer`) without having to waste time deleting lots of generated code.
-
-<table class="table table-striped table-bordered table-condensed">
-<tr><th>Module</th><th>Description</th></tr>
-<tr><td>myapp</td><td>The parent (aggregator) module</td></tr>
-<tr><td>myapp-dom</td><td>The domain object model, consisting of <tt>SimpleObject</tt> and <tt>SimpleObjects</tt> (repository) domain service.</td></tr>
-<tr><td>myapp-fixture</td><td>Domain object fixtures used for initializing the system when being demo'ed or for unit testing.</td></tr>
-<tr><td>myapp-integtests</td><td>End-to-end <a href="../../core/integtestsupport.html">integration tests</a>, that exercise from the UI through to the database</td></tr>
-<tr><td>myapp-webapp</td><td>Run as a webapp (from <tt>web.xml</tt>) using either the Wicket viewer or the RestfulObjects viewer</td></tr>
-</table>
-
-If you run into issues, please don't hesitate to ask for help on the [users mailing list](../../support.html).
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/getting-started/todoapp-archetype.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/getting-started/todoapp-archetype.md b/content-OLDSITE/intro/getting-started/todoapp-archetype.md
deleted file mode 100644
index bacfce9..0000000
--- a/content-OLDSITE/intro/getting-started/todoapp-archetype.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Title: TodoApp Archetype
-
-[//]: # (content copied to _user-guide_xxx)
-
-> as of 1.8.0 the todoapp is no longer released; the example app has instead moved to [Isis addons](https://github.com/isisaddons/isis-app-todoapp) (not ASF). This allows us to provide a more fully-fledged example that integrates with other Isis addons modules.
-
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/learning-more/Pawson-Naked-Objects-thesis.pdf
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/learning-more/Pawson-Naked-Objects-thesis.pdf b/content-OLDSITE/intro/learning-more/Pawson-Naked-Objects-thesis.pdf
deleted file mode 100644
index aca07e4..0000000
Binary files a/content-OLDSITE/intro/learning-more/Pawson-Naked-Objects-thesis.pdf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/learning-more/about.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/learning-more/about.md b/content-OLDSITE/intro/learning-more/about.md
deleted file mode 100644
index a01d20b..0000000
--- a/content-OLDSITE/intro/learning-more/about.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Title: Learning More
-
-back to: [documentation](../../documentation.html) page.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/learning-more/articles-and-presentations.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/learning-more/articles-and-presentations.md b/content-OLDSITE/intro/learning-more/articles-and-presentations.md
deleted file mode 100644
index bb4a716..0000000
--- a/content-OLDSITE/intro/learning-more/articles-and-presentations.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Title: Articles, Conference Sessions, Podcasts
-
-[//]: # (content to copy to ???)
-
-Some articles and recorded material relating to either Apache Isis (or its predecessor, the Naked Objects framework), or its 'sister' open source project on the .NET platform, Naked Objects .NET. We've **highlighted** some of the better ones...
-
-2014
-
-* Presentation, BDD Exchange: [To those whom much is given, much is expected... ](https://skillsmatter.com/skillscasts/5638-to-those-whom-much-is-given-much-is-expected) (45 min. video)
-* Presentation, JEEConf: [Extremely rapid application development with Apache Isis](https://www.youtube.com/watch?v=BNGUqZ6YE-M) (50 min. video)
-
-2013
-
-* Presentation, Oredev: [RRRADDD! Ridiculously Rapid Domain-driven (and Restful) Apps With Apache Isis](http://oredev.org/2013/wed-fri-conference/rrraddd-ridiculously-rapid-domain-driven-and-restful-apps-with-apache-isis) (50 min. video)
-* **Article, Methods and Tools : [Introducing Apache Isis](http://www.methodsandtools.com/PDF/mt201302.pdf)**
-* Article, SDJournal : [Introducing Isis](http://sdjournal.org/software-developers-journal-open-012013-2/)
-* Article, SDJournal: [Restful Objects on Apache Isis](http://sdjournal.org/software-developers-journal-open-012013-2/)
-* A Prezi [presentation on Naked Objects and Apache Isis](http://prezi.com/cunfhjsf8dqg/braiv-apache-isis/), mixed by Thomas Eck
-
-2012
-
-* **Article, InfoQ: [Introducing Restful Objects](http://www.infoq.com/articles/Intro_Restful_Objects)**
-* Presentation, Skillsmatter: [Restful Objects - A Hypermedia API For Domain Object Models](http://skillsmatter.com/podcast/java-jee/restful-objects)
-
-2011
-
-* **Presentation, InfoQ: [Case study: Large-scale Pure OO at the Irish Government](http://www.infoq.com/presentations/Large-scale-Pure-OO-Irish-Government)** (1 hr video)
-* Article, InfoQ: [Interview and Book Excerpt: Dan Haywood's Domain Driven Design using Naked Objects](http://www.infoq.com/articles/haywood-ddd-no)
-
-2010
-
-* Presentation, Skillsmatter: [How to have your domain-driven design cake and eat it, too](http://skillsmatter.com/podcast/java-jee/have-your-ddd-cake-eat-it-too) (1 hr video)
-* Article, InfoQ: [Fulfilling the Promise of MVC](http://www.infoq.com/articles/Nacked-MVC) (Naked Objects .NET)
-* **Podcast, Hanselminutes: [Inside the Naked Objects Framework with Richard Pawson](http://www.hanselman.com/blog/HanselminutesPodcast233InsideTheNakedObjectsFrameworkWithRichardPawson.aspx)** (Naked Objects .NET) (30 min)
-
-2009
-
-* **Article, Methods and Tools: [An Introduction to Domain Driven Design](http://www.methodsandtools.com/archive/archive.php?id=97)**
-* Presentation, Skillsmatter: [Exploring Domains and Collaborating with Domain Experts](http://skillsmatter.com/podcast/design-architecture/exploring-domains-and-collaborating-with-domain-experts) (1 hr video)
-* Presentation, Devoxx: [Introducing Scimpi](http://www.parleys.com/#id=1671&st=5) (30 min video)
-* Article, PragPub: [Going Naked](http://pragprog.com/magazines/2009-12)
-* **Book: [Domain Driven Design using Naked Objects](./books.html), Dan Haywood**
-
-2008:
-
-* Article, InfoQ: [Rapid Application Development using Naked Objects for .NET](http://www.infoq.com/articles/RAD-Naked-Objects) (Naked Objects .NET)
-
-
-2004:
-
-* **Richard Pawson's [PhD thesis on Naked Objects](./Pawson-Naked-Objects-thesis.pdf)**
-* Article series, TheServerSide
- * Part 1 - [The Case for Naked Objects - Getting Back to the Object-Oriented Ideal](http://www.theserverside.com/news/1365562/Part-1-The-Case-for-Naked-Objects-Getting-Back-to-the-Object-Oriented-Ideal)
- * **Part 2 - [Challenging the Dominant Design of the 4-Layer Architecture](http://www.theserverside.com/news/1365568/Part-2-Challenging-the-Dominant-Design-of-the-4-Layer-Architecture)**
- * Part 3 - [Write an application in Java and deploy it on .Net](http://www.theserverside.com/news/1365570/Part-3-Write-an-application-in-Java-and-deploy-it-on-Net)
- * Part 4 - [Modeling simultaneously in UML, Java, and User Perspectives](http://www.theserverside.com/news/1366868/Part-4-Modeling-simultaneously-in-UML-Java-and-User-Perspectives)
- * Part 5 - [Building Rich Internet Applications with Naked Objects](http://www.theserverside.com/news/1366871/Part-5-Building-Rich-Internet-Applications-with-Naked-Objects)
-
-2002:
-
-* **Book: [Naked Objects](./books.html), Richard Pawson and Robert Matthews.**
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/learning-more/books.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/learning-more/books.md b/content-OLDSITE/intro/learning-more/books.md
deleted file mode 100644
index 820ac5a..0000000
--- a/content-OLDSITE/intro/learning-more/books.md
+++ /dev/null
@@ -1,81 +0,0 @@
-Title: Books
-
-[//]: # (content copied to _user-guide_xxx)
-
-Although it has evolved since, the *Apache Isis* framework started out as an open source implementation of the naked objects pattern. Indeed, the generic user interfaces provided by Isis [Wicket](../../components/viewers/wicket/about.html) viewer and the [Restful Objects](../../components/viewers/restfulobjects/about.html) viewer are both "just" naked objects implementations; the first serves up a default generic representation of domain objects for human interaction, the latter serving up representation intended for machine consumption rather than human beings.
-
-If the idea of naked objects is of interest, then there are a couple of books on the topic that you might want to read.
-
-### Naked Objects
-
-Richard Pawson and Robert Matthews, Wiley 2002
-
-{row
-
-{span-one-third
-
-{book-image
-
-
-}
-
-}
-
-{span-two-thirds
-
-This book describes the original ideas of Naked Objects. Although based on a very early version of the framework, it's still definitely worth a read (and beautifully produced).
-
-
-Amazon quotes: (avg 5 stars)
-
-- Brilliant argument and toolkit for information systems
-- Most thoughtful and beautiful technical book I have read
-- Excellent presentation of an innovative practical idea
-
-The book is freely available online [here](http://www.nakedobjects.org/book/). Or, you can get a hardcopy of the book at [Wiley (publisher)](http://eu.wiley.com/WileyCDA/WileyTitle/productCd-0470844205.html) and [Amazon](http://www.amazon.com/Naked-Objects-Richard-Pawson/dp/0470844205).
-
-}
-
-}
-
-### Domain Driven Design using Naked Objects
-
-Dan Haywood, Pragmatic Bookshelf 2009
-
-{row
-
-
-{span-one-third
-
-{book-image
-
-
-}
-
-}
-
-{span-two-thirds
-
-This more recent book draws the parallel between domain-driven design and Naked Objects (4.0). In the spirit of the Pragmatic Bookshelf, it's a practical, hands-on sort of book, building up a case study as it goes and encouraging you to build your own app as you go.
-
-Amazon quotes: (avg 4.5 stars)
-
-- Important Contribution to Domain-Driven Design
-- The easy-to-learn Naked Objects Framework .. provide[s] a masterful exposition on DDD
-- Clear and passionate book about a great subject
-- Excellent book and a great framework
-
-You can find the book at [Pragmatic Bookshelf (publisher)](http://www.pragprog.com/titles/dhnako/domain-driven-design-using-naked-objects) and [Amazon](http://www.amazon.com/Domain-Driven-Design-Objects-Pragmatic-Programmers/dp/1934356441).
-
-}
-
-}
-
-### Restful Objects Specification
-
-Dan Haywood
-
-The [Restful Objects specification](http://restfulobjects.org) defines a set of RESTful resources, and corresponding JSON representations, for accessing and manipulating a domain object model.
-
-This is a comprehensive specification, running to over 200 pages in length. It is implemented by Isis' [Restful Objects](../../components/viewers/restfulobjects/about.html) viewer, and is also implemented by another (non-Apache) open source project, [Naked Objects MVC](http://nakedobjects.codeplex.com).
-
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/learning-more/hexagonal-architecture.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/learning-more/hexagonal-architecture.md b/content-OLDSITE/intro/learning-more/hexagonal-architecture.md
deleted file mode 100644
index 95df646..0000000
--- a/content-OLDSITE/intro/learning-more/hexagonal-architecture.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Title: Hexagonal Architecture
-
-[//]: # (content copied to _user-guide_core-concepts_hexagonal-architecture)
-
-{stub
-This page is a stub.
-}
-
-Apache Isis follows the *hexagonal architecture* pattern (also known as the *onion architecture* or *ports-and-adapters* architecture). It places the domain model in the middle, with presentation, persistence and other services dependent upon the domain model.
-
-
-<!--
-TODO
-
-x-rf the architecture picture,
-
--->
-
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/learning-more/resources/books/dhnako.jpg
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/learning-more/resources/books/dhnako.jpg b/content-OLDSITE/intro/learning-more/resources/books/dhnako.jpg
deleted file mode 100644
index 4c6b6cd..0000000
Binary files a/content-OLDSITE/intro/learning-more/resources/books/dhnako.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/learning-more/resources/books/nakedobjects-book.jpg
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/learning-more/resources/books/nakedobjects-book.jpg b/content-OLDSITE/intro/learning-more/resources/books/nakedobjects-book.jpg
deleted file mode 100644
index 8ef05ac..0000000
Binary files a/content-OLDSITE/intro/learning-more/resources/books/nakedobjects-book.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/powered-by/TransportPlanner/about.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/powered-by/TransportPlanner/about.md b/content-OLDSITE/intro/powered-by/TransportPlanner/about.md
deleted file mode 100644
index 95e794c..0000000
--- a/content-OLDSITE/intro/powered-by/TransportPlanner/about.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Title: TransportPlanner Script
-
-[//]: # (content copied to _user-guide_xxx)
-
-###Log in
-- log in with chris/pass
-- a user with less privileges is arne/pass (Arne is not allowed to plan. He represents a customer who only is able to create a transport demand)
-
-###Fixtures
-- System/Install to have some predefined objects. Give it some time to complete...
-
-###Browse existing `TransportDemand`s
-- Select 'Transport Demands/All Transport Demands' to show a list of predefined transport demands, i.e. requests to transport a cargo from pickup to delivery.
- - The [calendar view](https://github.com/danhaywood/isis-wicket-fullcalendar) gets somewhat confused by the dates.
-- Select 'Fiskarstrand-Rotterdam' with the Dried Fish cargo
-- On the left side of the screen some details show up, on the right side an empty schedule and no waypoints.
-
-###Schedule a new `TransportDemand`
-- Select the 'Plan transport' at the top right corner of the screen
-- You may now enter you criteria for finding a transport. Max price, max time and/or 'fastest', 'cheapest', 'cheap and fast' and, as a bonus 'expensive and slow' ;-)
- The software uses a shortest-paths-algorithm to look for the best solutions according to your criterium
-- When done, click and a list with possible schedules is presented
-- Select one, click the corresponding check box on the left and click 'plan and book'
-- The image of the selected schedule changes (a tick mark is placed on top of the globe)
-
-###View the `TransportDemand`
-- Select the transport demand again, either from the top menu or click on the corresponding bread crumb
-- The schedule is now filled, waypoints may be shown on a google map in the widget below
-- Click on 'Cost Pie' and 'Resource Usage' to see some graphs
-
-###Send an `Event`
-- You may now send an Event to the system. Events should in principle come from an outside system, but this is a demo...
-- Send a 'Failure event' and select a leg (probably not the last leg)
-- The status in the schedule changes to CANCELD and a red cross icon is shown.
-- Selecting replan-transport will give you the possibility to replan the transport, starting at the canceled destination.
-- Be sure to select 'REPLAN and book' (plan and book is still shown. It should have been hidden...)
-
-###Other Features
-- Have a look at all the logistic service providers, all logistic services, all destinations etc.
-- See the file TpmFixture.java for how the main domain objects link.
-
-###Caveats
-The software is not as streamlined as it should be and it contains bugs. ;-) But, remember, it was a quickly written demo.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/powered-by/about.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/powered-by/about.md b/content-OLDSITE/intro/powered-by/about.md
deleted file mode 100644
index 26a8261..0000000
--- a/content-OLDSITE/intro/powered-by/about.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Title: Powered by
-
-back to: [documentation](../../documentation.html) page.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/powered-by/images/estatio-1.png
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/powered-by/images/estatio-1.png b/content-OLDSITE/intro/powered-by/images/estatio-1.png
deleted file mode 100644
index e80ecb2..0000000
Binary files a/content-OLDSITE/intro/powered-by/images/estatio-1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/powered-by/powered-by.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/powered-by/powered-by.md b/content-OLDSITE/intro/powered-by/powered-by.md
deleted file mode 100644
index b45ee1f..0000000
--- a/content-OLDSITE/intro/powered-by/powered-by.md
+++ /dev/null
@@ -1,67 +0,0 @@
-Title: Powered by
-
-[//]: # (content copied to _user-guide_xxx)
-
-Here are some freely accessible (and sometimes open source) applications that are powered by Isis.
-
->If you have written an app in Isis that you'd like to share, please mention it on the [mailing list](../../support.html).
-
-## Estatio
-
-Estatio is an open source estate management application, available on [github](https://github.com/estatio/estatio).
-
-<img src="images/estatio-1.png" width="900"></img>
-
-
-Much of Isis' recent development has been driven out by the requirements of this application, so you can see for yourself how many of the features in Isis are used in real life.
-
-Estatio is being deployed by [Eurocommercial Properties](http://www.eurocommercialproperties.com/), who sponsored the development of the framework in order to make Estatio a reality. Our heart-felt thanks to them for their investment.
-
-
-## TransportPlanner
-
-TransportPlanner is a demo done by [Marintek AS](http://www.sintef.no/home/MARINTEK/) to show a possible 'solution' to a multimodal transport planning problem. It's a small part of a bigger European funded project.
-
-The domain is that:
-
-- some cargo should be transported from a pickup destination to a delivery destination.
-- A 'client' creates a transport demand
-- A 'logistics service provider' plans a route from pickup to delivery using a shortest path algorithm.
-- The route's waypoints (where cargo is loaded from one providere to another) may be shown on a map.
-- The costs associated with each leg may be shown as a pie chart
-- The resource usage, i.e. costs and time for each leg, may be shown as a bar chart.
-- An event may be generated (e.g. some customs papers are missing, therefore transport execution stops and a replan
-is necessary).
-
-The author, Christian Steinebach, wrote this demo part-time over the course of a few weeks. He commented:
-
-> I did not have too much time to get 'something done' ... But although I had a hard time in the beginning with Isis I don't think I would have made it
-in time using 'conventional' development with database, GUI etc...
-
-He went on,
-
-> Because this is a demo, there is a lot of room for improvement, but it does show how a relatively simple domain model can be brought 'alive' using Isis.
-
-If you want to try out the application, grab the [source code](https://www.assembla.com/code/transportplanner/git/nodes) and use this [script](TransportPlanner/about.html). Note that the app was written against a snapshot version of Isis; ask on the [mailing list](../../support.html) for help.
-
-<table>
- <tr>
- <td>TransportPlanner allows schedules of journeys to be planned. It uses Isis' integration with <a href="https://github.com/isisaddons/isis-wicket-gmap3">Google Maps</a> to provide the map.</td>
- <td>
- <a href="https://www.assembla.com/code/transportplanner/git/nodes/master/screenshots/TransportDemand.png"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TransportDemand.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" width="530"></img></a>
- </td>
- </tr>
- <tr>
- <td>TransportPlanner uses Isis' <a href="https://github.com/isisaddons/isis-wicket-wickedcharts">Wicked Charts</a> integration to provide custom graphs</td>
- <td>
- <a href="https://www.assembla.com/code/transportplanner/git/nodes/master/screenshots/TPM_CostPie.png"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/TPM_CostPie.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" width="530"></img></a>
- </td>
- </tr>
- <tr>
- <td>Another example of TransportPlanner's use of <i>Wicked Charts</i></td>
- <td>
- <a href="https://www.assembla.com/code/transportplanner/git/nodes/master/screenshots/Tpm_ResourceUsage.png"><img src="https://www.assembla.com/code/transportplanner/git/node/blob/screenshots/Tpm_ResourceUsage.png?raw=1&rev=a9d5184ecb05c3d95dafec587c84cfcbc7a25b8b" width="530"></img></a>
- </td>
- </tr>
-<table>
-
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/about.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/about.md b/content-OLDSITE/intro/resources/about.md
deleted file mode 100644
index e7d98a8..0000000
--- a/content-OLDSITE/intro/resources/about.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Title: Resources
-
-back to: [documentation](../../documentation.html) page.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/cheat-sheet.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/cheat-sheet.md b/content-OLDSITE/intro/resources/cheat-sheet.md
deleted file mode 100644
index cf0ea4a..0000000
--- a/content-OLDSITE/intro/resources/cheat-sheet.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Title: Cheat Sheet
-
-[//]: # (content copied to _user-guide_xxx)
-
-The cheat sheet ([pdf](resources/IsisCheatSheet.pdf) [docx](resources/IsisCheatSheet.docx)) summarises the main programming conventions to follow when writing an Isis application.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/downloadable-presentations.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/downloadable-presentations.md b/content-OLDSITE/intro/resources/downloadable-presentations.md
deleted file mode 100644
index ce3ed17..0000000
--- a/content-OLDSITE/intro/resources/downloadable-presentations.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: Downloadable Presentations
-
-The following presentation, available in multiple formats, provides some background on Isis:
-
-- Introduction to Apache Isis ([pptx][1], [ppt][2], [odp][3], [pdf slides][4], [pdf notes][5])
-
-Feel free to use/adapt as you see fit.
-
-[1]: resources/IntroducingApacheIsis.pptx
-[2]: resources/IntroducingApacheIsis.ppt
-[3]: resources/IntroducingApacheIsis.odp
-[4]: resources/IntroducingApacheIsis-slides.pdf
-[5]: resources/IntroducingApacheIsis-notes.pdf
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/editor-templates.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/editor-templates.md b/content-OLDSITE/intro/resources/editor-templates.md
deleted file mode 100644
index e3724ea..0000000
--- a/content-OLDSITE/intro/resources/editor-templates.md
+++ /dev/null
@@ -1,47 +0,0 @@
-Title: Editor Templates
-
-[//]: # (content copied to _user-guide_xxx)
-
-The following table lists various IDE templates (for IntelliJ and Eclipse) when writing Isis domain objects and unit tests:
-
-<table class="table table-striped table-bordered table-condensed">
- <tr class="heading">
- <th>Template</th>
- <th>Prefix</th>
- <th>IntelliJ</th>
- <th>Eclipse</th>
- </tr>
- <tr>
- <td>Isis Domain Objects</td>
- <td><tt>is</tt></td>
- <td><a href="resources/isis-templates-idea.xml">Download</a></td>
- <td><a href="resources/isis-templates.xml">Download</a></td>
- </tr>
- <tr>
- <td>JUnit tests</td>
- <td><tt>ju</tt></td>
- <td><a href="resources/junit4-templates-idea.xml">Download</a></td>
- <td><a href="resources/junit4-templates.xml">Download</a></td>
- </tr>
- <tr>
- <td>JMock tests</td>
- <td><tt>jm</tt></td>
- <td><a href="resources/jmock2-templates-idea.xml">Download</a></td>
- <td><a href="resources/jmock2-templates.xml">Download</a></td>
- </tr>
-</table>
-
-Enter the prefix (`is`, `ju`, `jm`) and the IDE will list all available templates in that category.
-
-The most commonly used Isis domain objects templates are also listed on the [Isis cheat sheet](cheat-sheet.html).
-
-### Installation
-
-To install in IntelliJ, copy to the relevant `config/templates` directory, eg:
-
-* Windows `<User home>\.IntelliJIdea13\config\templates`
-* Linux `~/.IntelliJIdea13/config/templates`
-* Mac OS `~/Library/Preferences/IntelliJIdea13/templates`
-
-To install in Eclipse, go to `Windows > Preferences > Java > Editor > Templates` and choose `Import`.
-
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/icons.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/icons.md b/content-OLDSITE/intro/resources/icons.md
deleted file mode 100644
index 7e7592f..0000000
--- a/content-OLDSITE/intro/resources/icons.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: Icons
-
-[//]: # (content copied to _user-guide_xxx)
-
-Most Isis viewers use icons to help identify domain objects in the user interface. It's a good idea to ensure that these are styled consistently. To get you started, we couple of basic icon sets:
-
-* [haywood](https://github.com/apache/isis/blob/master/src/site/resources/images/icons/haywood.zip?raw=true)
-* [nogl](https://github.com/apache/isis/blob/master/src/site/resources/images/icons/nogl.zip?raw=true)
-
-
-## Third Party Icon Sets
-
-There are also various open source icon sets for both personal and commercial use (though some require a link back to the authors website):
-
-* [icons8](http://icons8.com/) (as used in the [Estatio](../powered-by/powered-by.html) app) - styled for Win8, Android and MacOS
-
-* [tango desktop](http://tango.freedesktop.org/Tango_Icon_Library) icon set - as used in Linux GNOME and KDE desktops
-
-* [the noun project](http://thenounproject.com/) community of icon providers (both free and commercial)
-
-* [flaticon](http://www.flaticon.com/) - free vector icons
-
-* [Google material design](http://google.github.io/material-design-icons/) and [zip here](http://www.google.com/design/spec/resources/sticker-sheets.html#)
-
-* [batch](http://adamwhitcroft.com/batch/) (300+ icons)
-
-
-If you know of any others freely usable and easily accessible, let us know through the [mailing list](../../support.html).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-notes.pdf
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-notes.pdf b/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-notes.pdf
deleted file mode 100644
index 90f14ee..0000000
Binary files a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-notes.pdf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-slides.pdf
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-slides.pdf b/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-slides.pdf
deleted file mode 100644
index e82fc1c..0000000
Binary files a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis-slides.pdf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.odp
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.odp b/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.odp
deleted file mode 100644
index 25db2d4..0000000
Binary files a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.odp and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.ppt
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.ppt b/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.ppt
deleted file mode 100644
index 1a10993..0000000
Binary files a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.ppt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.pptx
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.pptx b/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.pptx
deleted file mode 100644
index 49fd202..0000000
Binary files a/content-OLDSITE/intro/resources/resources/IntroducingApacheIsis.pptx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/resources/IsisCheatSheet.docx
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/resources/IsisCheatSheet.docx b/content-OLDSITE/intro/resources/resources/IsisCheatSheet.docx
deleted file mode 100644
index dfd7d82..0000000
Binary files a/content-OLDSITE/intro/resources/resources/IsisCheatSheet.docx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/intro/resources/resources/IsisCheatSheet.pdf
----------------------------------------------------------------------
diff --git a/content-OLDSITE/intro/resources/resources/IsisCheatSheet.pdf b/content-OLDSITE/intro/resources/resources/IsisCheatSheet.pdf
deleted file mode 100644
index dded201..0000000
Binary files a/content-OLDSITE/intro/resources/resources/IsisCheatSheet.pdf and /dev/null differ