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 2008/04/09 23:08:04 UTC

svn commit: r646535 - in /tiles/framework/trunk: tiles-core/src/main/java/org/apache/tiles/factory/ tiles-core/src/test/java/org/apache/tiles/factory/ tiles-test/src/main/java/org/apache/tiles/test/factory/ tiles-test/src/main/webapp/WEB-INF/ tiles-tes...

Author: apetrelli
Date: Wed Apr  9 14:07:55 2008
New Revision: 646535

URL: http://svn.apache.org/viewvc?rev=646535&view=rev
Log:
TILES-261
Modified BasicTilesContainerFactory to enable a better customization.
Modified tiles-test webapp to load a pure-Java Tiles container factory.

Added:
    tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/
    tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java   (with props)
    tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/package.html   (with props)
Modified:
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
    tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
    tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java?rev=646535&r1=646534&r2=646535&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java Wed Apr  9 14:07:55 2008
@@ -43,7 +43,7 @@
      * @since 2.1.0
      */
     public static final String CONTAINER_FACTORY_INIT_PARAM =
-        "org.apache.tiles.factory.TilesContainerFactory";
+        "org.apache.tiles.factory.AbstractTilesContainerFactory";
 
     /**
      * Default configuration parameters.

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=646535&r1=646534&r2=646535&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Wed Apr  9 14:07:55 2008
@@ -25,8 +25,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.tiles.TilesApplicationContext;
 import org.apache.tiles.TilesContainer;
+import org.apache.tiles.context.ChainedTilesContextFactory;
 import org.apache.tiles.context.TilesContextFactory;
 import org.apache.tiles.definition.DefinitionsFactory;
 import org.apache.tiles.definition.DefinitionsReader;
@@ -37,6 +40,7 @@
 import org.apache.tiles.impl.BasicTilesContainer;
 import org.apache.tiles.locale.LocaleResolver;
 import org.apache.tiles.locale.impl.DefaultLocaleResolver;
+import org.apache.tiles.portlet.context.PortletTilesContextFactory;
 import org.apache.tiles.preparer.BasicPreparerFactory;
 import org.apache.tiles.preparer.PreparerFactory;
 import org.apache.tiles.renderer.AttributeRenderer;
@@ -56,19 +60,31 @@
  */
 public class BasicTilesContainerFactory extends AbstractTilesContainerFactory {
 
+    /**
+     * The count of elements in the Tiles context factory chain.
+     */
+    private static final int CONTEXT_FACTORY_CHAIN_COUNT = 3;
+
+    /**
+     * The logging object.
+     */
+    private static final Log LOG = LogFactory.getLog(BasicTilesContainerFactory.class);
+
     /** {@inheritDoc} */
     @Override
     public TilesContainer createContainer(Object context) {
-        BasicTilesContainer container = new BasicTilesContainer();
+        BasicTilesContainer container = instantiateContainer(context);
         TilesContextFactory contextFactory = createContextFactory(context);
         TilesApplicationContext applicationContext = contextFactory
                 .createApplicationContext(context);
         container.setContextFactory(contextFactory);
         container.setApplicationContext(applicationContext);
+        LocaleResolver resolver = createLocaleResolver(context,
+                applicationContext, contextFactory);
         container.setDefinitionsFactory(createDefinitionsFactory(context,
-                applicationContext, contextFactory));
+                applicationContext, contextFactory, resolver));
         AttributeEvaluator evaluator = createEvaluator(context,
-                applicationContext, contextFactory);
+                applicationContext, contextFactory, resolver);
         container.setEvaluator(evaluator);
         container.setPreparerFactory(createPreparerFactory(context,
                 applicationContext, contextFactory));
