diff --git a/component/objectstore/sql/sql-tests-common/pom.xml b/component/objectstore/sql/sql-tests-common/pom.xml
index d851265c8ae..b3d72411b54 100644
--- a/component/objectstore/sql/sql-tests-common/pom.xml
+++ b/component/objectstore/sql/sql-tests-common/pom.xml
@@ -91,7 +91,7 @@
- org.apache.isis.runtimes.dflt.objectstores
+ org.apache.isis.core.objectstore
xml
${xml-objectstore.version}
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 a0522bb9727..6858fe97340 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 @@
..
Default automapper is
- org.apache.isis.runtimes.dflt.objectstores.sql.jdbc.installer.JdbcFieldMappingFactoryInstaller
+ org.apache.isis.objectstore.sql.jdbc.installer.JdbcFieldMappingFactoryInstaller
@@ -645,7 +645,7 @@
either in configuration or at runtime.
The class
- org.apache.isis.runtimes.dflt.objectstores.sql.Defaults
+ org.apache.isis.objectstore.sql.Defaults
contains the following:
Programmatic, at runtime:
diff --git a/component/security/src/docbkx/guide/isis-security.xml b/component/security/src/docbkx/guide/isis-security.xml
index a909a3d1162..5f3bc8bc2d8 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
settings
isis.reflector.facets.include=\
- org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryForDfltRuntime
+ org.apache.isis.core.runtime.authorization.standard.AuthorizationFacetFactory
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 d2efc488181..43154f5b545 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 @@
Apache Isis HTML Viewer
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -34,7 +34,7 @@
IsisSessionFilter
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
logonPage
/logon.app
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 9b23797b442..c0b311b1577 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 default
runtime,
- [oai.runtimes.dflt:webapp]):
+ [oai.core:isis-core-runtime]):
<listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
The session is created for each request using the
@@ -518,7 +518,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>authenticationSessionLookupStrategy</param-name>
<param-value>org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
@@ -1017,7 +1017,7 @@ mvn jetty:run
<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>
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 118fdfc0a6f..f275a0326a8 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -90,7 +90,7 @@
IsisSessionFilter
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
authenticationSessionStrategy
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 fca44e3d1d6..3e61f54a865 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
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 524b9bf1b9c..a924ac6895e 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
installer-registry.properties file.
(Physically this is packaged within the
- [oai.runtimes.dflt:runtime] module's
+ [oai.core:isis-core-runtime] module's
JAR).
This allow the runner class to be aware of all the
@@ -1229,20 +1229,20 @@ $ mvn clean package
runtime works. If you just want to use the
- Components of the Default Runtime
+ Components of the Core Runtime
As will be clear if you've explored the codebase, the
- default runtime implementation consists of a main
+ core runtime implementation consists of a main
runtime
- module[oai.runtimes.dflt:runtime] along with a
- fairly large number of submodules.
+ module[oai.core:runtime] along with a
+ fairly large number of components.
The main runtime module provides the
following functionality:
- classes to bootstrap the default runtime
+ classes to bootstrap the core runtime
@@ -1383,7 +1383,7 @@ $ mvn clean package
- a module [oai.runtimes.dflt:webapp] with
+ a module [oai.core:isis-core-runtime] with
ServletContextListener and
javax.servlet.Filter implementations to
allow Isis to be bootstrapped from a
@@ -1392,7 +1392,7 @@ $ mvn clean package
provides a convenience module
- [oai.runtimes.dflt:webserver] that provides a
+ [oai.core:isis-core-webserver] that provides a
command-line utility to allow any Maven webapp-structured project
to be hosted within Jetty.
@@ -2048,7 +2048,7 @@ isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
runtime module.
- The runtime module [oai.runtimes.dflt:runtime]
+ The runtime module [oai.core:isis-core-runtime]
is the "engine-room" of the default runtime, taking responsibility to
manage domain object (pojo) instances at runtime:
diff --git a/core/src/docbkx/guide/isis-core.xml b/core/src/docbkx/guide/isis-core.xml
index b5ccb30fca0..4fd748d54f8 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).
- A key part of the design of the default runtime is the
- oai.runtimes.dflt.runtime.context.IsisContext
+ A key part of the design of the core runtime is the
+ oai.core.runtime.system.context.IsisContext
interface, which is used to obtain the current session
This interface is somewhat akin to HibernateUtil
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 f89f0ecff04..fec343b5562 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 @@
Apache Isis HTML Viewer
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -59,7 +59,7 @@
IsisSessionFilter
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
logonPage
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 82c44962591..aee86991cc1 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 @@
JSON Claims
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -72,7 +72,7 @@
IsisSessionFilter
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
authenticationSessionStrategy
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 fecac316dbc..45f56d63d8c 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
diff --git a/example/application/quickstart/viewer-html/pom.xml b/example/application/quickstart/viewer-html/pom.xml
index 465310044b3..bb4bd0ea062 100644
--- a/example/application/quickstart/viewer-html/pom.xml
+++ b/example/application/quickstart/viewer-html/pom.xml
@@ -93,16 +93,6 @@
-
-
org.apache.isis.objectstore
isis-objectstore-sql-impl
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 c4535143137..5739ebdc45d 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -178,11 +178,11 @@
IsisSessionFilterForHtml
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
authenticationSessionStrategy
- org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault
+ org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault
@@ -209,7 +209,7 @@
org.apache.isis.viewer.html.servlet.LogonServlet
authenticationSessionStrategy
- org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault
+ org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault
startPage
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 7973d69110a..d37ddcb666e 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
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 2f4553ad25e..4ac850f00da 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
@@ -94,16 +94,6 @@
-
-
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -169,7 +169,7 @@
IsisSessionFilterForRestfulObjects
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
authenticationSessionStrategy
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 2815befdde4..c0a50859ce7 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 @@
-
-
-
-
${project.groupId}
quickstart_wicket_restful_jdo-objstore-jdo
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 e23eea7b124..2ccef845206 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -181,11 +181,11 @@
IsisSessionFilterForHtml
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
authenticationSessionStrategy
- org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault
+ org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault
@@ -212,7 +212,7 @@
org.apache.isis.viewer.html.servlet.LogonServlet
authenticationSessionStrategy
- org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault
+ org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault
startPage
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 f7e8e7f71bf..2315ace3f2e 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
@@ -172,7 +172,7 @@
IsisSessionFilterForRestfulObjects
- org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter
+ org.apache.isis.core.webapp.IsisSessionFilter
authenticationSessionStrategy
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 9b227d5df2b..aa7a7686b63 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 @@
- org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper
+ org.apache.isis.core.webapp.IsisWebAppBootstrapper
diff --git a/scripts/searchandreplace.groovy b/scripts/searchandreplace.groovy
index c7d7b66e8fe..ffeffa9c4f9 100644
--- a/scripts/searchandreplace.groovy
+++ b/scripts/searchandreplace.groovy
@@ -40,7 +40,16 @@ if(options.x) {
//
//
def replacements = [
-"isis-metamodel": "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"
+
+//"isis-metamodel": "isis-core-metamodel"
//"integteestsupport": "integtestsupport"
//,"unitteestsupport": "unittestsupport"
diff --git a/src/docbkx/guide/isis-contributors-guide.xml b/src/docbkx/guide/isis-contributors-guide.xml
index 83a2fbfde69..5f87dcfdc28 100644
--- a/src/docbkx/guide/isis-contributors-guide.xml
+++ b/src/docbkx/guide/isis-contributors-guide.xml
@@ -1007,15 +1007,15 @@ done
- org.apache.isis.runtimes.dflt:objectstores
+ org.apache.isis.objectstore
is the aggregator for the "objectstores" group.
- Child modules within this group would include
- org.apache.isis.runtimes.dflt.objectstores:sql
+ Artifact modules within this group would include
+ org.apache.isis.objectstor:isis-objectstore-sql
and
- org.apache.isis.runtimes.dflt.objectstores:xml
.
+ org.apache.isis.objectstore:isis-objectstore-xml
.
@@ -4411,7 +4411,7 @@ svn switch https://svn.apache.org/repos/asf/incubator/isis/branches/x.x.x-incuba
The -P integration-tests
flag is required in
order to include the
- [oai.runtimes.dflt.objectstores:sql-tests-served].
+ [oai.objectstore:isis-objectstore-sql-tests-served].
This should generate the following prompt:
@@ -4472,7 +4472,7 @@ What is the release version for "Apache Isis"? (org.apache.isis:isis) 0.n.n-incu
The -P integration-tests
flag is required in
order to include the
- [oai.runtimes.dflt.objectstores:sql-tests-served].
+ [oai.objectstore:isis-objectstore-sql-tests-served].
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
Again, the -P integration-tests
flag is
required in order to include the
- [oai.runtimes.dflt.objectstores:sql-tests-served].
+ [oai.objectstore:isis-objectstore-sql-tests-served].