ISIS-188: updating class names in web.xml etc...

... with respect to package renames
apache · Dec 13, 2012 · fb97382 · fb97382
1 parent 978f79a
commit fb97382
Show file tree

Hide file tree

Showing 23 changed files with 60 additions and 87 deletions.
diff --git 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>

diff --git 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>

diff --git 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>

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
@@ -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>

diff --git a/component/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml b/component/viewer/restfulobjects/src/docbkx/guide/isis-restfulobjects-viewer.xml
@@ -507,18 +507,18 @@
           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>&lt;listener&gt;
-  &lt;listener-class&gt;org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper&lt;/listener-class&gt;
+  &lt;listener-class&gt;org.apache.isis.core.webapp.IsisWebAppBootstrapper&lt;/listener-class&gt;
 &lt;/listener&gt;</programlisting>
 
           <para>The session is created for each request using the
           <classname>IsisSessionFilter</classname>:</para>
 
           <programlisting>&lt;filter&gt;
   &lt;filter-name&gt;IsisSessionFilter&lt;/filter-name&gt;
-  &lt;filter-class&gt;org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter&lt;/filter-class&gt;
+  &lt;filter-class&gt;org.apache.isis.core.webapp.IsisSessionFilter&lt;/filter-class&gt;
   &lt;init-param&gt;
     &lt;param-name&gt;authenticationSessionLookupStrategy&lt;/param-name&gt;
     &lt;param-value&gt;org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionLookupStrategyTrusted&lt;/param-value&gt;
@@ -1017,7 +1017,7 @@ mvn jetty:run</programlisting>
 
           <programlisting>&lt;filter&gt;
   &lt;filter-name&gt;IsisSessionFilter&lt;/filter-name&gt;
-  &lt;filter-class&gt;org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter&lt;/filter-class&gt;
+  &lt;filter-class&gt;org.apache.isis.core.webapp.IsisSessionFilter&lt;/filter-class&gt;
   &lt;init-param&gt;
     &lt;param-name&gt;authenticationSessionLookupStrategy&lt;/param-name&gt;
     &lt;param-value&gt;org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted&lt;/param-value&gt;

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
@@ -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>

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
@@ -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>

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
@@ -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>
 

diff --git 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>

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
@@ -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>

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
@@ -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>

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
@@ -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>

diff --git 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>

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
@@ -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>

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
@@ -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 -->

diff --git 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 @@
 
         <!-- 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)

diff --git a/...ation/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml b/...ation/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>

diff --git 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>

diff --git a/...kstart/src/main/resources/archetype-resources/viewer-html/src/main/webapp/WEB-INF/web.xml b/...kstart/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>

diff --git a/.../main/resources/archetype-resources/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml b/.../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>