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 2009/10/30 21:39:57 UTC
svn commit: r831448 - in /tiles/framework/trunk: ./ src/site/apt/
src/site/apt/dev/ src/site/apt/migration/ src/site/apt/tutorial/
src/site/resources/images/ src/site/xdoc/dev/ src/site/xdoc/images/
tiles-api/src/main/java/org/apache/tiles/ tiles-api/s...
Author: apetrelli
Date: Fri Oct 30 20:39:52 2009
New Revision: 831448
URL: http://svn.apache.org/viewvc?rev=831448&view=rev
Log:
TILES-483
Fixed cascaded attribute management.
Merged from the sandbox.
Modified:
tiles/framework/trunk/ (props changed)
tiles/framework/trunk/src/site/apt/config-reference.apt (props changed)
tiles/framework/trunk/src/site/apt/dev/ (props changed)
tiles/framework/trunk/src/site/apt/getting_started.apt (props changed)
tiles/framework/trunk/src/site/apt/migration/ (props changed)
tiles/framework/trunk/src/site/apt/selenium.apt (props changed)
tiles/framework/trunk/src/site/apt/tutorial/ (props changed)
tiles/framework/trunk/src/site/resources/images/page_to_page.png (props changed)
tiles/framework/trunk/src/site/resources/images/tiled_page.png (props changed)
tiles/framework/trunk/src/site/xdoc/dev/building.xml (props changed)
tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml (props changed)
tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg (props changed)
tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg (props changed)
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java (props changed)
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ (props changed)
tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java (props changed)
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java (props changed)
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java (props changed)
tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java (props changed)
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java (props changed)
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java (props changed)
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/renderer/ (props changed)
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRendererTest.java (props changed)
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java (props changed)
tiles/framework/trunk/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java (props changed)
tiles/framework/trunk/tiles-portlet-wildcard/src/test/java/org/apache/tiles/portlet/wildcard/WildcardPortletTilesApplicationContextTest.java (props changed)
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/ (props changed)
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/ (props changed)
tiles/framework/trunk/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java (props changed)
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ (props changed)
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/ (props changed)
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/ (props changed)
tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/ (props changed)
tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/web/util/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/body.ftl (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/body.vm (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/test/java/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/test/resources/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/resources/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/test/java/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/test/resources/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/test/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/test/java/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/test/resources/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/ (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF (props changed)
tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml (props changed)
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/ (props changed)
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/VelocityAttributeRendererTest.java (props changed)
Propchange: tiles/framework/trunk/
------------------------------------------------------------------------------
svn:mergeinfo = /tiles/sandbox/trunk/tiles3:831431-831440
Propchange: tiles/framework/trunk/src/site/apt/config-reference.apt
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/apt/dev/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/apt/getting_started.apt
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/apt/migration/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/apt/selenium.apt
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/apt/tutorial/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/resources/images/page_to_page.png
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/resources/images/tiled_page.png
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/xdoc/dev/building.xml
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg
('svn:mergeinfo' removed)
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java?rev=831448&r1=831447&r2=831448&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java Fri Oct 30 20:39:52 2009
@@ -72,7 +72,6 @@
* @since 2.1.0
*/
public BasicAttributeContext() {
- super();
}
/**
@@ -257,8 +256,9 @@
}
if (attributes == null) {
- attributes = new HashMap<String, Attribute>(defaultAttributes);
+ attributes = new HashMap<String, Attribute>();
if (cascadedAttributes == null || cascadedAttributes.isEmpty()) {
+ attributes.putAll(defaultAttributes);
return;
}
}
@@ -267,7 +267,7 @@
for (Map.Entry<String, Attribute> entry : entries) {
String key = entry.getKey();
if (!attributes.containsKey(key)
- && (cascadedAttributes == null || cascadedAttributes
+ && (cascadedAttributes == null || !cascadedAttributes
.containsKey(key))) {
attributes.put(entry.getKey(), entry.getValue());
}
Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/
('svn:mergeinfo' removed)
Modified: tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java?rev=831448&r1=831447&r2=831448&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java (original)
+++ tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java Fri Oct 30 20:39:52 2009
@@ -20,6 +20,9 @@
*/
package org.apache.tiles;
+import static org.junit.Assert.*;
+import static org.easymock.EasyMock.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -28,20 +31,19 @@
import java.util.Map;
import java.util.Set;
-import org.easymock.EasyMock;
-
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* Tests <code>BasicAttributeContext</code>.
*
* @version $Rev$ $Date$
*/
-public class BasicAttributeContextTest extends TestCase {
+public class BasicAttributeContextTest {
/**
* Tests {@link BasicAttributeContext#BasicAttributeContext()}.
*/
+ @Test
public void testBasicAttributeContext() {
AttributeContext context = new BasicAttributeContext();
assertNull("There are some spurious attributes", context
@@ -53,6 +55,7 @@
/**
* Tests {@link BasicAttributeContext#BasicAttributeContext(Map)}.
*/
+ @Test
public void testBasicAttributeContextMapOfStringAttribute() {
Map<String, Attribute> name2attrib = new HashMap<String, Attribute>();
Attribute attribute = new Attribute("Value 1");
@@ -74,6 +77,7 @@
* Tests
* {@link BasicAttributeContext#BasicAttributeContext(AttributeContext)}.
*/
+ @Test
public void testBasicAttributeContextAttributeContext() {
Set<String> localAttributes = new LinkedHashSet<String>();
Set<String> cascadedAttributes = new LinkedHashSet<String>();
@@ -81,28 +85,27 @@
localAttributes.add("local2");
cascadedAttributes.add("cascaded1");
cascadedAttributes.add("cascaded2");
- AttributeContext toCopy = EasyMock.createMock(AttributeContext.class);
- EasyMock.expect(toCopy.getLocalAttributeNames()).andReturn(
- localAttributes);
- EasyMock.expect(toCopy.getLocalAttribute("local1")).andReturn(
+ AttributeContext toCopy = createMock(AttributeContext.class);
+ expect(toCopy.getLocalAttributeNames()).andReturn(localAttributes);
+ expect(toCopy.getLocalAttribute("local1")).andReturn(
new Attribute("value1")).anyTimes();
- EasyMock.expect(toCopy.getLocalAttribute("local2")).andReturn(
+ expect(toCopy.getLocalAttribute("local2")).andReturn(
new Attribute("value2")).anyTimes();
- EasyMock.expect(toCopy.getCascadedAttributeNames()).andReturn(
- cascadedAttributes);
- EasyMock.expect(toCopy.getCascadedAttribute("cascaded1")).andReturn(
+ expect(toCopy.getCascadedAttributeNames())
+ .andReturn(cascadedAttributes);
+ expect(toCopy.getCascadedAttribute("cascaded1")).andReturn(
new Attribute("value3")).anyTimes();
- EasyMock.expect(toCopy.getCascadedAttribute("cascaded2")).andReturn(
+ expect(toCopy.getCascadedAttribute("cascaded2")).andReturn(
new Attribute("value4")).anyTimes();
Attribute templateAttribute = new Attribute("/template.jsp", Expression
.createExpression("expression", null), "role1,role2",
"template");
- EasyMock.expect(toCopy.getTemplateAttribute()).andReturn(templateAttribute);
+ expect(toCopy.getTemplateAttribute()).andReturn(templateAttribute);
Set<String> roles = new HashSet<String>();
roles.add("role1");
roles.add("role2");
- EasyMock.expect(toCopy.getPreparer()).andReturn("my.preparer.Preparer");
- EasyMock.replay(toCopy);
+ expect(toCopy.getPreparer()).andReturn("my.preparer.Preparer");
+ replay(toCopy);
BasicAttributeContext context = new BasicAttributeContext(toCopy);
assertEquals("The template has not been set correctly",
"/template.jsp", context.getTemplateAttribute().getValue());
@@ -133,10 +136,12 @@
/**
* Tests
- * {@link BasicAttributeContext#BasicAttributeContext(BasicAttributeContext)}.
+ * {@link BasicAttributeContext#BasicAttributeContext(BasicAttributeContext)}
+ * .
*/
+ @Test
public void testBasicAttributeContextBasicAttributeContext() {
- AttributeContext toCopy = new BasicAttributeContext();
+ BasicAttributeContext toCopy = new BasicAttributeContext();
toCopy.putAttribute("name1", new Attribute("value1"), false);
toCopy.putAttribute("name2", new Attribute("value2"), true);
Attribute templateAttribute = Attribute
@@ -165,8 +170,11 @@
}
/**
- * Tests {@link BasicAttributeContext#inheritCascadedAttributes(AttributeContext)}.
+ * Tests
+ * {@link BasicAttributeContext#inheritCascadedAttributes(AttributeContext)}
+ * .
*/
+ @Test
public void testInheritCascadedAttributes() {
AttributeContext toCopy = new BasicAttributeContext();
toCopy.putAttribute("name1", new Attribute("value1"), false);
@@ -186,6 +194,7 @@
* testing inheritance between {@link ListAttribute} instances.
*/
@SuppressWarnings("unchecked")
+ @Test
public void testInheritListAttribute() {
AttributeContext toCopy = new BasicAttributeContext();
ListAttribute parentListAttribute = new ListAttribute();
@@ -203,7 +212,8 @@
assertNotNull("The list must exist", value);
assertEquals("The size is not correct", 2, value.size());
assertEquals("The first element is not correct", "first", value.get(0));
- assertEquals("The second element is not correct", "second", value.get(1));
+ assertEquals("The second element is not correct", "second", value
+ .get(1));
context = new BasicAttributeContext();
listAttribute = new ListAttribute();
@@ -215,23 +225,110 @@
value = (List<Object>) result.getValue();
assertNotNull("The list must exist", value);
assertEquals("The size is not correct", 1, value.size());
- assertEquals("The second element is not correct", "second", value.get(0));
+ assertEquals("The second element is not correct", "second", value
+ .get(0));
}
/**
- * Tests {@link BasicAttributeContext#inheritCascadedAttributes(AttributeContext)}.
+ * Tests
+ * {@link BasicAttributeContext#inheritCascadedAttributes(AttributeContext)}
+ * .
*/
+ @Test
public void testInherit() {
AttributeContext toCopy = new BasicAttributeContext();
+ Attribute parentTemplateAttribute = new Attribute();
+ parentTemplateAttribute.setValue("/parent/template.jsp");
+ toCopy.setTemplateAttribute(parentTemplateAttribute);
toCopy.putAttribute("name1", new Attribute("value1"), true);
toCopy.putAttribute("name2", new Attribute("value2"), true);
toCopy.putAttribute("name3", new Attribute("value3"), false);
toCopy.putAttribute("name4", new Attribute("value4"), false);
AttributeContext context = new BasicAttributeContext();
- toCopy.putAttribute("name1", new Attribute("newValue1"), true);
- toCopy.putAttribute("name3", new Attribute("newValue3"), false);
+ Attribute templateAttribute = new Attribute();
+ templateAttribute.setRole("role1,role2");
+ context.setTemplateAttribute(templateAttribute);
+ context.putAttribute("name1", new Attribute("newValue1"), true);
+ context.putAttribute("name3", new Attribute("newValue3"), false);
+ context.inherit(toCopy);
+ Attribute attribute = context.getTemplateAttribute();
+ assertEquals("/parent/template.jsp", attribute.getValue());
+ assertTrue(attribute.getRoles().contains("role1"));
+ assertTrue(attribute.getRoles().contains("role2"));
+ attribute = context.getCascadedAttribute("name1");
+ assertNotNull("Attribute name1 not found", attribute);
+ assertEquals("Attribute name1 has not been set correctly", "newValue1",
+ attribute.getValue());
+ attribute = context.getCascadedAttribute("name2");
+ assertNotNull("Attribute name2 not found", attribute);
+ assertEquals("Attribute name2 has not been set correctly", "value2",
+ attribute.getValue());
+ attribute = context.getLocalAttribute("name3");
+ assertNotNull("Attribute name3 not found", attribute);
+ assertEquals("Attribute name3 has not been set correctly", "newValue3",
+ attribute.getValue());
+ attribute = context.getLocalAttribute("name4");
+ assertNotNull("Attribute name4 not found", attribute);
+ assertEquals("Attribute name4 has not been set correctly", "value4",
+ attribute.getValue());
+
+ toCopy = new BasicAttributeContext();
+ toCopy.putAttribute("name1", new Attribute("value1"), true);
+ toCopy.putAttribute("name2", new Attribute("value2"), true);
+ toCopy.putAttribute("name3", new Attribute("value3"), false);
+ toCopy.putAttribute("name4", new Attribute("value4"), false);
+ context = new BasicAttributeContext();
+ context.inherit(toCopy);
+ attribute = context.getCascadedAttribute("name1");
+ assertNotNull("Attribute name1 not found", attribute);
+ assertEquals("Attribute name1 has not been set correctly", "value1",
+ attribute.getValue());
+ attribute = context.getCascadedAttribute("name2");
+ assertNotNull("Attribute name2 not found", attribute);
+ assertEquals("Attribute name2 has not been set correctly", "value2",
+ attribute.getValue());
+ attribute = context.getLocalAttribute("name3");
+ assertNotNull("Attribute name3 not found", attribute);
+ assertEquals("Attribute name3 has not been set correctly", "value3",
+ attribute.getValue());
+ attribute = context.getLocalAttribute("name4");
+ assertNotNull("Attribute name4 not found", attribute);
+ assertEquals("Attribute name4 has not been set correctly", "value4",
+ attribute.getValue());
+ }
+
+ /**
+ * Tests
+ * {@link BasicAttributeContext#inherit(AttributeContext)}
+ * .
+ */
+ @Test
+ public void testInheritAttributeContext() {
+ AttributeContext toCopy = createMock(AttributeContext.class);
+ Attribute templateAttribute = Attribute.createTemplateAttribute("/my/template.jsp");
+ expect(toCopy.getTemplateAttribute()).andReturn(templateAttribute);
+ expect(toCopy.getPreparer()).andReturn("my.preparer");
+ Set<String> cascadedNames = new HashSet<String>();
+ cascadedNames.add("name1");
+ cascadedNames.add("name2");
+ expect(toCopy.getCascadedAttributeNames()).andReturn(cascadedNames);
+ expect(toCopy.getCascadedAttribute("name1")).andReturn(new Attribute("value1"));
+ expect(toCopy.getCascadedAttribute("name2")).andReturn(new Attribute("value2"));
+ Set<String> names = new HashSet<String>();
+ names.add("name3");
+ names.add("name4");
+ expect(toCopy.getLocalAttributeNames()).andReturn(names);
+ expect(toCopy.getLocalAttribute("name3")).andReturn(new Attribute("value3"));
+ expect(toCopy.getLocalAttribute("name4")).andReturn(new Attribute("value4"));
+
+ replay(toCopy);
+ AttributeContext context = new BasicAttributeContext();
+ context.putAttribute("name1", new Attribute("newValue1"), true);
+ context.putAttribute("name3", new Attribute("newValue3"), false);
context.inherit(toCopy);
Attribute attribute = context.getCascadedAttribute("name1");
+ assertEquals("/my/template.jsp", context.getTemplateAttribute().getValue());
+ assertEquals("my.preparer", context.getPreparer());
assertNotNull("Attribute name1 not found", attribute);
assertEquals("Attribute name1 has not been set correctly", "newValue1",
attribute.getValue());
@@ -247,11 +344,80 @@
assertNotNull("Attribute name4 not found", attribute);
assertEquals("Attribute name4 has not been set correctly", "value4",
attribute.getValue());
+ verify(toCopy);
+ }
+
+ /**
+ * Tests {@link BasicAttributeContext#inherit(AttributeContext)}
+ * testing inheritance between {@link ListAttribute} instances.
+ */
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testInheritAttributeContextListAttribute() {
+ AttributeContext toCopy = createMock(AttributeContext.class);
+ Attribute templateAttribute = Attribute.createTemplateAttribute("/my/template.jsp");
+ expect(toCopy.getTemplateAttribute()).andReturn(templateAttribute).times(2);
+ expect(toCopy.getPreparer()).andReturn("my.preparer").times(2);
+ ListAttribute parentListAttribute = new ListAttribute();
+ parentListAttribute.add("first");
+ ListAttribute parentListAttribute2 = new ListAttribute();
+ parentListAttribute2.add("third");
+ Set<String> names = new HashSet<String>();
+ names.add("list");
+ Set<String> cascadedNames = new HashSet<String>();
+ cascadedNames.add("list2");
+ expect(toCopy.getCascadedAttributeNames()).andReturn(cascadedNames).times(2);
+ expect(toCopy.getCascadedAttribute("list2")).andReturn(parentListAttribute2).times(2);
+ expect(toCopy.getLocalAttributeNames()).andReturn(names).times(2);
+ expect(toCopy.getLocalAttribute("list")).andReturn(parentListAttribute).times(2);
+
+ replay(toCopy);
+ AttributeContext context = new BasicAttributeContext();
+ ListAttribute listAttribute = new ListAttribute();
+ listAttribute.setInherit(true);
+ listAttribute.add("second");
+ context.putAttribute("list", listAttribute, false);
+ ListAttribute listAttribute2 = new ListAttribute();
+ listAttribute2.setInherit(true);
+ listAttribute2.add("fourth");
+ context.putAttribute("list2", listAttribute2, true);
+ context.inherit(toCopy);
+ ListAttribute result = (ListAttribute) context.getAttribute("list");
+ assertNotNull("The attribute must exist", result);
+ List<Object> value = (List<Object>) result.getValue();
+ assertNotNull("The list must exist", value);
+ assertEquals("The size is not correct", 2, value.size());
+ assertEquals("The first element is not correct", "first", value.get(0));
+ assertEquals("The second element is not correct", "second", value
+ .get(1));
+ result = (ListAttribute) context.getAttribute("list2");
+ assertNotNull("The attribute must exist", result);
+ value = (List<Object>) result.getValue();
+ assertNotNull("The list must exist", value);
+ assertEquals("The size is not correct", 2, value.size());
+ assertEquals("The first element is not correct", "third", value.get(0));
+ assertEquals("The second element is not correct", "fourth", value
+ .get(1));
+
+ context = new BasicAttributeContext();
+ listAttribute = new ListAttribute();
+ listAttribute.add("second");
+ context.putAttribute("list", listAttribute);
+ context.inherit(toCopy);
+ result = (ListAttribute) context.getAttribute("list");
+ assertNotNull("The attribute must exist", result);
+ value = (List<Object>) result.getValue();
+ assertNotNull("The list must exist", value);
+ assertEquals("The size is not correct", 1, value.size());
+ assertEquals("The second element is not correct", "second", value
+ .get(0));
+ verify(toCopy);
}
/**
* Tests {@link BasicAttributeContext#addAll(Map)}.
*/
+ @Test
public void testAddAll() {
AttributeContext context = new BasicAttributeContext();
Map<String, Attribute> name2attrib = new HashMap<String, Attribute>();
@@ -268,11 +434,38 @@
assertNotNull("Attribute name2 not found", attribute);
assertEquals("Attribute name2 has not been set correctly", "Value 2",
attribute.getValue());
+
+ context.addAll(null);
+ attribute = context.getAttribute("name1");
+ assertNotNull("Attribute name1 not found", attribute);
+ assertEquals("Attribute name1 has not been set correctly", "Value 1",
+ attribute.getValue());
+ attribute = context.getAttribute("name2");
+ assertNotNull("Attribute name2 not found", attribute);
+ assertEquals("Attribute name2 has not been set correctly", "Value 2",
+ attribute.getValue());
+
+ name2attrib = new HashMap<String, Attribute>();
+ name2attrib.put("name3", new Attribute("Value 3"));
+ context.addAll(name2attrib);
+ attribute = context.getAttribute("name1");
+ assertNotNull("Attribute name1 not found", attribute);
+ assertEquals("Attribute name1 has not been set correctly", "Value 1",
+ attribute.getValue());
+ attribute = context.getAttribute("name2");
+ assertNotNull("Attribute name2 not found", attribute);
+ assertEquals("Attribute name2 has not been set correctly", "Value 2",
+ attribute.getValue());
+ attribute = context.getAttribute("name3");
+ assertNotNull("Attribute name3 not found", attribute);
+ assertEquals("Attribute name3 has not been set correctly", "Value 3",
+ attribute.getValue());
}
/**
* Tests {@link BasicAttributeContext#addMissing(Map)}.
*/
+ @Test
public void testAddMissing() {
Map<String, Attribute> name2attrib = new HashMap<String, Attribute>();
Attribute attribute = new Attribute("Value 1");
@@ -296,11 +489,74 @@
assertNotNull("Attribute name3 not found", attribute);
assertEquals("Attribute name3 has not been set correctly", "Value 3",
attribute.getValue());
+
+ context.addMissing(null);
+ attribute = context.getAttribute("name1");
+ assertNotNull("Attribute name1 not found", attribute);
+ assertEquals("Attribute name1 has not been set correctly", "Value 1",
+ attribute.getValue());
+ attribute = context.getAttribute("name2");
+ assertNotNull("Attribute name2 not found", attribute);
+ assertEquals("Attribute name2 has not been set correctly", "Value 2",
+ attribute.getValue());
+ attribute = context.getAttribute("name3");
+ assertNotNull("Attribute name3 not found", attribute);
+ assertEquals("Attribute name3 has not been set correctly", "Value 3",
+ attribute.getValue());
+
+ context = new BasicAttributeContext();
+ name2attrib = new HashMap<String, Attribute>();
+ name2attrib.put("name1", new Attribute("Value 1a"));
+ name2attrib.put("name3", new Attribute("Value 3"));
+ context.addMissing(name2attrib);
+ attribute = context.getAttribute("name1");
+ assertNotNull("Attribute name1 not found", attribute);
+ assertEquals("Attribute name1 has not been set correctly", "Value 1a",
+ attribute.getValue());
+ attribute = context.getAttribute("name3");
+ assertNotNull("Attribute name3 not found", attribute);
+ assertEquals("Attribute name3 has not been set correctly", "Value 3",
+ attribute.getValue());
+
+ context = new BasicAttributeContext();
+ context.putAttribute("name2", new Attribute("Value 2a"), true);
+ name2attrib = new HashMap<String, Attribute>();
+ name2attrib.put("name1", new Attribute("Value 1a"));
+ name2attrib.put("name3", new Attribute("Value 3"));
+ context.addMissing(name2attrib);
+ attribute = context.getAttribute("name1");
+ assertNotNull("Attribute name1 not found", attribute);
+ assertEquals("Attribute name1 has not been set correctly", "Value 1a",
+ attribute.getValue());
+ attribute = context.getAttribute("name2");
+ assertNotNull("Attribute name2 not found", attribute);
+ assertEquals("Attribute name2 has not been set correctly", "Value 2a",
+ attribute.getValue());
+ attribute = context.getAttribute("name3");
+ assertNotNull("Attribute name3 not found", attribute);
+ assertEquals("Attribute name3 has not been set correctly", "Value 3",
+ attribute.getValue());
+
+ context = new BasicAttributeContext();
+ context.putAttribute("name2", new Attribute("Value 2a"), true);
+ name2attrib = new HashMap<String, Attribute>();
+ name2attrib.put("name2", new Attribute("Value 2b"));
+ name2attrib.put("name3", new Attribute("Value 3"));
+ context.addMissing(name2attrib);
+ attribute = context.getAttribute("name2");
+ assertNotNull("Attribute name2 not found", attribute);
+ assertEquals("Attribute name2 has not been set correctly", "Value 2a",
+ attribute.getValue());
+ attribute = context.getAttribute("name3");
+ assertNotNull("Attribute name3 not found", attribute);
+ assertEquals("Attribute name3 has not been set correctly", "Value 3",
+ attribute.getValue());
}
/**
* Tests {@link BasicAttributeContext#getAttribute(String)}.
*/
+ @Test
public void testGetAttribute() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"), false);
@@ -324,6 +580,7 @@
/**
* Tests {@link BasicAttributeContext#getLocalAttribute(String)}.
*/
+ @Test
public void testGetLocalAttribute() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"), false);
@@ -345,6 +602,7 @@
/**
* Tests {@link BasicAttributeContext#getCascadedAttribute(String)}.
*/
+ @Test
public void testGetCascadedAttribute() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"), false);
@@ -366,6 +624,7 @@
/**
* Tests {@link BasicAttributeContext#getLocalAttributeNames()}.
*/
+ @Test
public void testGetLocalAttributeNames() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"), false);
@@ -381,6 +640,7 @@
/**
* Tests {@link BasicAttributeContext#getCascadedAttributeNames()}.
*/
+ @Test
public void testGetCascadedAttributeNames() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"), false);
@@ -396,6 +656,7 @@
/**
* Tests {@link BasicAttributeContext#putAttribute(String, Attribute)}.
*/
+ @Test
public void testPutAttributeStringAttribute() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"));
@@ -411,6 +672,7 @@
* Tests
* {@link BasicAttributeContext#putAttribute(String, Attribute, boolean)}.
*/
+ @Test
public void testPutAttributeStringAttributeBoolean() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"), false);
@@ -432,6 +694,7 @@
/**
* Tests {@link BasicAttributeContext#clear()}.
*/
+ @Test
public void testClear() {
AttributeContext context = new BasicAttributeContext();
context.putAttribute("name1", new Attribute("value1"), false);
@@ -446,8 +709,61 @@
}
/**
+ * Tests {@link BasicAttributeContext#equals(Object)}.
+ */
+ @Test
+ public void testEquals() {
+ BasicAttributeContext attributeContext = new BasicAttributeContext();
+ attributeContext.setPreparer("my.preparer");
+ attributeContext.setTemplateAttribute(Attribute.createTemplateAttribute("/my/template.jsp"));
+ attributeContext.putAttribute("attribute1", new Attribute("value1"), true);
+ attributeContext.putAttribute("attribute2", new Attribute("value2"), true);
+ attributeContext.putAttribute("attribute3", new Attribute("value3"), false);
+ BasicAttributeContext toCompare = new BasicAttributeContext(attributeContext);
+ assertTrue(toCompare.equals(attributeContext));
+ toCompare = new BasicAttributeContext(attributeContext);
+ toCompare.putAttribute("attribute4", new Attribute("value4"), true);
+ assertFalse(toCompare.equals(attributeContext));
+ toCompare = new BasicAttributeContext(attributeContext);
+ toCompare.putAttribute("attribute4", new Attribute("value4"), false);
+ assertFalse(toCompare.equals(attributeContext));
+ toCompare = new BasicAttributeContext(attributeContext);
+ toCompare.setPreparer("another.preparer");
+ assertFalse(toCompare.equals(attributeContext));
+ toCompare = new BasicAttributeContext(attributeContext);
+ toCompare.setTemplateAttribute(Attribute.createTemplateAttribute("/another/template.jsp"));
+ assertFalse(toCompare.equals(attributeContext));
+ }
+
+ /**
+ * Tests {@link BasicAttributeContext#hashCode()}.
+ */
+ @Test
+ public void testHashCode() {
+ BasicAttributeContext attributeContext = new BasicAttributeContext();
+ attributeContext.setPreparer("my.preparer");
+ Attribute templateAttribute = Attribute.createTemplateAttribute("/my/template.jsp");
+ attributeContext.setTemplateAttribute(templateAttribute);
+ Attribute attribute1 = new Attribute("value1");
+ Attribute attribute2 = new Attribute("value2");
+ Attribute attribute3 = new Attribute("value3");
+ attributeContext.putAttribute("attribute1", attribute1, true);
+ attributeContext.putAttribute("attribute2", attribute2, true);
+ attributeContext.putAttribute("attribute3", attribute3, false);
+ Map<String, Attribute> cascadedAttributes = new HashMap<String, Attribute>();
+ cascadedAttributes.put("attribute1", attribute1);
+ cascadedAttributes.put("attribute2", attribute2);
+ Map<String, Attribute> attributes = new HashMap<String, Attribute>();
+ attributes.put("attribute3", attribute3);
+ assertEquals(templateAttribute.hashCode() + "my.preparer".hashCode()
+ + attributes.hashCode() + cascadedAttributes.hashCode(),
+ attributeContext.hashCode());
+ }
+
+ /**
* Tests {@link BasicAttributeContext} for the TILES-429 bug.
*/
+ @Test
public void testTiles429() {
AttributeContext toCopy = new BasicAttributeContext();
toCopy.putAttribute("name1", new Attribute("value1"), false);
Propchange: tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/io/NullWriter.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/renderer/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/renderer:831431-831440*
Propchange: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRendererTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/renderer/FreeMarkerAttributeRendererTest.java:831431-831440
Propchange: tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-portlet-wildcard/src/test/java/org/apache/tiles/portlet/wildcard/WildcardPortletTilesApplicationContextTest.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/servlet/context/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-servlet/src/test/java/org/apache/tiles/web/util/
('svn:mergeinfo' removed)
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -1,2 +1,3 @@
/tiles/sandbox/trunk/tiles-test:740289
/tiles/sandbox/trunk/tiles-test-sandbox:740290-745038,747727-751891
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/pom.xml:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/body.ftl
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/body.ftl:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/body.vm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/body.vm:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/test:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/test/java:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-alt/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-alt/src/test/resources:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/pom.xml:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/main/resources:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/test:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/test/java:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-common/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-common/src/test/resources:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/pom.xml:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/resources:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/resources/META-INF:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/test:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/test/java:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test-db/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test-db/src/test/resources:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1,3 @@
+/tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/META-INF:740290-745038,747727-751891
+/tiles/sandbox/trunk/tiles-test/src/main/resources/META-INF:740289
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/resources/META-INF:831431-831440*
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1,3 @@
+/tiles/sandbox/trunk/tiles-test-sandbox/src/main/resources/META-INF/MANIFEST.MF:740290-745038,747727-751891
+/tiles/sandbox/trunk/tiles-test/src/main/resources/META-INF/MANIFEST.MF:740289
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF:831431-831440
Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml:831431-831440
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer:831431-831440*
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/VelocityAttributeRendererTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 30 20:39:52 2009
@@ -0,0 +1 @@
+/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/renderer/VelocityAttributeRendererTest.java:831431-831440