You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/10/25 15:15:34 UTC
svn commit: r829574 [2/2] - in /tiles/sandbox/trunk/tiles3:
tiles-api/src/main/java/org/apache/tiles/
tiles-api/src/main/java/org/apache/tiles/access/
tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/
tiles-core/src/main/java/org/...
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java Sun Oct 25 14:15:31 2009
@@ -133,7 +133,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- factory.init(params);
assertNotNull("test.def1 definition not found.", factory.getDefinition(
"test.def1", (TilesRequestContext) null));
@@ -187,7 +186,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- factory.init(params);
TilesRequestContext emptyContext = new MockOnlyLocaleTilesContext(null);
TilesRequestContext usContext = new MockOnlyLocaleTilesContext(Locale.US);
@@ -293,7 +291,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- factory.init(params);
// Parse files.
TilesRequestContext usContext = new MockOnlyLocaleTilesContext(Locale.US);
@@ -354,7 +351,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml");
- factory.init(params);
assertEquals("MockDefinitionsReader not used.",
instanceCount + 1,
@@ -384,7 +380,6 @@
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs-wildcard.xml");
- factory.init(params);
TilesRequestContext request = EasyMock.createMock(TilesRequestContext.class);
EasyMock.expect(request.getRequestLocale()).andReturn(Locale.ITALY).anyTimes();
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java Sun Oct 25 14:15:31 2009
@@ -67,17 +67,4 @@
public Map<String, Definition> read(Object source) {
return new LinkedHashMap();
}
-
- /**
- * Initializes the <code>DefinitionsReader</code> object.
- *
- * This method must be called before the {@link #read} method is called.
- *
- * @param params A map of properties used to set up the reader.
- * @throws org.apache.tiles.definition.DefinitionsFactoryException if required properties are not
- * passed in or the initialization fails.
- */
- public void init(Map<String, String> params) {
- }
-
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java Sun Oct 25 14:15:31 2009
@@ -142,14 +142,4 @@
public Object[] getRequestObjects() {
return null;
}
-
- /** {@inheritDoc} */
- public Object getRequest() {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- /** {@inheritDoc} */
- public Object getResponse() {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java Sun Oct 25 14:15:31 2009
@@ -130,7 +130,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- definitionDao.init(params);
assertNotNull("test.def1 definition not found.", definitionDao
.getDefinition("test.def1", null));
@@ -234,7 +233,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- definitionDao.init(params);
Map<String, Definition> defaultDefinitions = definitionDao
.getDefinitions(null);
@@ -373,7 +371,7 @@
}
/**
- * Tests {@link LocaleUrlDefinitionDAO#init(Map)}.
+ * Tests execution.
*
* @throws IOException If something goes wrong.
*/
@@ -393,7 +391,6 @@
EasyMock.replay(applicationContext);
Map<String, String> params = new HashMap<String, String>();
definitionDao.setApplicationContext(applicationContext);
- definitionDao.init(params);
assertEquals("The reader is not of the correct class",
DigesterDefinitionsReader.class, definitionDao.reader
.getClass());
@@ -432,7 +429,6 @@
+ "org/apache/tiles/config/defs3.xml");
definitionDao.setApplicationContext(applicationContext);
definitionDao.setSourceURLs(new ArrayList<URL>());
- definitionDao.init(params);
assertEquals("The reader is not of the correct class",
MockDefinitionsReader.class, definitionDao.reader.getClass());
sourceURLs = new ArrayList<URL>();
@@ -584,7 +580,6 @@
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG, urlPath);
- definitionDao.init(params);
TilesRequestContext context = EasyMock
.createMock(TilesRequestContext.class);
EasyMock.expect(context.getSessionScope()).andReturn(
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java Sun Oct 25 14:15:31 2009
@@ -119,7 +119,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- definitionDao.init(params);
assertNotNull("test.def1 definition not found.", definitionDao
.getDefinition("test.def1", null));
@@ -223,7 +222,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- definitionDao.init(params);
Map<String, Definition> defaultDefinitions = definitionDao
.getDefinitions(null);
@@ -362,7 +360,7 @@
}
/**
- * Tests {@link LocaleUrlDefinitionDAO#init(Map)}.
+ * Tests execution.
*
* @throws IOException If something goes wrong.
*/
@@ -382,7 +380,6 @@
EasyMock.replay(applicationContext);
Map<String, String> params = new HashMap<String, String>();
definitionDao.setApplicationContext(applicationContext);
- definitionDao.init(params);
assertEquals("The reader is not of the correct class",
DigesterDefinitionsReader.class, definitionDao.reader
.getClass());
@@ -421,7 +418,6 @@
+ "org/apache/tiles/config/defs3.xml");
definitionDao.setApplicationContext(applicationContext);
definitionDao.setSourceURLs(new ArrayList<URL>());
- definitionDao.init(params);
assertEquals("The reader is not of the correct class",
MockDefinitionsReader.class, definitionDao.reader.getClass());
sourceURLs = new ArrayList<URL>();
@@ -582,7 +578,6 @@
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG, urlPath);
- definitionDao.init(params);
TilesRequestContext context = EasyMock
.createMock(TilesRequestContext.class);
EasyMock.expect(context.getSessionScope()).andReturn(
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java Sun Oct 25 14:15:31 2009
@@ -135,7 +135,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- definitionDao.init(params);
assertNotNull("test.def1 definition not found.", definitionDao
.getDefinition("test.def1", null));
@@ -240,7 +239,6 @@
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- definitionDao.init(params);
Map<String, Definition> defaultDefinitions = definitionDao
.getDefinitions(null);
@@ -380,7 +378,7 @@
}
/**
- * Tests {@link LocaleUrlDefinitionDAO#init(Map)}.
+ * Tests execution.
*
* @throws IOException If something goes wrong.
*/
@@ -402,7 +400,6 @@
EasyMock.replay(applicationContext);
Map<String, String> params = new HashMap<String, String>();
definitionDao.setApplicationContext(applicationContext);
- definitionDao.init(params);
assertEquals("The reader is not of the correct class",
DigesterDefinitionsReader.class, definitionDao.reader
.getClass());
@@ -441,7 +438,6 @@
+ "org/apache/tiles/config/defs3.xml");
definitionDao.setApplicationContext(applicationContext);
definitionDao.setSourceURLs(new ArrayList<URL>());
- definitionDao.init(params);
assertEquals("The reader is not of the correct class",
MockDefinitionsReader.class, definitionDao.reader.getClass());
sourceURLs = new ArrayList<URL>();
@@ -602,7 +598,6 @@
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG, urlPath);
- definitionDao.init(params);
TilesRequestContext context = EasyMock
.createMock(TilesRequestContext.class);
EasyMock.expect(context.getSessionScope()).andReturn(
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Sun Oct 25 14:15:31 2009
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -98,8 +97,6 @@
*/
@SuppressWarnings("unchecked")
public void testRead() throws IOException {
- reader.init(new HashMap<String, String>());
-
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/tiles-defs.xml");
assertNotNull("Config file not found", configFile);
@@ -142,8 +139,6 @@
*/
@SuppressWarnings("unchecked")
public void testRead21Version() throws IOException {
- reader.init(new HashMap<String, String>());
-
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/tiles-defs-2.1.xml");
assertNotNull("Config file not found", configFile);
@@ -229,11 +224,6 @@
*/
public void testBadSource() {
try {
- Map<String, String> params = new HashMap<String, String>();
-
- // Initialize reader.
- reader.init(params);
-
// Read definitions.
reader.read(new String("Bad Input"));
fail("Should've thrown an exception.");
@@ -252,8 +242,6 @@
*/
public void testBadXml() {
try {
- reader.init(new HashMap<String, String>());
-
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/malformed-defs.xml");
assertNotNull("Config file not found", configFile);
@@ -280,9 +268,6 @@
public void testValidatingParameter() {
// Testing with default (validation ON).
try {
- Map<String, String> params = new HashMap<String, String>();
- reader.init(params);
-
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/invalid-defs.xml");
assertNotNull("Config file not found", configFile);
@@ -302,11 +287,6 @@
// Testing with validation OFF.
try {
setUp();
- Map<String, String> params = new HashMap<String, String>();
- params.put(DigesterDefinitionsReader.PARSER_VALIDATE_PARAMETER_NAME,
- "false");
- reader.init(params);
-
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/invalid-defs.xml");
assertNotNull("Config file not found", configFile);
@@ -327,8 +307,6 @@
*/
@SuppressWarnings("unchecked")
public void testRegressionTiles352() throws IOException {
- reader.init(new HashMap<String, String>());
-
URL configFile = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs_regression_TILES-352.xml");
assertNotNull("Config file not found", configFile);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesRequestContextFactory.java Sun Oct 25 14:15:31 2009
@@ -60,9 +60,4 @@
}
return retValue;
}
-
- /** {@inheritDoc} */
- public void init(Map<String, String> configurationParameters) {
- // Do nothing
- }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/impl/BasicRendererFactoryTest.java Sun Oct 25 14:15:31 2009
@@ -60,7 +60,7 @@
}
/**
- * Tests {@link BasicRendererFactory#init(Map)} and
+ * Tests execution and
* {@link BasicRendererFactory#getRenderer(String)}.
*/
public void testInitAndGetRenderer() {
@@ -68,7 +68,6 @@
params.put(BasicRendererFactory.TYPE_RENDERERS_INIT_PARAM, "test,"
+ StringAttributeRenderer.class.getName() + ";test2,"
+ StringAttributeRenderer.class.getName());
- rendererFactory.init(params);
AttributeRenderer renderer = rendererFactory.getRenderer("string");
assertNotNull("The renderer is null", renderer);
assertTrue("The class of the renderer is wrong", renderer instanceof StringAttributeRenderer);
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java Sun Oct 25 14:15:31 2009
@@ -20,23 +20,14 @@
*/
package org.apache.tiles.el;
-import java.util.Map;
-
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
import javax.el.ELResolver;
import javax.el.ExpressionFactory;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.ResourceBundleELResolver;
import javax.el.ValueExpression;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
-import org.apache.tiles.reflect.ClassUtil;
/**
* Evaluates string expression with typical EL syntax.<br>
@@ -89,35 +80,6 @@
}
/** {@inheritDoc} */
- public void init(Map<String, String> initParameters) {
- String expressionFactoryClassName = initParameters
- .get(EXPRESSION_FACTORY_FACTORY_INIT_PARAM);
- ExpressionFactoryFactory efFactory;
- if (expressionFactoryClassName != null) {
- efFactory = (ExpressionFactoryFactory) ClassUtil
- .instantiate(expressionFactoryClassName);
- } else {
- efFactory = new JspExpressionFactoryFactory();
- }
- if (efFactory instanceof TilesApplicationContextAware) {
- ((TilesApplicationContextAware) efFactory)
- .setApplicationContext(applicationContext);
- }
- expressionFactory = efFactory.getExpressionFactory();
- resolver = new CompositeELResolver() {
- {
- add(new TilesContextELResolver());
- add(new TilesContextBeanELResolver());
- add(new ArrayELResolver(false));
- add(new ListELResolver(false));
- add(new MapELResolver(false));
- add(new ResourceBundleELResolver());
- add(new BeanELResolver(false));
- }
- };
- }
-
- /** {@inheritDoc} */
public void setApplicationContext(TilesApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java Sun Oct 25 14:15:31 2009
@@ -25,12 +25,11 @@
import junit.framework.TestCase;
+import org.apache.el.ExpressionFactoryImpl;
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.el.ELAttributeEvaluator;
-import org.apache.tiles.evaluator.el.TomcatExpressionFactoryFactory;
import org.easymock.EasyMock;
/**
@@ -52,7 +51,6 @@
/** {@inheritDoc} */
@Override
- @SuppressWarnings("deprecation")
protected void setUp() throws Exception {
super.setUp();
evaluator = new ELAttributeEvaluator();
@@ -75,10 +73,7 @@
EasyMock.replay(request, applicationContext);
evaluator.setApplicationContext(applicationContext);
- Map<String, String> params = new HashMap<String, String>();
- params.put(ELAttributeEvaluator.EXPRESSION_FACTORY_FACTORY_INIT_PARAM,
- TomcatExpressionFactoryFactory.class.getName());
- evaluator.init(params);
+ evaluator.setExpressionFactory(new ExpressionFactoryImpl());
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java Sun Oct 25 14:15:31 2009
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
-import java.util.Locale;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextWrapper;
@@ -61,28 +60,20 @@
this.env = env;
}
- /** {@inheritDoc} */
- @Override
- public void dispatch(String path) throws IOException {
- include(path);
- }
-
- /** {@inheritDoc} */
- @Override
- public Object getRequest() {
+ /**
+ * Returns the environment object.
+ *
+ * @return The environment.
+ * @since 3.0.0
+ */
+ public Environment getEnvironment() {
return env;
}
/** {@inheritDoc} */
@Override
- public Locale getRequestLocale() {
- return env.getLocale();
- }
-
- /** {@inheritDoc} */
- @Override
- public Object getResponse() {
- return env;
+ public void dispatch(String path) throws IOException {
+ include(path);
}
/** {@inheritDoc} */
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java Sun Oct 25 14:15:31 2009
@@ -21,8 +21,6 @@
package org.apache.tiles.freemarker.context;
-import java.util.Map;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -90,9 +88,4 @@
}
return null;
}
-
- /** {@inheritDoc} */
- public void init(Map<String, String> configurationParameters) {
- // Nothing to initialize.
- }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactoryTest.java Sun Oct 25 14:15:31 2009
@@ -80,7 +80,7 @@
factory.setRequestContextFactory(parentFactory);
FreeMarkerTilesRequestContext context = (FreeMarkerTilesRequestContext) factory
.createRequestContext(applicationContext, env);
- assertEquals(env, context.getRequest());
+ assertEquals(env, context.getEnvironment());
assertEquals(enclosedRequest, context.getWrappedRequest());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextTest.java Sun Oct 25 14:15:31 2009
@@ -115,7 +115,7 @@
TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
- assertEquals(env, context.getRequest());
+ assertEquals(env, context.getEnvironment());
verify(enclosedRequest);
}
@@ -127,7 +127,7 @@
TilesRequestContext enclosedRequest = createMock(TilesRequestContext.class);
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
- assertEquals(env, context.getResponse());
+ assertEquals(env, context.getEnvironment());
verify(enclosedRequest);
}
@@ -142,7 +142,7 @@
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
- assertEquals(env, context.getResponse());
+ assertEquals(env, context.getEnvironment());
assertNotNull(context.getPrintWriter());
verify(enclosedRequest);
}
@@ -158,7 +158,7 @@
replay(enclosedRequest);
context = new FreeMarkerTilesRequestContext(enclosedRequest, env);
- assertEquals(env, context.getResponse());
+ assertEquals(env, context.getEnvironment());
assertNotNull(context.getWriter());
verify(enclosedRequest);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java Sun Oct 25 14:15:31 2009
@@ -20,20 +20,17 @@
*/
package org.apache.tiles.jsp.context;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.TilesRequestContextWrapper;
-import org.apache.tiles.servlet.context.ServletTilesRequestContext;
-import org.apache.tiles.servlet.context.ServletUtil;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
+import javax.servlet.ServletException;
+import javax.servlet.jsp.PageContext;
+
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.context.TilesRequestContextWrapper;
+import org.apache.tiles.servlet.context.ServletUtil;
+
/**
* Context implementation used for executing tiles within a
* jsp tag library.
@@ -49,11 +46,6 @@
private PageContext pageContext;
/**
- * The writer response to use.
- */
- private JspWriterResponse response;
-
- /**
* The request objects, lazily initialized.
*/
private Object[] requestObjects;
@@ -71,21 +63,6 @@
}
/**
- * Constructor.
- *
- * @param context The servlet context to use.
- * @param pageContext The page context to use.
- * @deprecated Use
- * {@link #JspTilesRequestContext(TilesRequestContext, PageContext)}.
- */
- @Deprecated
- public JspTilesRequestContext(ServletContext context, PageContext pageContext) {
- this(new ServletTilesRequestContext(context,
- (HttpServletRequest) pageContext.getRequest(),
- (HttpServletResponse) pageContext.getResponse()), pageContext);
- }
-
- /**
* Dispatches a path. In fact it "includes" it!
*
* @param path The path to dispatch to.
@@ -139,21 +116,4 @@
public PageContext getPageContext() {
return pageContext;
}
-
- /**
- * Returns the response object, obtained by the JSP page context. The print
- * writer will use the object obtained by {@link PageContext#getOut()}.
- *
- * @return The response object.
- * @deprecated Use {@link #getPageContext()} or {@link #getPrintWriter()}.
- */
- @Override
- @Deprecated
- public HttpServletResponse getResponse() {
- if (response == null) {
- response = new JspWriterResponse(pageContext);
- }
- return response;
- }
-
}
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactory.java Sun Oct 25 14:15:31 2009
@@ -21,18 +21,17 @@
package org.apache.tiles.jsp.context;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.TilesRequestContextFactory;
-import org.apache.tiles.servlet.context.ServletTilesRequestContext;
-
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
-import java.util.Map;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.context.TilesRequestContextFactory;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
/**
* Creates an instance of the appropriate {@link TilesRequestContext}
@@ -50,10 +49,6 @@
private TilesRequestContextFactory parent;
/** {@inheritDoc} */
- public void init(Map<String, String> configParameters) {
- }
-
- /** {@inheritDoc} */
public void setRequestContextFactory(
TilesRequestContextFactory contextFactory) {
parent = contextFactory;
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java Sun Oct 25 14:15:31 2009
@@ -21,8 +21,6 @@
package org.apache.tiles.mvel;
-import java.util.Map;
-
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextHolder;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
@@ -64,11 +62,6 @@
}
/** {@inheritDoc} */
- public void init(Map<String, String> initParameters) {
- // Does nothing.
- }
-
- /** {@inheritDoc} */
public Object evaluate(String expression, TilesRequestContext request) {
if (expression == null) {
throw new IllegalArgumentException("The expression parameter cannot be null");
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java Sun Oct 25 14:15:31 2009
@@ -21,8 +21,6 @@
package org.apache.tiles.ognl;
-import java.util.Map;
-
import ognl.Ognl;
import ognl.OgnlException;
@@ -50,9 +48,4 @@
+ expression + "'", e);
}
}
-
- /** {@inheritDoc} */
- public void init(Map<String, String> initParameters) {
- // Nothing to initialize.
- }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java Sun Oct 25 14:15:31 2009
@@ -20,18 +20,15 @@
*/
package org.apache.tiles.portlet.context;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import java.io.IOException;
import java.net.URL;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.HashSet;
+
+import javax.portlet.PortletContext;
+
+import org.apache.tiles.TilesApplicationContext;
/**
* Portlet-based TilesApplicationContext implementation.
@@ -144,27 +141,4 @@
set.add(getResource(path));
return set;
}
-
- /**
- * Creates a portlet context for a given request/response pair.
- *
- * @param request The request object.
- * @param response The response object.
- * @return The corresponding Tiles request context.
- * @deprecated Use
- * {@link org.apache.tiles.context.TilesContextFactory#createRequestContext(TilesApplicationContext, Object...)}
- * .
- */
- @Deprecated
- public TilesRequestContext createRequestContext(Object request, Object response) {
- if (request instanceof PortletRequest && response instanceof PortletResponse) {
- return new PortletTilesRequestContext(
- context,
- (PortletRequest) request,
- (PortletResponse) response);
- } else {
- throw new IllegalArgumentException("Invalid context specified. "
- + context.getClass().getName());
- }
- }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContext.java Sun Oct 25 14:15:31 2009
@@ -132,24 +132,6 @@
}
/**
- * Creates a new instance of PortletTilesRequestContext.
- *
- * @param context The portlet context to use.
- * @param request The request object to use.
- * @param response The response object to use.
- * @deprecated Use
- * {@link #PortletTilesRequestContext(TilesApplicationContext, PortletContext, PortletRequest, PortletResponse)}
- * .
- */
- @Deprecated
- public PortletTilesRequestContext(PortletContext context, PortletRequest request,
- PortletResponse response) {
- super(new PortletTilesApplicationContext(context));
- this.context = context;
- initialize(request, response);
- }
-
- /**
* <p>Initialize (or reinitialize) this {@link PortletTilesRequestContext} instance
* for the specified Portlet API objects.</p>
*
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesRequestContextFactory.java Sun Oct 25 14:15:31 2009
@@ -21,8 +21,6 @@
package org.apache.tiles.portlet.context;
-import java.util.Map;
-
import javax.portlet.PortletContext;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
@@ -71,10 +69,6 @@
}
/** {@inheritDoc} */
- public void init(Map<String, String> configParameters) {
- }
-
- /** {@inheritDoc} */
public TilesRequestContext createRequestContext(TilesApplicationContext context,
Object... requestItems) {
if (requestItems.length == 2
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java Sun Oct 25 14:15:31 2009
@@ -43,19 +43,6 @@
final class ServletHeaderMap implements Map<String, String> {
-
- /**
- * Constructor.
- *
- * @param request The request object to use.
- * @deprecated Use {@link #ServletHeaderMap(HttpServletRequest,HttpServletResponse)} instead
- */
- @Deprecated
- public ServletHeaderMap(HttpServletRequest request) {
- this(request, null);
- }
-
-
/**
* Constructor.
*
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java Sun Oct 25 14:15:31 2009
@@ -20,18 +20,15 @@
*/
package org.apache.tiles.servlet.context;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.net.URL;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.HashSet;
+
+import javax.servlet.ServletContext;
+
+import org.apache.tiles.TilesApplicationContext;
/**
* Servlet-based implementation of the TilesApplicationContext interface.
@@ -108,18 +105,6 @@
}
/**
- * Returns the servlet context.
- *
- * @return The servlet context.
- * @deprecated Use {@link #getContext()}.
- */
- @Deprecated
- public ServletContext getServletContext() {
- return servletContext;
- }
-
-
- /**
* <p>Initialize (or reinitialize) this {@link TilesApplicationContext} instance
* for the specified Servlet API objects.</p>
*
@@ -149,28 +134,4 @@
servletContext = null;
}
-
- /**
- * Creates a servlet context for a given request/response pair.
- *
- * @param request The request object.
- * @param response The response object.
- * @return The corresponding Tiles request context.
- * @deprecated Use
- * {@link org.apache.tiles.context.TilesContextFactory#createRequestContext(TilesApplicationContext, Object...)}
- * .
- */
- @Deprecated
- public TilesRequestContext createRequestContext(Object request, Object response) {
- if (request instanceof HttpServletRequest) {
- return new ServletTilesRequestContext(
- servletContext,
- (HttpServletRequest) request,
- (HttpServletResponse) response
- );
- } else {
- throw new IllegalArgumentException("Invalid context specified. "
- + servletContext.getClass().getName());
- }
- }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java Sun Oct 25 14:15:31 2009
@@ -28,7 +28,6 @@
import java.util.Map;
import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -125,25 +124,6 @@
initialize(request, response);
}
- /**
- * Creates a new instance of ServletTilesRequestContext.
- *
- * @param servletContext The servlet context.
- * @param request The request object.
- * @param response The response object.
- * @deprecated Use
- * {@link #ServletTilesRequestContext(TilesApplicationContext, HttpServletRequest, HttpServletResponse)}
- * .
- */
- @Deprecated
- public ServletTilesRequestContext(ServletContext servletContext,
- HttpServletRequest request,
- HttpServletResponse response) {
- super(new ServletTilesApplicationContext(servletContext));
- initialize(request, response);
- }
-
-
/** {@inheritDoc} */
public Map<String, String> getHeader() {
@@ -362,22 +342,4 @@
public boolean isUserInRole(String role) {
return request.isUserInRole(role);
}
-
- /**
- * Wraps a ServletException to create an IOException with the root cause if
- * present.
- *
- * @param ex The exception to wrap.
- * @param message The message of the exception.
- * @return The wrapped exception.
- * @since 2.0.6
- * @deprecated Use
- * {@link ServletUtil#wrapServletException(ServletException,String)}
- * instead.
- */
- @Deprecated
- protected IOException wrapServletException(ServletException ex,
- String message) {
- return ServletUtil.wrapServletException(ex, message);
- }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContextFactory.java Sun Oct 25 14:15:31 2009
@@ -21,14 +21,13 @@
package org.apache.tiles.servlet.context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
-
/**
* Creates an instance of the appropriate {@link TilesRequestContext}
* implementation in a servlet environment.
@@ -40,10 +39,6 @@
TilesRequestContextFactory {
/** {@inheritDoc} */
- public void init(Map<String, String> configParameters) {
- }
-
- /** {@inheritDoc} */
public TilesRequestContext createRequestContext(TilesApplicationContext context,
Object... requestItems) {
if (requestItems.length == 2
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java?rev=829574&r1=829573&r2=829574&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContextFactory.java Sun Oct 25 14:15:31 2009
@@ -21,7 +21,6 @@
package org.apache.tiles.velocity.context;
import java.io.Writer;
-import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -95,11 +94,6 @@
}
/** {@inheritDoc} */
- public void init(Map<String, String> configurationParameters) {
- // Nothing to initialize.
- }
-
- /** {@inheritDoc} */
public void setRequestContextFactory(
TilesRequestContextFactory contextFactory) {
this.parent = contextFactory;