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/12/13 08:30:03 UTC
[1/58] git commit: ISIS-188: updating class names in web.xml etc...
Updated Branches:
refs/heads/master 194a80124 -> fb973824e
ISIS-188: updating class names in web.xml etc...
... with respect to package renames
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/fb973824
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fb973824
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fb973824
Branch: refs/heads/master
Commit: fb973824ea20514cf040e3e88c7db02f52e30bc7
Parents: 978f79a
Author: Dan Haywood <da...@apache.org>
Authored: Thu Dec 13 07:28:20 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Dec 13 07:28:20 2012 +0000
----------------------------------------------------------------------
component/objectstore/sql/sql-tests-common/pom.xml | 2 +-
.../sql/src/docbkx/guide/isis-sql-objectstore.xml | 4 +-
.../security/src/docbkx/guide/isis-security.xml | 2 +-
.../html/tck/src/main/webapp/WEB-INF/web.xml | 4 +-
.../docbkx/guide/isis-restfulobjects-viewer.xml | 8 +++---
.../tck/src/main/webapp/WEB-INF/web.xml | 4 +-
.../scimpi/tck/src/main/webapp/WEB-INF/web.xml | 2 +-
.../isis-default-runtime.xml | 18 +++++++-------
core/src/docbkx/guide/isis-core.xml | 4 +-
.../viewer-html/src/main/webapp/WEB-INF/web.xml | 4 +-
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../viewer-scimpi/src/main/webapp/WEB-INF/web.xml | 2 +-
example/application/quickstart/viewer-html/pom.xml | 10 --------
.../viewer-html/src/main/webapp/WEB-INF/web.xml | 8 +++---
.../viewer-scimpi/src/main/webapp/WEB-INF/web.xml | 2 +-
.../viewer-restfulobjects/pom.xml | 10 --------
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../viewer-wicket/pom.xml | 16 -------------
.../viewer-html/src/main/webapp/WEB-INF/web.xml | 8 +++---
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../viewer-scimpi/src/main/webapp/WEB-INF/web.xml | 2 +-
scripts/searchandreplace.groovy | 11 ++++++++-
src/docbkx/guide/isis-contributors-guide.xml | 14 +++++-----
23 files changed, 60 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/component/objectstore/sql/sql-tests-common/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/pom.xml b/component/objectstore/sql/sql-tests-common/pom.xml
index d851265..b3d7241 100644
--- a/component/objectstore/sql/sql-tests-common/pom.xml
+++ b/component/objectstore/sql/sql-tests-common/pom.xml
@@ -91,7 +91,7 @@
</dependency>
<!-- Required to support the XML cross-test -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <groupId>org.apache.isis.core.objectstore</groupId>
<artifactId>xml</artifactId>
<version>${xml-objectstore.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/component/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml b/component/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml
index a0522bb..6858fe9 100644
--- a/component/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml
+++ b/component/objectstore/sql/src/docbkx/guide/isis-sql-objectstore.xml
@@ -632,7 +632,7 @@
..</para>
<para>Default automapper is
- <code>org.apache.isis.runtimes.dflt.objectstores.sql.jdbc.installer.JdbcFieldMappingFactoryInstaller</code></para>
+ <code>org.apache.isis.objectstore.sql.jdbc.installer.JdbcFieldMappingFactoryInstaller</code></para>
<para></para>
</sect1>
@@ -645,7 +645,7 @@
either in configuration or at runtime.</para>
<para>The class
- <code>org.apache.isis.runtimes.dflt.objectstores.sql.Defaults</code>
+ <code>org.apache.isis.objectstore.sql.Defaults</code>
contains the following:</para>
<para>Programmatic, at runtime:</para>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/component/security/src/docbkx/guide/isis-security.xml
----------------------------------------------------------------------
diff --git a/component/security/src/docbkx/guide/isis-security.xml b/component/security/src/docbkx/guide/isis-security.xml
index a909a3d..5f3bc8b 100644
--- a/component/security/src/docbkx/guide/isis-security.xml
+++ b/component/security/src/docbkx/guide/isis-security.xml
@@ -586,7 +586,7 @@ isis.authorization.file.blacklist=security_file.disallow </programlisting>
settings</para>
<programlisting format="linespecific">isis.reflector.facets.include=\
- org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryForDfltRuntime
+ org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetFactory
</programlisting>
<para></para>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/component/viewer/html/tck/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/component/viewer/html/tck/src/main/webapp/WEB-INF/web.xml b/component/viewer/html/tck/src/main/webapp/WEB-INF/web.xml
index d2efc48..43154f5 100644
--- a/component/viewer/html/tck/src/main/webapp/WEB-INF/web.xml
+++ b/component/viewer/html/tck/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
<display-name>Apache Isis HTML Viewer</display-name>
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<context-param>
@@ -34,7 +34,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<param-name>logonPage</param-name>
<param-value>/logon.app</param-value>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/component/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml b/component/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml
index 9b23797..c0b311b 100644
--- a/component/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml
+++ b/component/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml
@@ -507,10 +507,10 @@
that are used to create a session for each subsequent request. This
is done using a context listener (defined in the <emphasis>default
runtime</emphasis>,
- <package>[oai.runtimes.dflt:webapp]</package>):</para>
+ <package>[oai.core:isis-core-runtime]</package>):</para>
<programlisting><listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener></programlisting>
<para>The session is created for each request using the
@@ -518,7 +518,7 @@
<programlisting><filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<param-name>authenticationSessionLookupStrategy</param-name>
<param-value>org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
@@ -1017,7 +1017,7 @@ mvn jetty:run</programlisting>
<programlisting><filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<param-name>authenticationSessionLookupStrategy</param-name>
<param-value>org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/component/viewer/restfulobjects/tck/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/component/viewer/restfulobjects/tck/src/main/webapp/WEB-INF/web.xml b/component/viewer/restfulobjects/tck/src/main/webapp/WEB-INF/web.xml
index 118fdfc..f275a03 100644
--- a/component/viewer/restfulobjects/tck/src/main/webapp/WEB-INF/web.xml
+++ b/component/viewer/restfulobjects/tck/src/main/webapp/WEB-INF/web.xml
@@ -80,7 +80,7 @@
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<context-param>
@@ -90,7 +90,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<!-- trusted client, so no authentication required -->
<param-name>authenticationSessionStrategy</param-name>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/component/viewer/scimpi/tck/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/tck/src/main/webapp/WEB-INF/web.xml b/component/viewer/scimpi/tck/src/main/webapp/WEB-INF/web.xml
index fca44e3..3e61f54 100644
--- a/component/viewer/scimpi/tck/src/main/webapp/WEB-INF/web.xml
+++ b/component/viewer/scimpi/tck/src/main/webapp/WEB-INF/web.xml
@@ -28,7 +28,7 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<context-param>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/core/src/docbkx/guide-runtime-to-incorporate/isis-default-runtime.xml
----------------------------------------------------------------------
diff --git a/core/src/docbkx/guide-runtime-to-incorporate/isis-default-runtime.xml b/core/src/docbkx/guide-runtime-to-incorporate/isis-default-runtime.xml
index 524b9bf..a924ac6 100644
--- a/core/src/docbkx/guide-runtime-to-incorporate/isis-default-runtime.xml
+++ b/core/src/docbkx/guide-runtime-to-incorporate/isis-default-runtime.xml
@@ -266,7 +266,7 @@
found on the classpath from the
<filename>installer-registry.properties</filename> file.
(Physically this is packaged within the
- [oai.runtimes.dflt:runtime] module's
+ [oai.core:isis-core-runtime] module's
<acronym>JAR</acronym>).</para>
<para>This allow the runner class to be aware of all the
@@ -1229,20 +1229,20 @@ $ mvn clean package</screen>
runtime works. If you just want to use the</para>
<sect1>
- <title>Components of the Default Runtime</title>
+ <title>Components of the Core Runtime</title>
<para>As will be clear if you've explored the codebase, the
- <emphasis>default runtime</emphasis> implementation consists of a main
+ <emphasis>core runtime</emphasis> implementation consists of a main
<emphasis>runtime</emphasis>
- module<package>[oai.runtimes.dflt:runtime]</package> along with a
- fairly large number of submodules.</para>
+ module<package>[oai.core:runtime]</package> along with a
+ fairly large number of components.</para>
<para>The main <emphasis>runtime</emphasis> module provides the
following functionality:</para>
<itemizedlist>
<listitem>
- <para>classes to bootstrap the default runtime</para>
+ <para>classes to bootstrap the core runtime</para>
</listitem>
<listitem>
@@ -1383,7 +1383,7 @@ $ mvn clean package</screen>
<itemizedlist>
<listitem>
- <para>a module <package>[oai.runtimes.dflt:webapp]</package> with
+ <para>a module <package>[oai.core:isis-core-runtime]</package> with
<classname>ServletContextListener</classname> and
<classname>javax.servlet.Filter</classname> implementations to
allow <emphasis>Isis</emphasis> to be bootstrapped from a
@@ -1392,7 +1392,7 @@ $ mvn clean package</screen>
<listitem>
<para>provides a convenience module
- <package>[oai.runtimes.dflt:webserver]</package> that provides a
+ <package>[oai.core:isis-core-webserver]</package> that provides a
command-line utility to allow any Maven webapp-structured project
to be hosted within Jetty.</para>
</listitem>
@@ -2048,7 +2048,7 @@ isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
runtime module.</para>
</abstract>
- <para>The runtime module <package>[oai.runtimes.dflt:runtime]</package>
+ <para>The runtime module <package>[oai.core:isis-core-runtime]</package>
is the "engine-room" of the default runtime, taking responsibility to
manage domain object (pojo) instances at runtime:</para>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/core/src/docbkx/guide/isis-core.xml
----------------------------------------------------------------------
diff --git a/core/src/docbkx/guide/isis-core.xml b/core/src/docbkx/guide/isis-core.xml
index b5ccb30..4fd748d 100644
--- a/core/src/docbkx/guide/isis-core.xml
+++ b/core/src/docbkx/guide/isis-core.xml
@@ -361,8 +361,8 @@
the above (lifecycle, persistence, remoting and
profiles).</para>
- <para>A key part of the design of the default runtime is the
- <package>oai.runtimes.dflt.runtime.context.IsisContext</package>
+ <para>A key part of the design of the core runtime is the
+ <package>oai.core.runtime.system.context.IsisContext</package>
interface, which is used to obtain the current session<footnote>
<para>This interface is somewhat akin to <ulink
url="http://docs.jboss.org/hibernate/core/3.3/reference/en/html/tutorial.html">HibernateUtil</ulink>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-html/src/main/webapp/WEB-INF/web.xml b/example/application/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
index f89f0ec..fec343b 100644
--- a/example/application/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
<display-name>Apache Isis HTML Viewer</display-name>
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<context-param>
@@ -59,7 +59,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<!-- this is the 'legacy' way, preserved only for backwards compatibility -->
<param-name>logonPage</param-name>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/claims/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml b/example/application/claims/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
index 82c4496..aee8699 100644
--- a/example/application/claims/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/claims/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
<display-name>JSON Claims</display-name>
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<listener>
@@ -72,7 +72,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<!-- look for basic auth headers -->
<param-name>authenticationSessionStrategy</param-name>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml b/example/application/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
index fecac31..45f56d6 100644
--- a/example/application/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/claims/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
@@ -28,7 +28,7 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/quickstart/viewer-html/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/viewer-html/pom.xml b/example/application/quickstart/viewer-html/pom.xml
index 4653100..bb4bd0e 100644
--- a/example/application/quickstart/viewer-html/pom.xml
+++ b/example/application/quickstart/viewer-html/pom.xml
@@ -93,16 +93,6 @@
<!-- objectstore/domain service/repository implementations -->
- <!--
- - 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>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-sql-impl</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml b/example/application/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
index c453514..5739ebd 100644
--- a/example/application/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
@@ -49,7 +49,7 @@
<!-- bootstrap the Isis metamodel and runtime -->
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<!-- which (optional) configuration file(s) to load -->
@@ -178,11 +178,11 @@
<!-- authenticate user, and set up an Isis Session -->
<filter>
<filter-name>IsisSessionFilterForHtml</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<!-- lookup from cache, or if a logon filter was provided -->
<param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+ <param-value>org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
</init-param>
<init-param>
<!-- what to do if no session was found; we indicate access only to a restricted list of paths -->
@@ -209,7 +209,7 @@
<servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
<init-param>
<param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+ <param-value>org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
</init-param>
<init-param>
<param-name>startPage</param-name>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml b/example/application/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
index 7973d69..d37ddcb 100644
--- a/example/application/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
@@ -48,7 +48,7 @@
<!-- bootstrap the Isis metamodel and runtime -->
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<!-- which (optional) configuration file(s) to load -->
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
index 2f4553a..4ac850f 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
@@ -95,16 +95,6 @@
<!-- objectstore/domain service/repository implementations -->
<!--
- - 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>
- -->
-
- <!--
- uncomment in order to use jdo object store
- (also edit isis.properties)
-
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
index 697a2db..008fe99 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
@@ -48,7 +48,7 @@
<!-- bootstrap the Isis metamodel and runtime -->
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<!-- which (optional) configuration file(s) to load -->
@@ -169,7 +169,7 @@
<!-- authenticate user, set up an Isis session -->
<filter>
<filter-name>IsisSessionFilterForRestfulObjects</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<!-- authentication required for REST -->
<init-param>
<param-name>authenticationSessionStrategy</param-name>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
index 2815bef..c0a5085 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
@@ -95,22 +95,6 @@
<!-- objectstore/domain service/repository implementations -->
- <!--
- - 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>
- -->
-
-
- <!--
- - uncomment in order to use jdo object store
- - (also edit isis.properties)
- -
- -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-html/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-html/src/main/webapp/WEB-INF/web.xml b/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-html/src/main/webapp/WEB-INF/web.xml
index e23eea7..2ccef84 100644
--- a/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-html/src/main/webapp/WEB-INF/web.xml
+++ b/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-html/src/main/webapp/WEB-INF/web.xml
@@ -52,7 +52,7 @@
<!-- bootstrap the Isis metamodel and runtime -->
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<!-- which (optional) configuration file(s) to load -->
@@ -181,11 +181,11 @@
<!-- authenticate user, and set up an Isis Session -->
<filter>
<filter-name>IsisSessionFilterForHtml</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<!-- lookup from cache, or if a logon filter was provided -->
<param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+ <param-value>org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
</init-param>
<init-param>
<!-- what to do if no session was found; we indicate access only to a restricted list of paths -->
@@ -212,7 +212,7 @@
<servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
<init-param>
<param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+ <param-value>org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
</init-param>
<init-param>
<param-name>startPage</param-name>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml b/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
index f7e8e7f..2315ace 100644
--- a/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
+++ b/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
@@ -51,7 +51,7 @@
<!-- bootstrap the Isis metamodel and runtime -->
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<!-- which (optional) configuration file(s) to load -->
@@ -172,7 +172,7 @@
<!-- authenticate user, set up an Isis session -->
<filter>
<filter-name>IsisSessionFilterForRestfulObjects</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<!-- authentication required for REST -->
<init-param>
<param-name>authenticationSessionStrategy</param-name>
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-scimpi/src/main/webapp/WEB-INF/web.xml b/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
index 9b227d5..aa7a768 100644
--- a/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
+++ b/example/archetype/quickstart/src/main/resources/archetype-resources/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
@@ -51,7 +51,7 @@
<!-- bootstrap the Isis metamodel and runtime -->
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<!-- which (optional) configuration file(s) to load -->
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/scripts/searchandreplace.groovy
----------------------------------------------------------------------
diff --git a/scripts/searchandreplace.groovy b/scripts/searchandreplace.groovy
index c7d7b66..ffeffa9 100644
--- a/scripts/searchandreplace.groovy
+++ b/scripts/searchandreplace.groovy
@@ -40,7 +40,16 @@ if(options.x) {
//
//
def replacements = [
-"<artifactId>isis-metamodel": "<artifactId>isis-core-metamodel"
+
+"org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper":"org.apache.isis.core.webapp.IsisWebAppBootstrapper"
+,"org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter":"org.apache.isis.core.webapp.IsisSessionFilter"
+,"org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault":"org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault"
+,
+,"oai.runtimes.dflt:runtime":"oai.core:isis-core-runtime"
+,"oai.runtimes.dflt:webapp":"oai.core:isis-core-runtime"
+,"oai.runtimes.dflt:webserver":"oai.core:isis-core-webserver"
+
+//"<artifactId>isis-metamodel": "<artifactId>isis-core-metamodel"
//"integteestsupport": "integtestsupport"
//,"unitteestsupport": "unittestsupport"
http://git-wip-us.apache.org/repos/asf/isis/blob/fb973824/src/docbkx/guide/isis-contributors-guide.xml
----------------------------------------------------------------------
diff --git a/src/docbkx/guide/isis-contributors-guide.xml b/src/docbkx/guide/isis-contributors-guide.xml
index 83a2fbf..5f87dcf 100644
--- a/src/docbkx/guide/isis-contributors-guide.xml
+++ b/src/docbkx/guide/isis-contributors-guide.xml
@@ -1007,15 +1007,15 @@ done</programlisting>
<itemizedlist>
<listitem>
- <para><code>org.apache.isis.runtimes.dflt:objectstores</code>
+ <para><code>org.apache.isis.objectstore</code>
is the aggregator for the "objectstores" group.</para>
</listitem>
<listitem>
- <para>Child modules within this group would include
- <code>org.apache.isis.runtimes.dflt.objectstores:sql</code>
+ <para>Artifact modules within this group would include
+ <code>org.apache.isis.objectstor:isis-objectstore-sql</code>
and
- <code>org.apache.isis.runtimes.dflt.objectstores:xml</code>.</para>
+ <code>org.apache.isis.objectstore:isis-objectstore-xml</code>.</para>
</listitem>
</itemizedlist>
</listitem>
@@ -4411,7 +4411,7 @@ svn switch https://svn.apache.org/repos/asf/incubator/isis/branches/x.x.x-incuba
<note>
<para>The <code>-P integration-tests</code> flag is required in
order to include the
- <package>[oai.runtimes.dflt.objectstores:sql-tests-served]</package>.</para>
+ <package>[oai.objectstore:isis-objectstore-sql-tests-served]</package>.</para>
</note>
<para>This should generate the following prompt:</para>
@@ -4472,7 +4472,7 @@ What is the release version for "Apache Isis"? (org.apache.isis:isis) 0.n.n-incu
<note>
<para>The <code>-P integration-tests</code> flag is required in
order to include the
- <package>[oai.runtimes.dflt.objectstores:sql-tests-served]</package>.</para>
+ <package>[oai.objectstore:isis-objectstore-sql-tests-served]</package>.</para>
</note>
<para>Then, run the prepare step (skipping tests will reduce the
@@ -4483,7 +4483,7 @@ What is the release version for "Apache Isis"? (org.apache.isis:isis) 0.n.n-incu
<note>
<para>Again, the <code>-P integration-tests</code> flag is
required in order to include the
- <package>[oai.runtimes.dflt.objectstores:sql-tests-served]</package>.</para>
+ <package>[oai.objectstore:isis-objectstore-sql-tests-served]</package>.</para>
</note>
<note>