Author: apetrelli
Date: Sat Nov 3 09:19:46 2007
New Revision: 591644
URL: http://svn.apache.org/viewvc?rev=591644&view=rev
Log:
TILESSHOW-17
Converted the showcase to Tiles 2.0.5.
Modified:
tiles/examples/trunk/tiles-showcase/pom.xml
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/ChannelDefinitionsFactory.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/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/skin/DefinitionCatalog.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/template/DynTemplateAction.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/util/ContainerUtil.java
Modified: tiles/examples/trunk/tiles-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/pom.xml?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
--- tiles/examples/trunk/tiles-showcase/pom.xml (original)
+++ tiles/examples/trunk/tiles-showcase/pom.xml Sat Nov 3 09:19:46 2007
@@ -52,7 +52,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tiles-jsp</artifactId>
- <version>2.0.4-SNAPSHOT</version>
+ <version>2.0.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -23,7 +23,7 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
+import org.apache.tiles.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
/**
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -33,8 +33,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.Definition;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.Definitions;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.UrlDefinitionsFactory;
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -22,7 +22,7 @@
package org.apache.tiles.showcase.impl;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
+import org.apache.tiles.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
import org.apache.tiles.showcase.ExposerTilesContainer;
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -22,7 +22,7 @@
package org.apache.tiles.showcase.impl.mgmt;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
+import org.apache.tiles.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.mgmt.CachingKeyedDefinitionsFactoryTilesContainer;
import org.apache.tiles.showcase.ExposerTilesContainer;
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -40,15 +40,15 @@
import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.beans.MenuItem;
import org.apache.tiles.context.ListAttribute;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesRequestContext;
-import org.apache.tiles.definition.Definition;
import org.apache.tiles.preparer.PreparerException;
import org.apache.tiles.preparer.ViewPreparer;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.showcase.ExposerTilesContainer;
import org.apache.tiles.showcase.channel.AttributeUtils;
import org.apache.tiles.showcase.util.ContainerUtil;
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -42,7 +42,7 @@
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.beans.MenuItem;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesRequestContext;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
/**
* Tiles controller as Struts Action.
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -33,15 +33,15 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.Attribute;
+import org.apache.tiles.Definition;
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.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.FactoryNotFoundException;
import org.apache.tiles.definition.NoSuchDefinitionException;
import org.apache.tiles.impl.BasicTilesContainer;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.showcase.ExposerTilesContainer;
/**
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -34,7 +34,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.AttributeContext;
-import org.apache.tiles.definition.Definition;
+import org.apache.tiles.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.showcase.channel.AttributeUtils;
@@ -113,7 +113,7 @@
// Get user current skin
Definition definition = getCurrentDefinition( context, request,
getServlet().getServletContext(), response );
// get requested layout from definition
- String layout = (String)definition.getAttribute(layoutKey);
+ String layout = (String)definition.getAttribute(layoutKey).getValue();
if(layout==null)
throw new ServletException( "Error - CustomSkinAction : no layout
defined for key '"
+ layoutKey
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?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -29,10 +29,10 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.tiles.Attribute;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.mgmt.TileDefinition;
/**
@@ -68,16 +68,16 @@
System.out.println( "Start dynamic definition" );
// Create template definition
- TileDefinition definition = new TileDefinition();
+ Definition definition = new Definition();
definition.setName("templateDefinition");
String path = "/tutorial";
// set definition 'contents'
//definition.setTemplate( "/tutorial/basic/myFramesetLayout.jsp" );
- 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"));
+ definition.addAttribute(new Attribute("title", "My first dynamic frameset
page", null, Attribute.AttributeType.STRING));
+ definition.addAttribute(new Attribute("header", path +
"/common/header.jsp", null, Attribute.AttributeType.STRING));
+ definition.addAttribute(new Attribute("footer", path +
"/common/footer.jsp", null, Attribute.AttributeType.STRING));
+ definition.addAttribute(new Attribute("menu", path + "/basic/menu.jsp",
null, Attribute.AttributeType.STRING));
+ definition.addAttribute(new Attribute("body", path +
"/basic/helloBody.jsp", null, Attribute.AttributeType.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/TestActionTileAction.java
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
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
Sat Nov 3 09:19:46 2007
@@ -33,13 +33,13 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.tiles.AttributeContext;
+import org.apache.tiles.Definition;
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.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.BasicTilesContainer;
+import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.showcase.ExposerTilesContainer;
import org.apache.tiles.showcase.channel.AttributeUtils;
Modified:
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/util/ContainerUtil.java
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/util/ContainerUtil.java?rev=591644&r1=591643&r2=591644&view=diff
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/util/ContainerUtil.java
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/util/ContainerUtil.java
Sat Nov 3 09:19:46 2007
@@ -24,7 +24,7 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.context.servlet.ServletTilesApplicationContext;
+import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
/**
* @version $Rev$ $Date$