@@ -78,14 +94,62 @@
     }
 
     /**
+     * Instantiate the container, without initialization.
+     *
+     * @param context The context object.
+     * @return The instantiated container.
+     * @since 2.1.0
+     */
+    protected BasicTilesContainer instantiateContainer(Object context) {
+        return new BasicTilesContainer();
+    }
+
+    /**
      * Create a Tiles context factory. By default it creates a
      * {@link ServletTilesContextFactory}.
      *
      * @param context The context.
      * @return The context factory.
+     * @since 2.1.0
      */
     protected TilesContextFactory createContextFactory(Object context) {
-        return new ServletTilesContextFactory();
+        ChainedTilesContextFactory contextFactory = new ChainedTilesContextFactory();
+        registerChainContextFactories(context, contextFactory);
+
+        return contextFactory;
+    }
+
+    /**
+     * Register elements of a chained context factory.
+     *
+     * @param context The context.
+     * @param contextFactory The context factory to use.
+     * @since 2.1.0
+     */
+    protected void registerChainContextFactories(Object context,
+            ChainedTilesContextFactory contextFactory) {
+        List<TilesContextFactory> factories = new ArrayList<TilesContextFactory>(
+                CONTEXT_FACTORY_CHAIN_COUNT);
+        factories.add(new ServletTilesContextFactory());
+        factories.add(new PortletTilesContextFactory());
+        try {
+            Class<? extends TilesContextFactory> clazz = Class.forName(
+                    "org.apache.tiles.jsp.context.JspTilesContextFactory")
+                    .asSubclass(TilesContextFactory.class);
+            factories.add(clazz.newInstance());
+        } catch (ClassNotFoundException e) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Cannot find JspTilesContextFactory, ignoring problem", e);
+            }
+        } catch (InstantiationException e) {
+            throw new TilesContainerFactoryException(
+                    "Cannot instantiate JspTilesContextFactory", e);
+        } catch (IllegalAccessException e) {
+            throw new TilesContainerFactoryException(
+                    "Cannot access default constructor JspTilesContextFactory",
+                    e);
+        }
+        contextFactory.setFactories(factories);
     }
 
     /**
@@ -95,15 +159,15 @@
      * @param context The context.
      * @param applicationContext The Tiles application context.
      * @param contextFactory The Tiles context factory.
+     * @param resolver The locale resolver.
      * @return The definitions factory.
      */
     protected DefinitionsFactory createDefinitionsFactory(Object context,
             TilesApplicationContext applicationContext,
-            TilesContextFactory contextFactory) {
+            TilesContextFactory contextFactory, LocaleResolver resolver) {
         UrlDefinitionsFactory factory = new UrlDefinitionsFactory();
         factory.setApplicationContext(applicationContext);
-        factory.setLocaleResolver(createLocaleResolver(context,
-                applicationContext, contextFactory));
+        factory.setLocaleResolver(resolver);
         factory.setReader(createDefinitionsReader(context, applicationContext,
                 contextFactory));
         factory.setSourceURLs(getSourceURLs(context, applicationContext,
@@ -170,11 +234,12 @@
      * @param context The context.
      * @param applicationContext The Tiles application context.
      * @param contextFactory The Tiles context factory.
+     * @param resolver The locale resolver.
      * @return The evaluator.
      */
     protected AttributeEvaluator createEvaluator(Object context,
             TilesApplicationContext applicationContext,
-            TilesContextFactory contextFactory) {
+            TilesContextFactory contextFactory, LocaleResolver resolver) {
         return new DirectAttributeEvaluator();
     }
 

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java?rev=646535&r1=646534&r2=646535&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java Wed Apr  9 14:07:55 2008
@@ -28,6 +28,7 @@
 
 import org.apache.tiles.TilesApplicationContext;
 import org.apache.tiles.TilesContainer;
+import org.apache.tiles.context.ChainedTilesContextFactory;
 import org.apache.tiles.context.TilesContextFactory;
 import org.apache.tiles.definition.DefinitionsFactory;
 import org.apache.tiles.definition.DefinitionsReader;
@@ -47,7 +48,6 @@
 import org.apache.tiles.renderer.impl.StringAttributeRenderer;
 import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
 import org.apache.tiles.renderer.impl.UntypedAttributeRenderer;
-import org.apache.tiles.servlet.context.ServletTilesContextFactory;
 import org.apache.tiles.util.RollingVectorEnumeration;
 import org.easymock.EasyMock;
 
@@ -109,20 +109,22 @@
         TilesContextFactory contextFactory = factory
                 .createContextFactory(context);
         assertTrue("The class of the context factory is not correct",
-                contextFactory instanceof ServletTilesContextFactory);
+                contextFactory instanceof ChainedTilesContextFactory);
     }
 
     /**
      * Tests {@link BasicTilesContainerFactory#createDefinitionsFactory(Object,
-     * TilesApplicationContext, TilesContextFactory)}.
+     * TilesApplicationContext, TilesContextFactory, LocaleResolver)}.
      */
     public void testCreateDefinitionsFactory() {
         TilesContextFactory contextFactory = factory
                 .createContextFactory(context);
         TilesApplicationContext applicationContext = contextFactory
                 .createApplicationContext(context);
+        LocaleResolver resolver = factory.createLocaleResolver(context,
+                applicationContext, contextFactory);
         DefinitionsFactory defsFactory = factory.createDefinitionsFactory(
-                context, applicationContext, contextFactory);
+                context, applicationContext, contextFactory, resolver);
         assertTrue("The class of the definitions factory is not correct",
                 defsFactory instanceof UrlDefinitionsFactory);
     }
