Author: apetrelli
Date: Thu Dec 17 20:43:12 2009
New Revision: 891884
URL: http://svn.apache.org/viewvc?rev=891884&view=rev
Log:
TILESSB-19
Removed some useless TilesApplicationContextAware code.
Removed unused classes, files and directories.
Removed:
tiles/sandbox/trunk/tiles-request/tiles-request-api/src/main/java/META-INF/
tiles/sandbox/trunk/tiles-request/tiles-request-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/
tiles/sandbox/trunk/tiles-request/tiles-request-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/evaluator/
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/main/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractor.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/evaluator/
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/ApplicationScopeNestedObjectExtractorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/RequestScopeNestedObjectExtractorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/SessionScopeNestedObjectExtractorTest.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java?rev=891884&r1=891883&r2=891884&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
Thu Dec 17 20:43:12 2009
@@ -24,10 +24,8 @@
import java.util.Locale;
import org.apache.tiles.Definition;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
/**
@@ -43,8 +41,7 @@
* @version $Rev$ $Date$
* @since 2.2.1
*/
-public class UnresolvingLocaleDefinitionsFactory implements DefinitionsFactory,
- TilesApplicationContextAware {
+public class UnresolvingLocaleDefinitionsFactory implements DefinitionsFactory
{
/**
* The definition DAO that extracts the definitions from the sources.
@@ -54,24 +51,12 @@
protected DefinitionDAO<Locale> definitionDao;
/**
- * The application context.
- *
- * @since 2.2.1
- */
- protected ApplicationContext applicationContext;
-
- /**
* The locale resolver object.
*
* @since 2.2.1
*/
protected LocaleResolver localeResolver;
- /** {...@inheritdoc} */
- public void setApplicationContext(ApplicationContext applicationContext) {
- this.applicationContext = applicationContext;
- }
-
/**
* Sets the locale resolver to use.
*
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java?rev=891884&r1=891883&r2=891884&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
Thu Dec 17 20:43:12 2009
@@ -33,11 +33,9 @@
import java.util.Set;
import org.apache.tiles.Definition;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.RefreshMonitor;
-import org.apache.tiles.request.ApplicationContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,8 +47,7 @@
* @since 2.1.0
*/
public abstract class BaseLocaleUrlDefinitionDAO implements
- DefinitionDAO<Locale>, TilesApplicationContextAware, RefreshMonitor,
- URLReader {
+ DefinitionDAO<Locale>, RefreshMonitor, URLReader {
/**
* The logging object.
@@ -73,13 +70,6 @@
protected Map<String, Long> lastModifiedDates;
/**
- * The application context.
- *
- * @since 2.1.0
- */
- protected ApplicationContext applicationContext;
-
- /**
* Reader used to get definitions from the sources.
*
* @since 2.1.0
@@ -113,11 +103,6 @@
}
/** {...@inheritdoc} */
- public void setApplicationContext(ApplicationContext applicationContext) {
- this.applicationContext = applicationContext;
- }
-
- /** {...@inheritdoc} */
public boolean refreshRequired() {
boolean status = false;
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=891884&r1=891883&r2=891884&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
Thu Dec 17 20:43:12 2009
@@ -129,7 +129,6 @@
LocaleResolver resolver) {
UnresolvingLocaleDefinitionsFactory factory =
instantiateDefinitionsFactory(
applicationContext, resolver);
- factory.setApplicationContext(applicationContext);
factory.setLocaleResolver(resolver);
factory.setDefinitionDAO(createLocaleDefinitionDao(applicationContext,
resolver));
@@ -180,7 +179,6 @@
applicationContext, resolver);
definitionDao.setReader(createDefinitionsReader(applicationContext));
definitionDao.setSourceURLs(getSourceURLs(applicationContext));
- definitionDao.setApplicationContext(applicationContext);
if (definitionDao instanceof PatternDefinitionResolverAware) {
((PatternDefinitionResolverAware<Locale>) definitionDao)
.setPatternDefinitionResolver(createPatternDefinitionResolver(Locale.class));
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=891884&r1=891883&r2=891884&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
Thu Dec 17 20:43:12 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.definition;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import static org.junit.Assert.*;
@@ -32,7 +33,6 @@
import org.apache.tiles.Definition;
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Test;
@@ -49,7 +49,6 @@
@SuppressWarnings("unchecked")
@Test
public void testGetDefinition() {
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
DefinitionDAO<Locale> dao = createMock(DefinitionDAO.class);
LocaleResolver localeResolver = createMock(LocaleResolver.class);
Request request = createMock(Request.class);
@@ -67,13 +66,12 @@
LocaleDefinitionsFactory factory = new LocaleDefinitionsFactory();
- replay(applicationContext, dao, localeResolver, request);
- factory.setApplicationContext(applicationContext);
+ replay(dao, localeResolver, request);
factory.setDefinitionDAO(dao);
factory.setLocaleResolver(localeResolver);
Definition realDefinition = new Definition(definition);
realDefinition.inherit(anotherDefinition);
assertEquals(realDefinition, factory.getDefinition("myDefinition",
request));
- verify(applicationContext, dao, localeResolver, request);
+ verify(dao, localeResolver, request);
}
}
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java?rev=891884&r1=891883&r2=891884&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
Thu Dec 17 20:43:12 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.definition;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import static org.junit.Assert.*;
@@ -29,7 +30,6 @@
import org.apache.tiles.Definition;
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.locale.LocaleResolver;
-import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.junit.Test;
@@ -46,7 +46,6 @@
@SuppressWarnings("unchecked")
@Test
public void testGetDefinition() {
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
DefinitionDAO<Locale> dao = createMock(DefinitionDAO.class);
LocaleResolver localeResolver = createMock(LocaleResolver.class);
UnresolvingLocaleDefinitionsFactory factory = new
UnresolvingLocaleDefinitionsFactory();
@@ -57,12 +56,11 @@
expect(localeResolver.resolveLocale(request)).andReturn(locale);
expect(dao.getDefinition("myDefinition",
locale)).andReturn(definition);
- replay(applicationContext, dao, localeResolver, request, definition);
- factory.setApplicationContext(applicationContext);
+ replay(dao, localeResolver, request, definition);
factory.setDefinitionDAO(dao);
factory.setLocaleResolver(localeResolver);
assertEquals(definition, factory.getDefinition("myDefinition",
request));
- verify(applicationContext, dao, localeResolver, request, definition);
+ verify(dao, localeResolver, request, definition);
}
}
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=891884&r1=891883&r2=891884&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
Thu Dec 17 20:43:12 2009
@@ -44,7 +44,6 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.MockDefinitionsReader;
@@ -102,10 +101,6 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
-
List<URL> sourceURLs = new ArrayList<URL>();
sourceURLs.add(url1);
sourceURLs.add(url2);
@@ -170,7 +165,6 @@
assertNull("Definition in French not found", definitionDao
.getDefinition("test.def.overridden", Locale.FRENCH)
.getAttribute("title"));
- verify(applicationContext);
}
/**
@@ -188,10 +182,6 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
-
List<URL> sourceURLs = new ArrayList<URL>();
sourceURLs.add(url1);
sourceURLs.add(url2);
@@ -261,7 +251,6 @@
"country").getValue());
assertNull("Definition in French not found", frenchDefinitions.get(
"test.def.overridden").getAttribute("title"));
- verify(applicationContext);
}
/**
@@ -327,16 +316,6 @@
}
/**
- * Tests {...@link
LocaleUrlDefinitionDAO#setApplicationContext(ApplicationContext)}.
- */
- public void testSetApplicationContext() {
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- definitionDao.setApplicationContext(applicationContext);
- assertEquals("The application context has not been set",
- applicationContext, definitionDao.applicationContext);
- }
-
- /**
* Tests execution.
*
* @throws IOException If something goes wrong.
@@ -354,7 +333,6 @@
expect(applicationContext.getResources("/WEB-INF/tiles.xml"))
.andReturn(urlSet);
replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
DefinitionsReader reader = new DigesterDefinitionsReader();
definitionDao.setReader(reader);
List<URL> sourceURLs = new ArrayList<URL>();
@@ -367,9 +345,6 @@
definitionDao.sourceURLs);
reset(applicationContext);
- applicationContext = createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
definitionDao.setReader(new MockDefinitionsReader());
assertEquals("The reader is not of the correct class",
MockDefinitionsReader.class, definitionDao.reader.getClass());
@@ -380,7 +355,6 @@
definitionDao.setSourceURLs(sourceURLs);
assertEquals("The source URLs are not correct", sourceURLs,
definitionDao.sourceURLs);
- verify(applicationContext);
}
/**
@@ -410,11 +384,6 @@
urlPath = "file:/" + url.getPath();
}
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- ((TilesApplicationContextAware) definitionDao)
- .setApplicationContext(applicationContext);
-
// The following second madness is necessary b/c sometimes spaces
// are encoded as '%20', sometimes they are not. For example in
// Windows 2000 under Eclipse they are encoded, under the prompt of
@@ -492,7 +461,7 @@
assertEquals("Factory should be stale.", true, reloadable
.refreshRequired());
- verify(applicationContext, context);
+ verify(context);
}
/**
@@ -502,10 +471,6 @@
URL url = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs-wildcard.xml");
definitionDao.addSourceURL(url);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- ((TilesApplicationContextAware) definitionDao)
- .setApplicationContext(applicationContext);
definitionDao.setReader(new DigesterDefinitionsReader());
Definition definition =
definitionDao.getDefinition("test.defName.subLayered", Locale.ITALY);
@@ -537,7 +502,6 @@
assertNull(definition.getTemplateAttribute().getValue());
assertEquals(1, definition.getLocalAttributeNames().size());
assertEquals("Overridden Title",
definition.getAttribute("title").getValue());
- verify(applicationContext);
}
/**
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=891884&r1=891883&r2=891884&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
Thu Dec 17 20:43:12 2009
@@ -42,7 +42,6 @@
import junit.framework.TestCase;
import org.apache.tiles.Definition;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.MockDefinitionsReader;
@@ -93,10 +92,6 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
-
List<URL> sourceURLs = new ArrayList<URL>();
sourceURLs.add(url1);
sourceURLs.add(url2);
@@ -161,7 +156,6 @@
assertNull("Definition in French not found", definitionDao
.getDefinition("test.def.overridden", Locale.FRENCH)
.getAttribute("title"));
- verify(applicationContext);
}
/**
@@ -179,10 +173,6 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
-
List<URL> sourceURLs = new ArrayList<URL>();
sourceURLs.add(url1);
sourceURLs.add(url2);
@@ -252,7 +242,6 @@
"country").getValue());
assertNull("Definition in French not found", frenchDefinitions.get(
"test.def.overridden").getAttribute("title"));
- verify(applicationContext);
}
/**
@@ -318,16 +307,6 @@
}
/**
- * Tests {...@link
LocaleUrlDefinitionDAO#setApplicationContext(ApplicationContext)}.
- */
- public void testSetApplicationContext() {
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- definitionDao.setApplicationContext(applicationContext);
- assertEquals("The application context has not been set",
- applicationContext, definitionDao.applicationContext);
- }
-
- /**
* Tests execution.
*
* @throws IOException If something goes wrong.
@@ -345,7 +324,6 @@
expect(applicationContext.getResources("/WEB-INF/tiles.xml"))
.andReturn(urlSet);
replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
DefinitionsReader reader = new DigesterDefinitionsReader();
definitionDao.setReader(reader);
List<URL> sourceURLs = new ArrayList<URL>();
@@ -358,9 +336,6 @@
definitionDao.sourceURLs);
reset(applicationContext);
- applicationContext = createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
definitionDao.setReader(new MockDefinitionsReader());
assertEquals("The reader is not of the correct class",
MockDefinitionsReader.class, definitionDao.reader.getClass());
@@ -371,7 +346,6 @@
definitionDao.setSourceURLs(sourceURLs);
assertEquals("The source URLs are not correct", sourceURLs,
definitionDao.sourceURLs);
- verify(applicationContext);
}
/**
@@ -403,8 +377,6 @@
ApplicationContext applicationContext =
createMock(ApplicationContext.class);
replay(applicationContext);
- ((TilesApplicationContextAware) definitionDao)
- .setApplicationContext(applicationContext);
// The following second madness is necessary b/c sometimes spaces
// are encoded as '%20', sometimes they are not. For example in
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=891884&r1=891883&r2=891884&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
Thu Dec 17 20:43:12 2009
@@ -44,7 +44,6 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsReader;
import org.apache.tiles.definition.MockDefinitionsReader;
@@ -107,10 +106,6 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
-
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
@@ -180,7 +175,6 @@
"Definition to be extended", definitionDao.getDefinition(
"test.def.overridden", Locale.FRENCH).getAttribute(
"title").getValue());
- verify(applicationContext);
}
/**
@@ -198,10 +192,6 @@
"org/apache/tiles/config/defs3.xml");
assertNotNull("Could not load defs3 file.", url3);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- definitionDao.setApplicationContext(applicationContext);
-
Map<String, String> params = new HashMap<String, String>();
params.put(DefinitionsFactory.DEFINITIONS_CONFIG,
"org/apache/tiles/config/defs1.xml,org/apache/tiles/config/defs2.xml,"
@@ -277,7 +267,6 @@
assertEquals("Incorrect France title value",
"Definition to be extended", frenchDefinitions.get(
"test.def.overridden").getAttribute("title").getValue());
- verify(applicationContext);
}
/**
@@ -343,16 +332,6 @@
}
/**
- * Tests {...@link
LocaleUrlDefinitionDAO#setApplicationContext(ApplicationContext)}.
- */
- public void testSetApplicationContext() {
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- definitionDao.setApplicationContext(applicationContext);
- assertEquals("The application context has not been set",
- applicationContext, definitionDao.applicationContext);
- }
-
- /**
* Tests execution.
*
* @throws IOException If something goes wrong.
@@ -371,7 +350,6 @@
.andReturn(urlSet);
replay(applicationContext);
Map<String, String> params = new HashMap<String, String>();
- definitionDao.setApplicationContext(applicationContext);
DefinitionsReader reader = new DigesterDefinitionsReader();
definitionDao.setReader(reader);
List<URL> sourceURLs = new ArrayList<URL>();
@@ -393,7 +371,6 @@
"org/apache/tiles/config/defs1.xml,"
+ "org/apache/tiles/config/defs2.xml,"
+ "org/apache/tiles/config/defs3.xml");
- definitionDao.setApplicationContext(applicationContext);
definitionDao.setReader(new MockDefinitionsReader());
assertEquals("The reader is not of the correct class",
MockDefinitionsReader.class, definitionDao.reader.getClass());
@@ -434,11 +411,6 @@
urlPath = "file:/" + url.getPath();
}
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- ((TilesApplicationContextAware) definitionDao)
- .setApplicationContext(applicationContext);
-
// The following second madness is necessary b/c sometimes spaces
// are encoded as '%20', sometimes they are not. For example in
// Windows 2000 under Eclipse they are encoded, under the prompt of
@@ -515,8 +487,6 @@
assertEquals("Factory should be stale.", true, reloadable
.refreshRequired());
-
- verify(applicationContext, context);
}
/**
@@ -526,10 +496,6 @@
URL url = this.getClass().getClassLoader().getResource(
"org/apache/tiles/config/defs-wildcard.xml");
definitionDao.addSourceURL(url);
- ApplicationContext applicationContext =
createMock(ApplicationContext.class);
- replay(applicationContext);
- ((TilesApplicationContextAware) definitionDao)
- .setApplicationContext(applicationContext);
definitionDao.setReader(new DigesterDefinitionsReader());
Definition definition =
definitionDao.getDefinition("test.defName.subLayered", Locale.ITALY);
@@ -565,7 +531,6 @@
assertEquals("The header attribute is not correct",
"/common/headerLayered.jsp", definition.getAttribute("header")
.getValue());
- verify(applicationContext);
}
/**
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=891884&r1=891883&r2=891884&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
Thu Dec 17 20:43:12 2009
@@ -24,7 +24,6 @@
import javax.el.ExpressionFactory;
import javax.el.ValueExpression;
-import org.apache.tiles.awareness.TilesApplicationContextAware;
import org.apache.tiles.evaluator.AbstractAttributeEvaluator;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
@@ -38,8 +37,7 @@
* @version $Rev$ $Date$
* @since 2.2.1
*/
-public class ELAttributeEvaluator extends AbstractAttributeEvaluator implements
- TilesApplicationContextAware {
+public class ELAttributeEvaluator extends AbstractAttributeEvaluator {
/**
* Initialization parameter to decide the implementation of
@@ -51,13 +49,6 @@
"org.apache.tiles.evaluator.el.ExpressionFactoryFactory";
/**
- * The Tiles application context.
- *
- * @since 2.2.1
- */
- protected ApplicationContext applicationContext;
-
- /**
* The EL expression factory.
*
* @since 2.2.1
@@ -79,11 +70,6 @@
public ELAttributeEvaluator() {
}
- /** {...@inheritdoc} */
- public void setApplicationContext(ApplicationContext applicationContext) {
- this.applicationContext = applicationContext;
- }
-
/**
* Sets the expression factory to use.
*
@@ -109,7 +95,7 @@
ELContextImpl context = new ELContextImpl(resolver);
context.putContext(Request.class, request);
context.putContext(ApplicationContext.class,
- applicationContext);
+ request.getApplicationContext());
ValueExpression valueExpression = expressionFactory
.createValueExpression(context, expression, Object.class);
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=891884&r1=891883&r2=891884&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
Thu Dec 17 20:43:12 2009
@@ -80,9 +80,10 @@
new String[] { "request", "session", "application"
}).anyTimes();
ApplicationContext applicationContext = EasyMock
.createMock(ApplicationContext.class);
+ EasyMock.expect(request.getApplicationContext()).andReturn(
+ applicationContext).anyTimes();
EasyMock.replay(request, applicationContext);
- evaluator.setApplicationContext(applicationContext);
evaluator.setExpressionFactory(new ExpressionFactoryImpl());
ELResolver elResolver = new CompositeELResolver() {
{
Modified:
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java?rev=891884&r1=891883&r2=891884&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
Thu Dec 17 20:43:12 2009
@@ -236,7 +236,6 @@
private ELAttributeEvaluator createELEvaluator(
ApplicationContext applicationContext) {
ELAttributeEvaluator evaluator = new ELAttributeEvaluator();
- evaluator.setApplicationContext(applicationContext);
JspExpressionFactoryFactory efFactory = new
JspExpressionFactoryFactory();
efFactory.setApplicationContext(applicationContext);
evaluator.setExpressionFactory(efFactory.getExpressionFactory());
