Repository: isis
Updated Branches:
  refs/heads/release-1.15.0-RC1 02067e294 -> fabd843ab


http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
deleted file mode 100644
index 05deaeb..0000000
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound}  Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound}  or more contributor license agreements.  See the NOTICE file
-${symbol_pound}  distributed with this work for additional information
-${symbol_pound}  regarding copyright ownership.  The ASF licenses this file
-${symbol_pound}  to you under the Apache License, Version 2.0 (the
-${symbol_pound}  "License"); you may not use this file except in compliance
-${symbol_pound}  with the License.  You may obtain a copy of the License at
-${symbol_pound}  
-${symbol_pound}         http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}         
-${symbol_pound}  Unless required by applicable law or agreed to in writing,
-${symbol_pound}  software distributed under the License is distributed on an
-${symbol_pound}  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound}  KIND, either express or implied.  See the License for the
-${symbol_pound}  specific language governing permissions and limitations
-${symbol_pound}  under the License.
-
-${symbol_pound}
-${symbol_pound} configuration file for the Wicket viewer
-${symbol_pound}
-
-${symbol_pound}
-${symbol_pound} The maximum length of titles to display in standalone or 
parented tables.
-${symbol_pound} Titles longer than this length will be truncated with trailing 
ellipses (...)
-${symbol_pound}
-${symbol_pound} For example, if set to 12, the title
-${symbol_pound} "Buy milk on 15-Feb-13" will be truncated to "Buy milk ..."
-${symbol_pound}
-${symbol_pound} If set to 0, then only the icon will be shown.
-${symbol_pound}
-isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
-isis.viewer.wicket.maxTitleLengthInParentedTables=0
-
-
-${symbol_pound}
-${symbol_pound} in Firefox and more recent versions of Chrome 54+, cannot copy 
out of disabled fields; instead we use the
-${symbol_pound} readonly attribute 
(https://www.w3.org/TR/2014/REC-html5-20141028/forms.html${symbol_pound}the-readonly-attribute)
-${symbol_pound} This behaviour is enabled by default but can be disabled using 
this flag
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.replaceDisabledTagWithReadonlyTag=true
-
-
-${symbol_pound}
-${symbol_pound} Whether to disable buttons after it has been clicked (for both 
form submit and no-arg actions), to prevent users
-${symbol_pound} causing an error if they do a double click.
-${symbol_pound} Also, whether to show an indicator alongside the button.
-${symbol_pound}
-${symbol_pound} This behaviour is enabled by default, but can be disabled 
using this flag.
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.preventDoubleClickForFormSubmit=true
-${symbol_pound}isis.viewer.wicket.preventDoubleClickForNoArgAction=true
-${symbol_pound}isis.viewer.wicket.useIndicatorForFormSubmit=true
-${symbol_pound}isis.viewer.wicket.useIndicatorForNoArgAction=true
-
-
-${symbol_pound}isis.viewer.wicket.datePicker.minDate=1900-01-01T00:00:00.000Z
-${symbol_pound}isis.viewer.wicket.datePicker.maxDate=2100-01-01T00:00:00.000Z
-
-${symbol_pound}isis.viewer.wicket.datePattern=dd-MM-yyyy
-${symbol_pound}isis.viewer.wicket.dateTimePattern=dd-MM-yyyy HH:mm
-
-${symbol_pound}isis.viewer.wicket.datePattern=dd/MM/yy
-${symbol_pound}isis.viewer.wicket.dateTimePattern=dd/MM/yy HH:mm
-
-
-${symbol_pound}
-${symbol_pound} whether to strip wicket tags from markup (default is true, as 
they may break some CSS rules)
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.stripWicketTags=false
-
-
-${symbol_pound}
-${symbol_pound} whether to suppress the 'rememberMe' checkbox on the login 
page (default is false)
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.rememberMe.suppress=false
-
-
-${symbol_pound}
-${symbol_pound} Encryption key is used to encrypt the rememberMe 
user/password.  It should be set to a unique and private value.
-${symbol_pound} If a hard-coded and publicly known value is used, then it 
would be possible for rememberMe user/password to be
-${symbol_pound} intercepted and decrypted, compromising access.
-${symbol_pound}
-${symbol_pound} If no value is set then (for safety) a random UUID will be 
used as the encryption key.  The net effect of this
-${symbol_pound} default is that 'rememberMe' will work, but only until the 
webapp is restarted (after which the end-user will
-${symbol_pound} have to log in again).
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.rememberMe.encryptionKey=myEncryptionKey
-
-
-${symbol_pound}
-${symbol_pound} if user attempts to access a protected URL before signing in, 
then as a convenience the viewer will continue
-${symbol_pound} through to that destination after successful login.  If you 
consider this to be a security risk then this flag
-${symbol_pound} disables that behaviour (default is false).
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.clearOriginalDestination=true
-
-
-${symbol_pound}
-${symbol_pound} the maximum number of pages to list in bookmark (default is 15)
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.bookmarkedPages.maxSize=15
-
-
-${symbol_pound}
-${symbol_pound} whether to show the bootstrap theme chooser (defaults false)
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.themes.showChooser=false
-isis.viewer.wicket.themes.showChooser=true
-
-${symbol_pound}
-${symbol_pound} comma-separated list of themes to choose from (default is to 
show all themes from bootswatch.com).
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
-
-${symbol_pound} ISIS-1520 Temporarily disable the broken Amelia theme and list 
all other themes
-isis.viewer.wicket.themes.enabled=bootstrap-theme, Cerulean, Cosmo, Cyborg, 
Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, 
Spacelab, Superhero, United, Yeti
-
-${symbol_pound}
-${symbol_pound} whether to automatically select dependent choice when the 
choice it depends upon changes.
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.disableDependentChoiceAutoSelection=false
-
-
-${symbol_pound}
-${symbol_pound} enable liveReload.  For example, use with gradle -t -b 
liveReload.gradle --offline &
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
-
-
-
-${symbol_pound}
-${symbol_pound} cookie key holding the (encrypted) 'rememberMe' user/password.
-${symbol_pound} If not specified then the cookie key 'isisWicketRememberMe' 
will be used; there is generally no need to change this.
-${symbol_pound}
-${symbol_pound}isis.viewer.wicket.rememberMe.cookieKey=isisWicketRememberMe
-
-

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index afc3bb2..0000000
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,357 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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.
--->
-<web-app id="WebApp_ID" version="2.4"
-    xmlns="http://java.sun.com/xml/ns/j2ee"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
-
-    <display-name>Simple app</display-name>
-
-    <welcome-file-list>
-        <welcome-file>about/index.html</welcome-file>
-    </welcome-file-list>
-
-    <!-- shiro security configuration -->
-    <listener>
-        
<listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
-    </listener>
-
-    <filter>
-        <filter-name>ShiroFilter</filter-name>
-        <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>ShiroFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-
-    <!-- which configuration directory to read overloaded property files from 
-->
-    <!-- 
-    By default the framework will read configuration properties from the 
WEB-INF
-    directory (where this web.xml file resides).
-
-    If you want to read configuration files from some other external directory,
-    and the location of that external directory is the same/standardized for 
all
-    locations where you intend to deploy the WAR file, you can uncomment the
-    'isis.config.dir' context parameter, below, and set it to that standardized
-    location, eg:
-
-    <context-param>
-        <param-name>isis.config.dir</param-name>
-        <param-value>/usr/local/conf</param-value>
-    </context-param>
-
-    If however the location of the external directory changes from one 
deployment
-    to another (eg system testing, UAT, production etc) then you should be
-    able to override the context parameter through the servlet container's own
-    (proprietary) configuration files.
-
-    For example, if deploying to Tomcat, you can edit 
${symbol_dollar}CATALINA_BASE/conf/context.xml,
-    and add:
-
-    <Parameter name="isis.config.dir"
-               value="/usr/local/conf/systest"
-               override="false"/>
-
-    For more detail see: 
http://tomcat.apache.org/tomcat-7.0-doc/config/context.html${symbol_pound}Context_Parameters
-    -->
-
-
-    <!--
-    determines which additional configuration files to search for 
-     -->
-    <context-param>
-        <param-name>isis.viewers</param-name>
-        <param-value>wicket,restfulobjects</param-value>
-    </context-param>
-
-
-
-    <!-- 
-    for diagnostics
-    -->
-    <filter>
-        <filter-name>IsisLogOnExceptionFilter</filter-name>
-        
<filter-class>org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>IsisLogOnExceptionFilter</filter-name>
-        <url-pattern>/wicket/*</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>IsisLogOnExceptionFilter</filter-name>
-        <url-pattern>/restful/*</url-pattern>
-    </filter-mapping>
-
-
-
-    <!-- cache static resources for 1 day -->
-    <filter>
-        <filter-name>ResourceCachingFilter</filter-name>
-        
<filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
-        <init-param>
-            <param-name>CacheTime</param-name>
-            <param-value>86400</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.css</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.png</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.jpg</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.jpeg</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.gif</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.svg</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.js</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.html</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ResourceCachingFilter</filter-name>
-        <url-pattern>*.swf</url-pattern>
-    </filter-mapping>
-    
-    <servlet>
-        <servlet-name>Resource</servlet-name>
-        
<servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.css</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.png</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.jpg</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.jpeg</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.gif</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.svg</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.js</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.html</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Resource</servlet-name>
-        <url-pattern>*.swf</url-pattern>
-    </servlet-mapping>
-
-
-    <servlet>
-        <servlet-name>WebjarsServlet</servlet-name>
-        <servlet-class>org.webjars.servlet.WebjarsServlet</servlet-class>
-        <init-param>
-            <param-name>disableCache</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>WebjarsServlet</servlet-name>
-        <url-pattern>/webjars/*</url-pattern>
-    </servlet-mapping>
-
-
-
-    <!--
-    -
-    - config specific to the wicket-viewer
-    -
-    -->
-    <filter>
-        <filter-name>WicketFilter</filter-name>
-        
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
-        <init-param>
-            <param-name>applicationClassName</param-name>
-            <param-value>domainapp.webapp.DomainApplication</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>WicketFilter</filter-name>
-        <url-pattern>/wicket/*</url-pattern>
-    </filter-mapping>
-
-
-    <context-param>
-        <param-name>configuration</param-name>
-        <!-- 
-        <param-value>deployment</param-value>
-         -->
-        <param-value>development</param-value>
-    </context-param>
-    
-   
-    <!--
-    -
-    - 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_PROTOTYPE</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>isis.viewers</param-name>
-        <param-value>restfulobjects</param-value>
-    </context-param>    
-    -->    
-    
-    <!-- bootstrap the RestEasy framework -->
-    <listener>
-        
<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
-    </listener>
-
-    <!-- used by RestEasy to determine the JAX-RS resources and other related 
configuration -->
-    <context-param>
-        <param-name>javax.ws.rs.Application</param-name>
-        
<param-value>org.apache.isis.viewer.restfulobjects.server.RestfulObjectsApplication</param-value>
-    </context-param>
-    
-    <context-param>
-        <param-name>resteasy.servlet.mapping.prefix</param-name>
-        <param-value>/restful/</param-value>
-    </context-param>
-    
-
-    <!-- authenticate user, set up an Isis session -->
-    <filter>
-        <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
-        
<filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
-        <!-- authentication required for REST -->
-        <init-param>
-            <param-name>authenticationSessionStrategy</param-name>
-            
<param-value>org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
-        </init-param>
-        <init-param>
-            <!-- what to do if no session was found... -->
-            <param-name>whenNoSession</param-name>
-            <!-- ... 401 and a basic authentication challenge if request 
originates from web browser -->
-            <param-value>auto</param-value>
-        </init-param>
-        <init-param>
-            <param-name>passThru</param-name>
-            <param-value>/restful/swagger</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <!-- this is mapped to the entire app; however the IsisSessionFilter 
will "notice" if the session filter has already been
-             executed for the request pipeline, and if so will do nothing -->
-        <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
-        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
-    </filter-mapping>
-
-    <filter>
-        <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
-        
<filter-class>org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
-        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
-    </filter-mapping>
-
-
-    <servlet>
-        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
-        
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
-        <url-pattern>/restful/*</url-pattern>
-    </servlet-mapping>
-
-
-    <!-- 
-    uncomment to use container-managed datasource;
-    for both container-managed (JTA) and non-container-managed transactions
-     -->
-     <!-- 
-    <resource-ref>
-        <description>db</description>
-        <res-ref-name>jdbc/quickstart</res-ref-name>
-        <res-type>javax.sql.DataSource</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref>
-      -->
-
-    <!--
-    uncomment to use container-managed datasource
-    with container-managed transactions (JTA).
-    -->
-    <!-- 
-    <resource-ref>
-        <description>db</description>
-        <res-ref-name>jdbc/quickstart-nontx</res-ref-name>
-        <res-type>javax.sql.DataSource</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref>
-     -->
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/images/isis-logo.png
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/images/isis-logo.png
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/images/isis-logo.png
deleted file mode 100644
index 5284fe7..0000000
Binary files 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/images/isis-logo.png
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
deleted file mode 100644
index 3bc480e..0000000
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
+++ /dev/null
@@ -1,120 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-  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.
--->
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; 
charset=ISO-8859-1">
-        <title>Apache Isis&trade; SimpleApp</title>
-        
-        <style type="text/css">
-body {
-    background-color: ${symbol_pound}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;
-}
-${symbol_pound}wrapper {
-    background-color: ${symbol_pound}ffffff;
-    width: 900px;
-    margin: 8px auto;
-    padding: 12px;
-}
-        </style>
-    </head>
-    <body>
-        <div id="wrapper">
-            <img alt="Isis Logo" src="about/images/isis-logo.png" />
-             
-            <p>
-                This app has been generated using Apache Isis'
-                <a 
href="http://isis.apache.org/guides/ugfun.html${symbol_pound}_ugfun_getting-started_simple%61pp-archetype";
 target="_blank">SimpleApp</a> archetype,
-                to create a purposefully minimal application that nevertheless 
includes fixture data, integration tests and BDD specs.
-                <br/>
-                <br/>
-                The application's business logic resides in a single (maven) 
module, <a 
href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple";
  target="_blank">module-simple</a>, that in turn contains a single domain 
entity, <a 
href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java";
  target="_blank">SimpleObject</a>.  The module has its own <a 
href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple/src/main/java/domainapp/modules/simple/fixture";
 target="_blank">fixtures</a>, <a 
href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple/src/test/java/domainapp/modules/simple/dom/impl";
 target="_blank">unit tests</a> and <a 
href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple/src/test/java/domainapp/modules/simple/integtests/t
 ests" target="_blank">integration tests</a>.  New modules can be created by 
copying this first simple module.
-                <br/>
-                <br/>
-                The app also defines the <a 
href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/application";
  target="_blank">application</a> (maven) module; this holds <a 
href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/application/src/main/java/domainapp/application/fixture";
  target="_blank">fixtures</a>, <a 
href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/integtests";
 target="_blank">integration/smoke tests</a> and <a 
href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/bdd";
 target="_blank">BDD specs</a> to exercise the entire application.  It also 
holds the <a 
href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java";
 target="_blank">AppManifest</a> used to boots
 trap the entire application, as well as application-scoped <a 
href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/services";
 target="_blank">domain services</a> (eg a home page service).
-                <br/>
-                <br/>
-                The app's <a 
href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/webapp";
  target="_blank">webapp</a> (maven) module is used to assemble the application 
into a WAR file.
-            </p>
-
-            <p>To access the app:</p>
-            <ul>
-                <li>
-                    <p>
-                        <b><a href="wicket/">wicket/</a></b>
-                    </p>
-                    <p>
-                        provides access to a generic UI for end-users,
-                        Isis' <a 
href="http://isis.apache.org/guides/ugvw.html"; target="_blank">Wicket 
Viewer</a>.
-                        As its name suggests, this viewer is built on top of 
<a href="http://wicket.apache.org"; target="_blank">Apache Wicket</a>&trade;.
-                    </p>
-                </li>
-                <li>
-                    <p>
-                        <b>
-                            <a href="swagger-ui/index.html">swagger-ui/</a>
-                        </b>
-                    </p>
-                    <p>
-                        provides access to a Swagger UI which uses a subset of 
the framework's automatically
-                        generated <a href="restful/">RESTful API</a> (provided 
by the 
-                        <a href="http://isis.apache.org/guides/ugvro.html";  
target="_blank">Restful Objects viewer</a>).  There are 
-                        three versions of the Swagger spec files (that drive 
the UI): 
-                        <a href="restful/swagger/public">public</a> (for use 
by "third-party" apps), 
-                        <a href="restful/swagger/private">private</a> (for use 
by internal apps), and 
-                        <a href="restful/swagger/prototyping">prototyping</a> 
(an extended version of the private
-                        API).  The Swagger spec files are themselves 
dynamically generated and can be used to generate
-                        client-side stubs.
-                    </p>
-                    <p>The RESTful API can return both simple representations 
and also richer hypermedia representations
-                        that are conformant with the <a 
href="http://restfulobjects.org";  target="_blank">Restful Objects</a> spec.
-                        The HTTP <code>Accept</code> header is used to select 
which representation should be generated.
-                    </p>
-                </li>
-            </ul>
-
-            <p>
-            The default user/password is <b><i>sven/pass</i></b> (as 
configured in the
-            <a 
href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/webapp/src/main/webapp/WEB-INF/shiro.ini";
 target="_blank">shiro.ini</a> file).
-            </p>
-            
-        </div>
-    </body>
-</html>

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
deleted file mode 100644
index 9f1612a..0000000
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/css/application.css
+++ /dev/null
@@ -1,19 +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/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/images/spinning-icon.gif
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/images/spinning-icon.gif
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/images/spinning-icon.gif
deleted file mode 100644
index 75e3b1e..0000000
Binary files 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/images/spinning-icon.gif
 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/scripts/application.js
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/scripts/application.js
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/scripts/application.js
deleted file mode 100644
index d8cf6fe..0000000
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/scripts/application.js
+++ /dev/null
@@ -1,3 +0,0 @@
-$(document).ready(function() {
-       /// here...
-});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/swagger-ui/index.html
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/swagger-ui/index.html
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/swagger-ui/index.html
deleted file mode 100644
index 4694b93..0000000
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/swagger-ui/index.html
+++ /dev/null
@@ -1,164 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<!DOCTYPE html>
-<!--
-  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.
--->
-<html>
-<head>
-    <meta charset="UTF-8">
-    <base href="../webjars/swagger-ui/2.1.4/"/>
-    <title>Swagger UI</title>
-    <link rel="icon" type="image/png" href="images/favicon-32x32.png" 
sizes="32x32" />
-    <link rel="icon" type="image/png" href="images/favicon-16x16.png" 
sizes="16x16" />
-    <link href='css/typography.css' media='screen' rel='stylesheet' 
type='text/css'/>
-    <link href='css/reset.css' media='screen' rel='stylesheet' 
type='text/css'/>
-    <link href='css/screen.css' media='screen' rel='stylesheet' 
type='text/css'/>
-    <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-    <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
-    <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-    <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
-    <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
-    <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-    <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
-    <script src='lib/underscore-min.js' type='text/javascript'></script>
-    <script src='lib/backbone-min.js' type='text/javascript'></script>
-    <script src='swagger-ui.js' type='text/javascript'></script>
-    <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
-    <script src='lib/marked.js' type='text/javascript'></script>
-    <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-
-    <!-- Some basic translations -->
-    <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
-    <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
-    <!-- <script src='lang/en.js' type='text/javascript'></script> -->
-
-    <script type="text/javascript">
-    ${symbol_dollar}(function () {
-      var url = 
document.getElementById("input_baseUrl").selectedOptions[0].value;
-
-      // Pre load translate...
-      if(window.SwaggerTranslator) {
-        window.SwaggerTranslator.translate();
-      }
-      window.swaggerUi = new SwaggerUi({
-        url: url,
-        dom_id: "swagger-ui-container",
-        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
-        onComplete: function(swaggerApi, swaggerUi){
-          if(typeof initOAuth == "function") {
-            initOAuth({
-              clientId: "your-client-id",
-              clientSecret: "your-client-secret-if-required",
-              realm: "your-realms",
-              appName: "your-app-name",
-              scopeSeparator: ","
-            });
-          }
-
-          if(window.SwaggerTranslator) {
-            window.SwaggerTranslator.translate();
-          }
-
-          ${symbol_dollar}('pre code').each(function(i, e) {
-            hljs.highlightBlock(e)
-          });
-
-          addApiKeyAuthorization();
-        },
-        onFailure: function(data) {
-          log("Unable to Load SwaggerUI");
-        },
-        docExpansion: "none",
-        apisSorter: "alpha",
-        defaultModelRendering: 'schema',
-        showRequestHeaders: false
-      });
-
-      function addApiKeyAuthorization(){
-        /*
-        var key = 
encodeURIComponent(${symbol_dollar}('${symbol_pound}input_apiKey')[0].value);
-        if(key && key.trim() != "") {
-            var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", 
key, "query");
-            window.swaggerUi.api.clientAuthorizations.add("api_key", 
apiKeyAuth);
-            log("added key " + key);
-        }
-        */
-        var username = document.getElementById("input_user").value;
-        var password = document.getElementById("input_pass").value;
-        if(username && username.trim() != "" && password && password.trim() != 
"") {
-          var auth = "Basic " + btoa(username + ":" + password);
-          var swaggerUi = window.swaggerUi;
-          window.swaggerUi.api.clientAuthorizations.add("key", new 
SwaggerClient.ApiKeyAuthorization("Authorization", auth, "header"));
-        } else {
-          window.swaggerUi.api.clientAuthorizations.remove("key");
-        }
-      }
-
-      // if you have an apiKey you would like to pre-populate on the page for 
demonstration purposes...
-        /*
-      
${symbol_dollar}('${symbol_pound}input_apiKey').change(addApiKeyAuthorization);
-      */
-
-      /*
-        var apiKey = "myApiKeyXXXX123456789";
-        ${symbol_dollar}('${symbol_pound}input_apiKey').val(apiKey);
-      */
-      ${symbol_dollar}('${symbol_pound}input_user').val("sven");
-      ${symbol_dollar}('${symbol_pound}input_pass').val("pass");
-
-
-
-
-      window.swaggerUi.load();
-
-      function log() {
-        if ('console' in window) {
-          console.log.apply(console, arguments);
-        }
-      }
-  });
-  </script>
-</head>
-
-<body class="swagger-section">
-<div id='header'>
-    <div class="swagger-ui-wrap">
-        <a id="logo" href="http://swagger.io";>swagger</a>
-        <form id='api_selector'>
-            <div class='input'>
-                <div class='input'><input placeholder="user" id="input_user" 
name="user" type="text" size="10"/></div>
-                <div class='input'><input placeholder="pass" id="input_pass" 
name="pass" type="password" size="10"/></div>
-                <select id="input_baseUrl" name="baseUrl" style="height: 
26px;">
-                    <option id="private" label="private" 
value="/restful/swagger/private"/>
-                    <option id="public" label="public" 
value="/restful/swagger/public"/>
-                    <option id="prototyping" label="prototyping" 
value="/restful/swagger/prototyping"/>
-                </select>
-            </div>
-            <div class='input' style="display:none;"><input 
placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
-            <div class='input'><a id="explore" href="${symbol_pound}" 
data-sw-translate>Reload</a></div>
-        </form>
-
-    </div>
-</div>
-
-<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
 
b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index b032a17..0000000
--- 
a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Thu Feb 16 00:18:22 GMT 2017
-package=it.pkg
-version=0.1-SNAPSHOT
-groupId=archetype.it
-artifactId=basic

http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt 
b/example/archetype/simpleapp/src/test/resources/projects/basic/goal.txt
deleted file mode 100644
index e69de29..0000000

Reply via email to