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/31 17:53:41 UTC
[12/16] git commit: ISIS-319: updating archetype wrj
ISIS-319: updating archetype wrj
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b0f15259
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b0f15259
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b0f15259
Branch: refs/heads/master
Commit: b0f152593a88a059461c7b6e2cb3ccefde624600
Parents: b3ca808
Author: Dan Haywood <da...@apache.org>
Authored: Sun Jan 27 19:31:44 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Sun Jan 27 19:31:44 2013 +0000
----------------------------------------------------------------------
.../quickstart_wicket_restful_jdo/pom.xml | 4 +-
.../main/resources/archetype-resources/dom/pom.xml | 9 +
.../dom/src/main/java/dom/todo/ToDoItem.java | 90 +++++++++--
.../dom/src/main/java/dom/todo/ToDoItems.java | 14 ++-
.../src/main/resources/archetype-resources/pom.xml | 117 ++++++++++++++-
.../archetype-resources/viewer-webapp/pom.xml | 9 +
.../src/main/jettyconsole/isis-banner.pdn | Bin 68424 -> 69658 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30645 -> 30776 bytes
.../WEB-INF/persistor_datanucleus.properties | 16 +-
.../src/main/webapp/WEB-INF/shiro.ini | 39 +++++
.../viewer-webapp/src/main/webapp/WEB-INF/web.xml | 13 ++-
.../viewer-webapp/src/main/webapp/about/index.html | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
13 files changed, 280 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
index 55832f2..0aa2e65 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>quickstart_wicket_restful_jdo-archetype</artifactId>
@@ -44,6 +44,6 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml
index d2f8f31..5f55223 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/pom.xml
@@ -110,6 +110,15 @@
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
</dependency>
+
+ <!--
+ GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
+ <dependency>
+ <groupId>com.danhaywood.isis.wicket.ui.components</groupId>
+ <artifactId>danhaywood-isis-wicket-gmap3-applib</artifactId>
+ </dependency>
+ -->
+
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
index 0075b16..8ae05a2 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItem.java
@@ -21,16 +21,21 @@
*/
package dom.todo;
-import java.util.ArrayList;
import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
import javax.jdo.JDOHelper;
+import javax.jdo.annotations.Element;
import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Persistent;
import javax.jdo.annotations.VersionStrategy;
import javax.jdo.spi.PersistenceCapable;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.annotation.AutoComplete;
+import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberGroups;
@@ -49,10 +54,12 @@ import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.util.TitleBuffer;
+import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
import org.joda.time.LocalDate;
import com.google.common.base.Objects;
+import com.google.common.collect.Lists;
@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
@@ -78,7 +85,7 @@ import com.google.common.base.Objects;
@Auditable
@AutoComplete(repository=ToDoItems.class, action="autoComplete")
@MemberGroups({"General", "Detail"})
-public class ToDoItem implements Comparable<ToDoItem> {
+public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
private static final long ONE_WEEK_IN_MILLIS = 7 * 24 * 60 * 60 * 1000L;
@@ -130,6 +137,9 @@ public class ToDoItem implements Comparable<ToDoItem> {
public void setDueBy(final LocalDate dueBy) {
this.dueBy = dueBy;
}
+ public void clearDueBy() {
+ setDueBy(null);
+ }
// proposed new value is validated before setting
public String validateDueBy(final LocalDate dueBy) {
if (dueBy == null) {
@@ -197,6 +207,25 @@ public class ToDoItem implements Comparable<ToDoItem> {
}
// }}
+
+
+ // {{ Attachment (property)
+ private Blob attachment;
+
+ @Persistent
+ @Optional
+ @MemberOrder(name="Detail", sequence = "7")
+ public Blob getAttachment() {
+ return attachment;
+ }
+
+ public void setAttachment(final Blob attachment) {
+ this.attachment = attachment;
+ }
+ // }}
+
+
+
// {{ Version (derived property)
@Hidden(where=Where.ALL_TABLES)
@@ -217,6 +246,7 @@ public class ToDoItem implements Comparable<ToDoItem> {
// }}
// {{ completed (action)
+ @Bulk
@MemberOrder(sequence = "1")
public ToDoItem completed() {
setComplete(true);
@@ -227,7 +257,6 @@ public class ToDoItem implements Comparable<ToDoItem> {
public String disableCompleted() {
return complete ? "Already completed" : null;
}
-
// }}
// {{ notYetCompleted (action)
@@ -243,18 +272,24 @@ public class ToDoItem implements Comparable<ToDoItem> {
return !complete ? "Not yet completed" : null;
}
// }}
+
+
+
// {{ dependencies (Collection)
- private List<ToDoItem> dependencies = new ArrayList<ToDoItem>();
+ @Persistent(table="TODO_DEPENDENCIES")
+ @Join(column="DEPENDING_TODO_ID")
+ @Element(column="DEPENDENT_TODO_ID")
+ private SortedSet<ToDoItem> dependencies = new TreeSet<ToDoItem>();
@Disabled
@MemberOrder(sequence = "1")
@Resolve(Type.EAGERLY)
- public List<ToDoItem> getDependencies() {
+ public SortedSet<ToDoItem> getDependencies() {
return dependencies;
}
- public void setDependencies(final List<ToDoItem> dependencies) {
+ public void setDependencies(final SortedSet<ToDoItem> dependencies) {
this.dependencies = dependencies;
}
// }}
@@ -292,7 +327,7 @@ public class ToDoItem implements Comparable<ToDoItem> {
return null;
}
public List<ToDoItem> choices0Remove() {
- return getDependencies();
+ return Lists.newArrayList(getDependencies());
}
// }}
@@ -304,8 +339,24 @@ public class ToDoItem implements Comparable<ToDoItem> {
// nb: method is not called "clone()" is inherited by java.lang.Object and
// (a) has different semantics and (b) is in any case automatically ignored
// by the framework
- public ToDoItem duplicate() {
- return toDoItems.newToDo(getDescription() + " - Copy", getCategory(), getDueBy());
+ public ToDoItem duplicate(
+ @Named("Description")
+ String description,
+ @Named("Category")
+ ToDoItem.Category category,
+ @Named("Due by")
+ @Optional
+ LocalDate dueBy) {
+ return toDoItems.newToDo(description, category, dueBy);
+ }
+ public String default0Duplicate() {
+ return getDescription() + " - Copy";
+ }
+ public Category default1Duplicate() {
+ return getCategory();
+ }
+ public LocalDate default2Duplicate() {
+ return getDueBy();
}
// }}
@@ -325,7 +376,7 @@ public class ToDoItem implements Comparable<ToDoItem> {
// {{ SimilarItems (derived collection)
@MemberOrder(sequence = "5")
@NotPersisted
- @Resolve(Type.EAGERLY)
+ @Resolve(Type.LAZILY)
public List<ToDoItem> getSimilarItems() {
return toDoItems.similarTo(this);
}
@@ -338,7 +389,6 @@ public class ToDoItem implements Comparable<ToDoItem> {
/**
* by complete flag, then due by date, then description
*/
- @Programmatic
// exclude from the framework's metamodel
@Override
public int compareTo(final ToDoItem other) {
@@ -359,7 +409,6 @@ public class ToDoItem implements Comparable<ToDoItem> {
}
return getDueBy().compareTo(getDueBy());
}
-
// }}
// {{ helpers
@@ -410,8 +459,6 @@ public class ToDoItem implements Comparable<ToDoItem> {
};
}
-
-
// }}
// {{ injected: DomainObjectContainer
@@ -431,6 +478,19 @@ public class ToDoItem implements Comparable<ToDoItem> {
}
// }}
-
+// GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
+// // {{
+// @Persistent
+// private Location location;
+//
+// @MemberOrder(name="Detail", sequence = "10")
+// @Optional
+// public Location getLocation() {
+// return location;
+// }
+// public void setLocation(Location location) {
+// this.location = location;
+// }
+// // }}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
index b0e06e6..9a8b221 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/dom/src/main/java/dom/todo/ToDoItems.java
@@ -114,11 +114,23 @@ public class ToDoItems extends AbstractFactoryAndRepository {
toDoItem.setCategory(category);
toDoItem.setOwnedBy(userName);
toDoItem.setDueBy(dueBy);
+
+ //
+ // GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
+ // toDoItem.setLocation(
+ // new Location(51.5172+random(-0.05, +0.05), 0.1182 + random(-0.05, +0.05)));
+ //
+
persist(toDoItem);
return toDoItem;
}
+
+ private static double random(double from, double to) {
+ return Math.random() * (to-from) + from;
+ }
// }}
+
// {{ similarTo (action)
@NotInServiceMenu
@@ -135,7 +147,6 @@ public class ToDoItems extends AbstractFactoryAndRepository {
// }}
-
// {{ autoComplete (hidden)
@Hidden
public List<ToDoItem> autoComplete(final String description) {
@@ -158,4 +169,5 @@ public class ToDoItems extends AbstractFactoryAndRepository {
}
// }}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/pom.xml
index ed40b21..3392c37 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/pom.xml
@@ -28,11 +28,11 @@
<packaging>pom</packaging>
<properties>
- <isis.version>1.0.0</isis.version>
+ <isis.version>1.1.0</isis.version>
<isis-objectstore-jdo.version>1.0.0</isis-objectstore-jdo.version>
- <isis-viewer-wicket.version>1.0.0</isis-viewer-wicket.version>
+ <isis-viewer-wicket.version>1.1.0</isis-viewer-wicket.version>
<isis-viewer-restfulobjects.version>1.0.0</isis-viewer-restfulobjects.version>
- <isis-security-shiro.version>1.0.0</isis-security-shiro.version>
+ <isis-security-shiro.version>1.1.0</isis-security-shiro.version>
</properties>
<repositories>
@@ -132,6 +132,100 @@
<artifactId>jetty-console-maven-plugin</artifactId>
<version>1.43</version>
</plugin>
+
+ <!-- Apache Release Audit Tool -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.8</version>
+ <configuration>
+ <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
+ <excludeSubProjects>true</excludeSubProjects>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/target-ide/**</exclude>
+
+ <exclude>**/*.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/*.launch</exclude>
+ <exclude>src/site/resources/ide/eclipse/**</exclude>
+
+ <exclude>**/*.gitignore</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.pdn</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>**/*.json</exclude>
+ <exclude>**/*.min.js</exclude>
+ <exclude>**/*.js</exclude>
+ </excludes>
+ <licenses>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>AL2</licenseFamilyCategory>
+ <licenseFamilyName>Apache License 2.0</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
+ </patterns>
+ </license>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>JQRY</licenseFamilyCategory>
+ <licenseFamilyName>MIT</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern>
+ </patterns>
+ </license>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>JMOCK</licenseFamilyCategory>
+ <licenseFamilyName>JMock</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Copyright (c) 2000-2007, jMock.org</pattern>
+ </patterns>
+ </license>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>DOCBK</licenseFamilyCategory>
+ <licenseFamilyName>DocBook 4.5</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Permission to copy in any form is granted for use</pattern>
+ <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern>
+ <pattern>is hereby granted in perpetuity, provided that the above copyright</pattern>
+ <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern>
+ <pattern>XML Catalog data for DocBook XML V4.5</pattern>
+ <pattern>DocBook additional general entities V4.5</pattern>
+ <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern>
+ </patterns>
+ </license>
+ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
+ <licenseFamilyCategory>W3C</licenseFamilyCategory>
+ <licenseFamilyName>XHTML</licenseFamilyName>
+ <notes />
+ <patterns>
+ <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern>
+ </patterns>
+ </license>
+ </licenses>
+ <licenseFamilies>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>Apache License 2.0</familyName>
+ </licenseFamily>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>MIT</familyName>
+ </licenseFamily>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>JMock</familyName>
+ </licenseFamily>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>DocBook 4.5</familyName>
+ </licenseFamily>
+ <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
+ <familyName>XHTML</familyName>
+ </licenseFamily>
+ </licenseFamilies>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -189,25 +283,23 @@
<scope>import</scope>
</dependency>
+
<!-- this project's own modules -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${rootArtifactId}-dom</artifactId>
<version>${version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${rootArtifactId}-fixture</artifactId>
<version>${version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${rootArtifactId}-objstore-jdo</artifactId>
<version>${version}</version>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${rootArtifactId}-webapp</artifactId>
@@ -215,8 +307,21 @@
</dependency>
+ <!-- 3rd party extensions -->
+ <!--
+ GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
+ <dependency>
+ <groupId>com.danhaywood.isis.wicket.ui.components</groupId>
+ <artifactId>danhaywood-isis-wicket-gmap3</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ -->
+
</dependencies>
</dependencyManagement>
+
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/pom.xml
index fb371df..b70e156 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/pom.xml
@@ -165,6 +165,15 @@
<artifactId>log4jdbc-remix</artifactId>
</dependency>
+ <!-- 3rd party dependency -->
+ <!--
+ GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
+ <dependency>
+ <groupId>com.danhaywood.isis.wicket.ui.components</groupId>
+ <artifactId>danhaywood-isis-wicket-gmap3-ui</artifactId>
+ </dependency>
+ -->
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.pdn
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.pdn b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.pdn
index a0b5d06..37543c9 100644
Binary files a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.pdn and b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.pdn differ
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.png
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.png b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.png
index d3286e0..cd9ecfe 100644
Binary files a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.png and b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/jettyconsole/isis-banner.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index 14f8038..91f4719 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -46,18 +46,18 @@ ${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${sym
${symbol_pound}
${symbol_pound} HSQLDB in-memory
${symbol_pound}
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
+${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
${symbol_pound}
${symbol_pound} HSQLDB in-memory (using log4jdbc-remix)
${symbol_pound}
-${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:mem:test
-${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:mem:test
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
index b40ba5e..a643d86 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/shiro.ini
@@ -17,6 +17,44 @@
# under the License.
#
+[main]
+
+contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
+contextFactory.url = ldap://localhost:10389
+contextFactory.authenticationMechanism = CRAM-MD5
+contextFactory.systemAuthenticationMechanism = simple
+contextFactory.systemUsername = uid=admin,ou=system
+contextFactory.systemPassword = secret
+
+ldapRealm = org.apache.isis.security.shiro.IsisLdapRealm
+ldapRealm.contextFactory = $contextFactory
+
+ldapRealm.searchBase = ou=groups,o=mojo
+ldapRealm.groupObjectClass = groupOfUniqueNames
+ldapRealm.uniqueMemberAttribute = uniqueMember
+ldapRealm.uniqueMemberAttributeValueTemplate = uid={0}
+
+# optional mapping from physical groups to logical application roles
+#ldapRealm.rolesByGroup = \
+# LDN_USERS: user_role,\
+# NYK_USERS: user_role,\
+# HKG_USERS: user_role,\
+# GLOBAL_ADMIN: admin_role,\
+# DEMOS: self-install_role
+
+ldapRealm.permissionsByRole=\
+ user_role = *:ToDoItemsJdo:*:*,\
+ *:ToDoItem:*:*; \
+ self-install_role = *:ToDoItemsFixturesService:install:* ; \
+ admin_role = *
+
+# to use ldap...
+# (see docs for details of how to setup users/groups in Apache Directory Studio).
+#securityManager.realms = $ldapRealm
+
+# to use .ini file
+securityManager.realms = $iniRealm
+
# -----------------------------------------------------------------------------
@@ -29,6 +67,7 @@
[users]
# user = password, role1, role2, role3, ...
+
sven = pass, admin_role
dick = pass, user_role, self-install_role
bob = pass, user_role, self-install_role
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/web.xml b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/web.xml
index 6cea600..b8fec11 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/WEB-INF/web.xml
@@ -149,6 +149,10 @@
<param-name>applicationClassName</param-name>
<param-value>app.QuickStartApplication</param-value>
</init-param>
+ <init-param>
+ <param-name>GOOGLE_MAPS_API_KEY</param-name>
+ <param-value>AIzaSyDdSqWOwFXOG6VDe8EAuig5UXfPL4reukU</param-value>
+ </init-param>
</filter>
<filter-mapping>
@@ -160,7 +164,14 @@
</filter-mapping>
-
+ <context-param>
+ <param-name>configuration</param-name>
+ <!--
+ <param-value>deployment</param-value>
+ -->
+ <param-value>development</param-value>
+ </context-param>
+
<!--
-
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/about/index.html b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/about/index.html
index e40efa1..d4dbffc 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/about/index.html
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/viewer-webapp/src/main/webapp/about/index.html
@@ -23,7 +23,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
- <title>Apache Isis QuickStart (Wicket/Restful/JDO/Shiro)</title>
+ <title>Apache Isis™ QuickStart (Wicket/Restful/JDO/Shiro)</title>
<style type="text/css">
body {
http://git-wip-us.apache.org/repos/asf/isis/blob/b0f15259/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties b/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
index de5cfb9..965c7dc 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Mon Jan 07 08:58:51 GMT 2013
+#Sun Jan 27 19:24:26 GMT 2013
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it