incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1397207 [3/3] - in /incubator/isis/trunk: examples/quickstart/ examples/quickstart/dom/src/main/java/dom/todo/ examples/quickstart/exploration/ examples/quickstart/exploration/config/ examples/quickstart/exploration/ide/eclipse/launch/ exa...
Date Thu, 11 Oct 2012 18:06:46 GMT
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/isis.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties&p1=incubator/isis/trunk/examples/quickstart/exploration/config/isis.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/exploration/config/isis.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties Thu Oct 11 18:06:36 2012
@@ -57,38 +57,39 @@
 #               for objectstore-specific properties, see persistor_xml.properties 
 #
 # NOTE:
-# * edit isis.services (below) and pom.xml to reference appropriate objstore-xxx module
-# * for datanucleus objectstore, also edit isis.reflector.facets and isis.reflector.class-substitutor (below)
-# * for sql and datanucleus objectstores, also edit pom.xml to reference appropriate JDBC driver
+# * 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 mechanis to use (to logon to the system)
-# note that the Scimpi view allows access to anonymous users
-# 
-isis.authentication=dflt
+# 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.  Configure in web.xml 
+isis.authentication=file
 
 
 #
 # 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
 #
-# >>>
-# >>> NB: authorization also requires a "facet decorator" to be installed, 
-# >>> see 'miscellaneous' settings below.
-# >>> 
-# 
-isis.authorization=dflt
+# 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.  Configure in web.xml 
+#isis.authorization=file
 
 
 
@@ -105,53 +106,33 @@ isis.user-profile-store=in-memory
 
 #################################################################################
 #
-# System MetaModel and Runtime Components
+# MetaModel
 #
-#################################################################################
-
-#
-# programming model facets
+# The metamodel typically does not require additional configuration, although
+# the system components (defined above) may refine the metamodel for their needs.
 #
-# Some components require an additional set of facets to be defined. 
-#
-
-# for the datanucleus object store 
-#isis.reflector.facets=org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.metamodel.specloader.progmodelfacets.DataNucleusProgrammingModelFacets
+#################################################################################
 
 
 #
-# enable authorization
-#
-# authorization requires that a "facet decorator" be installed; this intercepts every
-# request and delegates to the configured authorization mechanism.  
+# additional programming model facets
 #
 
-#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
+#isis.reflector.facets.include=
+#isis.reflector.facets.exclude=
 
+# normally these facets would be installed by virtue of configuring the JDO object store
+# need to be configured manually if running some other object store only because the
+# JDO enhancer is still configured to run on the DOM project.
+isis.reflector.facets.include=\
+	org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoEnhancementTypesFacetFactory,\
+	org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoPrefixedMethodsFacetFactory
 
 #
-# enable Isis' built-in support for lazy loading/object dirtying.
-#
-# This configuration causes every domain entity to be "enhanced" so that objects graphs
-# can be traversed transparently, and modified objects are automatically saved back to the
-# object store.
-#
-# This setting is required by most persistors (in-memory, xml, mongodb, fileserver and sql)
-# For the datanucleus objectstore, it does not matter whether it is enabled or not.
+# metamodel validator
 #
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
 
-
-#
-# enable class substitution in the meta model
-#
-# The reflector (Isis metamodel) must be instructed to ignore the side-effects of enabling lazy-loading.
-#
-# This setting is required whenever the isis.persistor.object-factory property has been set.
-# For the datanucleus objectstore, it must be set to a specific implementation. 
-#
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.bytecode.DataNucleusTypesClassSubstitutor
+#isis.reflector.validator=
 
 
 
@@ -172,29 +153,19 @@ isis.reflector.class-substitutor=org.apa
 # The implementations depend on the configured (see isis.persistor above) 
 #
 
