Author: apetrelli
Date: Mon Jan 12 05:52:54 2009
New Revision: 733753
URL: http://svn.apache.org/viewvc?rev=733753&view=rev
Log:
TILES-346
Enhanced BasicTilesInitializer.
Modified test webapp to use custom TilesListener's.
Added:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
(with props)
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
(with props)
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
(with props)
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java?rev=733753&r1=733752&r2=733753&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
Mon Jan 12 05:52:54 2009
@@ -64,12 +64,28 @@
*/
protected TilesApplicationContext createTilesApplicationContext(
TilesApplicationContext preliminaryContext) {
+ AbstractTilesApplicationContextFactory acFactory =
+
createAndInitializeTilesApplicationContextFactory(preliminaryContext);
+ return
acFactory.createApplicationContext(preliminaryContext.getContext());
+ }
+
+ /**
+ * Creates and initializes the Tiles application context factory, to create
+ * a {...@link TilesApplicationContext} to be used across all the
Tiles-based
+ * application.
+ *
+ * @param preliminaryContext The preliminary application context to use.
+ * @return The Tiles application context factory.
+ * @since 2.1.2
+ */
+ protected AbstractTilesApplicationContextFactory
createAndInitializeTilesApplicationContextFactory(
+ TilesApplicationContext preliminaryContext) {
AbstractTilesApplicationContextFactory acFactory =
AbstractTilesApplicationContextFactory
.createFactory(preliminaryContext);
if (acFactory instanceof Initializable) {
((Initializable)
acFactory).init(preliminaryContext.getInitParams());
}
- return
acFactory.createApplicationContext(preliminaryContext.getContext());
+ return acFactory;
}
/**
@@ -93,8 +109,21 @@
* @since 2.1.2
*/
protected TilesContainer createContainer(TilesApplicationContext context) {
+ AbstractTilesContainerFactory factory =
createContainerFactory(context);
+ return factory.createContainer(context);
+ }
+
+ /**
+ * Creates a Tiles container factory.
+ *
+ * @param context The servlet context to use.
+ * @return The created container factory.
+ * @since 2.1.2
+ */
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
AbstractTilesContainerFactory factory = AbstractTilesContainerFactory
.getTilesContainerFactory(context);
- return factory.createContainer(context);
+ return factory;
}
}
Added:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java?rev=733753&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
(added)
+++
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
Mon Jan 12 05:52:54 2009
@@ -0,0 +1,62 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+package org.apache.tiles.test.listener;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import org.apache.tiles.startup.BasicTilesInitializer;
+import org.apache.tiles.startup.TilesInitializer;
+import org.apache.tiles.test.factory.TestAlternateTilesContainerFactory;
+import org.apache.tiles.web.startup.TilesListener;
+
+/**
+ * Test Tiles listener for Tiles initialization of the alternate container.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestAlternateTilesListener extends TilesListener {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected TilesInitializer createTilesInitializer() {
+ return new TestAlternateTilesInitializer();
+ }
+
+ /**
+ * Test Tiles initializer for Tiles initialization of the alternate
container.
+ */
+ private static class TestAlternateTilesInitializer extends
BasicTilesInitializer {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
+ return new TestAlternateTilesContainerFactory();
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected String getContainerKey(
+ TilesApplicationContext applicationContext) {
+ return "alternate";
+ }
+ }
+}
Propchange:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestAlternateTilesListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java?rev=733753&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
(added)
+++
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
Mon Jan 12 05:52:54 2009
@@ -0,0 +1,62 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+package org.apache.tiles.test.listener;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import org.apache.tiles.startup.BasicTilesInitializer;
+import org.apache.tiles.startup.TilesInitializer;
+import org.apache.tiles.test.factory.TestDbTilesContainerFactory;
+import org.apache.tiles.web.startup.TilesListener;
+
+/**
+ * Test Tiles listener for Tiles initialization of the db-based container.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestDbTilesListener extends TilesListener {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected TilesInitializer createTilesInitializer() {
+ return new TestDbTilesInitializer();
+ }
+
+ /**
+ * Test Tiles initializer for Tiles initialization of the db-based
container.
+ */
+ private static class TestDbTilesInitializer extends BasicTilesInitializer {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
+ return new TestDbTilesContainerFactory();
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected String getContainerKey(
+ TilesApplicationContext applicationContext) {
+ return "db";
+ }
+ }
+}
Propchange:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestDbTilesListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java?rev=733753&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
(added)
+++
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
Mon Jan 12 05:52:54 2009
@@ -0,0 +1,66 @@
+/*
+ * $Id$
+ *
+ * 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.
+ */
+package org.apache.tiles.test.listener;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.factory.AbstractTilesContainerFactory;
+import
org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContext;
+import org.apache.tiles.startup.BasicTilesInitializer;
+import org.apache.tiles.startup.TilesInitializer;
+import org.apache.tiles.test.factory.TestTilesContainerFactory;
+import org.apache.tiles.web.startup.TilesListener;
+
+/**
+ * Test Tiles listener for Tiles initialization of the default container.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestTilesListener extends TilesListener {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected TilesInitializer createTilesInitializer() {
+ return new TestTilesListenerInitializer();
+ }
+
+ /**
+ * Test Tiles initializer for Tiles initialization of the default
container.
+ */
+ private static class TestTilesListenerInitializer extends
BasicTilesInitializer {
+
+ /** {...@inheritdoc} */
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
+ TilesApplicationContext context) {
+ return new TestTilesContainerFactory();
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected TilesApplicationContext createTilesApplicationContext(
+ TilesApplicationContext preliminaryContext) {
+ return new WildcardServletTilesApplicationContext(
+ (ServletContext) preliminaryContext.getContext());
+ }
+ }
+}
Propchange:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/listener/TestTilesListener.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml?rev=733753&r1=733752&r2=733753&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml
(original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web-24.xml Mon Jan
12 05:52:54 2009
@@ -33,6 +33,15 @@
<listener>
<listener-class>org.apache.tiles.test.init.InitContextListener</listener-class>
</listener>
+ <listener>
+
<listener-class>org.apache.tiles.test.listener.TestTilesListener</listener-class>
+ </listener>
+ <listener>
+
<listener-class>org.apache.tiles.test.listener.TestAlternateTilesListener</listener-class>
+ </listener>
+ <listener>
+
<listener-class>org.apache.tiles.test.listener.TestDbTilesListener</listener-class>
+ </listener>
<filter>
<filter-name>Tiles Decoration Filter</filter-name>
<filter-class>org.apache.tiles.web.util.TilesDecorationFilter</filter-class>
@@ -65,45 +74,6 @@
<!-- Standard Action Servlet Configuration -->
<servlet>
- <servlet-name>tiles</servlet-name>
-
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
- <init-param>
-
<param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
-
<param-value>org.apache.tiles.test.factory.TestTilesContainerFactory</param-value>
- </init-param>
- <init-param>
-
<param-name>org.apache.tiles.context.AbstractTilesApplicationContextFactory</param-name>
-
<param-value>org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContextFactory</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>tiles-alt</servlet-name>
-
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
- <init-param>
-
<param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
-
<param-value>org.apache.tiles.test.factory.TestAlternateTilesContainerFactory</param-value>
- </init-param>
- <init-param>
-
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
- <param-value>alternate</param-value>
- </init-param>
- <load-on-startup>3</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>tiles-db</servlet-name>
-
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
- <init-param>
-
<param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
-
<param-value>org.apache.tiles.test.factory.TestDbTilesContainerFactory</param-value>
- </init-param>
- <init-param>
-
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
- <param-value>db</param-value>
- </init-param>
- <load-on-startup>4</load-on-startup>
- </servlet>
- <servlet>
<servlet-name>freemarker</servlet-name>
<servlet-class>freemarker.ext.servlet.FreemarkerServlet</servlet-class>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=733753&r1=733752&r2=733753&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml Mon Jan 12
05:52:54 2009
@@ -33,6 +33,15 @@
<listener>
<listener-class>org.apache.tiles.test.init.InitContextListener</listener-class>
</listener>
+ <listener>
+
<listener-class>org.apache.tiles.test.listener.TestTilesListener</listener-class>
+ </listener>
+ <listener>
+
<listener-class>org.apache.tiles.test.listener.TestAlternateTilesListener</listener-class>
+ </listener>
+ <listener>
+
<listener-class>org.apache.tiles.test.listener.TestDbTilesListener</listener-class>
+ </listener>
<filter>
<filter-name>Tiles Decoration Filter</filter-name>
<filter-class>org.apache.tiles.web.util.TilesDecorationFilter</filter-class>
@@ -65,45 +74,6 @@
<!-- Standard Action Servlet Configuration -->
<servlet>
- <servlet-name>tiles</servlet-name>
-
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
- <init-param>
-
<param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
-
<param-value>org.apache.tiles.test.factory.TestTilesContainerFactory</param-value>
- </init-param>
- <init-param>
-
<param-name>org.apache.tiles.context.AbstractTilesApplicationContextFactory</param-name>
-
<param-value>org.apache.tiles.servlet.context.wildcard.WildcardServletTilesApplicationContextFactory</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>tiles-alt</servlet-name>
-
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
- <init-param>
-
<param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
-
<param-value>org.apache.tiles.test.factory.TestAlternateTilesContainerFactory</param-value>
- </init-param>
- <init-param>
-
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
- <param-value>alternate</param-value>
- </init-param>
- <load-on-startup>3</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>tiles-db</servlet-name>
-
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
- <init-param>
-
<param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
-
<param-value>org.apache.tiles.test.factory.TestDbTilesContainerFactory</param-value>
- </init-param>
- <init-param>
-
<param-name>org.apache.tiles.startup.BasicTilesInitializer.CONTAINER_KEY</param-name>
- <param-value>db</param-value>
- </init-param>
- <load-on-startup>4</load-on-startup>
- </servlet>
- <servlet>
<servlet-name>freemarker</servlet-name>
<servlet-class>freemarker.ext.servlet.FreemarkerServlet</servlet-class>
