ISIS-839: updating example app .launch files and out-of-date welcome.html and the about/index.html files.
Also new recreate-archetype.sh script. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/db28e306 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/db28e306 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/db28e306 Branch: refs/heads/prepare/isis-1.6.0-RC3 Commit: db28e3060b0636b99dcde9b5e3a48b43b2d0c4fe Parents: 42dc991 Author: Dan Haywood <[email protected]> Authored: Wed Jul 23 22:29:55 2014 +0100 Committer: Dan Haywood <[email protected]> Committed: Thu Jul 24 06:34:11 2014 +0100 ---------------------------------------------------------------------- .../launch/SimpleApp-PROTOTYPE-jrebel.launch | 2 +- .../SimpleApp-PROTOTYPE-no-fixtures.launch | 2 +- .../SimpleApp-PROTOTYPE-with-fixtures.launch | 2 +- .../launch/SimpleApp-SERVER-no-fixtures.launch | 2 +- .../src/main/resources/webapp/welcome.html | 8 +- .../webapp/src/main/webapp/about/index.html | 55 ++----------- .../launch/ToDoApp-PROTOTYPE-jrebel.launch | 2 +- .../ToDoApp-PROTOTYPE-with-fixtures.launch | 2 +- .../ide/eclipse/launch/ToDoApp-PROTOTYPE.launch | 2 +- .../ide/eclipse/launch/ToDoApp-SERVER.launch | 2 +- .../src/main/resources/webapp/welcome.html | 7 +- .../webapp/src/main/webapp/about/index.html | 81 ++++++-------------- scripts/recreate-archetype.sh | 70 +++++++++++++++++ 13 files changed, 116 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-jrebel.launch ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-jrebel.launch b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-jrebel.launch index 698333c..e45f7f0 100644 --- a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-jrebel.launch +++ b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-jrebel.launch @@ -25,7 +25,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type PROTOTYPE"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simple_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simpleapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="${jrebel_args} -Drebel.log=false -Drebel.check_class_hash=true -Drebel.packages_exclude=org.apache.isis -Dproject.root=${project_loc}/.. -Dtarget.dir=target-ide -Drebel.plugins=C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar -Disis-jrebel-plugin.packagePrefix=dom.simple,org.apache.isis.objectstore.jdo.applib -Disis-jrebel-plugin.loggingLevel=warn -XX:MaxPermSize=128m"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-no-fixtures.launch ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-no-fixtures.launch b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-no-fixtures.launch index 346fe3c..96a9a54 100644 --- a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-no-fixtures.launch +++ b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-no-fixtures.launch @@ -18,6 +18,6 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER_PROTOTYPE"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simple_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simpleapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-with-fixtures.launch ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-with-fixtures.launch b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-with-fixtures.launch index 8bf2091..dbfb2b3 100644 --- a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-with-fixtures.launch +++ b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-PROTOTYPE-with-fixtures.launch @@ -15,6 +15,6 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 -D isis.persistor.datanucleus.install-fixtures=true --type SERVER_PROTOTYPE"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simple_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simpleapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-SERVER-no-fixtures.launch ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-SERVER-no-fixtures.launch b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-SERVER-no-fixtures.launch index e09fdbb..238b5a6 100644 --- a/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-SERVER-no-fixtures.launch +++ b/example/application/simpleapp/webapp/ide/eclipse/launch/SimpleApp-SERVER-no-fixtures.launch @@ -18,6 +18,6 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simple_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="simpleapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html b/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html index b25e363..fdfd6dd 100644 --- a/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html +++ b/example/application/simpleapp/webapp/src/main/resources/webapp/welcome.html @@ -18,17 +18,17 @@ under the License. --> <p class="intro"> - <a href="http://isis.apache.org";>Apache Isis</a>™ is a framework to let you rapidly develop + <a href="http://isis.apache.org"; target="_blank">Apache Isis</a>™ is a platform to let you rapidly develop domain-driven apps in Java. <br/> <br/> This app has been generated using Isis' - <a href="http://isis.apache.org/getting-started/simple-archetype.html";>simple</a> archetype, + <a href="http://isis.apache.org/intro/getting-started/simpleapp-archetype.html"; target="_blank">SimpleApp</a> archetype, which configures Isis' most commonly used components as part of a very simple and purposefully minimal application. <br/> <br/> - The app itself consists of a single domain class, <a href="https://github.com/apache/isis/blob/master/example/application/simple%5Fwicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObject.java"; target="_blank">SimpleObject</a>, - along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%5Fwicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObjects.java"; target="_blank">SimpleObjects</a>. + The app itself consists of a single domain class, <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java"; target="_blank">SimpleObject</a>, + along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java"; target="_blank">SimpleObjects</a>. <br/> <br/> For more details, see the <a href="http://isis.apache.org/documentation.html"; target="_blank">Isis website</a>. http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/simpleapp/webapp/src/main/webapp/about/index.html ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/webapp/src/main/webapp/about/index.html b/example/application/simpleapp/webapp/src/main/webapp/about/index.html index f5d88ac..3b9ef8f 100644 --- a/example/application/simpleapp/webapp/src/main/webapp/about/index.html +++ b/example/application/simpleapp/webapp/src/main/webapp/about/index.html @@ -20,7 +20,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <title>Apache Isis™ Simple (Wicket/Restful/JDO/Shiro) App</title> + <title>Apache Isis™ SimpleApp</title> <style type="text/css"> body { @@ -57,64 +57,25 @@ th, td { <img alt="Isis Logo" src="about/images/isis-logo.png" /> <p> - <a href="http://isis.apache.org";>Apache Isis</a>™ is a framework to let you rapidly develop + <a href="http://isis.apache.org"; target="_blank">Apache Isis</a>™ is a framework to let you rapidly develop domain-driven apps in Java. This app has been generated using Isis' - <a href="http://isis.apache.org/getting-started/simple-archetype.html";>simple</a> archetype, - which configures Isis' most commonly used components as part of a very simple and purposefully minimal - application. + <a href="http://isis.apache.org/intro/getting-started/simpleapp-archetype.html"; target="_blank">SimpleApp</a> archetype, + which configures Isis to run a very simple and purposefully minimal application. <p> The app itself consists of a single domain class, - <a href="https://github.com/apache/isis/blob/master/example/application/simple%5Fwicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObject.java"; target="_blank"><tt>SimpleObject</tt></a>, - along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%5Fwicket_restful_jdo/dom/src/main/java/dom/simple/SimpleObjects.java"; target="_blank"><tt>SimpleObjects</tt></a>. + <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObject.java"; target="_blank"><tt>SimpleObject</tt></a>, + along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/dom/src/main/java/dom/simple/SimpleObjects.java"; target="_blank"><tt>SimpleObjects</tt></a>. </p> <p> Alternatively, if you'd like to start from a richer starting point, you might want to use the - <a href="http://isis.apache.org/getting-started/quickstart-archetype.html";>quickstart</a> archetype, which - generates a straightforward "todo" app. + <a href="http://isis.apache.org/intro/getting-started/todoapp-archetype.html"; target="_blank">TodoApp</a> archetype. </p> <p> - The Isis components that are configured in this app are: - </p> - - <table> - <tr> - <th>Component</th> - <th>Access URL</th> - <th>Description</th> - <th>Further info on the Isis website</th> - </tr> - <tr> - <td>Wicket Viewer</td> - <td><a href="wicket/">wicket/</a></td> - <td>Provides a generic UI for end-users, built with <a href="http://wicket.apache.org";>Apache Wicket</a>™</td> - <td><a href="http://isis.apache.org/components/viewers/wicket/about.html";>wicket viewer</a></td> - </tr> - <tr> - <td>RestfulObjects Viewer</td> - <td><a href="restful/">restful/</a></td> - <td>Provides a RESTful API conformant with the <a href="http://restfulobjects.org";>Restful Objects</a> spec</td> - <td><a href="http://isis.apache.org/components/viewers/restfulobjects/about.html";>restfulobjects viewer</a></td> - </tr> - <tr> - <td>JDO Object Store</td> - <td>n/a</td> - <td>Persists objects using JDO/DataNucleus; configured to use HSQLDB in-memory database</td> - <td><a href="http://isis.apache.org/components/objectstores/jdo/about.html";>jdo objectstore</a></td> - </tr> - <tr> - <td>Shiro Security</td> - <td>n/a</td> - <td>Provides authentication and authorization, using <a href="http://shiro.apache.org";>Apache Shiro</a>™</td> - <td><a href="http://isis.apache.org/components/security/shiro/about.html";>shiro security</a></td> - </tr> - </table> - - <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%5Fwicket_restful_jdo/webapp/src/main/webapp/WEB-INF/shiro.ini";>shiro.ini</a> file). + <a href="https://github.com/apache/isis/blob/master/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini"; target="_blank">shiro.ini</a> file). </p> </div> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-jrebel.launch ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-jrebel.launch b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-jrebel.launch index 39cabb7..14ac1bf 100644 --- a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-jrebel.launch +++ b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-jrebel.launch @@ -18,7 +18,7 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER_PROTOTYPE"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="todoapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="${jrebel_args} -Drebel.log=false -Drebel.check_class_hash=true -Drebel.packages_exclude=org.apache.isis -Dproject.root=${project_loc}/.. -Dtarget.dir=target-ide -Drebel.plugins=C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar -Disis-jrebel-plugin.packagePrefix=dom.todo,org.apache.isis.objectstore.jdo.applib -Disis-jrebel-plugin.loggingLevel=warn -XX:MaxPermSize=128m"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-with-fixtures.launch ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-with-fixtures.launch b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-with-fixtures.launch index f46805b..2e272aa 100644 --- a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-with-fixtures.launch +++ b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE-with-fixtures.launch @@ -15,6 +15,6 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 -D isis.persistor.datanucleus.install-fixtures=true --type SERVER_PROTOTYPE"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="todoapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch index bc280d9..5870cb4 100644 --- a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch +++ b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-PROTOTYPE.launch @@ -18,6 +18,6 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER_PROTOTYPE"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="todoapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch index 721d7b7..a4ad877 100644 --- a/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch +++ b/example/application/todoapp/webapp/ide/eclipse/launch/ToDoApp-SERVER.launch @@ -18,6 +18,6 @@ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--port 8080 --type SERVER"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_wicket_restful_jdo-webapp"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="todoapp-webapp"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/> </launchConfiguration> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html b/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html index 8cd6f04..1dbee0b 100644 --- a/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html +++ b/example/application/todoapp/webapp/src/main/resources/webapp/welcome.html @@ -18,16 +18,17 @@ under the License. --> <p class="intro"> - <a href="http://isis.apache.org";>Apache Isis</a>™ is a framework to let you rapidly develop + <a href="http://isis.apache.org"; target="_blank">Apache Isis</a>™ is a platform to let you rapidly develop domain-driven apps in Java. <br/> <br/> This app has been generated using Isis' - <a href="http://isis.apache.org/getting-started/quickstart-archetype.html";>quickstart</a> archetype, + <a href="http://isis.apache.org/intro/getting-started/todoapp-archetype.html"; target="_blank">TodoApp</a> archetype, which configures Isis' most commonly used components in a straightforward "todo" app. <br/> <br/> - The core domain functionality class is provided by the <a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java"; target="_blank">ToDoItem</a> domain class. + The core functionality of the app is provided by the + <a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java"; target="_blank">ToDoItem</a> domain class. Supporting services provide additional capabilities. <br/> <br/> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/example/application/todoapp/webapp/src/main/webapp/about/index.html ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/src/main/webapp/about/index.html b/example/application/todoapp/webapp/src/main/webapp/about/index.html index 6322108..f248f38 100644 --- a/example/application/todoapp/webapp/src/main/webapp/about/index.html +++ b/example/application/todoapp/webapp/src/main/webapp/about/index.html @@ -20,7 +20,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <title>Apache Isis™ QuickStart (Wicket/Restful/JDO/Shiro) App</title> + <title>Apache Isis™ TodoApp</title> <style type="text/css"> body { @@ -57,10 +57,10 @@ th, td { <img alt="Isis Logo" src="about/images/isis-logo.png" /> <p> - <a href="http://isis.apache.org";>Apache Isis</a>™ is a framework to let you rapidly develop + <a href="http://isis.apache.org"; target="_blank">Apache Isis</a>™ is a framework to let you rapidly develop domain-driven apps in Java. This app has been generated using Isis' - <a href="http://isis.apache.org/getting-started/quickstart-archetype.html";>quickstart</a> archetype, - which configures Isis' most commonly used components as part of a (quite feature rich) "todo" app. + <a href="http://isis.apache.org/intro/getting-started/todoapp-archetype.html"; target="_blank">TodoApp</a> archetype, + which configures Isis to run a (quite feature rich) "todo" app. <p> The app itself consists of a single domain class, <tt>ToDoItem</tt>, along with a number of supporting @@ -70,49 +70,12 @@ th, td { <p> To build your own app, while you could start with this todo app and remove/rename as required, you are probably better off using the extremely minimal - <a href="http://isis.apache.org/getting-started/simple-archetype.html";>simple</a> archetype. + <a href="http://isis.apache.org/intro/getting-started/simpleapp-archetype.html"; target="_blank">SimpleApp</a> archetype. </p> - - <p> - The Isis components that are configured in this app are: - </p> - - <table> - <tr> - <th>Component</th> - <th>Access URL</th> - <th>Description</th> - <th>Further info on the Isis website</th> - </tr> - <tr> - <td>Wicket Viewer</td> - <td><a href="wicket/">wicket/</a></td> - <td>Provides a generic UI for end-users, built with <a href="http://wicket.apache.org";>Apache Wicket</a>™</td> - <td><a href="http://isis.apache.org/components/viewers/wicket/about.html";>wicket viewer</a></td> - </tr> - <tr> - <td>RestfulObjects Viewer</td> - <td><a href="restful/">restful/</a></td> - <td>Provides a RESTful API conformant with the <a href="http://restfulobjects.org";>Restful Objects</a> spec</td> - <td><a href="http://isis.apache.org/components/viewers/restfulobjects/about.html";>restfulobjects viewer</a></td> - </tr> - <tr> - <td>JDO Object Store</td> - <td>n/a</td> - <td>Persists objects using JDO/DataNucleus; configured to use HSQLDB in-memory database</td> - <td><a href="http://isis.apache.org/components/objectstores/jdo/about.html";>jdo objectstore</a></td> - </tr> - <tr> - <td>Shiro Security</td> - <td>n/a</td> - <td>Provides authentication and authorization, using <a href="http://shiro.apache.org";>Apache Shiro</a>™</td> - <td><a href="http://isis.apache.org/components/security/shiro/about.html";>shiro security</a></td> - </tr> - </table> <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/quickstart%5Fwicket_restful_jdo/webapp/src/main/webapp/WEB-INF/shiro.ini";>shiro.ini</a> file). + <a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini"; target="_blank">shiro.ini</a> file). </p> <h2>App contents</h2> @@ -121,37 +84,37 @@ th, td { <ul> <li>Domain classes (todo functionality) (in <tt>dom</tt> module) <ul> - <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java";><tt>ToDoItem</tt></a> domain entity + <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java"; target="_blank"><tt>ToDoItem</tt></a> domain entity </li> - <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java";><tt>ToDoItems</tt></a> domain service (repository/factory) + <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItems.java"; target="_blank"><tt>ToDoItems</tt></a> domain service (repository/factory) </li> - <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/app/ToDoItemAnalysis.java";><tt>ToDoItemAnalysis</tt></a> application service analysing todo items + <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/app/ToDoItemAnalysis.java"; target="_blank"><tt>ToDoItemAnalysis</tt></a> application service analysing todo items </li> - <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/app/ToDoAppDashboard.java";><tt>ToDoAppDashboard</tt></a> dashboard application service + <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/dom/src/main/java/app/ToDoAppDashboard.java"; target="_blank"><tt>ToDoAppDashboard</tt></a> dashboard application service </li> </ul> </li> <li>Fixture scripts (in <tt>fixture</tt> module) <ul> - <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java";><tt>ToDoItemsFixtureService</tt></a> domain service to install fixtures at run-time + <li><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java"; target="_blank"><tt>ToDoItemsFixtureService</tt></a> domain service to install fixtures at run-time </li> </ul> </li> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml";>WEB-INF/web.xml</a></tt> (in <tt>webapp</tt> module) + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml"; target="_blank">WEB-INF/web.xml</a></tt> (in <tt>webapp</tt> module) <ul> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L98";>ResourceCachingFilter</a></tt> and <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L134";>ResourceServlet</a></tt> - filter and servlet for serving up static resources. + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L98"; target="_blank">ResourceCachingFilter</a></tt> and <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L134"; target="_blank">ResourceServlet</a></tt> - filter and servlet for serving up static resources. </li> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L174";>WicketFilter</a></tt> - filter for the wicket application, mapped to <tt>/wicket/*</tt> + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L174"; target="_blank">WicketFilter</a></tt> - filter for the wicket application, mapped to <tt>/wicket/*</tt> </li> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L223";>ResteasyBootstrap</a></tt>, - <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L240";>IsisSessionFilterForRestfulObjects</a></tt>, - <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L271";>RestfulObjectsRestEasyDispatcher</a></tt> - listeners, filters and servlets to bootstrap and map restful objects viewer to <tt>/restful/*</tt>. + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L223"; target="_blank">ResteasyBootstrap</a></tt>, + <tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L240"; target="_blank">IsisSessionFilterForRestfulObjects</a></tt>, + <tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L271"; target="_blank">RestfulObjectsRestEasyDispatcher</a></tt> - listeners, filters and servlets to bootstrap and map restful objects viewer to <tt>/restful/*</tt>. </li> - <li>commented out <tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/web.xml#L208";>IsisWebAppBootstrapper</a></tt> listener; this is NOT required unless wicket viewer config is removed + <li>commented out <tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/web.xml#L208"; target="_blank">IsisWebAppBootstrapper</a></tt> listener; this is NOT required unless wicket viewer config is removed </li> </ul> </li> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties";>WEB-INF/isis.properties</a></tt> (in <tt>webapp</tt> module) + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties"; target="_blank">WEB-INF/isis.properties</a></tt> (in <tt>webapp</tt> module) <ul> <li><tt>isis.services</tt> - specifies the two domain services described above (<tt>ToDoItems</tt> and <tt>ToDoItemsFixtureService</tt>), appearing on the menu bar in the Wicket viewer, along with a number of hidden framework-provided domain services demonstrating Isis' support for publishing, auditing and customizable error handling @@ -162,19 +125,19 @@ th, td { </li> </ul> </li> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties";>WEB-INF/persistor_datanucleus.properties</a></tt> (in <tt>webapp</tt> module) + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties"; target="_blank">WEB-INF/persistor_datanucleus.properties</a></tt> (in <tt>webapp</tt> module) <ul> <li>configuration for JDO object store </li> </ul> </li> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/webapp/src/main/webapp/WEB-INF/persistor.properties";>WEB-INF/persistor.properties</a></tt> (in <tt>webapp</tt> module) + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties"; target="_blank">WEB-INF/persistor.properties</a></tt> (in <tt>webapp</tt> module) <ul> <li>JDBC URL for JDO object store </li> </ul> </li> - <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/webapp/src/main/webapp/WEB-INF/shiro.ini";>WEB-INF/shiro.ini</a></tt> (in <tt>webapp</tt> module) + <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/todoapp/webapp/src/main/webapp/WEB-INF/shiro.ini"; target="_blank">WEB-INF/shiro.ini</a></tt> (in <tt>webapp</tt> module) <ul> <li>configuration for Shiro security </li> http://git-wip-us.apache.org/repos/asf/isis/blob/db28e306/scripts/recreate-archetype.sh ---------------------------------------------------------------------- diff --git a/scripts/recreate-archetype.sh b/scripts/recreate-archetype.sh new file mode 100644 index 0000000..5538198 --- /dev/null +++ b/scripts/recreate-archetype.sh @@ -0,0 +1,70 @@ +export ISISART=$(basename $(pwd))-archetype + +TOFIX="" + +env | grep ISISTMP >/dev/null +if [ $? -ne 0 ]; then + echo "\$ISISTMP not set!" + TOFIX="$TOFIX\nexport ISISTMP=/c/tmp" +fi + +env | grep ISISDEV >/dev/null +if [ $? -ne 0 ]; then + echo "\$ISISDEV not set!" + TOFIX="$TOFIX\nexport ISISDEV=1.7.0-SNAPSHOT" +fi + +env | grep ISISREL >/dev/null +if [ $? -ne 0 ]; then + echo "\$ISISREL not set!" + TOFIX="$TOFIX\nexport ISISDEV=1.6.0" +fi + +env | grep ISISRC >/dev/null +if [ $? -ne 0 ]; then + echo "\$ISISRC not set!" + TOFIX="$TOFIX\nexport ISISRC=RC1" +fi + +env | grep ISISPAR >/dev/null +if [ $? -ne 0 ]; then + echo "\$ISISPAR not set! (Isis parent release, usually same as ISISREL)" + TOFIX="$TOFIX\nexport ISISPAR=$ISISREL" +fi + +if [ "$TOFIX" != "" ]; then + echo -e $TOFIX + exit 1 +fi + +export ISISCPT=$(echo $ISISART | cut -d- -f2) +export ISISCPN=$(echo $ISISART | cut -d- -f1) + +# +# +# +env | grep ISIS | sort + + +echo "mvn clean ..." +mvn clean + +echo "removing other non-source files ..." +for a in .project .classpath .settings bin .idea target-ide; do /bin/find . -name $a -exec rm -r {} \;; done +/bin/find . -name "*.iml" -exec rm {} \; +/bin/find . -name "*.log" -exec rm {} \; +/bin/find . -name "pom.xml.*" -exec rm {} \; + +echo "mvn archetype:create-from-project ..." +mvn archetype:create-from-project + +echo "groovy script to update archetypes ..." +groovy ../../../scripts/updateGeneratedArchetypeSources.groovy -n $ISISCPN -v $ISISPAR + +echo "deleting old archetype ..." +git rm -rf ../../archetype/$ISISCPN +rm -rf ../../archetype/$ISISCPN + +echo "adding new archetype ..." +mv target/generated-sources/archetype ../../archetype/$ISISCPN +git add ../../archetype/$ISISCPN
