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 2007/10/21 17:13:48 UTC
svn commit: r586909 - in /tiles/framework/branches/TILES_2_0_X/tiles-test/src: main/java/org/apache/tiles/test/filter/ main/webapp/ main/webapp/WEB-INF/ test/selenium/

Author: apetrelli
Date: Sun Oct 21 08:13:47 2007
New Revision: 586909

URL: http://svn.apache.org/viewvc?rev=586909&view=rev
Log:
TILES-186
Merge from trunk to TILES_2_0_X branch.
Added functionality tests for roles in attributes and definitions.

Added:
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/java/org/apache/tiles/test/filter/
      - copied from r586908, tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/filter/
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java   (contents, props changed)
      - copied, changed from r586908, tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
      - copied unchanged from r586908, tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
      - copied unchanged from r586908, tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
      - copied unchanged from r586908, tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html   (contents, props changed)
      - copied, changed from r586908, tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html   (contents, props changed)
      - copied, changed from r586908, tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html   (contents, props changed)
      - copied, changed from r586908, tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html
Modified:
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/web.xml
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp
    tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html

Copied: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java (from r586908, tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java)
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java?p2=tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java&p1=tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java&r1=586908&r2=586909&rev=586909&view=diff
==============================================================================
    (empty)

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?rev=586909&r1=586908&r2=586909&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Sun Oct 21 08:13:47 2007
@@ -102,4 +102,23 @@
       <put-attribute name="body" value="/defaultlocale.jsp" />
   </definition>
 
+  <definition name="test.definition.appears" extends="test.definition">
+      <put-attribute name="title"  value="This definition appears."/>
+  </definition>
+
+  <definition name="test.definition.does_not_appear" extends="test.definition">
+      <put-attribute name="title"  value="This definition does not appear."/>
+  </definition>
+
+  <definition name="test.definition.appears.configured"
+    extends="test.definition.appears" role="goodrole" />
+
+  <definition name="test.definition.does_not_appear.configured"
+    extends="test.definition.does_not_appear" role="badrole" />
+
+  <definition name="test.definition.roles" template="/layout.jsp">
+      <put-attribute name="title"  value="This is the title."/>
+      <put-attribute name="header" value="/header.jsp" role="goodrole" />
+      <put-attribute name="body"   value="/body.jsp" role="badrole" />
+  </definition>
 </tiles-definitions>

Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=586909&r1=586908&r2=586909&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/WEB-INF/web.xml Sun Oct 21 08:13:47 2007
@@ -53,9 +53,20 @@
         </init-param>
     </filter>
 
+    <filter>
+        <filter-name>Security Wrapping Filter</filter-name>
+        <filter-class>org.apache.tiles.test.filter.SecurityWrappingFilter</filter-class>
+    </filter>
+
     <filter-mapping>
         <filter-name>Tiles Decoration Filter</filter-name>
         <url-pattern>/testdecorationfilter.jsp</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>Security Wrapping Filter</filter-name>
+        <url-pattern>/*</url-pattern>
         <dispatcher>REQUEST</dispatcher>
     </filter-mapping>
 

Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp?rev=586909&r1=586908&r2=586909&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/main/webapp/index.jsp Sun Oct 21 08:13:47 2007
@@ -64,6 +64,11 @@
     <a href="testinsertdefinition_composite_tags.jsp">Test Insert Definition that contains another definition inside using JSP tags</a><br/>
     <a href="testinsertdefinition_composite_tags_includes_configured_notype.jsp">Test Insert Definition that contains another definition inside (configured via tiles-defs.xml) using JSP tags without types</a><br/>
     <a href="testinsertdefinition_composite_tags_notype.jsp">Test Insert Definition that contains another definition inside using JSP tags without types</a><br/></body>
+    
+    <h3>Roles Verification tests</h3>
+    <a href="testinsertdefinition_role.jsp">Test Insert Configured Definition with Specified Role</a><br/>
+    <a href="testinsertdefinition_role_tag.jsp">Test Insert Configured Definition with Specified Role in Tag</a><br/>
+    <a href="testinsertdefinition_attribute_roles.jsp">Test Insert Configured Definition with Attribute that have Roles</a><br/>
 
     <h2>Currently not working tests</h2>
 

Copied: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html (from r586908, tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html?p2=tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html&p1=tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html&r1=586908&r2=586909&rev=586909&view=diff
==============================================================================
    (empty)

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html (from r586908, tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html?p2=tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html&p1=tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html&r1=586908&r2=586909&rev=586909&view=diff
==============================================================================
    (empty)

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html (from r586908, tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html)
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html?p2=tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html&p1=tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html&r1=586908&r2=586909&rev=586909&view=diff
==============================================================================
    (empty)

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html?rev=586909&r1=586908&r2=586909&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-test/src/test/selenium/TestSuite.html Sun Oct 21 08:13:47 2007
@@ -117,6 +117,15 @@
     <tr>
         <td><a href="CompositeDefinitionWithInnerDefinitionNoTypeTest.html">Composite Definition with inner Definition with no Type Test</a></td>
     </tr>
+    <tr>
+        <td><a href="ConfiguredDefinitionRoleTest.html">Configured Definition Role Test</a></td>
+    </tr>
+    <tr>
+        <td><a href="ConfiguredDefinitionRoleTagTest.html">Configured Definition Role Tag Test</a></td>
+    </tr>
+    <tr>
+        <td><a href="ConfiguredDefinitionAttributeRolesTest.html">Configured Definition Attribute Roles Test</a></td>
+    </tr>
 </table>
 </body>
 </html>