You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/03/23 10:49:00 UTC
svn commit: r521651 - in /tiles/examples/trunk/tiles-showcase/src/main:
java/org/apache/tiles/showcase/ java/org/apache/tiles/showcase/channel/
java/org/apache/tiles/showcase/dynPortal/
java/org/apache/tiles/showcase/impl/ java/org/apache/tiles/showcas...
Author: apetrelli
Date: Fri Mar 23 02:48:58 2007
New Revision: 521651
URL: http://svn.apache.org/viewvc?view=rev&rev=521651
Log:
TILESSHOW-15
Aligned to Tiles 2 and Struts 1 - Tiles 2 integration changes.
Modified:
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/ExposerTilesContainer.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/AttributeUtils.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelDefinitionsFactory.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/ExposerKeyedTilesContainer.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/mgmt/ExposerMutableKeyedTilesContainer.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java
tiles/examples/trunk/tiles-showcase/src/main/webapp/common/directSubmenu.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/menu.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/frameset.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/ExposerTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/ExposerTilesContainer.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/ExposerTilesContainer.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/ExposerTilesContainer.java Fri Mar 23 02:48:58 2007
@@ -23,14 +23,14 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
/**
* @version $Rev$ $Date$
*/
public interface ExposerTilesContainer extends TilesContainer {
- public ComponentDefinition getDefinition(String definitionName,
+ public Definition getDefinition(String definitionName,
TilesRequestContext request) throws DefinitionsFactoryException;
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/AttributeUtils.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/AttributeUtils.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/AttributeUtils.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/AttributeUtils.java Fri Mar 23 02:48:58 2007
@@ -21,7 +21,7 @@
*/
package org.apache.tiles.showcase.channel;
-import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.Attribute;
/**
* @version $Rev$ $Date$
@@ -31,7 +31,7 @@
private AttributeUtils() {
}
- public static String getAttributeValueAsString(ComponentAttribute attribute) {
+ public static String getAttributeValueAsString(Attribute attribute) {
String retValue = null;
if (attribute != null) {
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelDefinitionsFactory.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelDefinitionsFactory.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelDefinitionsFactory.java Fri Mar 23 02:48:58 2007
@@ -34,8 +34,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
-import org.apache.tiles.definition.ComponentDefinitions;
+import org.apache.tiles.definition.Definition;
+import org.apache.tiles.definition.Definitions;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.UrlDefinitionsFactory;
@@ -68,24 +68,24 @@
*/
private List<String> processedLocales;
- private ComponentDefinitions definitions;
+ private Definitions definitions;
/**
- * Returns a ComponentDefinition object that matches the given name and
+ * Returns a Definition object that matches the given name and
* Tiles context
*
- * @param name The name of the ComponentDefinition to return.
+ * @param name The name of the Definition to return.
* @param tilesContext The Tiles context to use to resolve the definition.
- * @return the ComponentDefinition matching the given name or null if none
+ * @return the Definition matching the given name or null if none
* is found.
* @throws DefinitionsFactoryException if an error occurs reading definitions.
*/
@Override
- public ComponentDefinition getDefinition(String name,
+ public Definition getDefinition(String name,
TilesRequestContext tilesContext)
throws DefinitionsFactoryException {
- ComponentDefinitions definitions = getComponentDefinitions();
+ Definitions definitions = getDefinitions();
String key = getLocaleKey(tilesContext);
Locale locale = getLocale(key);
@@ -102,16 +102,16 @@
}
/**
- * Appends locale-specific {@link ComponentDefinition} objects to an existing
- * {@link ComponentDefinitions} set by reading locale-specific versions of
+ * Appends locale-specific {@link Definition} objects to an existing
+ * {@link Definitions} set by reading locale-specific versions of
* the applied sources.
*
- * @param definitions The ComponentDefinitions object to append to.
+ * @param definitions The Definitions object to append to.
* @param tilesContext The requested locale.
* @throws DefinitionsFactoryException if an error occurs reading definitions.
*/
@Override
- protected void addDefinitions(ComponentDefinitions definitions,
+ protected void addDefinitions(Definitions definitions,
TilesRequestContext tilesContext)
throws DefinitionsFactoryException {
String key = getLocaleKey(tilesContext);
@@ -158,7 +158,7 @@
}
// At the end of definitions loading, they can be assigned to
- // ComponentDefinitions implementation, to allow inheritance resolution.
+ // Definitions implementation, to allow inheritance resolution.
definitions.addDefinitions(localeDefsMap, locale);
}
@@ -182,7 +182,7 @@
return processedLocales.contains(key);
}
- protected ComponentDefinitions getComponentDefinitions()
+ protected Definitions getDefinitions()
throws DefinitionsFactoryException {
if (definitions == null) {
definitions = readDefinitions();
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java Fri Mar 23 02:48:58 2007
@@ -26,7 +26,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.Attribute;
/**
* Objects of this class hold portal settings for one user.
@@ -51,8 +51,8 @@
{
String retValue = null;
int index = choices.indexOf( key );
- ComponentAttribute attribute =
- (ComponentAttribute) choiceLabels.get(index);
+ Attribute attribute =
+ (Attribute) choiceLabels.get(index);
if (attribute != null) {
retValue = (String) attribute.getValue();
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java Fri Mar 23 02:48:58 2007
@@ -31,8 +31,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.showcase.channel.AttributeUtils;
@@ -83,8 +83,8 @@
HttpSession session = request.getSession();
// Try to retrieve tile context
- ComponentContext context = TilesAccess.getContainer(
- request.getSession().getServletContext()).getComponentContext(
+ AttributeContext context = TilesAccess.getContainer(
+ request.getSession().getServletContext()).getAttributeContext(
request, response);
if( context == null )
{
@@ -95,10 +95,10 @@
PortalSettings settings = getSettings( context, session );
// Set parameters for tiles
- context.putAttribute( "numCols", new ComponentAttribute(
+ context.putAttribute( "numCols", new Attribute(
Integer.toString(settings.getNumCols())));
for( int i=0; i<settings.getNumCols(); i++ )
- context.putAttribute( "list"+i, new ComponentAttribute(
+ context.putAttribute( "list"+i, new Attribute(
settings.getListAt(i) ));
System.out.println("Exit action RetrievePortalAction");
@@ -109,7 +109,7 @@
* Retrieve user setting from session.
* If settings are not found, initialized them.
*/
- public static PortalSettings getSettings( ComponentContext context, HttpSession session )
+ public static PortalSettings getSettings( AttributeContext context, HttpSession session )
{
// Get user portal list from user context
PortalSettings settings = (PortalSettings)session.getAttribute( USER_PORTAL_SETTINGS );
@@ -122,7 +122,7 @@
for( int i=0; i<settings.getNumCols(); i++ )
{
List col = (List)context.getAttribute( ((String)PARAM_LIST+i) ).getValue();
- ComponentAttribute labelsAttribute = context
+ Attribute labelsAttribute = context
.getAttribute(((String) PARAM_LIST_LABELS + i));
List labels = null;
if (labelsAttribute != null) {
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java Fri Mar 23 02:48:58 2007
@@ -30,7 +30,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.access.TilesAccess;
@@ -74,8 +74,8 @@
PortalPrefsForm prefsForm = (PortalPrefsForm)form;
// Try to retrieve tile context
- ComponentContext context = TilesAccess.getContainer(
- request.getSession().getServletContext()).getComponentContext(
+ AttributeContext context = TilesAccess.getContainer(
+ request.getSession().getServletContext()).getAttributeContext(
request, response);
if( context == null )
{
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/ExposerKeyedTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/ExposerKeyedTilesContainer.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/ExposerKeyedTilesContainer.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/ExposerKeyedTilesContainer.java Fri Mar 23 02:48:58 2007
@@ -22,7 +22,7 @@
package org.apache.tiles.showcase.impl;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
import org.apache.tiles.showcase.ExposerTilesContainer;
@@ -34,7 +34,7 @@
KeyedDefinitionsFactoryTilesContainer implements ExposerTilesContainer {
@Override
- public ComponentDefinition getDefinition(String definitionName,
+ public Definition getDefinition(String definitionName,
TilesRequestContext request) throws DefinitionsFactoryException {
return super.getDefinition(definitionName, request);
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/mgmt/ExposerMutableKeyedTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/mgmt/ExposerMutableKeyedTilesContainer.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/mgmt/ExposerMutableKeyedTilesContainer.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/impl/mgmt/ExposerMutableKeyedTilesContainer.java Fri Mar 23 02:48:58 2007
@@ -22,7 +22,7 @@
package org.apache.tiles.showcase.impl.mgmt;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.mgmt.CachingKeyedDefinitionsFactoryTilesContainer;
import org.apache.tiles.showcase.ExposerTilesContainer;
@@ -34,7 +34,7 @@
CachingKeyedDefinitionsFactoryTilesContainer implements ExposerTilesContainer {
@Override
- public ComponentDefinition getDefinition(String definition,
+ public Definition getDefinition(String definition,
TilesRequestContext context) throws DefinitionsFactoryException {
return super.getDefinition(definition, context);
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java Fri Mar 23 02:48:58 2007
@@ -30,7 +30,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentConstants;
+import org.apache.tiles.Constants;
/**
* @version $Rev$ $Date$
@@ -84,7 +84,7 @@
{
HttpSession session = request.getSession(false);
if (session != null)
- session.setAttribute(ComponentConstants.LOCALE_KEY, locale);
+ session.setAttribute(Constants.LOCALE_KEY, locale);
}
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java Fri Mar 23 02:48:58 2007
@@ -28,14 +28,14 @@
import java.util.List;
import java.util.Map;
-import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.Attribute;
import org.apache.tiles.showcase.channel.AttributeUtils;
/**
* A catalog of available tiles for a portal.
* Tiles denote a local URL or a Tile definition name.
- * To check : should be possible to put ComponentDefinition class also.
+ * To check : should be possible to put Definition class also.
*
* @version $Rev$ $Date$
*/
@@ -93,7 +93,7 @@
key2index.clear();
int i = 0;
for (Object item: list) {
- key2index.put(((ComponentAttribute) item).getValue(), i);
+ key2index.put(((Attribute) item).getValue(), i);
i++;
}
tileLabels = labels;
@@ -128,7 +128,7 @@
tiles.addAll(list);
int i = key2index.size();
for (Object item: list) {
- key2index.put(((ComponentAttribute) item).getValue(), i);
+ key2index.put(((Attribute) item).getValue(), i);
i++;
}
tileLabels.addAll(labels);
@@ -160,7 +160,7 @@
if(index==-1)
return null;
return AttributeUtils.getAttributeValueAsString(
- (ComponentAttribute) tileLabels.get(index));
+ (Attribute) tileLabels.get(index));
}
/**
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java Fri Mar 23 02:48:58 2007
@@ -38,15 +38,15 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.beans.MenuItem;
-import org.apache.tiles.context.ComponentListAttribute;
+import org.apache.tiles.context.ListAttribute;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.servlet.ServletTilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.Definition;
import org.apache.tiles.preparer.ViewPreparer;
import org.apache.tiles.showcase.ExposerTilesContainer;
import org.apache.tiles.showcase.channel.AttributeUtils;
@@ -139,7 +139,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -162,7 +162,7 @@
* @param servletContext Current servlet context
*/
public void perform(
- ComponentContext context,
+ AttributeContext context,
HttpServletRequest request,
HttpServletResponse response,
ServletContext servletContext)
@@ -178,7 +178,7 @@
MenuSettings settings = getUserSettings(tilesContext, context);
// Set parameters for rendering page
- context.putAttribute(USER_ITEMS_ATTRIBUTE, new ComponentAttribute(
+ context.putAttribute(USER_ITEMS_ATTRIBUTE, new Attribute(
settings.getItems()));
log.debug("settings=" + settings);
@@ -195,7 +195,7 @@
*/
public static MenuSettings getUserSettings(
TilesRequestContext tilesContext,
- ComponentContext context)
+ AttributeContext context)
throws ServletException {
// Retrieve attribute name used to store settings.
@@ -216,8 +216,8 @@
// List doesn't exist, create it and initialize it from Tiles parameters
settings = new MenuSettings();
try {
- ComponentListAttribute settingsAttribute =
- (ComponentListAttribute) context.getAttribute(USER_ITEMS_ATTRIBUTE);
+ ListAttribute settingsAttribute =
+ (ListAttribute) context.getAttribute(USER_ITEMS_ATTRIBUTE);
settings.addItems((List) settingsAttribute.getValue());
} catch (ClassCastException ex) {
throw new ServletException("Can't initialize user menu : default items must be a list of items");
@@ -236,7 +236,7 @@
* entries.
*/
public static List getCatalog(
- ComponentContext context,
+ AttributeContext context,
TilesRequestContext tilesContext,
TilesApplicationContext applicationContext)
throws ServletException {
@@ -256,7 +256,7 @@
// If not found, initialize it from provided default menu
if (catalog == null) {
- ComponentAttribute menuBar = context.getAttribute(CATALOG_SETTING_ATTRIBUTE);
+ Attribute menuBar = context.getAttribute(CATALOG_SETTING_ATTRIBUTE);
if (menuBar == null) {
throw new ServletException(
"Attribute '"
@@ -290,7 +290,7 @@
* Check object type class :
* <li>
* <ul>MenuItems : add it</ul>
- * <ul>ComponentDefinition : get attribute items, or list if not found.
+ * <ul>Definition : get attribute items, or list if not found.
* Call ExtractItems with resulting attribute.
* </ul>
* <ul>List : iterate on list, and call ExtractItems for each element.
@@ -304,7 +304,7 @@
private static void extractItems(
List<Object> result,
Object object,
- ComponentContext context,
+ AttributeContext context,
ExposerTilesContainer container,
TilesRequestContext tilesContext) {
@@ -312,7 +312,7 @@
if (object instanceof String) { // definition name
try {
- ComponentDefinition def = container.getDefinition(
+ Definition def = container.getDefinition(
(String) object, tilesContext);
extractItems(result, def, context, container, tilesContext);
@@ -326,8 +326,8 @@
extractItems(result, iter.next(), context, container, tilesContext);
}
- } else if (object instanceof ComponentDefinition) {
- ComponentDefinition definition = (ComponentDefinition) object;
+ } else if (object instanceof Definition) {
+ Definition definition = (Definition) object;
Object attribute = definition.getAttribute("items");
if (attribute == null) {
attribute = definition.getAttribute("list");
@@ -338,8 +338,8 @@
}
extractItems(result, attribute, context, container, tilesContext);
- } else if (object instanceof ComponentAttribute) {
- extractItems(result, ((ComponentAttribute) object).getValue(),
+ } else if (object instanceof Attribute) {
+ extractItems(result, ((Attribute) object).getValue(),
context, container, tilesContext);
} else if (object instanceof MenuItem) {
result.add(object);
@@ -347,10 +347,10 @@
}
/**
- * @see org.apache.tiles.Controller#execute(org.apache.tiles.ComponentContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
+ * @see org.apache.tiles.Controller#execute(org.apache.tiles.AttributeContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext)
*/
public void execute(TilesRequestContext tilesContext,
- ComponentContext tileContext)
+ AttributeContext tileContext)
throws Exception {
log.debug("Enter action UserMenuAction");
@@ -359,7 +359,7 @@
MenuSettings settings = getUserSettings(tilesContext, tileContext);
// Set parameters for rendering page
- tileContext.putAttribute(USER_ITEMS_ATTRIBUTE, new ComponentAttribute(
+ tileContext.putAttribute(USER_ITEMS_ATTRIBUTE, new Attribute(
settings.getItems()));
log.debug("settings=" + settings);
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java Fri Mar 23 02:48:58 2007
@@ -36,8 +36,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.beans.MenuItem;
@@ -95,7 +95,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -139,9 +139,9 @@
}
// Prepare data for view tile
- context.putAttribute("userItems", new ComponentAttribute(settings
+ context.putAttribute("userItems", new Attribute(settings
.getItems()));
- context.putAttribute("catalog", new ComponentAttribute(catalog));
+ context.putAttribute("catalog", new Attribute(catalog));
log.debug("Exit action UserMenuSettingsAction");
return null;
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java Fri Mar 23 02:48:58 2007
@@ -33,8 +33,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.showcase.channel.AttributeUtils;
/**
@@ -96,7 +96,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -107,11 +107,11 @@
PortalSettings settings = getSettings(request, context);
// Set parameters for tiles
- context.putAttribute("numCols", new ComponentAttribute(Integer
+ context.putAttribute("numCols", new Attribute(Integer
.toString(settings.getNumCols())));
for (int i = 0; i < settings.getNumCols(); i++) {
- context.putAttribute("list" + i, new ComponentAttribute(settings
+ context.putAttribute("list" + i, new Attribute(settings
.getListAt(i)));
}
@@ -124,7 +124,7 @@
*/
public static PortalSettings getSettings(
HttpServletRequest request,
- ComponentContext context) {
+ AttributeContext context) {
// Get current session.
HttpSession session = request.getSession();
@@ -167,7 +167,7 @@
* Create it from default values if needed.
*/
static public PortalCatalog getPortalCatalog(
- ComponentContext context,
+ AttributeContext context,
ServletContext servletContext) {
PortalCatalog catalog =
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java Fri Mar 23 02:48:58 2007
@@ -29,7 +29,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
/**
* Implementation of <strong>Action</strong> that populates an instance of
@@ -66,7 +66,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java Fri Mar 23 02:48:58 2007
@@ -38,8 +38,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessages;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.access.TilesAccess;
/**
@@ -85,8 +85,8 @@
log.debug("Enter Rss Channel Action");
// Try to retrieve tile context
- ComponentContext context = TilesAccess.getContainer(request
- .getSession().getServletContext()).getComponentContext(request,
+ AttributeContext context = TilesAccess.getContainer(request
+ .getSession().getServletContext()).getAttributeContext(request,
response);
if (context == null) {
throw new ServletException("This action must be called by a Tile, not directly");
@@ -98,7 +98,7 @@
// Urls can come from a list, or from a single attribute.
List channels = null;
- ComponentAttribute channelsAttribute =
+ Attribute channelsAttribute =
context.getAttribute(CHANNEL_URLS_KEY);
if (channelsAttribute != null) {
channels = (List) channelsAttribute.getValue();
@@ -158,7 +158,7 @@
log.debug("Exit Rss Channel Action");
// Use Tile context to pass channels
- context.putAttribute(CHANNELS_KEY, new ComponentAttribute(
+ context.putAttribute(CHANNELS_KEY, new Attribute(
channelBeans));
return mapping.findForward("continue");
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java Fri Mar 23 02:48:58 2007
@@ -38,8 +38,8 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.showcase.channel.AttributeUtils;
import org.apache.tiles.showcase.digester.rss.Channel;
import org.apache.tiles.showcase.digester.rss.RSSDigester;
@@ -95,7 +95,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -124,7 +124,7 @@
for (int i = 0; i < channels.size(); i++) {
RSSDigester digester = new RSSDigester();
String url = AttributeUtils
- .getAttributeValueAsString((ComponentAttribute) channels
+ .getAttributeValueAsString((Attribute) channels
.get(i));
// Add application path if needed
if (url.startsWith("/")) {
@@ -163,7 +163,7 @@
log.debug("Exit Rss Channel Action");
// Use Tile context to pass channels
- context.putAttribute(CHANNELS_KEY, new ComponentAttribute(
+ context.putAttribute(CHANNELS_KEY, new Attribute(
channelBeans));
return null;
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java Fri Mar 23 02:48:58 2007
@@ -32,12 +32,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.Attribute;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.servlet.ServletTilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.FactoryNotFoundException;
import org.apache.tiles.definition.NoSuchDefinitionException;
@@ -65,7 +65,7 @@
/**
* Map of skins, by their keys
*/
- private ComponentDefinition defaultDefinition;
+ private Definition defaultDefinition;
/**
* List of names
@@ -99,7 +99,7 @@
tilesContext = new ServletTilesRequestContext(context, request, response);
}
// Get definition containing list of definitions
- ComponentDefinition catalogDef = container.getDefinition(catalogName, tilesContext);
+ Definition catalogDef = container.getDefinition(catalogName, tilesContext);
if(debug)
System.out.println( "Got definition " + catalogDef );
// Get list of definition names
@@ -107,15 +107,15 @@
Iterator i = list.iterator();
while(i.hasNext() )
{
- ComponentAttribute attribute = (ComponentAttribute) i.next();
+ Attribute attribute = (Attribute) i.next();
Object value = attribute.getValue();
- ComponentDefinition def = null;
+ Definition def = null;
String name = null;
if (value instanceof String) {
name = value.toString();
def = container.getDefinition(name, tilesContext);
- } else if (value instanceof ComponentDefinition) {
- def = (ComponentDefinition) value;
+ } else if (value instanceof Definition) {
+ def = (Definition) value;
name = def.getName();
}
if(def==null)
@@ -131,11 +131,11 @@
* @param key
* @return Definition associated to key
*/
- public ComponentDefinition get(Object key)
+ public Definition get(Object key)
{
if(key==null)
return getDefault();
- return (ComponentDefinition)definitions.get(key);
+ return (Definition)definitions.get(key);
}
/**
@@ -143,7 +143,7 @@
* @param key
* @return Definition associated to key
*/
- public ComponentDefinition getDefault()
+ public Definition getDefault()
{
return defaultDefinition;
}
@@ -186,7 +186,7 @@
* Add a skin definition
* @param definition
*/
- public void add(String key, ComponentDefinition definition)
+ public void add(String key, Definition definition)
{
// Intitialize default definition with first definition encountered
if( defaultDefinition == null )
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java Fri Mar 23 02:48:58 2007
@@ -28,8 +28,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
/**
* Action used to set user skin.
@@ -60,7 +60,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -96,8 +96,8 @@
} // end if
// Prepare data for view tile
- context.putAttribute("selected", new ComponentAttribute(selected));
- context.putAttribute("catalog", new ComponentAttribute(catalog));
+ context.putAttribute("selected", new Attribute(selected));
+ context.putAttribute("catalog", new Attribute(catalog));
if(debug)
System.out.println("Exit action LayoutSettingAction");
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java Fri Mar 23 02:48:58 2007
@@ -33,8 +33,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentContext;
-import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.AttributeContext;
+import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.showcase.channel.AttributeUtils;
@@ -93,7 +93,7 @@
* @since Struts 1.1
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -111,7 +111,7 @@
+ "' not found in Tile's attributes. Need it to select appropriate layout" );
// Get user current skin
- ComponentDefinition definition = getCurrentDefinition( context, request, getServlet().getServletContext(), response );
+ Definition definition = getCurrentDefinition( context, request, getServlet().getServletContext(), response );
// get requested layout from definition
String layout = (String)definition.getAttribute(layoutKey);
if(layout==null)
@@ -122,7 +122,7 @@
// set path to forward to
// Not very nice solution, need to improve it
/*
- ComponentDefinition forwarDefinition = new ComponentDefinition( "", layout, new HashMap() );
+ Definition forwarDefinition = new Definition( "", layout, new HashMap() );
DefinitionsUtil.setActionDefinition( request, forwarDefinition );
*/
if(debug)
@@ -142,7 +142,7 @@
* This key denote a definition in catalog.
* Return user selected key, or "default" if none is set.
*/
- public static String getUserSetting( ComponentContext context, HttpServletRequest request )
+ public static String getUserSetting( AttributeContext context, HttpServletRequest request )
{
HttpSession session = request.getSession( false );
if( session == null )
@@ -162,7 +162,7 @@
* This key denote a definition in catalog.
* Return user selected key, or "default" if none is set.
*/
- public static void setUserSetting( ComponentContext context, HttpServletRequest request, String setting )
+ public static void setUserSetting( AttributeContext context, HttpServletRequest request, String setting )
{
HttpSession session = request.getSession();
@@ -179,16 +179,16 @@
* Get currently selected skin definition.
* @param response TODO
*/
- public static ComponentDefinition getCurrentDefinition( ComponentContext context, HttpServletRequest request, ServletContext servletContext, HttpServletResponse response )
+ public static Definition getCurrentDefinition( AttributeContext context, HttpServletRequest request, ServletContext servletContext, HttpServletResponse response )
throws ServletException
{
// Get selected key
String selected = getUserSetting(context, request);
DefinitionCatalog catalog = getCatalog( context, request, response, servletContext);
- ComponentDefinition definition = (ComponentDefinition)catalog.get( selected );
+ Definition definition = (Definition)catalog.get( selected );
if( definition == null )
- definition = (ComponentDefinition)catalog.getDefault();
+ definition = (Definition)catalog.getDefault();
return definition;
}
@@ -197,7 +197,7 @@
* Get catalog of available skins.
* @param response TODO
*/
- public static DefinitionCatalog getCatalog( ComponentContext context, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext )
+ public static DefinitionCatalog getCatalog( AttributeContext context, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext )
throws ServletException
{
// Retrieve name used to store catalog in application context.
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java Fri Mar 23 02:48:58 2007
@@ -33,7 +33,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.showcase.channel.AttributeUtils;
@@ -81,7 +81,7 @@
* an exception
*/
public ActionForward execute(
- ComponentContext context,
+ AttributeContext context,
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -121,7 +121,7 @@
* This key denote a definition in catalog.
* Return user selected key, or "default" if none is set.
*/
- public static String getUserSetting( ComponentContext context, HttpServletRequest request )
+ public static String getUserSetting( AttributeContext context, HttpServletRequest request )
{
HttpSession session = request.getSession( false );
if( session == null )
@@ -141,7 +141,7 @@
* This key denote a definition in catalog.
* Return user selected key, or "default" if none is set.
*/
- public static void setUserSetting( ComponentContext context, HttpServletRequest request, String setting )
+ public static void setUserSetting( AttributeContext context, HttpServletRequest request, String setting )
{
HttpSession session = request.getSession();
@@ -158,7 +158,7 @@
* Get catalog of available skins.
* @param response TODO
*/
- public static DefinitionCatalog getCatalog( ComponentContext context, HttpServletRequest request, ServletContext servletContext, HttpServletResponse response )
+ public static DefinitionCatalog getCatalog( AttributeContext context, HttpServletRequest request, ServletContext servletContext, HttpServletResponse response )
throws ServletException
{
// Retrieve name used to store catalog in application context.
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java Fri Mar 23 02:48:58 2007
@@ -28,7 +28,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.mgmt.MutableTilesContainer;
@@ -73,11 +73,11 @@
String path = "/tutorial";
// set definition 'contents'
//definition.setTemplate( "/tutorial/basic/myFramesetLayout.jsp" );
- definition.addAttribute(new ComponentAttribute("title", "My first dynamic frameset page", null, "string"));
- definition.addAttribute(new ComponentAttribute("header", path + "/common/header.jsp", null, "string"));
- definition.addAttribute(new ComponentAttribute("footer", path + "/common/footer.jsp", null, "string"));
- definition.addAttribute(new ComponentAttribute("menu", path + "/basic/menu.jsp", null, "string"));
- definition.addAttribute(new ComponentAttribute("body", path + "/basic/helloBody.jsp", null, "string"));
+ definition.addAttribute(new Attribute("title", "My first dynamic frameset page", null, "string"));
+ definition.addAttribute(new Attribute("header", path + "/common/header.jsp", null, "string"));
+ definition.addAttribute(new Attribute("footer", path + "/common/footer.jsp", null, "string"));
+ definition.addAttribute(new Attribute("menu", path + "/basic/menu.jsp", null, "string"));
+ definition.addAttribute(new Attribute("body", path + "/basic/helloBody.jsp", null, "string"));
System.out.println( "definition=" + definition );
// Save our definition as a bean :
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java Fri Mar 23 02:48:58 2007
@@ -29,7 +29,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.access.TilesAccess;
@@ -76,8 +76,8 @@
throws Exception {
// Try to retrieve tile context
- ComponentContext context = TilesAccess.getContainer(request.getSession()
- .getServletContext()).getComponentContext(request, response);;
+ AttributeContext context = TilesAccess.getContainer(request.getSession()
+ .getServletContext()).getAttributeContext(request, response);;
return (mapping.findForward("success"));
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java Fri Mar 23 02:48:58 2007
@@ -32,12 +32,12 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.servlet.ServletTilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.showcase.ExposerTilesContainer;
@@ -84,8 +84,8 @@
ActionForward retValue = null;
// Try to retrieve tile context
- ComponentContext context = TilesAccess.getContainer(request.getSession()
- .getServletContext()).getComponentContext(request, response);
+ AttributeContext context = TilesAccess.getContainer(request.getSession()
+ .getServletContext()).getAttributeContext(request, response);
// Get requested test from tile parameter
String param;
@@ -110,7 +110,7 @@
try
{
// Read definition from factory, but we can create it here.
- ComponentDefinition definition = container.getDefinition(
+ Definition definition = container.getDefinition(
param, tilesContext);
retValue = new ActionForward(definition.getTemplate());
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java Fri Mar 23 02:48:58 2007
@@ -29,8 +29,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.ComponentAttribute;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
import org.apache.tiles.preparer.ViewPreparerSupport;
import org.apache.tiles.showcase.channel.AttributeUtils;
@@ -54,7 +54,7 @@
* @param response Current response
* @param servletContext Current servlet context
*/
- public void perform(ComponentContext tileContext,
+ public void perform(AttributeContext tileContext,
HttpServletRequest request, HttpServletResponse response,
ServletContext servletContext)
throws ServletException, IOException
@@ -65,7 +65,7 @@
String title = AttributeUtils.getAttributeValueAsString(
tileContext.getAttribute("title"));
title += "- controller called";
- tileContext.putAttribute("title", new ComponentAttribute(title));
+ tileContext.putAttribute("title", new Attribute(title));
}
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/common/directSubmenu.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/common/directSubmenu.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/common/directSubmenu.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/common/directSubmenu.jsp Fri Mar 23 02:48:58 2007
@@ -28,7 +28,7 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%-- Push component attributes in page context --%>
+<%-- Push attributes in page context --%>
<tiles:importAttribute />
<table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/common/submenu.jsp Fri Mar 23 02:48:58 2007
@@ -28,7 +28,7 @@
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%-- Push component attributes in page context --%>
+<%-- Push attributes in page context --%>
<tiles:importAttribute />
<table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/common/viewSrcBody.jsp Fri Mar 23 02:48:58 2007
@@ -32,7 +32,7 @@
directive (see above). Error page show a message.
--%>
- <%-- Import component attributes, if any.
+ <%-- Import attributes, if any.
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/classicLayout.jsp Fri Mar 23 02:48:58 2007
@@ -23,7 +23,7 @@
--%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%-- Layout component
+<%-- Layout
parameters : title, header, menu, body, footer
--%>
<HTML>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/columnsLayout.jsp Fri Mar 23 02:48:58 2007
@@ -23,7 +23,7 @@
--%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%-- Layout component
+<%-- Layout
Render a list on severals columns
parameters : numCols, list0, list1, list2, list3, ...
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layout/vboxLayout.jsp Fri Mar 23 02:48:58 2007
@@ -25,7 +25,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%-- Layout component
+<%-- Layout
Render a list on severals columns
parameters : componentsList
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/layouts/vboxLayout.jsp Fri Mar 23 02:48:58 2007
@@ -25,7 +25,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<%-- Layout component
+<%-- Layout template
Render a list of tiles in a vertical column
@param : list List of names to insert
This file contains 3 possible implementations.
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/layout.jsp Fri Mar 23 02:48:58 2007
@@ -27,8 +27,8 @@
<%--
A simple layout.
- First, we get component/template attribute (title) as a String.
- Next, we insert component/template attribute (header and body).
+ First, we get template attribute (title) as a String.
+ Next, we insert template attribute (header and body).
--%>
<table border="2" width="300" bordercolor="Gray">
<tr>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/menu.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/menu.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/menu.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/menu.jsp Fri Mar 23 02:48:58 2007
@@ -29,7 +29,7 @@
<%--
--%>
-<%-- Push component attributes in page context --%>
+<%-- Push attributes in page context --%>
<tiles:importAttribute />
<%-- Prepare the links list to be iterated --%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testIgnore.jsp Fri Mar 23 02:48:58 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%-- Test 'ignore' attribute :
- Insert components/templates with undefined attributes, or bad urls.
+ Insert templates with undefined attributes, or bad urls.
Undefined must be spkipped, while false urls must output exception.
--%>
<hr>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testRole.jsp Fri Mar 23 02:48:58 2007
@@ -26,7 +26,7 @@
<%-- Test tags basic behaviors
--%>
<hr>
-<strong>Show Component if 'tomcat' role is set</strong>
+<strong>Show filled template if 'tomcat' role is set</strong>
<br>
<tiles:insertTemplate template="layout.jsp" role="tomcat">
<tiles:putAttribute name="title" value="Tomcat role" />
@@ -35,7 +35,7 @@
</tiles:insertTemplate>
<hr>
-<strong>Show Component if 'role1' role is set</strong>
+<strong>Show filled template if 'role1' role is set</strong>
<br>
<tiles:insertTemplate template="layout.jsp" role="role1">
<tiles:putAttribute name="title" value="role1 role" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myFramesetLayout.jsp Fri Mar 23 02:48:58 2007
@@ -23,7 +23,7 @@
--%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%-- Frameset Layout component
+<%-- Frameset Layout
parameters : title, header, menu, body, footer
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/basic/myLayout.jsp Fri Mar 23 02:48:58 2007
@@ -23,7 +23,7 @@
--%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%-- Layout component
+<%-- Layout
parameters : title, header, menu, body, footer
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/menuViewSrc.jsp Fri Mar 23 02:48:58 2007
@@ -27,8 +27,8 @@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%-- Menu of sources component
- This component is a menu of sources. When a source is clicked, its
+<%-- Menu of sources elements
+ This page is a menu of sources. When a source is clicked, its
code is shown using a viewer.
A list of absolute source path must be provided.
Viewer path can be provided.
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/submenu.jsp Fri Mar 23 02:48:58 2007
@@ -27,7 +27,7 @@
<%@ page import="java.util.Iterator" %>
-<%-- Push component attributes in page context --%>
+<%-- Push attributes in page context --%>
<tiles:importAttribute />
<table>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/common/viewSrcBody.jsp Fri Mar 23 02:48:58 2007
@@ -32,7 +32,7 @@
directive (see above). Error page show a message.
--%>
- <%-- Import component attributes, if any.
+ <%-- Import attributes, if any.
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/frameset.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/frameset.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/frameset.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/frameset.jsp Fri Mar 23 02:48:58 2007
@@ -23,7 +23,7 @@
--%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%-- Layout component
+<%-- Layout template
parameters : title, header, menu, body, footer
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editAddress.jsp Fri Mar 23 02:48:58 2007
@@ -29,7 +29,7 @@
@param bean An address object to edit.
@param beanName The path to add between the bean and the properties to edit.
--%>
-<%-- Retrieve parameters from component context, and declare them as page variable --%>
+<%-- Retrieve parameters from attribute context, and declare them as page variable --%>
<tiles:useAttribute id="beanName" name="property" classname="java.lang.String" ignore="true" />
<tiles:importAttribute name="bean" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice.jsp Fri Mar 23 02:48:58 2007
@@ -63,8 +63,8 @@
</tr>
<tr>
<td align="center" colspan="2">
- <%-- Include an "address editor" component. --%>
- <%-- Pass the component name and component value as parameter --%>
+ <%-- Include an "address editor" filled template. --%>
+ <%-- Pass the attribute name and attribute as parameter --%>
<%-- Value comes from the form bean --%>
<tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" >
<tiles:putAttribute name="property" value="shippingAddress" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/invoice/editInvoice2.jsp Fri Mar 23 02:48:58 2007
@@ -63,8 +63,8 @@
</tr>
<tr>
<td align="center" colspan="2">
- <%-- Include an "address editor" component. --%>
- <%-- Pass the component name and component value as parameter --%>
+ <%-- Include an "address editor" filled template. --%>
+ <%-- Pass the attribute name and attribute value as parameter --%>
<%-- Value comes from the form bean --%>
<tiles:insertTemplate template="/tutorial/invoice/editAddress.jsp" >
<tiles:putAttribute name="compName" value="shippingAddress" />
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/columnsLayout.jsp Fri Mar 23 02:48:58 2007
@@ -21,10 +21,10 @@
*
*/
--%>
-<%@ page import="org.apache.struts.tiles.ComponentContext"%>
+<%@ page import="org.apache.tiles.AttributeContext"%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%-- Layout component
+<%-- Layout template
Render a list in severals columns
parameters : numCols, list0, list1, list2, list3, ...
--%>
@@ -36,7 +36,7 @@
<tr>
<%
int numCols = Integer.parseInt(numColsStr);
-ComponentContext context = ComponentContext.getContext( request );
+AttributeContext context = AttributeContext.getContext( request );
for( int i=0; i<numCols; i++ )
{
java.util.List list=(java.util.List)context.getAttribute( "list" + i );
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/layout/vboxLayout.jsp Fri Mar 23 02:48:58 2007
@@ -24,7 +24,7 @@
<%@ page import="java.util.Iterator"%>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-<%-- Layout component
+<%-- Layout template
Render a list on severals columns
parameters : componentsList
--%>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/myLayout.jsp Fri Mar 23 02:48:58 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%-- Layout component
+<%-- Layout template
parameters : title, header, menu, body, footer
--%>
@@ -40,7 +40,7 @@
<TD colspan="2">
<tiles:insertAttribute name="header" >
<%-- FIXME It had beanScope="template", check if the definition is taken
- from componentContext--%>
+ from attributeContext--%>
<tiles:putAttribute name="body" value="${body}" />
</tiles:insertAttribute>
</TD></TR>
Modified: tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp?view=diff&rev=521651&r1=521650&r2=521651
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/tutorial/test/templateLayout.jsp Fri Mar 23 02:48:58 2007
@@ -24,7 +24,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%-- Layout component
+<%-- Layout template
parameters : title, header, menu, body, footer
--%>