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 2013/01/04 16:14:59 UTC
[4/6] git commit: ISIS-290: updating quickstart_wrj example app
ISIS-290: updating quickstart_wrj example app
- also fix to updateGeneratedArchetypreSources.groovy to fix issue with incorrect editing of .launch files
- also fix to webapp's index.html to fix a link in the generated app's welcome page
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/78820f00
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/78820f00
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/78820f00
Branch: refs/heads/master
Commit: 78820f008d050a871d72245db7cdab11b56d32ee
Parents: f81b824
Author: Dan Haywood <da...@apache.org>
Authored: Fri Jan 4 12:13:51 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Jan 4 12:13:51 2013 +0000
----------------------------------------------------------------------
.../ide/eclipse/launch/viewer-scimpi-tck.launch | 16 -----
.../core/runtime/installer-registry.properties | 16 +++--
.../ide/eclipse/launch/onlinedemo-webapp.launch | 19 ------
.../src/main/jettyconsole/isis-banner.pdn | Bin 66390 -> 66892 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 29047 -> 30003 bytes
.../src/main/resources/app/welcome.html | 2 +-
.../src/main/webapp/WEB-INF/isis.properties | 2 -
.../src/main/webapp/WEB-INF/shiro.ini | 5 +-
.../viewer-webapp/src/main/webapp/WEB-INF/web.xml | 16 ++++--
.../viewer-webapp/src/main/webapp/about/index.html | 46 +++++++++------
...ckstart_wicket_restful_jdo-viewer-webapp.launch | 2 +-
.../src/main/resources/app/welcome.html | 2 +-
scripts/updateGeneratedArchetypeSources.groovy | 2 +-
13 files changed, 54 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/component/viewer/scimpi/tck/ide/eclipse/launch/viewer-scimpi-tck.launch
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/tck/ide/eclipse/launch/viewer-scimpi-tck.launch b/component/viewer/scimpi/tck/ide/eclipse/launch/viewer-scimpi-tck.launch
deleted file mode 100644
index 90be469..0000000
--- a/component/viewer/scimpi/tck/ide/eclipse/launch/viewer-scimpi-tck.launch
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<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.PROJECT_ATTR" value="org.apache.isis.viewer.scimpi-tck"/>
-<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/78820f00/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties b/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
index 3f3509e..44491fe 100644
--- a/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
+++ b/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties
@@ -27,17 +27,19 @@ org.apache.isis.core.progmodel.facetdecorators.help.file.HelpFacetDecoratorUsing
############################################################
org.apache.isis.core.security.authentication.BypassAuthenticationManagerInstaller # "bypass"
-org.apache.isis.core.security.authorization.BypassAuthorizationManagerInstaller # "bypass"
+org.apache.isis.core.security.authorization.BypassAuthorizationManagerInstaller # "bypass"
-org.apache.isis.security.file.authentication.FileAuthenticationManagerInstaller # "file"
-org.apache.isis.security.file.authorization.FileAuthorizationManagerInstaller # "file"
+org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller # "shiro"
+org.apache.isis.security.shiro.authorization.ShiroAuthorizationManagerInstaller # "shiro"
-org.apache.isis.security.ldap.authorization.LdapAuthorizationManagerInstaller # "ldap"
-org.apache.isis.security.ldap.authentication.LdapAuthenticationManagerInstaller # "ldap"
+org.apache.isis.security.file.authentication.FileAuthenticationManagerInstaller # "file"
+org.apache.isis.security.file.authorization.FileAuthorizationManagerInstaller # "file"
-org.apache.isis.security.sql.authorization.SqlAuthorizationManagerInstaller # "sql"
-org.apache.isis.security.sql.authentication.SqlAuthenticationManagerInstaller # "sql"
+org.apache.isis.security.ldap.authorization.LdapAuthorizationManagerInstaller # "ldap"
+org.apache.isis.security.ldap.authentication.LdapAuthenticationManagerInstaller # "ldap"
+org.apache.isis.security.sql.authorization.SqlAuthorizationManagerInstaller # "sql"
+org.apache.isis.security.sql.authentication.SqlAuthenticationManagerInstaller # "sql"
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/application/onlinedemo/webapp/ide/eclipse/launch/onlinedemo-webapp.launch
----------------------------------------------------------------------
diff --git a/example/application/onlinedemo/webapp/ide/eclipse/launch/onlinedemo-webapp.launch b/example/application/onlinedemo/webapp/ide/eclipse/launch/onlinedemo-webapp.launch
deleted file mode 100644
index 7f8be91..0000000
--- a/example/application/onlinedemo/webapp/ide/eclipse/launch/onlinedemo-webapp.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/onlinedemo-webapp"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<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.PROJECT_ATTR" value="onlinedemo-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/78820f00/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.pdn
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.pdn b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.pdn
index 1ce228c..141ba11 100644
Binary files a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.pdn and b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.pdn differ
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.png b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.png
index 1f2811f..7085398 100644
Binary files a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.png and b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/jettyconsole/isis-banner.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/resources/app/welcome.html
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/resources/app/welcome.html b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/resources/app/welcome.html
index 6188923..81ffeab 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/resources/app/welcome.html
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/resources/app/welcome.html
@@ -1,5 +1,5 @@
<p class="intro">
-This is a <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">single-class</a> domain application, configured to run with Isis' wicket viewer and the JDO/DataNucleus objectstore.
+This is a <a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java" target="_blank">single-class</a> domain application, configured to run with Isis' wicket viewer and the JDO/DataNucleus objectstore.
</p>
<br/>
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/isis.properties
index 4556efd..5fb6717 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/isis.properties
@@ -80,11 +80,9 @@ isis.persistor=datanucleus
#
# default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
-
#isis.authentication=bypass
isis.authentication=org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller
-
#
# configure authorization mechanism to use
#
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
index 3aac276..4703d3e 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
@@ -48,7 +48,7 @@ guest = guest, guest
admin = *
user = *:ToDoItemsJdo:*:*,\
- *:ToDoItemJdo:*:*,\
+ *:ToDoItem:*:*,\
*:ToDoItemsFixturesService:install:*
guest = *:ToDoItemsJdo:notYetComplete:*,\
*:ToDoItemsJdo:complete:*,\
@@ -57,4 +57,5 @@ guest = *:ToDoItemsJdo:notYetComplete:*,\
*:ToDoItem:*:r,\
*:ToDoItem:completed:*,\
*:ToDoItem:notYetCompleted:r
-
\ No newline at end of file
+
+### packageName:className:memberName:r,w
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml
index 7c82c7c..0c98d1a 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml
@@ -74,7 +74,6 @@
</context-param>
-->
-
<filter>
<filter-name>AboutPageFilter</filter-name>
<filter-class>app.AboutPageFilter</filter-class>
@@ -85,7 +84,6 @@
</filter-mapping>
-
<!-- cache static resources for 1 day -->
<filter>
<filter-name>ResourceCachingFilter</filter-name>
@@ -168,6 +166,9 @@
<filter-mapping>
<filter-name>WicketFilter</filter-name>
<url-pattern>/wicket/*</url-pattern>
+ <!--
+ <url-pattern>/*</url-pattern>
+ -->
</filter-mapping>
@@ -208,6 +209,12 @@
<param-name>javax.ws.rs.Application</param-name>
<param-value>org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplication</param-value>
</context-param>
+
+ <context-param>
+ <param-name>resteasy.servlet.mapping.prefix</param-name>
+ <param-value>/restful/</param-value>
+ </context-param>
+
<!-- authenticate user, set up an Isis session -->
<filter>
@@ -231,16 +238,15 @@
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
</filter-mapping>
-
<servlet>
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- <url-pattern>/</url-pattern>
+ <url-pattern>/restful/*</url-pattern>
</servlet-mapping>
-
+
</web-app>
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/index.html b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/index.html
index 31a5499..f22d516 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/index.html
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>Apache Isis QuickStart (Wicket/Restful/JDO)</title>
+ <title>Apache Isis QuickStart (Wicket/Restful/JDO/Shiro)</title>
<style type="text/css">
body {
@@ -38,7 +38,7 @@ th, td {
<div id="wrapper">
<img alt="Isis Logo" src="about/images/isis-logo.png" />
- <p>This app has been generated by the <a href="http://isis.apache.org/getting-started/quickstart-archetype.html">quickstart</a> (wicket/restful/jdo) archetype for
+ <p>This app has been generated by the <a href="http://isis.apache.org/getting-started/quickstart-archetype.html">quickstart</a> (wicket/restful/jdo/shiro) archetype for
<a href="http://isis.apache.org">Apache Isis</a>™, a framework to let you rapidly develop
domain-driven apps in Java.</p>
@@ -51,32 +51,32 @@ th, td {
<tr>
<th>Component</th>
<th>Access URL</th>
- <th>HTTP Accept header</th>
<th>Description</th>
- <th>Further info on the Isis site</th>
+ <th>Further info on the Isis website</th>
</tr>
<tr>
<td>Wicket Viewer</td>
<td><a href="/wicket">/wicket</a></td>
- <td>[any]</td>
- <td>Provides a generic UI for end-users</td>
- <td><a href="http://isis.apache.org/components/viewers/wicket/about.html">wicket viewer</a> page</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 rowspan="2">RestfulObjects Viewer</td>
- <td><a href="/">/</a></td><td><tt>application/json</tt></td>
- <td rowspan="2">Provides a RESTful API conformant with the <a href="http://restfulobjects.org">Restful Objects</a> spec</td>
- <td rowspan="2"><a href="http://isis.apache.org/components/viewers/restfulobjects/about.html">restfulobjects viewer</a> page</td>
- </tr>
- <tr>
- <td><a href="/services">/services</a></td><td>[any]</td>
+ <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>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> page</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>
@@ -118,7 +118,7 @@ th, td {
</li>
<li><tt>WicketFilter</tt> - filter for the wicket application, mapped to <tt>/wicket/*</tt>
</li>
- <li><tt>ResteasyBootstrap</tt>, <tt>IsisSessionFilterForRestfulObjects</tt>, <tt>RestfulObjectsRestEasyDispatcher</tt> - listeners, filters and servlets to bootstrap and map restful objects viewer to <tt>/</tt>.
+ <li><tt>ResteasyBootstrap</tt>, <tt>IsisSessionFilterForRestfulObjects</tt>, <tt>RestfulObjectsRestEasyDispatcher</tt> - listeners, filters and servlets to bootstrap and map restful objects viewer to <tt>/restful/*</tt>.
</li>
<li>commented out <tt>IsisWebAppBootstrapper</tt> listener; this is NOT required unless wicket viewer config is removed
</li>
@@ -130,7 +130,7 @@ th, td {
</li>
<li><tt>isis.persistor</tt> - specifies to use the JDO object store
</li>
- <li><tt>isis.authentication</tt> - specifies to use <tt>bypass</tt> authentication (ie effectively disables)
+ <li><tt>isis.authentication</tt> and <tt>isis.authorization</tt> - security mechanism to use (<tt>bypass</tt> effectively disables)
</li>
</ul>
</li>
@@ -140,14 +140,22 @@ th, td {
</li>
</ul>
</li>
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini">WEB-INF/shiro.ini</a></tt> (in <tt>viewer-webapp</tt> module)</a>
+ <ul>
+ <li>configuration for Shiro security
+ </li>
+ </ul>
+ </li>
</ul>
<h2>Next steps</h2>
<p>Use the following as a check-list for refactoring towards your own application:
<ul>
+ <li>Enable <tt>shiro</tt> authentication and authorization (in <tt>isis.properties</tt>) and experiment with users, roles and permissions (in <tt>shiro.ini</tt>)
+ </li>
<li>Remove the <tt>AboutPageFilter</tt> from <tt>web.xml</tt>; this filter redirects to this page, which you are unlikely to want to keep
</li>
- <li>Refactor the <tt>ToDoItem</tt>, <tt>ToDoItems</tt> and <tt>ToDoItemsJdo</tt> towards your own application's functionality; obviously you are likely to introduce many more classes and services
+ <li>Refactor the <tt>ToDoItem</tt>, <tt>ToDoItems</tt> and <tt>ToDoItemsJdo</tt> towards your own application's functionality; obviously you are likely to introduce many more classes and services
</li>
<li>Reconfigure <tt>persistor_datanucleus.properties</tt> to specify the JDBC URL to the database you wish to work with; if necessary also update the <tt>pom.xml</tt> in the <tt>viewer-webapp</tt> module to add the JDBC driver to the classpath
</li>
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-webapp.launch
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-webapp.launch b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-webapp.launch
index e11766b..7200ec3 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-webapp.launch
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-webapp.launch
@@ -17,6 +17,6 @@
<booleanAttribute value="true" key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS"/>
<stringAttribute value="org.eclipse.m2e.launchconfig.classpathProvider" key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"/>
<stringAttribute value="org.apache.isis.WebServer" key="org.eclipse.jdt.launching.MAIN_TYPE"/>
- <stringAttribute value="quickstart_wicket_restful_jdo-viewer-webapp" key="org.eclipse.jdt.launching.PROJECT_ATTR"/>
+ <stringAttribute value="${rootArtifactId}-viewer-webapp" key="org.eclipse.jdt.launching.PROJECT_ATTR"/>
<stringAttribute value="org.eclipse.m2e.launchconfig.sourcepathProvider" key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER"/>
</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/resources/app/welcome.html
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/resources/app/welcome.html b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/resources/app/welcome.html
index bd17e28..a288dec 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/resources/app/welcome.html
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/resources/app/welcome.html
@@ -2,7 +2,7 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<p class="intro">
-This is a <a href="https://github.com/apache/isis/blob/master/example/application/${parentArtifactId}/dom/src/main/java/dom/todo/ToDoItem.java" target="_blank">single-class</a> domain application, configured to run with Isis' wicket viewer and the JDO/DataNucleus objectstore.
+This is a <a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java" target="_blank">single-class</a> domain application, configured to run with Isis' wicket viewer and the JDO/DataNucleus objectstore.
</p>
<br/>
http://git-wip-us.apache.org/repos/asf/isis/blob/78820f00/scripts/updateGeneratedArchetypeSources.groovy
----------------------------------------------------------------------
diff --git a/scripts/updateGeneratedArchetypeSources.groovy b/scripts/updateGeneratedArchetypeSources.groovy
index 56f91e7..80c0434 100644
--- a/scripts/updateGeneratedArchetypeSources.groovy
+++ b/scripts/updateGeneratedArchetypeSources.groovy
@@ -191,7 +191,7 @@ new File(ROOT+"archetype-resources/").eachDirRecurse() { dir ->
def launchXml = new XmlSlurper().parseText(launchFile.text)
def projectAttr = launchXml.stringAttribute.find { it.@key=="org.eclipse.jdt.launching.PROJECT_ATTR" }
String oldValue=projectAttr.@value
- def newValue = oldValue.replaceAll("quickstart-","\\\${rootArtifactId}-")
+ def newValue = oldValue.replaceAll("quickstart[^-]*-","\\\${rootArtifactId}-")
projectAttr.@value=newValue
launchFile.text = """#set( \$symbol_pound = '#' )