@@ -174,15 +176,18 @@
 
     /**
      * Tests
-     * {@link BasicTilesContainerFactory#createEvaluator(Object, TilesApplicationContext, TilesContextFactory)}.
+     * {@link BasicTilesContainerFactory#createEvaluator(Object,
+     * TilesApplicationContext, TilesContextFactory, LocaleResolver)}.
      */
     public void testCreateEvaluator() {
         TilesContextFactory contextFactory = factory
                 .createContextFactory(context);
         TilesApplicationContext applicationContext = contextFactory
                 .createApplicationContext(context);
-        AttributeEvaluator evaluator = factory.createEvaluator(context,
+        LocaleResolver resolver = factory.createLocaleResolver(context,
                 applicationContext, contextFactory);
+        AttributeEvaluator evaluator = factory.createEvaluator(context,
+                applicationContext, contextFactory, resolver);
         assertTrue("The class of the evaluator is not correct",
                 evaluator instanceof DirectAttributeEvaluator);
     }
@@ -212,8 +217,10 @@
                 .createContextFactory(context);
         TilesApplicationContext applicationContext = contextFactory
                 .createApplicationContext(context);
-        AttributeEvaluator evaluator = factory.createEvaluator(context,
+        LocaleResolver resolver = factory.createLocaleResolver(context,
                 applicationContext, contextFactory);
+        AttributeEvaluator evaluator = factory.createEvaluator(context,
+                applicationContext, contextFactory, resolver);
         RendererFactory rendererFactory = factory.createRendererFactory(
                 context, applicationContext, contextFactory, container,
                 evaluator);
@@ -243,8 +250,10 @@
                 .createContextFactory(context);
         TilesApplicationContext applicationContext = contextFactory
                 .createApplicationContext(context);
-        AttributeEvaluator evaluator = factory.createEvaluator(context,
+        LocaleResolver resolver = factory.createLocaleResolver(context,
                 applicationContext, contextFactory);
+        AttributeEvaluator evaluator = factory.createEvaluator(context,
+                applicationContext, contextFactory, resolver);
         AttributeRenderer renderer = factory.createDefaultAttributeRenderer(
                 context, applicationContext, contextFactory, container,
                 evaluator);

Added: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java?rev=646535&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java (added)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java Wed Apr  9 14:07:55 2008
@@ -0,0 +1,124 @@
+/*
+ * $Id$
+ *
+ * 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
+ * "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 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 License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tiles.test.factory;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader;
+import org.apache.tiles.context.TilesContextFactory;
+import org.apache.tiles.context.enhanced.EnhancedContextFactory;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.DefinitionsReader;
+import org.apache.tiles.evaluator.AttributeEvaluator;
+import org.apache.tiles.evaluator.el.ELAttributeEvaluator;
+import org.apache.tiles.factory.BasicTilesContainerFactory;
+import org.apache.tiles.impl.BasicTilesContainer;
+import org.apache.tiles.impl.mgmt.CachingTilesContainer;
+import org.apache.tiles.locale.LocaleResolver;
+import org.apache.tiles.renderer.impl.BasicRendererFactory;
+import org.apache.tiles.test.renderer.ReverseStringAttributeRenderer;
+
+import de.odysseus.el.ExpressionFactoryImpl;
+
+/**
+ * Test Tiles container factory to customize Tiles behaviour.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestTilesContainerFactory extends BasicTilesContainerFactory {
+
+    /**
+     * The number of URLs to load..
+     */
+    private static final int URL_COUNT = 3;
+
+    /** {@inheritDoc} */
+    @Override
+    protected BasicTilesContainer instantiateContainer(Object context) {
+        return new CachingTilesContainer();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected TilesContextFactory createContextFactory(Object context) {
+        EnhancedContextFactory factory = new  EnhancedContextFactory();
+        registerChainContextFactories(context, factory);
+        return factory;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void registerAttributeRenderers(
+            BasicRendererFactory rendererFactory, Object context,
+            TilesApplicationContext applicationContext,
+            TilesContextFactory contextFactory, TilesContainer container,
+            AttributeEvaluator evaluator) {
+        super.registerAttributeRenderers(rendererFactory, context, applicationContext,
+                contextFactory, container, evaluator);
+        ReverseStringAttributeRenderer renderer = new ReverseStringAttributeRenderer();
+        renderer.setApplicationContext(applicationContext);
+        renderer.setContextFactory(contextFactory);
+        renderer.setEvaluator(evaluator);
+        rendererFactory.registerRenderer("reversed", renderer);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected AttributeEvaluator createEvaluator(Object context,
+            TilesApplicationContext applicationContext,
+            TilesContextFactory contextFactory, LocaleResolver resolver) {
+        ELAttributeEvaluator evaluator = new ELAttributeEvaluator();
+        evaluator.setApplicationContext(applicationContext);
+        evaluator.setExpressionFactory(new ExpressionFactoryImpl());
+        evaluator.init(null);
+        return evaluator;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected List<URL> getSourceURLs(Object context,
+            TilesApplicationContext applicationContext,
+            TilesContextFactory contextFactory) {
+        List<URL> urls = new ArrayList<URL>(URL_COUNT);
+        try {
+            urls.add(applicationContext.getResource("/WEB-INF/tiles-defs.xml"));
+            urls.add(applicationContext.getResource("/org/apache/tiles/classpath-defs.xml"));
+            urls.add(applicationContext.getResource("/WEB-INF/tiles-defs-1.1.xml"));
+        } catch (IOException e) {
+            throw new DefinitionsFactoryException(
+                    "Cannot load definition URLs", e);
+        }
+        return urls;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected DefinitionsReader createDefinitionsReader(Object context,
+            TilesApplicationContext applicationContext,
+            TilesContextFactory contextFactory) {
+        return new CompatibilityDigesterDefinitionsReader();
+    }
+}

Propchange: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/package.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/package.html?rev=646535&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/package.html (added)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/package.html Wed Apr  9 14:07:55 2008
@@ -0,0 +1,30 @@
+<!--
+/*
+ * $Id$
+ *
+ * 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
+ * "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 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 License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<html>
+<head>
+    <title>Tiles factories package</title>
+</head>
+<body>
+Contains factories to customize Tiles initialization.
+</body>
+</html>
\ No newline at end of file

Propchange: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/package.html
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=646535&r1=646534&r2=646535&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml Wed Apr  9 14:07:55 2008
@@ -31,23 +31,8 @@
     <distributable/>
 
     <context-param>
-        <param-name>org.apache.tiles.context.TilesContextFactory</param-name>
-        <param-value>org.apache.tiles.context.enhanced.EnhancedContextFactory</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.tiles.factory.TilesContainerFactory.MUTABLE</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.tiles.renderer.impl.BasicRendereFactory.TYPE_RENDERERS</param-name>
-        <param-value>reversed,org.apache.tiles.test.renderer.ReverseStringAttributeRenderer</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.tiles.evaluator.AttributeEvaluator</param-name>
-        <param-value>org.apache.tiles.evaluator.el.ELAttributeEvaluator</param-value>
+        <param-name>org.apache.tiles.factory.AbstractTilesContainerFactory</param-name>
+        <param-value>org.apache.tiles.test.factory.TestTilesContainerFactory</param-value>
     </context-param>
 
     <filter>
@@ -84,14 +69,6 @@
     <servlet>
         <servlet-name>tiles</servlet-name>
         <servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
-        <init-param>
-            <param-name>definitions-config</param-name>
-            <param-value>/WEB-INF/tiles-defs.xml,/org/apache/tiles/classpath-defs.xml,/WEB-INF/tiles-defs-1.1.xml</param-value>
-        </init-param>
-        <init-param>
-            <param-name>org.apache.tiles.definition.DefinitionsReader</param-name>
-            <param-value>org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader</param-value>
-        </init-param>
         <load-on-startup>2</load-on-startup>
     </servlet>
     <servlet>

Modified: tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html?rev=646535&r1=646534&r2=646535&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html Wed Apr  9 14:07:55 2008
@@ -154,9 +154,6 @@
         <td><a href="TilesDispatchServletTest.html">Tiles Dispatch Servlet Test</a></td>
     </tr>
     <tr>
-        <td><a href="InitContainerTest.html">Init Container Tag Test</a></td>
-    </tr>
-    <tr>
         <td><a href="DefinitionTagTest.html">Definition Tag Test</a></td>
     </tr>
     <tr>
@@ -185,6 +182,9 @@
     </tr>
     <tr>
         <td><a href="ConfiguredDefinitionAttributeRolesTest.html">Configured Definition Attribute Roles Test</a></td>
+    </tr>
+    <tr>
+        <td><a href="InitContainerTest.html">Init Container Tag Test</a></td>
     </tr>
 </table>
 </body>