svn commit: r737689 - in /tiles/framework/trunk/tiles-core/src: main/java/org/apache/tiles/definition/dao/ test/java/org/apache/tiles/definition/dao/

[apetrelli]

Author: apetrelli
Date: Mon Jan 26 13:22:48 2009
New Revision: 737689

URL: http://svn.apache.org/viewvc?rev=737689&view=rev
Log:
TILES-354
Removed the "getRole" call from the definition.

Modified:
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
    
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java

Modified: 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java?rev=737689&r1=737688&r2=737689&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
 Mon Jan 26 13:22:48 2009
@@ -334,7 +334,6 @@
         nudef.setExtends(replace(d.getExtends(), vars));
         nudef.setName(name);
         nudef.setPreparer(replace(d.getPreparer(), vars));
-        nudef.setRole(replace(d.getRole(), vars));
         nudef.setTemplateAttribute(replaceVarsInAttribute(d
                 .getTemplateAttribute(), vars));
 

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java?rev=737689&r1=737688&r2=737689&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
 Mon Jan 26 13:22:48 2009
@@ -585,7 +585,7 @@
                 null);
         assertNotNull("rewrite.test definition not found.", definition);
         assertEquals("Incorrect initial template value", "/test.jsp",
-                definition.getTemplate());
+                definition.getTemplateAttribute().getValue());
 
         RefreshMonitor reloadable = (RefreshMonitor) definitionDao;
         assertEquals("Factory should be fresh.", false, reloadable
@@ -635,17 +635,20 @@
         definitionDao.setReader(new DigesterDefinitionsReader());
 
         Definition definition = 
definitionDao.getDefinition("test.defName.subLayered", Locale.ITALY);
-        assertEquals("The template is not correct", "/testName.jsp", 
definition.getTemplate());
+        assertEquals("The template is not correct", "/testName.jsp", definition
+                .getTemplateAttribute().getValue());
         assertEquals("The header attribute is not correct",
                 "/common/headerLayered.jsp", definition.getAttribute("header")
                         .getValue());
         definition = definitionDao.getDefinition("test.defName.subLayered", 
Locale.ITALIAN);
-        assertEquals("The template is not correct", "/testName.jsp", 
definition.getTemplate());
+        assertEquals("The template is not correct", "/testName.jsp", definition
+                .getTemplateAttribute().getValue());
         assertEquals("The header attribute is not correct",
                 "/common/headerLayered.jsp", definition.getAttribute("header")
                         .getValue());
         definition = definitionDao.getDefinition("test.defName.subLayered", 
null);
-        assertEquals("The template is not correct", "/testName.jsp", 
definition.getTemplate());
+        assertEquals("The template is not correct", "/testName.jsp", definition
+                .getTemplateAttribute().getValue());
         assertEquals("The header attribute is not correct",
                 "/common/headerLayered.jsp", definition.getAttribute("header")
                         .getValue());

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java?rev=737689&r1=737688&r2=737689&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
 Mon Jan 26 13:22:48 2009
@@ -594,7 +594,7 @@
                 null);
         assertNotNull("rewrite.test definition not found.", definition);
         assertEquals("Incorrect initial template value", "/test.jsp",
-                definition.getTemplate());
+                definition.getTemplateAttribute().getValue());
 
         RefreshMonitor reloadable = (RefreshMonitor) definitionDao;
         assertEquals("Factory should be fresh.", false, reloadable

Modified: 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java?rev=737689&r1=737688&r2=737689&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
 Mon Jan 26 13:22:48 2009
@@ -598,7 +598,7 @@
                 null);
         assertNotNull("rewrite.test definition not found.", definition);
         assertEquals("Incorrect initial template value", "/test.jsp",
-                definition.getTemplate());
+                definition.getTemplateAttribute().getValue());
 
         RefreshMonitor reloadable = (RefreshMonitor) definitionDao;
         assertEquals("Factory should be fresh.", false, reloadable
@@ -648,7 +648,8 @@
         definitionDao.setReader(new DigesterDefinitionsReader());
 
         Definition definition = 
definitionDao.getDefinition("test.defName.subLayered", null);
-        assertEquals("The template is not correct", "/testName.jsp", 
definition.getTemplate());
+        assertEquals("The template is not correct", "/testName.jsp", definition
+                .getTemplateAttribute().getValue());
         assertEquals("The header attribute is not correct",
                 "/common/headerLayered.jsp", definition.getAttribute("header")
                         .getValue());