-# if using the in-memory or XML object stores:
-isis.services.prefix = objstore.dflt
-isis.services = todo.ToDoItemsDefault
-
-
-# if using the DataNucleus object store:
-#isis.services.prefix = objstore.jdo
-#isis.services = todo.ToDoItemsJdo
-
-
-# if using the SQL object store:
-#isis.services.prefix = objstore.sql
-#isis.services = todo.ToDoItemsSql
 
+# if using the in-memory, XML, SQL, fileserver or mongo object stores:
+isis.services.prefix = dom
+isis.services = todo.ToDoItems
 
-# if using the mongodb object store:
-#isis.services.prefix = objstore.mongodb
-#isis.services = todo.ToDoItemsMongo
 
+# 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
 
-# if using the fileserver object store:
-#isis.services.prefix = objstore.fileserver
-#isis.services = todo.ToDoItemsFileServer
 
 
 

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties Thu Oct 11 18:06:36 2012
@@ -1,89 +1,89 @@
-#  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=DEBUG,jdbc, Console
-log4j.additivity.jdbc.audit=false
-
-log4j.logger.jdbc.resultset=DEBUG,jdbc
-log4j.additivity.jdbc.resultset=false
-
-log4j.logger.jdbc.sqltiming=WARNING,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
-
+#  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=DEBUG,jdbc, Console
+log4j.additivity.jdbc.audit=false
+
+log4j.logger.jdbc.resultset=DEBUG,jdbc
+log4j.additivity.jdbc.resultset=false
+
+log4j.logger.jdbc.sqltiming=WARNING,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
+

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_fileserver.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_fileserver.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml Thu Oct 11 18:06:36 2012
@@ -21,7 +21,42 @@
     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>Quickstart Wicket app</display-name>
+    <display-name>Apache Isis Webapp</display-name>
+
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    
+    <context-param>
+        <param-name>deploymentType</param-name>
+        <!-- 
+        <param-value>SERVER</param-value>
+         -->
+        <param-value>SERVER_EXPLORATION</param-value>
+    </context-param>
+
+    
+    
+    <!--
+    -
+    -
+    - config common to all viewer(s)
+    -
+    -
+    -->
+    
+    <!-- bootstrap the Isis metamodel and runtime -->
+    <listener>
+        <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+    </listener>
+
+    <!-- which (optional) configuration file(s) to load -->
+    <context-param>
+        <param-name>isis.viewers</param-name>
+        <param-value>scimpi</param-value>
+    </context-param>
+
 
     <!-- which configuration directory to read overloaded property files from -->
     <!-- 
@@ -110,24 +145,30 @@
     
 
 
+
     <!--
     -
-    - config specific to the wicket-viewer
+    -
+    - config specific to the scimpi-viewer
+    -
     -
     -->
-	<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>org.apache.isis.viewer.wicket.viewer.IsisWicketApplication</param-value>
-		</init-param>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>wicket</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
+    <servlet>
+        <servlet-name>ScimpiDispatcher</servlet-name>
+        <servlet-class>org.apache.isis.viewer.scimpi.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+             <param-name>view</param-name>
+             <param-value>login.shtml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ScimpiDispatcher</servlet-name>
+        <url-pattern>*.shtml</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ScimpiDispatcher</servlet-name>
+        <url-pattern>*.app</url-pattern>
+    </servlet-mapping>
 
-	
 </web-app>

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/debug.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/debug.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/debug.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/debug.shtml Thu Oct 11 18:06:36 2012
@@ -18,6 +18,6 @@
   under the License.
 -->
 <swf:template file="scimpi/style/template.shtml"/>
