You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/10/11 20:06:46 UTC
svn commit: r1397207 [2/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...
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.png?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/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-html/src/main/resources/images/Default.png?p2=incubator/isis/trunk/examples/quickstart/viewer-html/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-html/src/main/webapp/WEB-INF/authentication_file.passwords (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/authentication_file.passwords?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/authentication_file.passwords&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/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-html/src/main/webapp/WEB-INF/authentication_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-html/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-html/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-html/src/main/webapp/WEB-INF/authorization_file.allow?p2=incubator/isis/trunk/examples/quickstart/viewer-html/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-html/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-html/src/main/webapp/WEB-INF/authorization_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-html/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-html/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-html/src/main/webapp/WEB-INF/isis.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-html/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-html/src/main/webapp/WEB-INF/isis.properties Thu Oct 11 18:06:36 2012
@@ -57,38 +57,37 @@
# 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
+isis.persistor=sql
#
-# 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 +104,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 +151,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
@@ -206,6 +175,6 @@ isis.services = todo.ToDoItemsDefault
# 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.prefix= fixture
isis.fixtures= todo.ToDoItemsFixture
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/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-html/src/main/webapp/WEB-INF/logging.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-html/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
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/persistor_sql.properties (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_sql.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/persistor_sql.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/persistor_sql.properties&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_sql.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_sql.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/persistor_sql.properties Thu Oct 11 18:06:36 2012
@@ -21,16 +21,33 @@
#
-# configuration for HSQLDB
+# HSQLDB in-memory (using log4jdbc-remix)
#
-#
+#isis.persistor.sql.jdbc.driver=net.sf.log4jdbc.DriverSpy
+#isis.persistor.sql.jdbc.connection=jdbc:log4jdbc:hsqldb:mem:test
+#isis.persistor.sql.jdbc.user=sa
+#isis.persistor.sql.jdbc.password=
+
+
+#
+# HSQLDB (file)
#
isis.persistor.sql.jdbc.driver=org.hsqldb.jdbcDriver
-isis.persistor.sql.jdbc.connection=jdbc:hsqldb:file:hsql-db/tests
+isis.persistor.sql.jdbc.connection=jdbc:hsqldb:mem:test
isis.persistor.sql.jdbc.user=sa
isis.persistor.sql.jdbc.password=
+
+#
+# HSQLDB (file)
+#
+#isis.persistor.sql.jdbc.driver=org.hsqldb.jdbcDriver
+#isis.persistor.sql.jdbc.connection=jdbc:hsqldb:file:hsql-db/tests
+#isis.persistor.sql.jdbc.user=sa
+#isis.persistor.sql.jdbc.password=
+
+
#
# configuration for MS SQL
# (also edit pom.xml of objstore-mongodb)
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/viewer_html.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/viewer_html.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/viewer_html.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml Thu Oct 11 18:06:36 2012
@@ -30,33 +30,13 @@
<context-param>
<param-name>deploymentType</param-name>
+ <!--
<param-value>SERVER</param-value>
+ -->
+ <param-value>SERVER_EXPLORATION</param-value>
</context-param>
- <!--
- -
- -
- - config for archetype only
- -
- -
- -->
-
- <!-- redirect to /doc/index.html if accessing "/" using web browser -->
- <filter>
- <filter-name>RedirectToDocsFilter</filter-name>
- <filter-class>org.apache.isis.core.webapp.routing.RedirectToDocsFilter</filter-class>
- <init-param>
- <param-name>redirectTo</param-name>
- <param-value>/index.html</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>RedirectToDocsFilter</filter-name>
- <url-pattern>/</url-pattern>
- </filter-mapping>
-
-
<!--
@@ -75,9 +55,10 @@
<!-- which (optional) configuration file(s) to load -->
<context-param>
<param-name>isis.viewers</param-name>
- <param-value>html,restfulobjects,scimpi</param-value>
+ <param-value>html</param-value>
</context-param>
+
<!-- which configuration directory to read overloaded property files from -->
<!--
Normally configuration like this should be done from outside your web
@@ -248,87 +229,5 @@
<servlet-name>HtmlDispatcher</servlet-name>
<url-pattern>*.htmlviewer</url-pattern>
</servlet-mapping>
-
-
-
-
- <!--
- -
- -
- - config specific to the scimpi-viewer
- -
- -
- -->
- <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>
-
-
-
-
- <!--
- -
- -
- - config specific to the restfulobjects-viewer
- -
- -
- -->
-
- <!-- 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.viewer.RestfulObjectsApplication</param-value>
- </context-param>
-
- <!-- authenticate user, set up an Isis session -->
- <filter>
- <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
- <!-- authentication required for REST -->
- <init-param>
- <param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
- </init-param>
- <init-param>
- <!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge -->
- <param-name>whenNoSession</param-name>
- <param-value>basicAuthChallenge</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>JsonDispatcher</servlet-name>
- </filter-mapping>
-
-
- <servlet>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
</web-app>
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner-bg.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner-bg.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner-bg.png?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner-bg.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner-bg.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner.png?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/style/default.css (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/style/default.css?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/style/default.css&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/eclipse/launch/quickstart-viewer-restfulobjects.launch (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/eclipse/launch/quickstart-viewer-restfulobjects.launch?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/eclipse/launch/quickstart-viewer-restfulobjects.launch&p1=incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/eclipse/launch/quickstart-viewer-restfulobjects.launch Thu Oct 11 18:06:36 2012
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<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.PROGRAM_ARGUMENTS" value="-D isis.persistor.datanucleus.install-fixtures=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-wicket"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<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.PROGRAM_ARGUMENTS" value="--type server_exploration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-viewer-restfulobjects"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/lib/.gitignore (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/lib/.gitignore?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/lib/.gitignore&p1=incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/lib/.gitignore Thu Oct 11 18:06:36 2012
@@ -1,5 +1,5 @@
-#
-# explicitly ignoring Microsoft JDBC4 jar
-# (cannot redistribute, licensing)
-#
-sqljdbc4.jar
+#
+# explicitly ignoring Microsoft JDBC4 jar
+# (cannot redistribute, licensing)
+#
+sqljdbc4.jar
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/pom.xml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/pom.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/pom.xml&p1=incubator/isis/trunk/examples/quickstart/webapp/pom.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/pom.xml Thu Oct 11 18:06:36 2012
@@ -26,8 +26,12 @@
<version>0.3.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>quickstart-webapp</artifactId>
- <name>Quickstart Webapp</name>
+ <artifactId>quickstart-viewer-restfulobjects</artifactId>
+ <name>Quickstart Restful Objects Viewer</name>
+
+ <description>This module runs Isis' Restful Objects viewer, configured to run using the
+ datanucleus object store. It also includes a demonstrator single-page JQueryMobile app.
+ See other viewer modules for more persistence options.</description>
<packaging>war</packaging>
@@ -88,66 +92,38 @@
- <!-- 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
+ - uncomment in order to use jdo object store
- (also edit isis.properties)
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-sql</artifactId>
- </dependency>
+ - (also uncomment in order to install facet factories used to
+ - filter out any JDO enhancement to pojos)
-->
-
- <!--
- - uncomment in order to use either mongodb or fileserver object store
- - (also edit isis.properties)
- -
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-nosql</artifactId>
+ <artifactId>quickstart-objstore-jdo</artifactId>
</dependency>
- -->
<!-- isis viewer -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>restfulobjects-viewer</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-servlet</artifactId>
- </dependency>
-
<!-- isis runtime -->
<dependency>
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.pdn (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.pdn?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.pdn&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.png?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/resources/images/Default.png (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/resources/images/Default.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/resources/images/Default.png?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/resources/images/Default.png&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/resources/images/Default.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.passwords (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.passwords)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.passwords?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.passwords&p1=incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.passwords&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.passwords (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.passwords Thu Oct 11 18:06:36 2012
@@ -22,7 +22,7 @@
#
# list of users, and their password, and optionally roles
-sven:pass:org.apache.isis.viewer.wicket.roles.USER
-dick:pass:org.apache.isis.viewer.wicket.roles.USER
-bob:pass:org.apache.isis.viewer.wicket.roles.USER
-joe:pass:org.apache.isis.viewer.wicket.roles.USER
+sven:pass:role1|role2|role3
+dick:pass
+bob:pass
+joe:pass
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.allow (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.allow?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.allow&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties Thu Oct 11 18:06:36 2012
@@ -57,38 +57,37 @@
# 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
-#
+# 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=file
+# 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,61 +104,27 @@ 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
+#################################################################################
#
-# metamodel validator
+# additional programming model facets
#
-# for the datanucleus object store
-isis.reflector.validator=org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.specloader.validator.JdoMetaModelValidator
+#isis.reflector.facets.include=
+#isis.reflector.facets.exclude=
#
-# enable authorization
-#
-# authorization requires that a "facet decorator" be installed; this intercepts every
-# request and delegates to the configured authorization mechanism.
-#
-
-#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
-
-
-#
-# 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=
@@ -180,33 +145,20 @@ 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:
-#isis.services.prefix =
+
+# if using the DataNucleus object store
+# (with support for DN's audit service, and to install 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
-
-
#
@@ -215,7 +167,7 @@ isis.services = objstore.jdo.todo.ToDoIt
# Fixtures are used to seed the object store with an initial set of data. For the
# in-memory object store, the fixtures are installed on every run. For other
# object stores, they are used only when the object store is first initialized.
-#
-isis.fixtures.prefix= fixture
+#
+isis.fixtures.prefix= fixture
isis.fixtures= todo.ToDoItemsFixture
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/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-restfulobjects/src/main/webapp/WEB-INF/logging.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/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-restfulobjects/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-restfulobjects/src/main/webapp/WEB-INF/persistor_datanucleus.properties (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/persistor_datanucleus.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/persistor_datanucleus.properties&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/persistor_datanucleus.properties Thu Oct 11 18:06:36 2012
@@ -33,31 +33,30 @@ isis.persistor.datanucleus.impl.datanucl
-#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
@@ -75,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
#
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/viewer_restfulobjects.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/viewer_restfulobjects.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/viewer_restfulobjects.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/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-restfulobjects/src/main/webapp/WEB-INF/web.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/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-restfulobjects/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>restfulobjects</param-value>
+ </context-param>
+
<!-- which configuration directory to read overloaded property files from -->
<!--
@@ -110,24 +145,57 @@
+
+
<!--
-
- - config specific to the wicket-viewer
+ -
+ - config specific to the restfulobjects-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>
+
+ <!-- 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.viewer.RestfulObjectsApplication</param-value>
+ </context-param>
+
+ <!-- authenticate user, set up an Isis session -->
+ <filter>
+ <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
+ <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <!-- authentication required for REST -->
+ <init-param>
+ <param-name>authenticationSessionStrategy</param-name>
+ <param-value>org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
+ </init-param>
+ <init-param>
+ <!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge -->
+ <param-name>whenNoSession</param-name>
+ <param-value>basicAuthChallenge</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>
+
+ <servlet>
+ <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
+ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
</web-app>
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/ajax-loader.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/ajax-loader.png?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/ajax-loader.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-black.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-black.png?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-black.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-white.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-white.png?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-white.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-black.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-black.png?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-black.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-white.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-white.png?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-white.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery/jquery-1.6.4.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery/jquery-1.6.4.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery/jquery-1.6.4.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery/jquery-1.6.4.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery/jquery-1.6.4.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.css (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.css?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.css&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/generic.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/generic.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/generic.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/generic.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/generic.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/index.html (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/index.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/index.html?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/index.html&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/index.html&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/namespace.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/namespace.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/namespace.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/namespace.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/namespace.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/util.js (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/util.js)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/util.js?p2=incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/util.js&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/util.js&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch&p1=incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch Thu Oct 11 18:06:36 2012
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<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-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<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.PROGRAM_ARGUMENTS" value="--type server_exploration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-viewer-scimpi"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/lib/.gitignore (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/lib/.gitignore?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/lib/.gitignore&p1=incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/lib/.gitignore Thu Oct 11 18:06:36 2012
@@ -1,5 +1,5 @@
-#
-# explicitly ignoring Microsoft JDBC4 jar
-# (cannot redistribute, licensing)
-#
-sqljdbc4.jar
+#
+# explicitly ignoring Microsoft JDBC4 jar
+# (cannot redistribute, licensing)
+#
+sqljdbc4.jar
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/pom.xml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/pom.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/pom.xml&p1=incubator/isis/trunk/examples/quickstart/webapp/pom.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/pom.xml Thu Oct 11 18:06:36 2012
@@ -26,8 +26,13 @@
<version>0.3.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>quickstart-webapp</artifactId>
- <name>Quickstart Webapp</name>
+ <artifactId>quickstart-viewer-scimpi</artifactId>
+ <name>Quickstart Scimpi Viewer</name>
+
+ <description>This module runs Isis' Scimpi webapp viewer. By default it is configured to
+ run using the in-memory object store, but it can be easily switched to, for example, the
+ mongo or fileserver object store by updating isis.properties.
+ See other viewer modules for more persistence options.</description>
<packaging>war</packaging>
@@ -88,61 +93,33 @@
- <!-- 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>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-jdo</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
<!--
- - uncomment in order to use sql object store
+ - uncomment in order to use jdo object store
- (also edit isis.properties)
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-sql</artifactId>
- </dependency>
+ - (also uncomment in order to install facet factories used to
+ - filter out any JDO enhancement to pojos)
-->
-
- <!--
- - uncomment in order to use either mongodb or fileserver object store
- - (also edit isis.properties)
- -
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-nosql</artifactId>
+ <artifactId>quickstart-objstore-jdo</artifactId>
</dependency>
- -->
<!-- isis viewer -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-viewer</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.viewer</groupId>
<artifactId>scimpi-servlet</artifactId>
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.png (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.png?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.png&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/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-scimpi/src/main/resources/images/Default.png?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/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-scimpi/src/main/webapp/ToDoItem/edit.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/edit.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/edit.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords Thu Oct 11 18:06:36 2012
@@ -22,7 +22,7 @@
#
# list of users, and their password, and optionally roles
-sven:pass:role1|role2|role3
-dick:pass
-bob:pass
-joe:pass
+sven:pass:role1|role2|role3
+dick:pass
+bob:pass
+joe:pass
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.allow)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.allow&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)