Author: apetrelli
Date: Fri Feb 13 12:37:06 2009
New Revision: 744100
URL: http://svn.apache.org/viewvc?rev=744100&view=rev
Log:
TILESSB-5
Finished fixing the tests.
Removed:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/selectlocale_db.ftl
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_list_inherit.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_db.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java?rev=744100&r1=744099&r2=744100&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/java/org/apache/tiles/test/factory/TestDbTilesContainerFactory.java
Fri Feb 13 12:37:06 2009
@@ -21,15 +21,19 @@
package org.apache.tiles.test.factory;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Locale;
import javax.sql.DataSource;
import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.context.ChainedTilesRequestContextFactory;
import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.definition.LocaleDefinitionsFactory;
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.factory.BasicTilesContainerFactory;
+import
org.apache.tiles.freemarker.context.FreeMarkerTilesRequestContextFactory;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.test.definition.dao.LocaleDbDefinitionDAO;
@@ -57,5 +61,23 @@
TilesApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
return new LocaleDefinitionsFactory();
- }
+ }
+
+ /** {...@inheritdoc} */
+ @Override
+ protected void registerChainedRequestContextFactories(
+ ChainedTilesRequestContextFactory contextFactory) {
+ List<TilesRequestContextFactory> factories = new
ArrayList<TilesRequestContextFactory>(
+ 3);
+ registerRequestContextFactory(
+
"org.apache.tiles.servlet.context.ServletTilesRequestContextFactory",
+ factories, contextFactory);
+ registerRequestContextFactory(
+ "org.apache.tiles.jsp.context.JspTilesRequestContextFactory",
+ factories, contextFactory);
+ registerRequestContextFactory(
+ FreeMarkerTilesRequestContextFactory.class.getName(),
+ factories, contextFactory);
+ contextFactory.setFactories(factories);
+ }
}
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_list_inherit.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_list_inherit.ftl?rev=744100&r1=744099&r2=744100&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_list_inherit.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testdef_list_inherit.ftl
Fri Feb 13 12:37:06 2009
@@ -23,8 +23,8 @@
-->
<@tiles.definition name="templateDefinition" extends="test.putAttributes">
<@tiles.putAttribute name="stringTest" value="This is a string"
type="string"/>
- <@tiles.putListAttribute name="list" inherit="true">
+ <@tiles.putListAttribute name="list" inherit=true>
<@tiles.addAttribute value="valueFour" type="string" />
</@tiles.putListAttribute>
</@tiles.definition>
-<@tiles.insertDefinition name="freemarker.templateDefinition" />
+<@tiles.insertDefinition name="templateDefinition" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_db.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_db.ftl?rev=744100&r1=744099&r2=744100&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_db.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_db.ftl
Fri Feb 13 12:37:06 2009
@@ -22,4 +22,4 @@
*/
-->
<@tiles.setCurrentContainer containerKey="db"/>
-<@tiles.insertDefinition name="freemarker.test.definition" />
+<@tiles.insertDefinition name="test.definition" />
Modified:
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl?rev=744100&r1=744099&r2=744100&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl
(original)
+++
tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl
Fri Feb 13 12:37:06 2009
@@ -22,4 +22,4 @@
*/
-->
<@tiles.setCurrentContainer containerKey="db"/>
-<@tiles.insertDefinition name="freemarker.test.definition.extended" />
+<@tiles.insertDefinition name="test.definition.extended" />
Modified: tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp?rev=744100&r1=744099&r2=744100&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp (original)
+++ tiles/sandbox/trunk/tiles-test-sandbox/src/main/webapp/index.jsp Fri Feb 13
12:37:06 2009
@@ -192,6 +192,5 @@
<h3>Database Verification tests</h3>
<a href="freemarker/testinsertdefinition_db.ftl">FreeMarker: Test Insert
Configured Definition from DB</a><br/>
<a href="freemarker/testinsertdefinition_extended_db.ftl">FreeMarker: Test
Insert Extended Configured Definition from DB</a><br/>
- <a href="freemarker/selectlocale_db.ftl">FreeMarker: Test Localization
from DB</a><br/>
</html>
\ No newline at end of file
