Author: apetrelli
Date: Tue Nov 28 04:58:33 2006
New Revision: 480029
URL: http://svn.apache.org/viewvc?view=rev&rev=480029
Log:
SB-91
Changed imports to remove dependencies to Struts-Tiles.
Started the compilation error resolution.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelFactorySet.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelFactorySet.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelFactorySet.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelFactorySet.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/channel/ChannelFactorySet.java
Tue Nov 28 04:58:33 2006
@@ -27,18 +27,20 @@
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.xmlDefinition.DefinitionsFactory;
import org.apache.struts.tiles.xmlDefinition.FactorySet;
import org.apache.struts.tiles.xmlDefinition.XmlDefinitionsSet;
import org.apache.struts.tiles.xmlDefinition.XmlParser;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.FactoryNotFoundException;
import org.xml.sax.SAXException;
/**
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
Tue Nov 28 04:58:33 2006
@@ -31,7 +31,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.access.TilesAccess;
/**
@@ -80,7 +82,8 @@
HttpSession session = request.getSession();
// Try to retrieve tile context
- ComponentContext context = ComponentContext.getContext( request );
+ ComponentContext context = TilesAccess.getContainer( request )
+ .getComponentContext(request, response);
if( context == null )
{
throw new ServletException( "This action must be called by a Tile, not
directly" );
@@ -90,9 +93,11 @@
PortalSettings settings = getSettings( context, session );
// Set parameters for tiles
- context.putAttribute( "numCols", Integer.toString(settings.getNumCols()) );
+ context.putAttribute( "numCols", new ComponentAttribute(
+ Integer.toString(settings.getNumCols())));
for( int i=0; i<settings.getNumCols(); i++ )
- context.putAttribute( "list"+i, settings.getListAt(i) );
+ context.putAttribute( "list"+i, new ComponentAttribute(
+ settings.getListAt(i) ));
System.out.println("Exit action RetrievePortalAction");
return (mapping.findForward("success"));
@@ -110,7 +115,8 @@
if( settings == null )
{ // List doesn't exist, create it and initialize it from Tiles
parameters
settings = new PortalSettings();
- settings.setNumCols( (String)context.getAttribute( PARAM_NUMCOLS ) );
+ settings.setNumCols( (String)context.getAttribute( PARAM_NUMCOLS )
+ .getValue() );
for( int i=0; i<settings.getNumCols(); i++ )
{
List col = (List)context.getAttribute( ((String)PARAM_LIST+i) );
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
Tue Nov 28 04:58:33 2006
@@ -30,7 +30,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.access.TilesAccess;
/**
@@ -73,7 +74,8 @@
PortalPrefsForm prefsForm = (PortalPrefsForm)form;
// Try to retrieve tile context
- ComponentContext context = ComponentContext.getContext( request );
+ ComponentContext context = TilesAccess.getContainer( request )
+ .getComponentContext(request, response);
if( context == null )
{
throw new ServletException( "This action must be called by a Tile, not
directly" );
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/lang/SelectLocaleAction.java
Tue Nov 28 04:58:33 2006
@@ -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.struts.tiles.taglib.ComponentConstants;
+import org.apache.tiles.taglib.ComponentConstants;
/**
* @version $Rev$ $Date$
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
Tue Nov 28 04:58:33 2006
@@ -38,12 +38,12 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.Controller;
-import org.apache.struts.tiles.DefinitionsUtil;
-import org.apache.struts.tiles.actions.TilesAction;
-import org.apache.struts.tiles.beans.MenuItem;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.ComponentDefinition;
+import org.apache.tiles.Controller;
+import org.apache.tiles.DefinitionsUtil;
+import org.apache.tiles.actions.TilesAction;
+import org.apache.tiles.beans.MenuItem;
/**
* This controller load user menu settings and put them in tile context.
@@ -331,7 +331,7 @@
}
/**
- * @see
org.apache.struts.tiles.Controller#execute(org.apache.struts.tiles.ComponentContext,
javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
javax.servlet.ServletContext)
+ * @see
org.apache.tiles.Controller#execute(org.apache.tiles.ComponentContext,
javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
javax.servlet.ServletContext)
*/
public void execute(
ComponentContext tileContext,
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuSettingsAction.java
Tue Nov 28 04:58:33 2006
@@ -34,9 +34,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.actions.TilesAction;
-import org.apache.struts.tiles.beans.MenuItem;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.actions.TilesAction;
+import org.apache.tiles.beans.MenuItem;
/**
* Tiles controller as Struts Action.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
Tue Nov 28 04:58:33 2006
@@ -32,8 +32,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.actions.TilesAction;
/**
* This controller load user portal settings and put them in tile context.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalSettingsAction.java
Tue Nov 28 04:58:33 2006
@@ -28,8 +28,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.actions.TilesAction;
/**
* Implementation of <strong>Action</strong> that populates an instance of
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
Tue Nov 28 04:58:33 2006
@@ -39,7 +39,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-import org.apache.struts.tiles.ComponentContext;
+import org.apache.tiles.ComponentContext;
/**
* Read and parse RSS files found at on a given
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
Tue Nov 28 04:58:33 2006
@@ -37,8 +37,8 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.actions.TilesAction;
/**
* Read and parse RSS files found at on a given
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
Tue Nov 28 04:58:33 2006
@@ -31,11 +31,11 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.DefinitionsUtil;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+import org.apache.tiles.ComponentDefinition;
+import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.DefinitionsUtil;
+import org.apache.tiles.FactoryNotFoundException;
+import org.apache.tiles.NoSuchDefinitionException;
/**
* A catalog of available definitions.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
Tue Nov 28 04:58:33 2006
@@ -27,8 +27,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.actions.TilesAction;
/**
* Action used to set user skin.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
Tue Nov 28 04:58:33 2006
@@ -31,10 +31,10 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.ComponentDefinition;
+import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.actions.TilesAction;
/**
* Customize layouts according to predefined "skin"
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
Tue Nov 28 04:58:33 2006
@@ -31,9 +31,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.actions.TilesAction;
/**
* Simple Switch Layout
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/template/DynTemplateAction.java
Tue Nov 28 04:58:33 2006
@@ -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.struts.tiles.ComponentDefinition;
+import org.apache.tiles.ComponentDefinition;
/**
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/NoForward.java
Tue Nov 28 04:58:33 2006
@@ -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.struts.tiles.ComponentContext;
+import org.apache.tiles.ComponentContext;
/**
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestActionTileAction.java
Tue Nov 28 04:58:33 2006
@@ -28,12 +28,12 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ComponentDefinition;
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.DefinitionsUtil;
-import org.apache.struts.tiles.FactoryNotFoundException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.ComponentDefinition;
+import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.DefinitionsUtil;
+import org.apache.tiles.FactoryNotFoundException;
+import org.apache.tiles.NoSuchDefinitionException;
/**
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java?view=diff&rev=480029&r1=480028&r2=480029
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-showcase/src/main/java/org/apache/tiles/showcase/test/TestTileController.java
Tue Nov 28 04:58:33 2006
@@ -29,8 +29,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.tiles.ComponentContext;
-import org.apache.struts.tiles.ControllerSupport;
+import org.apache.tiles.ComponentContext;
+import org.apache.tiles.ControllerSupport;
/**
