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/03 20:14:34 UTC
[2/7] ISIS-293: combining ro and wicket viewer...
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.css
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.css b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.css
deleted file mode 100644
index eaeea17..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.js
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.js b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.js
deleted file mode 100644
index 5f2c500..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/app.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var util = namespace('org.apache.isis.viewer.json.jqmobile.util');
-var generic = namespace('org.apache.isis.viewer.json.jqmobile.generic');
-
-$(function() {
- $("#settings-theme input").click(function(e) {
-
- var theme = e.currentTarget.value;
- $("div[data-role='page']").each( function() {
- $(this).attr("data-theme", e);
- // TODO: how refresh?
- });
- });
-
- $(document).bind("pagebeforechange", generic.submitRenderAndNavigate);
-
- // if user manually refreshes page for domain object, then re-retrieve
- var locationHref = location.href;
- if(locationHref.indexOf("genericDomainObjectView") != -1) {
- var urlHref = generic.extract(locationHref);
- generic.submitAndRender(urlHref, "pop");
- } else {
- $.mobile.changePage($("#home"))
- }
-});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/generic.js
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/generic.js b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/generic.js
deleted file mode 100644
index 71b38d8..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/generic.js
+++ /dev/null
@@ -1,226 +0,0 @@
-var util = namespace('org.apache.isis.viewer.json.jqmobile.util');
-var generic = namespace('org.apache.isis.viewer.json.jqmobile.generic');
-
-generic.itemLinks = function(jsonItems) {
- var items = $.map(jsonItems, function(value, i) {
- return {
- "hrefUrlEncoded" : util.urlencode(value.href),
- "title" : value.title,
- "href" : value.href
- }
- })
- return items
-}
-
-generic.extract = function(urlHref) {
- // does it match: foobar.html?dataUrl=xxx; if so, then return xxx
- var matches = /.*?dataUrl=(.*)/.exec(urlHref)
- var url = matches && matches[1]
- if(url) {
- return util.urldecode(url)
- }
- // does it simply match foobar.html; if so, then return null
- if ( /.*\.html$/.test(urlHref)) {
- return null
- }
- // simply return the URL, assuming it is the data url we need to get.
- return urlHref
-}
-
-generic.returnTypeFor = function(memberItem) {
- var detailsJson = util.grepAndFollowLink(memberItem.links, "details")
- if (!detailsJson) {
- return null;
- }
- var describedByJson = util.grepAndFollowLink(detailsJson.links, "describedby")
- if (!describedByJson) {
- return null;
- }
- var returnTypeLink = util.grepLink(describedByJson.links, "returntype")
- return returnTypeLink? returnTypeLink.href : null;
-}
-
-generic.dataTypeFor = function(memberItem) {
- var returnType = generic.returnTypeFor(memberItem);
- if(returnType.endsWith("boolean")) return "boolean"
- return "string"
-}
-
-generic.pageAndOptions = function(page, view, dataUrl, transition) {
- var pageAndOptions = {
- "page": page,
- "options": {
- "dataUrl": "#" + view + "?dataUrl=" + util.urlencode(dataUrl),
- "allowSamePageTransition": true,
- "transition": transition
- }
- }
- return pageAndOptions
-}
-
-generic.handleDomainObjectRepresentation = function(urlHref, pageChangeData, json, xhr) {
-
- var page = $("#genericDomainObjectView");
- var header = page.children(":jqmData(role=header)");
- var content = page.children(":jqmData(role=content)");
-
- header.find("h1").html(json.title);
-
- // value properties
- var valueProperties = json.members.filter(function(item) {
- return item.memberType === "property" && item.value && !item.value.href;
- });
-
- valueProperties = $.map( valueProperties, function(value, i) {
- var dataType = generic.dataTypeFor(value)
- return {
- "id": value.id,
- "value": value.value,
- "dataTypeIsString": dataType === "string",
- "dataTypeIsBoolean": dataType === "boolean"
- }
- } );
-
- var valuePropertiesDiv = page.children(":jqmData(role=content)").find(".valueProperties");
- var valuePropertiesTemplateDiv = page.children(".valueProperties-tmpl");
- util.applyTemplateDiv(valueProperties, valuePropertiesDiv, valuePropertiesTemplateDiv);
-
-
- // reference properties
- var referenceProperties = json.members.filter(function(item) {
- return item.memberType === "property" && item.value && item.value.href;
- });
- var referencePropertiesList = page.children(":jqmData(role=content)").find(".referenceProperties");
- var referencePropertiesTemplateDiv = page.children(".referenceProperties-tmpl");
- util.applyTemplateDiv(referenceProperties, referencePropertiesList, referencePropertiesTemplateDiv);
-
- var collections = json.members.filter(function(item) {
- return item.memberType === "collection";
- }).map(function(value, i) {
- var href = util.grepLink(value.links, "details").href
- return {
- "hrefUrlEncoded" : util.urlencode(value.links[0].href),
- "id" : value.id,
- "href" : value.links[0].href
- }
- });
-
- // collections
- var collectionsList = page.children(":jqmData(role=content)").find(".collections");
- var collectionsTemplateDiv = page.children(".collections-tmpl");
- util.applyTemplateDiv(collections, collectionsList, collectionsTemplateDiv);
-
- page.page();
- content.find( ":jqmData(role=listview)" ).listview("refresh");
- page.trigger("create");
-
- return generic.pageAndOptions(page, "genericDomainObjectView", urlHref)
-}
-
-
-generic.handleListRepresentation = function(urlHref, pageChangeData, json, xhr) {
-
- var page = $("#genericListView");
- var header = page.children(":jqmData(role=header)");
- var content = page.children(":jqmData(role=content)");
-
- var items = generic.itemLinks(json.value)
-
- header.find("h1").html("Objects");
-
- var div = page.find("ul");
- var templateDiv = page.find(".tmpl");
-
- util.applyTemplateDiv(items, div, templateDiv);
-
- page.page();
- content.find( ":jqmData(role=listview)" ).listview("refresh");
- page.trigger("create");
-
- return generic.pageAndOptions(page, "genericListView", urlHref)
-}
-
-generic.handleObjectCollectionRepresentation = function(urlHref, pageChangeData, json, xhr) {
-
- var page = $("#genericObjectCollectionView");
- var header = page.children(":jqmData(role=header)");
- var content = page.children(":jqmData(role=content)");
-
- var items = generic.itemLinks(json.value)
-
- var parentTitle = util.grepLink(json.links, "up").title
-
- var collectionId = json.id;
- header.find("h1").html(collectionId + " for " + parentTitle);
-
- var div = page.find("ul");
- var templateDiv = page.find(".tmpl");
- util.applyTemplateDiv(items, div, templateDiv);
-
- page.page();
- content.find( ":jqmData(role=listview)" ).listview("refresh");
- page.trigger("create");
-
- return generic.pageAndOptions(page, "genericObjectCollectionView", urlHref, "slideup")
-}
-
-
-generic.actionResultHandlers = {
- "object": generic.handleDomainObjectRepresentation,
- "list": generic.handleListRepresentation
-}
-
-generic.handleActionResultRepresentation = function(urlHref, pageChangeData, json, xhr) {
- var resultType = json.resulttype
- var handler = generic.actionResultHandlers[resultType];
- if(!handler) {
- alert("unable to handle result type")
- return;
- }
- return handler(urlHref, pageChangeData, json.result, xhr)
-}
-
-generic.handlers = {
- "application/json;profile=\"urn:org.restfulobjects/domainobject\"": generic.handleDomainObjectRepresentation,
- "application/json; profile=\"urn:org.restfulobjects/domainobject\"": generic.handleDomainObjectRepresentation,
- "application/json;profile=\"urn:org.restfulobjects/list\"": generic.handleListRepresentation,
- "application/json; profile=\"urn:org.restfulobjects/list\"": generic.handleListRepresentation,
- "application/json;profile=\"urn:org.restfulobjects/objectcollection\"": generic.handleObjectCollectionRepresentation,
- "application/json; profile=\"urn:org.restfulobjects/objectcollection\"": generic.handleObjectCollectionRepresentation,
- "application/json;profile=\"urn:org.restfulobjects/actionresult\"": generic.handleActionResultRepresentation,
- "application/json; profile=\"urn:org.restfulobjects/actionresult\"": generic.handleActionResultRepresentation
-}
-
-generic.submitAndRender = function(urlHref, pageChangeData) {
- $.ajax({
- url : urlHref,
- dataType : 'json',
- success : function(json, str, xhr) {
- var contentType = xhr.getResponseHeader("Content-Type");
- var handler = generic.handlers[contentType];
- if(!handler) {
- alert("unable to handle response")
- return;
- }
- var pageAndOptions = handler(urlHref, pageChangeData, json, xhr)
-
- $.mobile.changePage(pageAndOptions.page, pageAndOptions.options);
- }
- })
-}
-
-generic.submitRenderAndNavigate = function(e, pageChangeData) {
- if (typeof pageChangeData.toPage !== "string") {
- return;
- }
-
- var url = $.mobile.path.parseUrl(pageChangeData.toPage)
- var urlHref = generic.extract(url.href)
- if(!urlHref) {
- return;
- }
-
- generic.submitAndRender(urlHref, pageChangeData);
- e.preventDefault();
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/index.html
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/index.html b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/index.html
deleted file mode 100644
index 59f99d4..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/index.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="initial-scale=1, width=device-width, target-densitydpi=device-dpi"/>
-
-<title>Apache Isis Online Demo</title>
-
-<link rel="stylesheet" href="../jquery.mobile/jquery.mobile-1.0.css" />
-
-<script src="../jquery/jquery-1.6.4.js"></script>
-<script src="../jquery.mobile/jquery.mobile-1.0.js"></script>
-<script src="../jquery.tmpl/jquery.tmpl-vBeta1.0.0.js"></script>
-
-<link rel="stylesheet" type="text/css" href="app.css" />
-
-<script type="text/javascript" src="namespace.js"></script>
-<script type="text/javascript" src="util.js"></script>
-<script type="text/javascript" src="generic.js"></script>
-<script type="text/javascript" src="app.js"></script>
-</head>
-
-<body id="pageHolder">
- <div data-role="page" id="home">
-
- <div data-role="header">
- <h1>Home</h1>
- </div>
-
- <div data-role="content">
- <br/>
- <button>Tasks</button>
- <ul data-role="listview" class="tasks"></ul>
- </div>
-
- <script class="tmpl" type="text/x-jquery-tmpl">
- <li>
- <a href="${href}">${title}</a>
- </li>
- </script>
-
- <script type="text/javascript">
- $("#home button").click(function(){
- $.mobile.changePage("../services/toDoItems/actions/notYetDone/invoke", "pop")
- });
- </script>
-
- <div data-role="footer" data-id="global-footer" data-position="fixed">
- <a href="../index.html" rel="external">home</a> | <a href="../services" rel="external">rest</a> | <a href="../logon.htmlviewer" rel="external">html</a> | <a href="../index.shtml" rel="external">scimpi</a>
- </div>
- </div>
-
- <div data-role="page" id="genericListView">
-
- <div data-role="header">
- <a data-icon="back" data-rel="back">Back</a>
- <h1>List</h1>
- </div>
-
- <div data-role="content">
- <br/>
- <ul data-filter="true" data-role="listview"></ul>
- </div>
-
- <script class="tmpl" type="text/x-jquery-tmpl">
- <li>
- <a href="${href}">${title}</a>
- </li>
- </script>
-
- <div data-role="footer" data-id="global-footer" data-position="fixed">
- <a href="../index.html" rel="external">home</a> | <a href="../services" rel="external">rest</a> | <a href="../logon.htmlviewer" rel="external">html</a> | <a href="../index.shtml" rel="external">scimpi</a>
- </div>
- </div>
-
- <div data-role="page" id="genericObjectCollectionView">
-
- <div data-role="header">
- <a data-icon="back" data-rel="back">Back</a>
- <h1>Collection</h1>
- </div>
-
- <div data-role="content">
- <br/>
- <ul data-filter="true" data-role="listview"></ul>
- </div>
-
- <script class="tmpl" type="text/x-jquery-tmpl">
- <li>
- <a href="${href}">${title}</a>
- </li>
- </script>
-
- <div data-role="footer" data-id="global-footer" data-position="fixed">
- <a href="../index.html" rel="external">home</a> | <a href="../services" rel="external">rest</a> | <a href="../logon.htmlviewer" rel="external">html</a> | <a href="../index.shtml" rel="external">scimpi</a>
- </div>
- </div>
-
- <div data-role="page" id="genericDomainObjectView">
-
- <div data-role="header">
- <a data-icon="back" data-rel="back">Back</a>
- <h1>Object</h1>
- </div>
-
- <div data-role="content">
- <div class="valueProperties"></div>
- <br/>
- <p>References</p>
- <ul data-role="listview" data-inset="true" class="referenceProperties"></ul>
- <br/>
- <p>Collections</p>
- <ul data-role="listview" data-inset="true" class="collections"></ul>
- </div>
-
- <script class="valueProperties-tmpl" type="text/x-jquery-tmpl">
- {{if dataTypeIsString}}
- <label for="${id}">${id}:</label>
- <input type="text"
- name="${id}" id="${id}" value="${value}" placeholder="${id}"
- class="required"/>
- {{/if}}
- {{if dataTypeIsBoolean}}
- <div data-role="fieldcontain">
- <fieldset data-role="controlgroup">
- <legend>${id}?</legend>
- <input type="checkbox"
- name="${id}" id="${id}" value="${value}"
- class="required"/>
- <label for="${id}">${id}</label>
- </fieldset>
- </div>
- {{/if}}
- </script>
-
- <script class="referenceProperties-tmpl" type="text/x-jquery-tmpl">
- <li>
- <a data-transition="slide" href="${value.href}">
- <p>${id}</p>
- <p><b>${value.title}</b></p>
- </a>
- </li>
- </script>
-
- <script class="collections-tmpl" type="text/x-jquery-tmpl">
- <li>
- <a data-transition="slideup" href="${href}">${id}</a>
- </li>
- </script>
-
- <div data-role="footer" data-id="global-footer" data-position="fixed">
- <a href="../index.html" rel="external">home</a> | <a href="../services" rel="external">rest</a> | <a href="../logon.htmlviewer" rel="external">html</a> | <a href="../index.shtml" rel="external">scimpi</a>
- </div>
- </div>
-
- <div data-role="page" id="settings" data-add-back-btn="true">
-
- <div data-role="header">
- <h1>Settings</h1>
- </div>
-
- <div data-role="content">
-
- <fieldset id="settings-theme">
- <legend>Theme:</legend>
- <input type="radio" name="settings-theme" id="settings-theme-a" value="a" checked="checked" />
- <label for="settings-theme-a">Dark</label>
-
- <input type="radio" name="settings-theme" id="settings-theme-b" value="b"/>
- <label for="settings-theme-b">Blue</label>
-
- <input type="radio" name="settings-theme" id="settings-theme-c" value="c"/>
- <label for="settings-theme-c">Grey</label>
-
- <input type="radio" name="settings-theme" id="settings-theme-d" value="d"/>
- <label for="settings-theme-d">White</label>
-
- <input type="radio" name="settings-theme" id="settings-theme-e" value="e"/>
- <label for="settings-theme-e">Yellow</label>
- </fieldset>
-
- </div>
-
- <script type="text/javascript">
- $("#settings input").change(function(e){
- var theme = $(this).attr("value");
- $("div").filter( function() {
- var divDataRole = $(this).attr("data-role")
- var isPage = (divDataRole === "page");
- return isPage;
- }).attr("data-theme", theme);
- });
- </script>
-
- <div data-role="footer" data-id="global-footer" data-position="fixed">
- <a href="../index.html" rel="external">home</a> | <a href="../services" rel="external">rest</a> | <a href="../logon.htmlviewer" rel="external">html</a> | <a href="../index.shtml" rel="external">scimpi</a>
- </div>
- </div>
-
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/namespace.js
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/namespace.js b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/namespace.js
deleted file mode 100644
index 7da5ff2..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/namespace.js
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace = function(namespaceString) {
- var parts = namespaceString.split('.'),
- parent = window,
- currentPart = '';
-
- for(var i = 0, length = parts.length; i < length; i++) {
- currentPart = parts[i];
- parent[currentPart] = parent[currentPart] || {};
- parent = parent[currentPart];
- }
-
- return parent;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/util.js
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/util.js b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/util.js
deleted file mode 100644
index fe17a03..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/mobile/util.js
+++ /dev/null
@@ -1,94 +0,0 @@
-String.prototype.endsWith = function(pattern) {
- var d = this.length - pattern.length;
- return d >= 0 && this.lastIndexOf(pattern) === d;
-};
-
-
-var util = namespace('org.apache.isis.viewer.json.jqmobile.util');
-
-util.findPage = function(selector) {
- var page = $("#pageHolder").find(selector);
- if(page[0]) {
- return page[0];
- }
- return null
-}
-
-util.removePage = function(id) {
- var page = util.findPage(id)
- if(page) {
- page.remove();
- }
-}
-
-util.cloneAndInsertPage = function(sourceId, targetId) {
- var page = $("#"+sourceId).clone().attr("id", targetId);
- page.appendTo("#pageHolder");
- return page
-}
-
-util.grepLink = function(links, relStr) {
- return $.grep(links, function(v) { return v.rel === relStr } )[0]
-}
-
-util.followLink = function(link) {
- var response = {};
- $.ajax({
- url : link.href,
- dataType : 'json',
- async: false,
- success : function(json, str, xhr) {
- response = {
- "json": json,
- "str": str,
- "xhr": xhr
- }
- }
- })
- return response;
-}
-
-util.grepAndFollowLink = function(links, rel) {
- var link = util.grepLink(links, rel)
- if (!link) { return null; }
- var response = util.followLink(link);
- if (!response) { return null; }
- return response.json;
-}
-
-util.queryParamsFor = function (href) {
- var vars = [], hash;
- var hashes = href.slice(href.indexOf('?') + 1).split('&');
- for(var i = 0; i < hashes.length; i++)
- {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = urldecode(hash[1]);
- }
- return vars;
-}
-
-// from http://phpjs.org/functions/urlencode:573
-util.urlencode = function(str) {
- str = (str + '').toString();
- return encodeURIComponent(str).replace(/!/g, '%21').replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29').replace(/\*/g, '%2A').replace(/%20/g, '+');
-}
-
-// from http://phpjs.org/functions/urldecode:572
-util.urldecode = function(str) {
- return decodeURIComponent((str + '').replace(/\+/g, '%20'));
-}
-
-util.applyTemplate = function(data, selector, templateSelector) {
- $(selector).empty();
- $(templateSelector)
- .tmpl(data)
- .appendTo(selector);
-}
-
-util.applyTemplateDiv = function(data, div, templateDiv) {
- div.empty();
- templateDiv
- .tmpl(data)
- .appendTo(div);
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/java/app/AboutPageFilter.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/java/app/AboutPageFilter.java b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/java/app/AboutPageFilter.java
new file mode 100644
index 0000000..3edc7ee
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/java/app/AboutPageFilter.java
@@ -0,0 +1,35 @@
+package app;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+public class AboutPageFilter implements Filter {
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+ String acceptHeader = httpServletRequest.getHeader("Accept");
+ String requestURI = httpServletRequest.getRequestURI();
+ if(requestURI.equals("/") && acceptHeader.contains("text/html")) {
+ request.getRequestDispatcher("/about/index.html").forward(request, response);
+ } else {
+ chain.doFilter(request, response);
+ }
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/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 0ad75fc..72a657d 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
@@ -23,6 +23,7 @@
<display-name>Quickstart Wicket app</display-name>
+
<!-- which configuration directory to read overloaded property files from -->
@@ -48,6 +49,16 @@
-->
+ <filter>
+ <filter-name>AboutPageFilter</filter-name>
+ <filter-class>app.AboutPageFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>AboutPageFilter</filter-name>
+ <url-pattern>/</url-pattern>
+ </filter-mapping>
+
+
<!-- cache static resources for 1 day -->
<filter>
@@ -120,7 +131,7 @@
-
-->
<filter>
- <filter-name>wicket</filter-name>
+ <filter-name>WicketFilter</filter-name>
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
@@ -129,7 +140,7 @@
</filter>
<filter-mapping>
- <filter-name>wicket</filter-name>
+ <filter-name>WicketFilter</filter-name>
<url-pattern>/wicket/*</url-pattern>
</filter-mapping>
@@ -141,6 +152,25 @@
- config specific to the restfulobjects-viewer
-
-->
+
+ <!--
+ THE FOLLOWING CONFIGURATION IS NOT REQUIRED IF THE WICKET VIEWER IS IN USE.
+ IF THE WICKET VIEWER CONFIGURATION IS REMOVED, THEN UNCOMMENT
+
+ <listener>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
+ </listener>
+
+ <context-param>
+ <param-name>deploymentType</param-name>
+ <param-value>SERVER_EXPLORATION</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>isis.viewers</param-name>
+ <param-value>restfulobjects</param-value>
+ </context-param>
+ -->
<!-- bootstrap the RestEasy framework -->
<listener>
@@ -184,6 +214,7 @@
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-
+
+
</web-app>
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/images/isis-logo.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/images/isis-logo.png b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/images/isis-logo.png
new file mode 100644
index 0000000..5284fe7
Binary files /dev/null and b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/images/isis-logo.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/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
new file mode 100644
index 0000000..09916ec
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/about/index.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Apache Isis QuickStart (Wicket/Restful/JDO)</title>
+
+<style type="text/css">
+body {
+ background-color: #1A467B;
+ font-family: Verdana, Helvetica, Arial;
+ font-size: 90%;
+}
+
+li {
+ margin-top: 6px;
+ margin-bottom: 6px;
+}
+table {
+ border-collapse: collapse;
+}
+table, th, td {
+ border: 1px;
+ border-style: solid;
+ border-color: lightgray;
+}
+th, td {
+ padding: 10px;
+}
+#wrapper {
+ background-color: #ffffff;
+ width: 900px;
+ margin: 8px auto;
+ padding: 12px;
+}
+</style>
+</head>
+<body>
+
+ <body>
+ <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
+ <a href="http://isis.apache.org">Apache Isis</a>™, a framework to let you rapidly develop
+ domain-driven apps in Java.</p>
+
+ <p>
+ The app consists of a bare minimum of classes, so that you can easily strip it back and
+ reuse for your own purposes. It is configured with:
+ </p>
+
+ <table>
+ <tr>
+ <th>Component</th>
+ <th>Access URL</th>
+ <th>HTTP Accept header</th>
+ <th>Description</th>
+ <th>Further info on the Isis site</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/component/viewer/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/component/viewer/restfulobjects/about.html">restfulobjects viewer</a></td>
+ </tr>
+ <tr>
+ <td><a href="/services">/services</a></td><td>[any]</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/component/objectstore/jdo/about.html">jdo objectstore</a> page</td>
+ </tr>
+ </table>
+
+ <h2>App contents</h2>
+ <p>The key files in the application are:</p>
+ <ul>
+ <li>Domain classes (todo functionality) (in <tt>dom</tt> module and <tt>objstore-jdo</tt> module)</a>
+ <ul>
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java"><tt>ToDoItem</tt></a> domain entity
+ </li>
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java"><tt>ToDoItems</tt></a> domain service (repository/factory)
+ </li>
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java"><tt>ToDoItemsJdo</tt></a> domain service (repository methods overridden for JDO)
+ </li>
+ </ul>
+ </li>
+ <li>Domain classes (demo audit functionality) (in <tt>dom</tt> module)</a>
+ <ul>
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/audit/AuditEntry.java"><tt>AuditEntry</tt></a> domain entity
+ </li>
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/audit/AuditServiceDemo.java"><tt>AuditService</tt></a> domain service (repository/factory)
+ </li>
+ </ul>
+ </li>
+ <li>Fixture classes (in <tt>fixture</tt> module)</a>
+ <ul>
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java"><tt>ToDoItemsFixture</tt></a> example fixture data (since configured for in-memory HSQLDB)
+ </li>
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java"><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_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/web.xml">WEB-INF/web.xml</a></tt> (in <tt>viewer-webapp</tt> module)</a>
+ <ul>
+ <li><tt>AboutPageFilter</tt> - filter that redirects to this page
+ </li>
+ <li><tt>ResourceCachingFilter</tt> and <tt>ResourceServlet</tt> - filter and servlet for serving up static resources.
+ </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>
+ <li>commented out <tt>IsisWebAppBootstrapper</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_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/isis.properties">WEB-INF/isis.properties</a></tt> (in <tt>viewer-webapp</tt> module)</a>
+ <ul>
+ <li><tt>isis.services</tt> - specifies the three domain services (<tt>ToDoItemsJdo</tt>, <tt>AuditServiceDemo</tt> and <tt>ToDoItemsFixtureService</tt>)
+ </li>
+ <li><tt>isis.persistor</tt> - specifies the JDO objectstore as the object store
+ </li>
+ <li><tt>isis.authentication</tt> - specifies the <tt>bypass</tt> authentication (ie effectively disables)
+ </li>
+ </ul>
+ </li>
+ <li><tt><a href="https://github.com/apache/isis/blob/master/example/application/quickstart_wicket_restful_jdo/viewer-webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties">WEB-INF/persistor_datanucleus.properties</a></tt> (in <tt>viewer-webapp</tt> module)</a>
+ <ul>
+ <li>configuration for JDO object store
+ </li>
+ </ul>
+ </li>
+ </ul>
+
+ <h2>Next steps</h2>
+ <p>Use the following as a check list to refactoring towards your own application:
+ <ul>
+ <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>
+ <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>
+ <li>Assuming you are using a persistent data store, then remove the <tt>ToDoItemsFixtureService</tt> from the <tt>isis.properties</tt> file (<tt>isis.services</tt> key). Alternatively you could keep but refactor to provide a similar service for your own application's domain.
+ </li>
+ <li>Decide if you require the audit service. If you don't, then remove the <tt>AuditDemoService</tt> from the <tt>isis.properties</tt> file (<tt>isis.services</tt> key). If you do, then refactor the <tt>AuditServiceDemo</tt> according to your requirements (the only requirement is that it implements <tt>org.apache.isis.objectstore.jdo.applib.AuditService</tt>)
+ </li>
+ <li>If you want the wicket viewer but NOT the restful objects viewer, then remove/comment out the <tt>ResteasyBootstrap</tt>, <tt>IsisSessionFilterForRestfulObjects</tt>, <tt>RestfulObjectsRestEasyDispatcher</tt> from <tt>web.xml</tt>
+ </li>
+ <li>If you want the restful objects viewer but NOT the wicket viewer, then remove/comment out the <tt>WicketFilter</tt> filter and uncomment the <tt>IsisWebAppBootstrapper</tt> listener in <tt>web.xml</tt>
+ </li>
+ </ul>
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-wicket.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-wicket.launch b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-wicket.launch
deleted file mode 100644
index b6cb507..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/ide/eclipse/launch/quickstart_wicket_restful_jdo-viewer-wicket.launch
+++ /dev/null
@@ -1,20 +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="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<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"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.commons&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.metamodel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/>
; <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.progmodel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.runtime&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.testsupport&quot;/&gt;&#13;&a
mp;#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.core.webapp&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.dflt&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&
;#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.jdo-applib&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.jdo-datanucleus&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.objectstores.jdo-metamodel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject&qu
ot;/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.runtimes.dflt.runtime&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-applib&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-metam
odel&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-model&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-tck&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&qu
ot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-ui&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;org.apache.isis.viewer.wicket-viewer&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
-<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="quickstart_wicket_restful_jdo-viewer-wicket"/>
-<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/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/lib/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/lib/.gitignore b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/lib/.gitignore
deleted file mode 100644
index 70eee7e..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/lib/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# explicitly ignoring Microsoft JDBC4 jar
-# (cannot redistribute, licensing)
-#
-sqljdbc4.jar
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
deleted file mode 100644
index 4b39d93..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
---><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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>quickstart_wicket_restful_jdo-viewer-wicket</artifactId>
- <name>Quickstart Wicket/Restful/JDO Wicket Viewer</name>
-
- <description>This module runs Isis' Wicket webapp viewer, configured to run using the
- datanucleus object store. See other viewer modules for more persistence options.</description>
-
- <packaging>war</packaging>
-
- <properties>
- <siteBaseDir>..</siteBaseDir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
-
- <!-- mvn package -->
- <plugin>
- <groupId>org.simplericity.jettyconsole</groupId>
- <artifactId>jetty-console-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>createconsole</goal>
- </goals>
- <configuration>
- <backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
- </configuration>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
-
- <!-- prereqs: mvn package -->
- <!-- mvn antrun:run -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <tasks>
- <exec executable="java" failonerror="true">
- <arg value="-jar" />
- <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.war" />
- </exec>
- </tasks>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- other modules in this project -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart_wicket_restful_jdo-dom</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart_wicket_restful_jdo-fixture</artifactId>
- </dependency>
-
-
- <!-- objectstore/domain service/repository implementations -->
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
- </dependency>
-
-
-
-
- <!-- isis viewer -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-impl</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-file</artifactId>
- </dependency>
- -->
-
- <!-- to run using WebServer (optional) -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-webserver</artifactId>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
-
-
- <!--
- JDBC drivers
- (if using jdo or sql object store)
- -->
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
- <!--
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>jdbc</artifactId>
- <version>4.0</version>
- <scope>system</scope>
- <optional>true</optional>
- <systemPath>${basedir}/lib/sqljdbc4.jar</systemPath>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.lazyluke</groupId>
- <artifactId>log4jdbc-remix</artifactId>
- <version>0.2.7</version>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java
deleted file mode 100644
index 1f25a6d..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package app;
-
-import com.google.inject.Singleton;
-
-import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistrarDefault;
-
-@Singleton
-public class ComponentFactoryRegistrarForQuickStart extends ComponentFactoryRegistrarDefault {
-
- @Override
- public void addComponentFactories(ComponentFactoryList componentFactories) {
- super.addComponentFactories(componentFactories);
- // currently no replacements
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java
deleted file mode 100644
index c700d77..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/java/app/QuickStartApplication.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package app;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import com.google.common.base.Joiner;
-import com.google.common.io.Resources;
-import com.google.inject.AbstractModule;
-import com.google.inject.Module;
-import com.google.inject.name.Names;
-import com.google.inject.util.Modules;
-
-import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
-import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
-
-
-/**
- * As specified in <tt>web.xml</tt>.
- *
- * <p>
- * See:
- * <pre>
- * <filter>
- * <filter-name>wicket</filter-name>
- * <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
- * <init-param>
- * <param-name>applicationClassName</param-name>
- * <param-value>app.QuickStartApplication</param-value>
- * </init-param>
- * </filter>
- * </pre>
- *
- */
-public class QuickStartApplication extends IsisWicketApplication {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected Module newIsisWicketModule() {
- final Module isisDefaults = super.newIsisWicketModule();
-
- final Module quickstartOverrides = new AbstractModule() {
- @Override
- protected void configure() {
- bind(ComponentFactoryRegistrar.class).to(ComponentFactoryRegistrarForQuickStart.class);
-
- bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Quick Start App");
- bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css");
- bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js");
- bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines("welcome.html"));
- bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("QuickStart v1.0.0");
- }
-
- };
-
- return Modules.override(isisDefaults).with(quickstartOverrides);
- }
-
- private static String readLines(final String resourceName) {
- try {
- List<String> readLines = Resources.readLines(Resources.getResource(QuickStartApplication.class, resourceName), Charset.defaultCharset());
- final String aboutText = Joiner.on("\n").join(readLines);
- return aboutText;
- } catch (IOException e) {
- return "This is Quick Start";
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.pdn
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.pdn b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.pdn
deleted file mode 100644
index ee6b1c4..0000000
Binary files a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.png b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.png
deleted file mode 100644
index c6dea47..0000000
Binary files a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/jettyconsole/isis-banner.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html
deleted file mode 100644
index 6188923..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/app/welcome.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<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.
-</p>
-
-<br/>
-<br/>
-<p>
-For more details, see the <a href="http://isis.apache.org/documentation.html" target="_blank">Isis website</a>.
-</p>
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/images/Default.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/images/Default.png b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/images/Default.png
deleted file mode 100644
index 8409e46..0000000
Binary files a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/resources/images/Default.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords
deleted file mode 100644
index 9a568b0..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#
-# configuration file for the file-based authentication
-# not used by the onlinedemo
-#
-
-# list of users, and their password, and optionally roles
-sven:pass:org.apache.isis.viewer.wicket.roles.USER
-dick:pass:org.apache.isis.viewer.wicket.roles.USER
-bob:pass:org.apache.isis.viewer.wicket.roles.USER
-joe:pass:org.apache.isis.viewer.wicket.roles.USER
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties
deleted file mode 100644
index 62b9dae..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# configuration file for the File-based authentication mechanism
-#
-
-
-#
-# (intentionally empty)
-#
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow
deleted file mode 100644
index 4407ec2..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#
-# configuration file for the file-based authorization
-#
-
-
-#
-# (intentionally empty)
-#
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties
deleted file mode 100644
index f44bb6c..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# configuration file for the File-based authorization mechanism
-#
-
-
-#
-# the whitelist file
-# (value shown below is the default)
-#
-
-#isis.authorization.file.whitelist=authorization_file.allow
-
-
-
-#
-# the blacklist file
-# (there is no default value; provide a filename)
-#
-
-#isis.authorization.file.blacklist=
-
-
-
-#
-# switch on "learning mode". In this mode the authorization mechanism
-# will grant all requests, and log those requests into the allow file.
-#
-
-#isis.authorization.learn=true
-
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
deleted file mode 100644
index 191a324..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#################################################################################
-#
-# specify system components.
-#
-# The values correspond to the named components in the installer-registry.properties file
-# in the org.apache.isis.runtimes.dflt:runtime JAR (in the org.apache.isis.runtimes.dflt.runtime package)
-#
-# Although all configuration could reside in isis.properties, the recommendation is
-# to split out into component specific files:
-#
-# xxx_yyy.properties files
-#
-# where
-# * xxx is the component type, and
-# * yyy is the component name.
-#
-# For example, persistor_sql.properties holds configuration information specific to the
-#
-#
-# If the components are changed, also remember to edit pom.xml (further comments can be
-# found in the persistor_xxx.properties files)
-#
-#################################################################################
-
-#
-# configure the persistor (object store) to use
-#
-# * in-memory requires no additional configuration, but stores object in-memory.
-# Only suitable for prototyping
-# * datanucleus uses JDO DataNucleus to persist objects to relational database.
-# for objectstore-specific properties, see persistor_datanucleus.properties
-# * fileserver uses a simple FileServer to persist objects as JSON documents. It requires the fileserver component to be running
-# for objectstore-specific properties, see persistor_fileserver.properties
-# * mongodb uses MongoDB to be persist objects as JSON documents. It requires MongoDB to be installed and running
-# for objectstore-specific properties, see persistor_fileserver.properties
-# * sql uses an RDBMS to persist objects as table rows.
-# for objectstore-specific properties, see persistor_sql.properties
-# * xml uses the XML ObjectStore to be persist objects to a set of XML files. Only suitable for prototyping.
-# for objectstore-specific properties, see persistor_xml.properties
-#
-# NOTE:
-# * if using non-naive implementations of services, edit isis.services (below) and
-# * if necessary, update the pom.xml to reference appropriate objstore-xxx module
-# * for sql and datanucleus objectstores, update the pom.xml to reference appropriate JDBC driver
-#
-
-#isis.persistor=in-memory
-isis.persistor=datanucleus
-#isis.persistor=fileserver
-#isis.persistor=mongodb
-#isis.persistor=sql
-#isis.persistor=xml
-
-
-
-
-#
-# configure authentication mechanism to use (to logon to the system)
-# note:
-# - authentication is disabled if running in exploration mode
-# - the Scimpi viewer allows access to anonymous users
-#
-
-# default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
-isis.authentication=bypass
-
-
-#
-# configure authorization mechanism to use
-#
-# The authorization mechanism define each users' permissions to view/edit object properties
-# or collections, and to view/invoke object actions
-#
-# configuring this component automatically refines the metamodel (installing a facet factory
-# which vetoes access as required)
-#
-
-# default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
-#isis.authorization=file
-
-
-
-#
-# configure the user profile store to use.
-#
-# the user profile store is supported by some viewers as a way to store
-# user-specific settings (eg colours, themes etc)
-#
-isis.user-profile-store=in-memory
-
-
-
-
-#################################################################################
-#
-# MetaModel
-#
-# The metamodel typically does not require additional configuration, although
-# the system components (defined above) may refine the metamodel for their needs.
-#
-#################################################################################
-
-
-#
-# additional programming model facets
-#
-
-#isis.reflector.facets.include=
-#isis.reflector.facets.exclude=
-
-
-#
-# metamodel validator
-#
-
-#isis.reflector.validator=
-
-
-
-#################################################################################
-#
-# Application Services and fixtures
-#
-#################################################################################
-
-#
-# Specify the domain services.
-#
-# These are the most important configuration properties in the system, as they define
-# the set of the classes for Isis to instantiate as domain service singletons.
-# From these domain service instances the rest of the metamodel is discovered, while the
-# end-user gains access to other domain objects by invoking the actions of the domain services.
-#
-# The implementations depend on the configured (see isis.persistor above)
-#
-
-# if using the in-memory, XML, SQL, fileserver or mongo object stores:
-#isis.services.prefix = dom
-#isis.services = todo.ToDoItems
-
-
-# if using the DataNucleus object store
-# (with support for JDO's audit service, and installing fixtures using a domain service)
-#isis.services.prefix =
-isis.services = objstore.jdo.todo.ToDoItemsJdo,\
- fixture.todo.ToDoItemsFixturesService,\
- dom.audit.AuditServiceDemo
-
-
-
-
-
-#
-# Specify the (optional) test fixtures
-#
-# Fixtures are used to seed the object store with an initial set of data. For the
-# in-memory object store, the fixtures are installed on every run. For other
-# object stores, they are used only when the object store is first initialized.
-#
-#isis.fixtures.prefix=
-#isis.fixtures=
-
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/logging.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/logging.properties b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index e3038de..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,90 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#
-# Isis uses log4j is used to provide system logging
-#
-log4j.rootCategory=INFO, Console
-
-# The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-
-
-
-
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-#log4j.debug=true
-
-
-log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-log4j.additivity.jdbc.sqlonly=false
-
-log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-log4j.additivity.jdbc.resultsettable=false
-
-
-
-log4j.logger.jdbc.audit=WARN,jdbc, Console
-log4j.additivity.jdbc.audit=false
-
-log4j.logger.jdbc.resultset=WARN,jdbc
-log4j.additivity.jdbc.resultset=false
-
-log4j.logger.jdbc.sqltiming=WARN,sqltiming
-log4j.additivity.jdbc.sqltiming=false
-
-log4j.logger.jdbc.connection=FATAL,connection
-log4j.additivity.jdbc.connection=false
-
-
-
-log4j.appender.sql=org.apache.log4j.FileAppender
-log4j.appender.sql.File=./logs/sql.log
-log4j.appender.sql.Append=false
-log4j.appender.sql.layout=org.apache.log4j.PatternLayout
-log4j.appender.sql.layout.ConversionPattern=-----> %d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%n
-
-log4j.appender.sqltiming=org.apache.log4j.FileAppender
-log4j.appender.sqltiming.File=./logs/sqltiming.log
-log4j.appender.sqltiming.Append=false
-log4j.appender.sqltiming.layout=org.apache.log4j.PatternLayout
-log4j.appender.sqltiming.layout.ConversionPattern=-----> %d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%n
-
-log4j.appender.jdbc=org.apache.log4j.FileAppender
-log4j.appender.jdbc.File=./logs/jdbc.log
-log4j.appender.jdbc.Append=false
-log4j.appender.jdbc.layout=org.apache.log4j.PatternLayout
-log4j.appender.jdbc.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.connection=org.apache.log4j.FileAppender
-log4j.appender.connection.File=./logs/connection.log
-log4j.appender.connection.Append=false
-log4j.appender.connection.layout=org.apache.log4j.PatternLayout
-log4j.appender.connection.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
http://git-wip-us.apache.org/repos/asf/isis/blob/fe44b4da/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties
deleted file mode 100644
index fd264f9..0000000
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ /dev/null
@@ -1,111 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# configuration file for the JDO objectstore
-#
-
-isis.persistor.datanucleus.impl.javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.api.jdo.JDOPersistenceManagerFactory
-isis.persistor.datanucleus.impl.datanucleus.autoCreateSchema=true
-isis.persistor.datanucleus.impl.datanucleus.validateTables=true
-isis.persistor.datanucleus.impl.datanucleus.validateConstraints=true
-
-
-# L2 cache (on by default)
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
-
-#see http://www.datanucleus.org/products/datanucleus/jdo/transaction_types.html#optimistic
-isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
-
-
-
-
-
-#############################################################################
-# JDBC connection details
-# (also update the pom.xml to reference the appropriate JDBC driver)
-#############################################################################
-
-#
-# HSQLDB in-memory
-#
-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=
-
-#
-# HSQLDB in-memory (using log4jdbc-remix)
-#
-#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=
-
-
-
-#
-# HSQLDB to file
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:file:/tmp/isis-todo-app/hsql-db;hsqldb.write_delay=false;shutdown=true
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
-
-#
-# HSQLDB to file (using log4jdbc-remix)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:file:/tmp/isis-todo-app/hsql-db;hsqldb.write_delay=false;shutdown=true
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
-
-
-
-#
-# PostgreSQL Server
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.postgresql.Driver
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:postgresql://localhost:5432/isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis
-
-#
-# PostgreSQL Server (using log4jdbc-remix)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:postgresql://localhost:5432/isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis
-
-
-
-#
-# MS SQL Server
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:sqlserver://127.0.0.1:1433;instance=SQLEXPRESS;databaseName=jdo
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=jdo
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=jdopass
-
-#
-# MS SQL Server (using log4jdbc-remix)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:sqlserver://127.0.0.1:1433;instance=SQLEXPRESS;databaseName=jdo
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=jdo
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=jdopass