-
-<swf:services/>
+
+<swf:services/>
 

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/error.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/error.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/error.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/action.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/action.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/action.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/collection.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/collection.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/collection.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/edit.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/edit.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/edit.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/object.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/object.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/object.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/index.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/index.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/index.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/login.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/login.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/login.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/login.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/login.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/custom/new-todo.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/custom/new-todo.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/images/scimpi-logo.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/images/scimpi-logo.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/reset.css (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/reset.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/reset.css?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/reset.css&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/reset.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/screen.css (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/screen.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/screen.css?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/screen.css&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/screen.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/site-template.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/site-template.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/template.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/template.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/eclipse/launch/quickstart-viewer-wicket.launch (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/eclipse/launch/quickstart-viewer-wicket.launch?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/eclipse/launch/quickstart-viewer-wicket.launch&p1=incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/eclipse/launch/quickstart-viewer-wicket.launch Thu Oct 11 18:06:36 2012
@@ -15,6 +15,6 @@
 <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"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-viewer-wicket"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/lib/.gitignore (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/lib/.gitignore?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/lib/.gitignore&p1=incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/pom.xml (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/pom.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/pom.xml&p1=incubator/isis/trunk/examples/quickstart/wicket/pom.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/pom.xml Thu Oct 11 18:06:36 2012
@@ -25,9 +25,12 @@
         <version>0.3.1-incubating-SNAPSHOT</version>
     </parent>
 
-	<artifactId>quickstart-wicket</artifactId>
-	<name>QuickStart Wicket App</name>
-	
+	<artifactId>quickstart-viewer-wicket</artifactId>
+	<name>QuickStart 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>
@@ -90,50 +93,29 @@
         </dependency>
 
 
-        <!-- domain service/repository implementations -->
-        
-        <!--
-          - uncomment in order to use in-memory or xml object stores
-          - (also edit isis.properties)
-          -
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>quickstart-objstore-dflt</artifactId>
-        </dependency>
-          -->
+        <!-- objectstore/domain service/repository implementations -->
         
         <!--
-         - uncomment in order to use jdo object store
+         - uncomment in order to use default object store
          - (also edit isis.properties)
          - 
+		<dependency>
+			<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+			<artifactId>dflt</artifactId>
+		</dependency>
         -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>quickstart-objstore-jdo</artifactId>
-        </dependency>
+        
         
         <!--
-         - uncomment in order to use sql object store
-         - (also edit isis.properties)
-         -
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>quickstart-objstore-sql</artifactId>
-        </dependency>
-        -->
-
-        <!--
-         - uncomment in order to use either mongodb or fileserver object store
+         - uncomment in order to use jdo object store
          - (also edit isis.properties)
          - 
+        -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>quickstart-objstore-nosql</artifactId>
+            <artifactId>quickstart-objstore-jdo</artifactId>
         </dependency>
-        -->
         
-
-
         
         
 

Added: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java Thu Oct 11 18:06:36 2012
@@ -0,0 +1,15 @@
+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
+    }
+}

Added: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/QuickStartApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/QuickStartApplication.java?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/QuickStartApplication.java (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/QuickStartApplication.java Thu Oct 11 18:06:36 2012
@@ -0,0 +1,71 @@
+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>
+ * &lt;filter>
+ *   &lt;filter-name>wicket&lt;/filter-name>
+ *    &lt;filter-class>org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class>
+ *    &lt;init-param>
+ *      &lt;param-name>applicationClassName&lt;/param-name>
+ *      &lt;param-value>app.QuickStartApplication&lt;/param-value>
+ *    &lt;/init-param>
+ * &lt;/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 v0.1.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";
+        }
+    }
+
+}

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.pdn (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.pdn)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.pdn?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.pdn&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.pdn&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.png (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.png?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.png&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Added: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html Thu Oct 11 18:06:36 2012
@@ -0,0 +1,25 @@
+<p class="intro">
+This sample webapp was generated by the Isis QuickStart archetype, configured to use Isis' wicket viewer.
+</p>
+
+<br/>
+<p>
+By default the domain objects are persisted using JDO/DataNucleus objectstore, configured to persist to an in-memory HSQL/DB database.
+</p>
+
+<br/>
+<p>
+To change the JDBC connection string, edit <tt>WEB-INF/persistor_datanucleus.properties</tt>.  Also update the <tt>pom.xml</tt> for the appropriate JDBC driver.
+</p>
+
+<br/>
+<p>
+To change the objectstore implementation, edit the <tt>WEB-INF/isis.properties</tt> file.
+</p>
+
+<br/>
+<p>
+The wicket viewer initially is configured using Wicket's 'development' mode, and Isis' authentication and authorization modules are disabled.
+For deployment, typically Wicket viewer should be switched to 'deployment' mode, by editing <tt>WEB-INF/web.xml</tt>.  
+Isis' authentication and authorization should also be enabled (again, by editing the <tt>WEB-INF/isis.properties</tt> config file).  
+</p>

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/images/Default.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/resources/images/Default.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/images/Default.png?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/images/Default.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/resources/images/Default.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.passwords)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.passwords&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties&p1=incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow&p1=incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties&p1=incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/isis.properties (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/isis.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/isis.properties&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/isis.properties Thu Oct 11 18:06:36 2012
@@ -57,9 +57,9 @@
 #               for objectstore-specific properties, see persistor_xml.properties 
 #
 # NOTE:
-# * edit isis.services (below) and pom.xml to reference appropriate objstore-xxx module
-# * for datanucleus objectstore, also edit isis.reflector.facets and isis.reflector.class-substitutor (below)
-# * for sql and datanucleus objectstores, also edit pom.xml to reference appropriate JDBC driver
+# * 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
@@ -73,24 +73,28 @@ isis.persistor=datanucleus
 
 
 #
-# configure authentication mechanis to use (to logon to the system)
-# note that the Scimpi view allows access to anonymous users
+# 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=file
 
 
 #
 # 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
 #
-# >>>
-# >>> NB: authorization also requires a "facet decorator" to be installed, 
-# >>> see 'miscellaneous' settings below.
-# >>> 
+# configuring this component automatically refines the metamodel (installing a facet factory
+# which vetoes access as required)
 # 
-isis.authorization=file
+ 
+# default is file in SERVER mode, none in SERVER_EXPLORATION.  Derived from wicket mode 
+#isis.authorization=file
 
 
 
@@ -107,61 +111,27 @@ isis.user-profile-store=in-memory
 
 #################################################################################
 #
-# System MetaModel and Runtime Components
-#
-#################################################################################
-
-#
-# programming model facets
-#
-# Some components require an additional set of facets to be defined. 
+# MetaModel
 #
-
-# for the datanucleus object store 
-isis.reflector.facets=org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.metamodel.specloader.progmodelfacets.DataNucleusProgrammingModelFacets
-
-
+# The metamodel typically does not require additional configuration, although
+# the system components (defined above) may refine the metamodel for their needs.
 #
-# metamodel validator
-#
-
-# for the datanucleus object store 
-isis.reflector.validator=org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.specloader.validator.JdoMetaModelValidator
+#################################################################################
 
 
 #
-# enable authorization
-#
-# authorization requires that a "facet decorator" be installed; this intercepts every
-# request and delegates to the configured authorization mechanism.  
+# additional programming model facets
 #
 
-#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
+#isis.reflector.facets.include=
+#isis.reflector.facets.exclude=
 
 
 #
-# enable Isis' built-in support for lazy loading/object dirtying.
-#
-# This configuration causes every domain entity to be "enhanced" so that objects graphs
-# can be traversed transparently, and modified objects are automatically saved back to the
-# object store.
-#
-# This setting is required by most persistors (in-memory, xml, mongodb, fileserver and sql)
-# For the datanucleus objectstore, it does not matter whether it is enabled or not.
+# metamodel validator
 #
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
 
-
-#
-# enable class substitution in the meta model
-#
-# The reflector (Isis metamodel) must be instructed to ignore the side-effects of enabling lazy-loading.
-#
-# This setting is required whenever the isis.persistor.object-factory property has been set.
-# For the datanucleus objectstore, it must be set to a specific implementation. 
-#
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.bytecode.DataNucleusTypesClassSubstitutor
+#isis.reflector.validator=
 
 
 
@@ -182,31 +152,19 @@ isis.reflector.class-substitutor=org.apa
 # The implementations depend on the configured (see isis.persistor above) 
 #
 
-# if using the in-memory or XML object stores:
-#isis.services.prefix = objstore.dflt
-#isis.services = todo.ToDoItemsDefault
+# 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:
+# 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
 
 
-# if using the SQL object store:
-#isis.services.prefix = objstore.sql
-#isis.services = todo.ToDoItemsSql
-
-
-# if using the mongodb object store:
-#isis.services.prefix = objstore.mongodb
-#isis.services = todo.ToDoItemsMongo
-
-
-# if using the fileserver object store:
-#isis.services.prefix = objstore.fileserver
-#isis.services = todo.ToDoItemsFileServer
-
 
 
 
@@ -217,6 +175,6 @@ isis.services = objstore.jdo.todo.ToDoIt
 # 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= fixture
-isis.fixtures= todo.ToDoItemsFixture
+#isis.fixtures.prefix= 
+#isis.fixtures= 
 

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/logging.properties (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/logging.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/logging.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/logging.properties&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/logging.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties Thu Oct 11 18:06:36 2012
@@ -32,31 +32,31 @@ isis.persistor.datanucleus.impl.datanucl
 isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
 
 
-#isis.persistor.datanucleus.install-fixtures=true
 
 
 
-
-#
+#############################################################################
 # JDBC connection details
-# (also update the pom.xml)
-#
+# (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=
+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=
+#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
@@ -74,6 +74,26 @@ isis.persistor.datanucleus.impl.javax.jd
 #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
 #
@@ -89,4 +109,3 @@ isis.persistor.datanucleus.impl.javax.jd
 #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
-

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/web.xml (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/web.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/web.xml&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/web.xml Thu Oct 11 18:06:36 2012
@@ -120,7 +120,7 @@
 		<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
 		<init-param>
 			<param-name>applicationClassName</param-name>
-			<param-value>org.apache.isis.viewer.wicket.viewer.IsisWicketApplication</param-value>
+			<param-value>app.QuickStartApplication</param-value>
 		</init-param>
 	</filter>
 

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/css/application.css (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/css/application.css?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/css/application.css&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/css/application.css Thu Oct 11 18:06:36 2012
@@ -16,22 +16,26 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+
+/*
+uncomment to add a logo (in an ../images directory relative to this file)
+
 #header {
-    background: none no-repeat scroll left center;
-    height: 20px;
+    height: 48px;
+    background-image: url("../images/logo.png");
+	background-repeat: no-repeat;
+}
+
+#header h1 {
+	display: none;
 }
+*/
+
 body {
 	background-color: #00477F;
 }
 
-div.entitySummary > label.entityTitle {
-	color: maroon;
-	font-size: xx-large;
-	font-weight: bolder;
-}
-.ToDoItem-description .scalarName {
-  color: maroon;
-  font-weight: bolder;
+.welcome .intro {
+	font-size: larger;
+	text-align: center;
 }
-
-

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.pdn (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.pdn)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.pdn?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.pdn&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.pdn&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Copied: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.png (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.png?p2=incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.png&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
    (empty)

Added: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/scripts/application.js
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/scripts/application.js?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/scripts/application.js (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/scripts/application.js Thu Oct 11 18:06:36 2012
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+	/// here...
+});
\ No newline at end of file

Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java (original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java Thu Oct 11 18:06:36 2012
@@ -50,7 +50,7 @@ public class AboutIsis {
         } catch (final MissingResourceException ex) {
             logo = "splash-logo";
             frameworkVersion = "${project.version}-r${buildNumber}";
-            frameworkCopyright = "Copyright (c) 2010~2011 Apache Software Foundation";
+            frameworkCopyright = "Copyright (c) 2010~2012 Apache Software Foundation";
             frameworkName = "${project.parent.name}";
         }
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java Thu Oct 11 18:06:36 2012
@@ -131,7 +131,7 @@ public final class SqlObjectStore implem
 
         final RootOidDefault sqlOid = (RootOidDefault) rootOid;
         connector.addToQueryValues(sqlOid.getIdentifier());
-        connector.addToQueryValues(rootOid.getObjectSpecId());
+        connector.addToQueryValues(rootOid.getObjectSpecId().asString());
 
         connector.insert(sql.toString());
         connectionPool.release(connector);
@@ -435,7 +435,7 @@ public final class SqlObjectStore implem
             sql.append(" where ");
             sql.append(Defaults.getIdColumn());
             sql.append(" = ?");
-            connector.addToQueryValues(serviceSpec.getSpecId());
+            connector.addToQueryValues(serviceSpec.getSpecId().asString());
 
             final Results results = connector.select(sql.toString());
             if (!results.next()) {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java Thu Oct 11 18:06:36 2012
@@ -38,8 +38,8 @@ public class BookmarkedPagesModel extend
     private List<PageParameters> list = Lists.newArrayList();
     private transient PageParameters current;
     
-    public void bookmarkPage(final BookmarkableModel<?> isisModel) {
-        final PageParameters pageParameters = isisModel.asPageParameters();
+    public void bookmarkPage(final BookmarkableModel<?> bookmarkableModel) {
+        final PageParameters pageParameters = bookmarkableModel.asPageParameters();
         
         // ignore if doesn't provide a page type for subsequent disambiguation
         PageType pageType = PageParameterNames.PAGE_TYPE.getEnumFrom(pageParameters, PageType.class);

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java Thu Oct 11 18:06:36 2012
@@ -69,7 +69,7 @@ public class EntityModel extends Bookmar
         final Boolean persistent = adapter.representsPersistent();
 
         if (persistent) {
-            final String oidStr = adapter.getOid().enString(getOidMarshaller());
+            final String oidStr = adapter.getOid().enStringNoVersion(getOidMarshaller());
 
             PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr);
         } else {

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java Thu Oct 11 18:06:36 2012
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.ui
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
-import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.basic.MultiLineLabel;
 
 import org.apache.isis.viewer.wicket.model.models.AboutModel;
 import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
@@ -45,7 +45,7 @@ public class AboutPanel extends PanelAbs
     public AboutPanel(final String id, final AboutModel model) {
         super(id, model);
         getModel().setObject(aboutMessage);
-        add(new Label(ID_MESSAGE, model.getObject()));
+        add(new MultiLineLabel(ID_MESSAGE, model.getObject()));
     }
 
 }

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java Thu Oct 11 18:06:36 2012
@@ -45,6 +45,6 @@ public class WelcomePanel extends PanelA
     public WelcomePanel(final String id, WelcomeModel model) {
         super(id, model);
         model.setObject(welcomeMessage);
-        add(new Label(ID_MESSAGE, getModel().getObject()));
+        add(new Label(ID_MESSAGE, getModel().getObject()).setEscapeModelStrings(false));
     }
 }

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html Thu Oct 11 18:06:36 2012
@@ -49,7 +49,7 @@
 			</div>
 
 			<div id="footer">
-				<a href="#" wicket:id="logoutLink">logout</a>&nbsp;|&nbsp;<a href="#" wicket:id="aboutLink">about</a>&nbsp;|&nbsp;powered by <a href="http://isis.apache.org">Apache Isis</a>
+				<a href="#" wicket:id="logoutLink">logout</a>&nbsp;|&nbsp;<a href="#" wicket:id="aboutLink">about</a>&nbsp;|&nbsp;powered by <a href="http://incubator.apache.org/isis">Apache Isis (incubating)</a>
 			</div>
 		</div>
 	</body>

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html Thu Oct 11 18:06:36 2012
@@ -30,7 +30,9 @@
 	<body>
 		<wicket:extend>
 			<div class="aboutPage">
-				<div wicket:id="about"/>
+				<div>
+					<span wicket:id="about"/>
+				</div>
 			</div>
 		</wicket:extend>
 	</body>



Mime
View raw message