Author: apetrelli
Date: Wed Nov 5 06:28:29 2008
New Revision: 711572
URL: http://svn.apache.org/viewvc?rev=711572&view=rev
Log:
TILES-330
Created TilesRequestContextFactory and TilesApplicationContextFactory.
Deprecated TilesContextFactory.
Removal of TilesContextFactoryAware.
Creation of TilesApplicationContextFactoryAware and
TilesRequestContextFactoryAware.
Replacement of implementation of TilesContextFactoryAware with
TilesRequestContextFactoryAware.
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextFactoryAware.java
(with props)
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
(with props)
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextFactory.java
(with props)
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
(with props)
Removed:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesContextFactoryAware.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/UntypedAttributeRendererTest.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextFactoryAware.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextFactoryAware.java?rev=711572&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextFactoryAware.java
(added)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextFactoryAware.java
Wed Nov 5 06:28:29 2008
@@ -0,0 +1,42 @@
+/*
+ * $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.awareness;
+
+import org.apache.tiles.context.TilesApplicationContextFactory;
+
+/**
+ * It represents an object that can have a reference to the
+ * [EMAIL PROTECTED] TilesApplicationContextFactory}.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.1
+ */
+public interface TilesApplicationContextFactoryAware {
+
+ /**
+ * Sets the Tiles application context factory.
+ *
+ * @param contextFactory The Tiles application context factory.
+ * @since 2.1.0
+ */
+ void setAppplicationContextFactory(
+ TilesApplicationContextFactory contextFactory);
+}
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextFactoryAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesApplicationContextFactoryAware.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java?rev=711572&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
(added)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
Wed Nov 5 06:28:29 2008
@@ -0,0 +1,41 @@
+/*
+ * $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.awareness;
+
+import org.apache.tiles.context.TilesRequestContextFactory;
+
+/**
+ * It represents an object that can have a reference to the
+ * [EMAIL PROTECTED] TilesRequestContextFactory}.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.1
+ */
+public interface TilesRequestContextFactoryAware {
+
+ /**
+ * Sets the Tiles request context factory.
+ *
+ * @param contextFactory The Tiles context factory.
+ * @since 2.1.1
+ */
+ void setRequestContextFactory(TilesRequestContextFactory contextFactory);
+}
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/awareness/TilesRequestContextFactoryAware.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
Wed Nov 5 06:28:29 2008
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.awareness.TilesContextFactoryAware;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import java.util.ArrayList;
import java.util.Iterator;
@@ -162,8 +162,9 @@
*/
protected void injectParentTilesContextFactory() {
for (TilesContextFactory factory : factories) {
- if (factory instanceof TilesContextFactoryAware) {
- ((TilesContextFactoryAware) factory).setContextFactory(this);
+ if (factory instanceof TilesRequestContextFactoryAware) {
+ ((TilesRequestContextFactoryAware) factory)
+ .setRequestContextFactory(this);
}
}
}
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextFactory.java?rev=711572&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextFactory.java
(added)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextFactory.java
Wed Nov 5 06:28:29 2008
@@ -0,0 +1,42 @@
+/*
+ * $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.context;
+
+import org.apache.tiles.Initializable;
+import org.apache.tiles.TilesApplicationContext;
+
+/**
+ * Creates an instance of the appropriate [EMAIL PROTECTED]
TilesApplicationContext}
+ * implementation.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.1
+ */
+public interface TilesApplicationContextFactory extends Initializable {
+
+ /**
+ * Create a TilesApplicationContext for the given context.
+ *
+ * @param context The (application) context to use.
+ * @return TilesApplicationContext The Tiles application context.
+ */
+ TilesApplicationContext createApplicationContext(Object context);
+}
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesApplicationContextFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
Wed Nov 5 06:28:29 2008
@@ -20,41 +20,14 @@
*/
package org.apache.tiles.context;
-import org.apache.tiles.TilesApplicationContext;
-
-import java.util.Map;
-
/**
- * Creates an instance of the appropriate TilesApplicationContext
implementation.
+ * Creates an instance of the appropriate TilesApplicationContext
+ * implementation.
*
- * @since Sep 21, 2006
* @version $Rev$ $Date$
+ * @deprecated Use [EMAIL PROTECTED] TilesApplicationContextFactory} or
+ * [EMAIL PROTECTED] TilesRequestContextFactory}.
*/
-public interface TilesContextFactory {
-
- /**
- * Initialize the factory.
- *
- * @param configurationParameters A map of parameters.
- */
- void init(Map<String, String> configurationParameters);
-
- /**
- * Create a TilesApplicationContext for the given context.
- *
- * @param context The (application) context to use.
- * @return TilesApplicationContext The Tiles application context.
- */
- TilesApplicationContext createApplicationContext(Object context);
-
- /**
- * Create a TilesRequestContext for the given context,
- * request, and response.
- *
- * @param context the associated [EMAIL PROTECTED]
TilesApplicationContext}
- * @param requestItems the associated request items, typically a request
and a response.
- * @return TilesRequestContext
- */
- TilesRequestContext createRequestContext(TilesApplicationContext context,
- Object... requestItems);
+public interface TilesContextFactory extends TilesApplicationContextFactory,
+ TilesRequestContextFactory {
}
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java?rev=711572&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
(added)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
Wed Nov 5 06:28:29 2008
@@ -0,0 +1,45 @@
+/*
+ * $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.context;
+
+import org.apache.tiles.Initializable;
+import org.apache.tiles.TilesApplicationContext;
+
+/**
+ * Creates an instance of the appropriate [EMAIL PROTECTED]
TilesRequestContext}
+ * implementation.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.1
+ */
+public interface TilesRequestContextFactory extends Initializable {
+
+ /**
+ * Create a TilesRequestContext for the given context,
+ * request, and response.
+ *
+ * @param context the associated [EMAIL PROTECTED]
TilesApplicationContext}
+ * @param requestItems the associated request items, typically a request
and a response.
+ * @return TilesRequestContext
+ */
+ TilesRequestContext createRequestContext(TilesApplicationContext context,
+ Object... requestItems);
+}
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
Wed Nov 5 06:28:29 2008
@@ -360,7 +360,7 @@
AttributeEvaluator evaluator) {
BasicRendererFactory retValue = new BasicRendererFactory();
retValue.setApplicationContext(applicationContext);
- retValue.setContextFactory(contextFactory);
+ retValue.setRequestContextFactory(contextFactory);
retValue.setContainer(container);
retValue.setEvaluator(evaluator);
retValue.setDefaultRenderer(createDefaultAttributeRenderer(context,
@@ -388,7 +388,7 @@
UntypedAttributeRenderer retValue = new UntypedAttributeRenderer();
retValue.setApplicationContext(applicationContext);
retValue.setContainer(container);
- retValue.setContextFactory(contextFactory);
+ retValue.setRequestContextFactory(contextFactory);
retValue.setEvaluator(evaluator);
return retValue;
}
@@ -413,20 +413,20 @@
AttributeEvaluator evaluator) {
StringAttributeRenderer stringRenderer = new StringAttributeRenderer();
stringRenderer.setApplicationContext(applicationContext);
- stringRenderer.setContextFactory(contextFactory);
+ stringRenderer.setRequestContextFactory(contextFactory);
stringRenderer.setEvaluator(evaluator);
rendererFactory.registerRenderer("string", stringRenderer);
TemplateAttributeRenderer templateRenderer = new
TemplateAttributeRenderer();
templateRenderer.setApplicationContext(applicationContext);
- templateRenderer.setContextFactory(contextFactory);
+ templateRenderer.setRequestContextFactory(contextFactory);
templateRenderer.setEvaluator(evaluator);
rendererFactory.registerRenderer("template", templateRenderer);
DefinitionAttributeRenderer definitionRenderer = new
DefinitionAttributeRenderer();
definitionRenderer.setApplicationContext(applicationContext);
definitionRenderer.setContainer(container);
- definitionRenderer.setContextFactory(contextFactory);
+ definitionRenderer.setRequestContextFactory(contextFactory);
definitionRenderer.setEvaluator(evaluator);
rendererFactory.registerRenderer("definition", definitionRenderer);
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
Wed Nov 5 06:28:29 2008
@@ -26,7 +26,7 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.awareness.TilesContainerAware;
-import org.apache.tiles.awareness.TilesContextFactoryAware;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.context.ChainedTilesContextFactory;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.definition.DefinitionsFactory;
@@ -305,11 +305,6 @@
AttributeEvaluator evaluator = (AttributeEvaluator) createFactory(
configuration, ATTRIBUTE_EVALUATOR_INIT_PARAM);
- if (evaluator instanceof TilesContextFactoryAware) {
- ((TilesContextFactoryAware) evaluator)
- .setContextFactory(contextFactory);
- }
-
if (evaluator instanceof TilesApplicationContextAware) {
((TilesApplicationContextAware) evaluator)
.setApplicationContext(tilesContext);
@@ -321,9 +316,9 @@
evaluator.init(configuration);
- if (rendererFactory instanceof TilesContextFactoryAware) {
- ((TilesContextFactoryAware) rendererFactory)
- .setContextFactory(contextFactory);
+ if (rendererFactory instanceof TilesRequestContextFactoryAware) {
+ ((TilesRequestContextFactoryAware) rendererFactory)
+ .setRequestContextFactory(contextFactory);
}
if (rendererFactory instanceof TilesApplicationContextAware) {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
Wed Nov 5 06:28:29 2008
@@ -30,9 +30,9 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
-import org.apache.tiles.awareness.TilesContextFactoryAware;
-import org.apache.tiles.context.TilesContextFactory;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.AttributeEvaluator;
import org.apache.tiles.evaluator.AttributeEvaluatorAware;
import org.apache.tiles.renderer.AttributeRenderer;
@@ -44,7 +44,7 @@
* @since 2.1.0
*/
public abstract class AbstractBaseAttributeRenderer implements
- AttributeRenderer, TilesContextFactoryAware,
+ AttributeRenderer, TilesRequestContextFactoryAware,
TilesApplicationContextAware, AttributeEvaluatorAware {
/**
@@ -54,11 +54,11 @@
.getLog(AbstractBaseAttributeRenderer.class);
/**
- * The Tiles context factory.
+ * The Tiles request context factory.
*
- * @since 2.1.0
+ * @since 2.1.1
*/
- protected TilesContextFactory contextFactory;
+ protected TilesRequestContextFactory contextFactory;
/**
* The Tiles application context.
@@ -75,7 +75,7 @@
protected AttributeEvaluator evaluator;
/** [EMAIL PROTECTED] */
- public void setContextFactory(TilesContextFactory contextFactory) {
+ public void setRequestContextFactory(TilesRequestContextFactory
contextFactory) {
this.contextFactory = contextFactory;
}
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
Wed Nov 5 06:28:29 2008
@@ -27,8 +27,8 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.awareness.TilesContainerAware;
-import org.apache.tiles.awareness.TilesContextFactoryAware;
-import org.apache.tiles.context.TilesContextFactory;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
+import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.evaluator.AttributeEvaluator;
import org.apache.tiles.evaluator.AttributeEvaluatorAware;
import org.apache.tiles.reflect.ClassUtil;
@@ -43,7 +43,7 @@
* @since 2.1.0
*/
public class BasicRendererFactory implements RendererFactory,
- TilesContainerAware, TilesContextFactoryAware,
+ TilesContainerAware, TilesRequestContextFactoryAware,
TilesApplicationContextAware, AttributeEvaluatorAware {
/**
@@ -80,9 +80,9 @@
/**
* The Tiles context factory.
*
- * @since 2.1.0
+ * @since 2.1.1
*/
- protected TilesContextFactory contextFactory;
+ protected TilesRequestContextFactory contextFactory;
/**
* The Tiles application context.
@@ -219,7 +219,8 @@
}
/** [EMAIL PROTECTED] */
- public void setContextFactory(TilesContextFactory contextFactory) {
+ public void setRequestContextFactory(
+ TilesRequestContextFactory contextFactory) {
this.contextFactory = contextFactory;
}
@@ -235,9 +236,9 @@
* @since 2.1.0
*/
protected void initializeRenderer(AttributeRenderer renderer) {
- if (renderer instanceof TilesContextFactoryAware) {
- ((TilesContextFactoryAware) renderer)
- .setContextFactory(contextFactory);
+ if (renderer instanceof TilesRequestContextFactoryAware) {
+ ((TilesRequestContextFactoryAware) renderer)
+ .setRequestContextFactory(contextFactory);
}
if (renderer instanceof TilesApplicationContextAware) {
((TilesApplicationContextAware) renderer)
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesContextFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesContextFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesContextFactory.java
Wed Nov 5 06:28:29 2008
@@ -26,9 +26,10 @@
import java.util.Set;
import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.awareness.TilesContextFactoryAware;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.context.TilesRequestContextFactory;
/**
* "Repeats" (i.e. returns back) the context as a
@@ -38,7 +39,7 @@
* @version $Rev$ $Date$
*/
public class RepeaterTilesContextFactory implements TilesContextFactory,
- TilesContextFactoryAware {
+ TilesRequestContextFactoryAware {
/**
* The application context.
@@ -48,7 +49,7 @@
/**
* The parent context factory.
*/
- private TilesContextFactory parent;
+ private TilesRequestContextFactory parent;
/**
* Constructor.
@@ -67,7 +68,8 @@
}
/** [EMAIL PROTECTED] */
- public void setContextFactory(TilesContextFactory contextFactory) {
+ public void setRequestContextFactory(
+ TilesRequestContextFactory contextFactory) {
this.parent = contextFactory;
}
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRendererTest.java
Wed Nov 5 06:28:29 2008
@@ -62,7 +62,7 @@
TilesContextFactory contextFactory = EasyMock
.createMock(TilesContextFactory.class);
EasyMock.replay(contextFactory);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
assertNotNull("The context factory is null", renderer.contextFactory);
}
@@ -97,7 +97,7 @@
.andReturn(requestContext);
EasyMock.replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, writer);
writer.close();
assertEquals("Wrongly written", "wrote", writer.toString());
@@ -117,7 +117,7 @@
.andReturn(requestContext);
EasyMock.replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
assertTrue("This is not the expected request",
requestContext == renderer.getRequestContext());
}
@@ -141,7 +141,7 @@
Boolean.FALSE).anyTimes();
EasyMock.replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
Set<String> roles = new HashSet<String>();
roles.add("first");
assertTrue("The role is not permitted", renderer.isPermitted(
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
Wed Nov 5 06:28:29 2008
@@ -54,7 +54,7 @@
.createMock(TilesContextFactory.class);
TilesContainer container = EasyMock.createMock(TilesContainer.class);
rendererFactory.setApplicationContext(applicationContext);
- rendererFactory.setContextFactory(contextFactory);
+ rendererFactory.setRequestContextFactory(contextFactory);
rendererFactory.setContainer(container);
EasyMock.replay(applicationContext, contextFactory, container);
}
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/DefinitionAttributeRendererTest.java
Wed Nov 5 06:28:29 2008
@@ -74,7 +74,7 @@
EasyMock.replay(applicationContext, contextFactory, requestContext,
container);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.setContainer(container);
renderer.render(attribute, writer);
writer.close();
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/StringAttributeRendererTest.java
Wed Nov 5 06:28:29 2008
@@ -70,7 +70,7 @@
.andReturn(requestContext);
EasyMock.replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, writer);
writer.close();
assertEquals("Not written 'Result'", "Result", writer.toString());
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/TemplateAttributeRendererTest.java
Wed Nov 5 06:28:29 2008
@@ -71,7 +71,7 @@
requestContext.dispatch("/myTemplate.jsp");
EasyMock.replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.render(attribute, writer);
writer.close();
}
Modified:
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/UntypedAttributeRendererTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/UntypedAttributeRendererTest.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/UntypedAttributeRendererTest.java
(original)
+++
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/renderer/impl/UntypedAttributeRendererTest.java
Wed Nov 5 06:28:29 2008
@@ -77,7 +77,7 @@
EasyMock.replay(applicationContext, contextFactory, requestContext,
container);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.setContainer(container);
renderer.render(attribute, writer);
writer.close();
@@ -106,7 +106,7 @@
.andReturn(Boolean.TRUE);
EasyMock.replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.setContainer(container);
renderer.render(attribute, writer);
writer.close();
@@ -137,7 +137,7 @@
.andReturn(Boolean.TRUE);
EasyMock.replay(applicationContext, contextFactory, requestContext);
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.setContainer(container);
renderer.render(attribute, writer);
writer.close();
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
Wed Nov 5 06:28:29 2008
@@ -22,9 +22,10 @@
package org.apache.tiles.jsp.context;
import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.awareness.TilesContextFactoryAware;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
@@ -41,19 +42,21 @@
*
* @version $Rev$ $Date$
*/
-public class JspTilesContextFactory implements TilesContextFactory,
TilesContextFactoryAware {
+public class JspTilesContextFactory implements TilesContextFactory,
+ TilesRequestContextFactoryAware {
/**
* Parent Tiles context factory.
*/
- private TilesContextFactory parent;
+ private TilesRequestContextFactory parent;
/** [EMAIL PROTECTED] */
public void init(Map<String, String> configParameters) {
}
/** [EMAIL PROTECTED] */
- public void setContextFactory(TilesContextFactory contextFactory) {
+ public void setRequestContextFactory(
+ TilesRequestContextFactory contextFactory) {
parent = contextFactory;
}
Modified:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=711572&r1=711571&r2=711572&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
Wed Nov 5 06:28:29 2008
@@ -99,7 +99,7 @@
contextFactory, container, evaluator);
ReverseStringAttributeRenderer renderer = new
ReverseStringAttributeRenderer();
renderer.setApplicationContext(applicationContext);
- renderer.setContextFactory(contextFactory);
+ renderer.setRequestContextFactory(contextFactory);
renderer.setEvaluator(evaluator);
rendererFactory.registerRenderer("reversed", renderer);
}
