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 2010/05/09 14:59:06 UTC
svn commit: r942533 - in /tiles/sandbox/trunk/tiles3:
tiles-compat/src/main/java/org/apache/tiles/beans/
tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/
tiles-compat/src/main/resources/org/apache/tiles/compat/resources/
tiles-co...
Author: apetrelli
Date: Sun May 9 12:59:05 2010
New Revision: 942533
URL: http://svn.apache.org/viewvc?rev=942533&view=rev
Log:
TILESSB-33
Created version 3.0 of the DTD.
Moved 2.1 DTD and menu item classes to tiles-compat.
Added:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/
- copied from r931641, tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_0.dtd
- copied unchanged from r931641, tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_1.dtd
- copied unchanged from r931641, tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd
- copied, changed from r931641, tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
Removed:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/
tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_0.dtd
tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
Modified:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs_regression_TILES-352.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1_it.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java Sun May 9 12:59:05 2010
@@ -22,6 +22,7 @@
package org.apache.tiles.compat.definition.digester;
import org.apache.commons.digester.Digester;
+import org.apache.tiles.beans.SimpleMenuItem;
import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
/**
@@ -32,6 +33,17 @@ import org.apache.tiles.definition.diges
*/
public class CompatibilityDigesterDefinitionsReader extends
DigesterDefinitionsReader {
+
+ /**
+ * Intercepts a <item> tag.
+ */
+ private static final String ADD_WILDCARD = "*/item";
+
+ /**
+ * Intercepts a <bean> tag.
+ */
+ private static final String BEAN_TAG = "*/bean";
+
/**
* The set of public identifiers, and corresponding resource names for the
* versions of the configuration file DTDs we know about. There <strong>MUST</strong>
@@ -48,6 +60,7 @@ public class CompatibilityDigesterDefini
initDigesterForComponentsDefinitionsSyntax(digester);
initDigesterForInstancesSyntax(digester);
initDigesterForTilesDefinitionsSyntax(digester);
+ initDigesterForBeans(digester);
}
/**
@@ -180,6 +193,35 @@ public class CompatibilityDigesterDefini
digester.addSetNext(addListElementTag, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
}
+ /**
+ * Init digester for Tiles syntax with first element = tiles-definitions.
+ *
+ * @param digester Digester instance to use.
+ */
+ private void initDigesterForBeans(Digester digester) {
+
+ // item elements rules
+ // We use Attribute class to avoid rewriting a new class.
+ // Name part can't be used in listElement attribute.
+ //String ADD_WILDCARD = LIST_TAG + "/addItem";
+ // non String ADD_WILDCARD = LIST_TAG + "/addx*";
+ String menuItemDefaultClass = SimpleMenuItem.class.getName();
+ digester.addObjectCreate(ADD_WILDCARD, menuItemDefaultClass, "classtype");
+ digester.addSetProperties(ADD_WILDCARD);
+ digester.addRule(ADD_WILDCARD, new SetValueToAttributeRule());
+ digester.addSetNext(ADD_WILDCARD, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
+
+ // bean elements rules
+ String beanDefaultClass = SimpleMenuItem.class.getName();
+ digester.addObjectCreate(BEAN_TAG, beanDefaultClass, "classtype");
+ digester.addSetProperties(BEAN_TAG);
+ digester.addRule(BEAN_TAG, new SetValueToAttributeRule());
+ digester.addSetNext(BEAN_TAG, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
+
+ // Set properties to surrounding element
+ digester.addSetProperty(BEAN_TAG + "/set-property", "property", "value");
+ }
+
/** {@inheritDoc} */
@Override
protected String[] getRegistrations() {
@@ -189,6 +231,8 @@ public class CompatibilityDigesterDefini
"/org/apache/tiles/resources/tiles-config_2_0.dtd",
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN",
"/org/apache/tiles/resources/tiles-config_2_1.dtd",
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN",
+ "/org/apache/tiles/resources/tiles-config_3_0.dtd",
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN",
"/org/apache/tiles/compat/resources/tiles-config_1_1.dtd",
"-//Apache Software Foundation//DTD Tiles Configuration 1.3//EN",
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java Sun May 9 12:59:05 2010
@@ -21,31 +21,35 @@
package org.apache.tiles.compat.preparer;
+import static org.easymock.EasyMock.*;
+
import java.io.IOException;
import javax.servlet.ServletException;
-import junit.framework.TestCase;
-
import org.apache.tiles.AttributeContext;
+import org.apache.tiles.preparer.PreparerException;
import org.apache.tiles.request.Request;
-import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests {@link UrlPreparer}.
*
* @version $Rev$ $Date$
*/
-public class UrlPreparerTest extends TestCase {
+public class UrlPreparerTest {
/**
* The preparer to test.
*/
private UrlPreparer preparer;
- /** {@inheritDoc} */
- @Override
- protected void setUp() {
+ /**
+ * Sets up the test.
+ */
+ @Before
+ public void setUp() {
preparer = new UrlPreparer("/my/url.do");
}
@@ -56,15 +60,37 @@ public class UrlPreparerTest extends Tes
* @throws IOException If something goes wrong.
* @throws ServletException If something goes wrong.
*/
+ @Test
public void testExecute() throws IOException {
- Request requestContext = EasyMock.createMock(Request.class);
- AttributeContext attributeContext = EasyMock
- .createMock(AttributeContext.class);
+ Request requestContext = createMock(Request.class);
+ AttributeContext attributeContext = createMock(AttributeContext.class);
requestContext.include("/my/url.do");
- EasyMock
- .replay(requestContext, attributeContext);
+ replay(requestContext, attributeContext);
preparer.execute(requestContext, attributeContext);
- EasyMock.verify(requestContext, attributeContext);
+ verify(requestContext, attributeContext);
+ }
+
+ /**
+ * Test method for
+ * {@link org.apache.tiles.compat.preparer.UrlPreparer#execute(
+ * org.apache.tiles.request.Request, org.apache.tiles.AttributeContext)}.
+ * @throws IOException If something goes wrong.
+ * @throws ServletException If something goes wrong.
+ */
+ @Test(expected=PreparerException.class)
+ public void testExecuteException() throws IOException {
+ Request requestContext = createMock(Request.class);
+ AttributeContext attributeContext = createMock(AttributeContext.class);
+
+ requestContext.include("/my/url.do");
+ expectLastCall().andThrow(new IOException());
+
+ replay(requestContext, attributeContext);
+ try {
+ preparer.execute(requestContext, attributeContext);
+ } finally {
+ verify(requestContext, attributeContext);
+ }
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java Sun May 9 12:59:05 2010
@@ -112,16 +112,6 @@ public class DigesterDefinitionsReader i
*/
private static final String NESTED_LIST = "*/add-list-attribute";
- /**
- * Intercepts a <item> tag.
- */
- private static final String ADD_WILDCARD = "*/item";
-
- /**
- * Intercepts a <bean> tag.
- */
- private static final String BEAN_TAG = "*/bean";
-
// Handler class names.
/**
@@ -417,27 +407,6 @@ public class DigesterDefinitionsReader i
digester.addObjectCreate(NESTED_LIST, LIST_HANDLER_CLASS);
digester.addSetProperties(NESTED_LIST);
digester.addSetNext(NESTED_LIST, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
-
- // item elements rules
- // We use Attribute class to avoid rewriting a new class.
- // Name part can't be used in listElement attribute.
- //String ADD_WILDCARD = LIST_TAG + "/addItem";
- // non String ADD_WILDCARD = LIST_TAG + "/addx*";
- String menuItemDefaultClass = "org.apache.tiles.beans.SimpleMenuItem";
- digester.addObjectCreate(ADD_WILDCARD, menuItemDefaultClass, "classtype");
- digester.addSetProperties(ADD_WILDCARD);
- digester.addRule(ADD_WILDCARD, new SetValueToAttributeRule());
- digester.addSetNext(ADD_WILDCARD, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
-
- // bean elements rules
- String beanDefaultClass = "org.apache.tiles.beans.SimpleMenuItem";
- digester.addObjectCreate(BEAN_TAG, beanDefaultClass, "classtype");
- digester.addSetProperties(BEAN_TAG);
- digester.addRule(BEAN_TAG, new SetValueToAttributeRule());
- digester.addSetNext(BEAN_TAG, "add", PUT_ATTRIBUTE_HANDLER_CLASS);
-
- // Set properties to surrounding element
- digester.addSetProperty(BEAN_TAG + "/set-property", "property", "value");
}
/**
@@ -487,10 +456,8 @@ public class DigesterDefinitionsReader i
protected String[] getRegistrations() {
if (registrations == null) {
registrations = new String[] {
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN",
- "/org/apache/tiles/resources/tiles-config_2_0.dtd",
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN",
- "/org/apache/tiles/resources/tiles-config_2_1.dtd"};
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN",
+ "/org/apache/tiles/resources/tiles-config_3_0.dtd"};
}
return registrations;
}
Copied: tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd (from r931641, tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd)
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd?p2=tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd&p1=tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd&r1=931641&r2=942533&rev=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd Sun May 9 12:59:05 2010
@@ -22,8 +22,8 @@
%
@hidden $Id$
-@title DTD for the Tiles Definition File, Version 2.1
-@doctype tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd"
+@title DTD for the Tiles Definition File, Version 3.0
+@doctype tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" "http://tiles.apache.org/dtds/tiles-config_3_0.dtd"
@root tiles-definitions
-->
@@ -57,19 +57,6 @@
-->
<!ENTITY % DefinitionName "CDATA">
-<!-- A "BeanName" is the identifier of a JavaBean, such as a form bean,
- and also serves as the name of the corresponding scripting variable
- and the name of the JSP attribute under which the bean is accessed.
- Therefore, it must conform to the rules for a Java identifier.
--->
-<!ENTITY % BeanName "CDATA">
-
-<!-- A "PropName" is the name of a JavaBeans property, and must begin with
- a lower case letter and contain only characters that are legal in a
- Java identifier.
--->
-<!ENTITY % PropName "CDATA">
-
<!-- A "Location" is a relative path, delimited by "/" characters, that
defines the location of a resource relative to the location of the
configuration file itself.
@@ -91,7 +78,7 @@
page. This definition is identified by its logical name. A definition allows
to define all the attributes that can be set in <insert> tag from a jsp page.
-->
-<!ELEMENT definition (icon?, display-name?, description?, put-attribute*, put-list-attribute*)>
+<!ELEMENT definition (put-attribute*, put-list-attribute*)>
<!ATTLIST definition id ID #IMPLIED>
<!--
@attr preparer The fully qualified Java class name of the preparer
@@ -182,10 +169,10 @@
<!-- The "put-list-attribute" element describes a list attribute of a definition. It allows to
specify an attribute that is a java List containing any kind of values. In
- the config file, the list elements are specified by nested <add-attribute>, <item> or
+ the config file, the list elements are specified by nested <add-attribute> or
<add-list-attribute>.
-->
-<!ELEMENT put-list-attribute ( (add-attribute* | item* | bean* | add-list-attribute*)+) >
+<!ELEMENT put-list-attribute ( (add-attribute* | add-list-attribute*)+) >
<!ATTLIST put-list-attribute id ID #IMPLIED>
<!--
@attr name The unique identifier for this put attribute list.
@@ -246,10 +233,9 @@
<!-- The "add-list-attribute" element describes a list attribute subordinate to another
list attribute. It allows to specify an attribute value that is a java List
containing any kind of values. In the config file, the list elements are specified
- by nested <add-attribute>, <item> or
- <add-list-attribute>.
+ by nested <add-attribute> or <add-list-attribute>.
-->
-<!ELEMENT add-list-attribute ( (add-attribute* | item* | bean* | add-list-attribute*)+) >
+<!ELEMENT add-list-attribute ( (add-attribute* | add-list-attribute*)+) >
<!ATTLIST add-list-attribute id ID #IMPLIED>
<!--
@attr role Security role name that is allowed access to this attribute
@@ -258,107 +244,3 @@
use it or not depending on the role of the user.
-->
<!ATTLIST add-list-attribute role CDATA #IMPLIED>
-
-
-<!-- The "bean" element describes an element of a list. It create a bean of the
- specified java classtype. This bean is initialized with appropriate nested
- <set-property>.
--->
-<!ELEMENT bean (set-property*)>
-<!ATTLIST bean id ID #IMPLIED>
-<!--
-@attr classtype The fully qualified classname for this bean.
--->
-<!ATTLIST bean classtype %ClassName; #REQUIRED>
-
-<!-- The "set-property" element specifies the method name and initial value of
- a bean property. When the object representing
- the surrounding element is instantiated, the accessor for the indicated
- property is called and passed the indicated value.
--->
-<!ELEMENT set-property EMPTY>
-<!ATTLIST set-property id ID #IMPLIED>
-<!--
-@attr property Name of the JavaBeans property whose setter method
- will be called.
--->
-<!ATTLIST set-property property %PropName; #REQUIRED>
-<!--
-@attr value String representation of the value to which this
- property will be set, after suitable type conversion
--->
-<!ATTLIST set-property value CDATA #REQUIRED>
-
-
-<!-- The "item" element describes an element of a list. It create a bean added as
- element to the list. Each bean can contain different properties: value, link,
- icon, tooltip. These properties are to be interpreted by the jsp page using
- them.
- By default the bean is of type
- "org.apache.struts.tiles.beans.SimpleMenuItem". This bean is useful to
- create a list of beans used as menu items.
--->
-<!ELEMENT item (#PCDATA)>
-<!ATTLIST item id ID #IMPLIED>
-<!--
-@attr classtype The fully qualified classtype for this bean.
- If specified, the classtype must be a subclass of the interface
- "org.apache.struts.tiles.beans.MenuItem".
--->
-<!ATTLIST item classtype %ClassName; #IMPLIED>
-<!--
-@attr icon The bean 'icon' property.
--->
-<!ATTLIST item icon CDATA #IMPLIED>
-<!--
-@attr link The bean 'link' property.
--->
-<!ATTLIST item link CDATA #REQUIRED>
-<!--
-@attr tooltip The bean 'tooltip' property.
--->
-<!ATTLIST item tooltip CDATA #IMPLIED>
-<!--
-@attr value The bean 'value' property.
--->
-<!ATTLIST item value CDATA #REQUIRED>
-
-
-<!-- ========== Info Elements ====================================== -->
-
-<!-- The "description" element contains descriptive (paragraph length) text
- about the surrounding element, suitable for use in GUI tools.
--->
-<!ELEMENT description (#PCDATA)>
-<!ATTLIST description id ID #IMPLIED>
-
-
-<!-- The "display-name" element contains a short (one line) description of
- the surrounding element, suitable for use in GUI tools.
--->
-<!ELEMENT display-name (#PCDATA)>
-<!ATTLIST display-name id ID #IMPLIED>
-
-
-<!-- The "icon" element contains a small-icon and large-icon element which
- specify the location, relative to the Struts configuration file, for small
- and large images used to represent the surrounding element in GUI tools.
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-<!ATTLIST icon id ID #IMPLIED>
-
-
-<!-- The "large-icon" element specifies the location, relative to the Struts
- configuration file, of a resource containing a large (32x32 pixel)
- icon image.
--->
-<!ELEMENT large-icon (%Location;)>
-<!ATTLIST large-icon id ID #IMPLIED>
-
-
-<!-- The "small-icon" element specifies the location, relative to the Struts
- configuration file, of a resource containing a small (16x16 pixel)
- icon image.
--->
-<!ELEMENT small-icon (%Location;)>
-<!ATTLIST small-icon id ID #IMPLIED>
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs-wildcard.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_en_US.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs1_fr_CA.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs2.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs3.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs_regression_TILES-352.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs_regression_TILES-352.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs_regression_TILES-352.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/defs_regression_TILES-352.xml Sun May 9 12:59:05 2010
@@ -5,9 +5,9 @@
contributor license agreements. See the NOTICE file * distributed with
this work for additional information * regarding copyright ownership.
The ASF licenses this file * to you under the Apache License, Version
- 2.0 (the * "License"); you may not use this file except in compliance
+ 3.0 (the * "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at * *
- http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+ http://www.apache.org/licenses/LICENSE-3.0 * * Unless required by
applicable law or agreed to in writing, * software distributed under
the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY * KIND, either express or implied. See the
@@ -16,8 +16,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions to check regression from TILES-252 -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/invalid-defs.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/malformed-defs.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/temp-defs.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml Sun May 9 12:59:05 2010
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
/*
- * $Id:tiles-defs-2.1.xml 628334 2008-02-16 16:01:46Z apetrelli $
+ * $Id:tiles-defs-3.0.xml 628334 2008-02-16 16:01:46Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1_it.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1_it.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1_it.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1_it.xml Sun May 9 12:59:05 2010
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
/*
- * $Id:tiles-defs-2.1.xml 628334 2008-02-16 16:01:46Z apetrelli $
+ * $Id:tiles-defs-3.0.xml 628334 2008-02-16 16:01:46Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml?rev=942533&r1=942532&r2=942533&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs.xml Sun May 9 12:59:05 2010
@@ -7,11 +7,11 @@
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
+ * to you under the Apache License, Version 3.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-3.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -23,8 +23,8 @@
-->
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<!-- Definitions for Tiles documentation -->