Author: apetrelli
Date: Mon Nov 6 04:32:03 2006
New Revision: 471712
URL: http://svn.apache.org/viewvc?view=rev&rev=471712
Log:
SB-30
Updated test files to the removal of deprecated DTD elements
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="test.def1" path="/test.jsp">
+ <definition name="test.def1" template="/test.jsp">
<put name="country" value="default"/>
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="test.def1" path="/test.jsp">
+ <definition name="test.def1" template="/test.jsp">
<put name="country" value="US"/>
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="test.def1" path="/test.jsp">
+ <definition name="test.def1" template="/test.jsp">
<put name="country" value="France"/>
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="test.def2" path="/test.jsp">
+ <definition name="test.def2" template="/test.jsp">
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
<put name="menu" value="doc.menu.main" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="test.def3" path="/test.jsp">
+ <definition name="test.def3" template="/test.jsp">
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
<put name="menu" value="doc.menu.main" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Dorked up XML tag. -->
- <definitionasdfad name="doc.mainLayout" path="/layout/classicLayout.jsp">
+ <definitionasdfad name="doc.mainLayout" template="/layout/classicLayout.jsp">
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
<put name="menu" value="doc.menu.main" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+ <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
<put name="menu" value="doc.menu.main" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="test.def1" path="/test.jsp">
+ <definition name="test.def1" template="/test.jsp">
<put name="country" value="default"/>
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+ <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
<put name="menu" value="doc.menu.main" />
@@ -25,7 +25,7 @@
<!-- Main page body definitions
-->
<!-- ======================================================= -->
- <definition name="doc.portal.body" path="/layout/columnsLayout.jsp">
+ <definition name="doc.portal.body" template="/layout/columnsLayout.jsp">
<put name="numCols" value="2" />
<putList name="list0" >
<add value="/doc/portal/welcome.jsp" />
@@ -48,7 +48,7 @@
<!-- ======================================================= -->
<!-- Menu bar definition -->
-<definition name="doc.menu.main" path="/layout/vboxLayout.jsp" >
+<definition name="doc.menu.main" template="/layout/vboxLayout.jsp" >
<putList name="componentsList" >
<add value="doc.menu.links" />
<add value="doc.menu.taglib.references" />
@@ -58,7 +58,7 @@
</definition>
<!-- Documentation menu definition v1.1-->
-<definition name="doc.menu.links" path="/layouts/menu.jsp" >
+<definition name="doc.menu.links" template="/layouts/menu.jsp" >
<put name="title" value="Documentation" />
<putList name="items" >
<item value="Home" link="/index.jsp" />
@@ -84,7 +84,7 @@
</definition>
<!-- Printer friendly menu definition -->
-<definition name="doc.menu.printer.friendly" path="/layouts/menu.jsp" >
+<definition name="doc.menu.printer.friendly" template="/layouts/menu.jsp" >
<put name="title" value="Printer Versions" />
<putList name="items" >
<item value="Quick Overview" link="/test/testAll.jsp" />
@@ -95,7 +95,7 @@
</definition>
<!-- Taglib menu definition -->
-<definition name="doc.menu.taglib.references" path="/layouts/menu.jsp" >
+<definition name="doc.menu.taglib.references" template="/layouts/menu.jsp" >
<put name="title" value="Tag Library Reference" />
<putList name="items" >
<item value="Tiles Tags" link="/doc/tilesTags.jsp" />
@@ -104,7 +104,7 @@
</definition>
<!-- Oldies menu definition -->
-<definition name="doc.menu.old.documents" path="/layouts/menu.jsp" >
+<definition name="doc.menu.old.documents" template="/layouts/menu.jsp" >
<put name="title" value="Old Documents" />
<putList name="items" >
<item value="Overview (old)" link="/doc/overview.jsp" />
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java
Mon Nov 6 04:32:03 2006
@@ -63,7 +63,7 @@
public void testPutAttribute() {
ComponentDefinition def = new ComponentDefinition();
def.setName("test1");
- def.setPath("/page1.jsp");
+ def.setTemplate("/page1.jsp");
def.put("attr1", new ComponentDefinition(), "definition", null);
Object attr1 = def.getAttribute("attr1");
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java
Mon Nov 6 04:32:03 2006
@@ -70,7 +70,7 @@
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
- def.setPath("/test1.jsp");
+ def.setTemplate("/test1.jsp");
ComponentAttribute attr = new ComponentAttribute();
attr.setName("attr1");
attr.setValue("value1");
@@ -95,15 +95,15 @@
assertNotNull("Couldn't get parent.",
definitions.getDefinition("parent.def1"));
- assertEquals("Incorrect path value." , "/test1.jsp",
- definitions.getDefinition("parent.def1").getPath());
+ assertEquals("Incorrect template value." , "/test1.jsp",
+ definitions.getDefinition("parent.def1").getTemplate());
assertEquals("Incorrect attr1 value", "value1",
definitions.getDefinition("parent.def1").getAttribute("attr1"));
assertNotNull("Couldn't get child.",
definitions.getDefinition("child.def1"));
- assertEquals("Incorrect path value." , "/test1.jsp",
- definitions.getDefinition("child.def1").getPath());
+ assertEquals("Incorrect template value." , "/test1.jsp",
+ definitions.getDefinition("child.def1").getTemplate());
assertEquals("Incorrect attr1 value", "New value",
definitions.getDefinition("child.def1").getAttribute("attr1"));
}
@@ -115,7 +115,7 @@
Map defs = new HashMap();
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
- def.setPath("/test1.jsp");
+ def.setTemplate("/test1.jsp");
ComponentAttribute attr = new ComponentAttribute();
attr.setName("attr1");
attr.setValue("value1");
@@ -151,29 +151,29 @@
assertNotNull("Couldn't get parent.",
definitions.getDefinition("parent.def1"));
- assertEquals("Incorrect path value." , "/test1.jsp",
- definitions.getDefinition("parent.def1").getPath());
+ assertEquals("Incorrect template value." , "/test1.jsp",
+ definitions.getDefinition("parent.def1").getTemplate());
assertEquals("Incorrect attr1 value", "value1",
definitions.getDefinition("parent.def1").getAttribute("attr1"));
assertNotNull("Couldn't get child.",
definitions.getDefinition("child.def1"));
- assertEquals("Incorrect path value." , "/test1.jsp",
- definitions.getDefinition("child.def1").getPath());
+ assertEquals("Incorrect template value." , "/test1.jsp",
+ definitions.getDefinition("child.def1").getTemplate());
assertEquals("Incorrect attr1 value", "New value",
definitions.getDefinition("child.def1").getAttribute("attr1"));
assertNotNull("Couldn't get parent.",
definitions.getDefinition("parent.def1", Locale.US));
- assertEquals("Incorrect path value." , "/test1.jsp",
- definitions.getDefinition("parent.def1", Locale.US).getPath());
+ assertEquals("Incorrect template value." , "/test1.jsp",
+ definitions.getDefinition("parent.def1",
Locale.US).getTemplate());
assertEquals("Incorrect attr1 value", "value1",
definitions.getDefinition("parent.def1",
Locale.US).getAttribute("attr1"));
assertNotNull("Couldn't get child.",
definitions.getDefinition("child.def1", Locale.US));
- assertEquals("Incorrect path value." , "/test1.jsp",
- definitions.getDefinition("child.def1", Locale.US).getPath());
+ assertEquals("Incorrect template value." , "/test1.jsp",
+ definitions.getDefinition("child.def1",
Locale.US).getTemplate());
assertEquals("Incorrect attr1 value", "US Value",
definitions.getDefinition("child.def1",
Locale.US).getAttribute("attr1"));
}
@@ -186,7 +186,7 @@
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
- def.setPath("/test1.jsp");
+ def.setTemplate("/test1.jsp");
ComponentAttribute attr = new ComponentAttribute();
attr.setName("attr1");
attr.setValue("value1");
@@ -229,7 +229,7 @@
ComponentDefinition def = new ComponentDefinition();
def.setName("parent.def1");
- def.setPath("/test1.jsp");
+ def.setTemplate("/test1.jsp");
ComponentAttribute attr = new ComponentAttribute();
attr.setName("attr1");
attr.setValue("tiles.def2");
@@ -239,7 +239,7 @@
def = new ComponentDefinition();
def.setName("parent.notype.def1");
- def.setPath("/test1.jsp");
+ def.setTemplate("/test1.jsp");
attr = new ComponentAttribute();
attr.setName("attr1");
attr.setValue("tiles.def2");
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
Mon Nov 6 04:32:03 2006
@@ -107,7 +107,7 @@
"\"-//Apache Software Foundation//DTD Tiles Configuration
1.1//EN\" " +
"\"http://struts.apache.org/dtds/tiles-config_1_1.dtd\";>\n\n" +
"<tiles-definitions>" +
- "<definition name=\"rewrite.test\" path=\"/test.jsp\">" +
+ "<definition name=\"rewrite.test\" template=\"/test.jsp\">" +
"<put name=\"testparm\" value=\"testval\"/>" +
"</definition>" +
"</tiles-definitions>";
@@ -127,8 +127,8 @@
assertNotNull("rewrite.test definition not found.",
definitions.getDefinition("rewrite.test"));
- assertEquals("Incorrect initial path value", "/test.jsp",
- definitions.getDefinition("rewrite.test").getPath());
+ assertEquals("Incorrect initial template value", "/test.jsp",
+ definitions.getDefinition("rewrite.test").getTemplate());
ReloadableDefinitionsFactory reloadable =
(ReloadableDefinitionsFactory) factory;
assertEquals("Factory should be fresh.", false,
@@ -143,7 +143,7 @@
"\"-//Apache Software Foundation//DTD Tiles Configuration
1.1//EN\" " +
"\"http://struts.apache.org/dtds/tiles-config_1_1.dtd\";>\n\n" +
"<tiles-definitions>" +
- "<definition name=\"rewrite.test\" path=\"/newtest.jsp\">" +
+ "<definition name=\"rewrite.test\" template=\"/newtest.jsp\">"
+
"<put name=\"testparm\" value=\"testval\"/>" +
"</definition>" +
"</tiles-definitions>";
@@ -160,7 +160,7 @@
definitions = factory.readDefinitions();
assertNotNull("rewrite.test definition not found.",
definitions.getDefinition("rewrite.test"));
- assertEquals("Incorrect initial path value", "/newtest.jsp",
- definitions.getDefinition("rewrite.test").getPath());
+ assertEquals("Incorrect initial template value", "/newtest.jsp",
+ definitions.getDefinition("rewrite.test").getTemplate());
}
}
Modified:
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?view=diff&rev=471712&r1=471711&r2=471712
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
(original)
+++
struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
Mon Nov 6 04:32:03 2006
@@ -13,7 +13,7 @@
<!-- ======================================================= -->
<!-- Doc index page description -->
- <definition name="doc.mainLayout" path="/layout/classicLayout.jsp">
+ <definition name="doc.mainLayout" template="/layout/classicLayout.jsp">
<put name="title" value="Tiles Library Documentation" />
<put name="header" value="/common/header.jsp" />
<put name="menu" value="doc.menu.main" />
