Author: apetrelli
Date: Sat Jan 6 05:00:16 2007
New Revision: 493466
URL: http://svn.apache.org/viewvc?view=rev&rev=493466
Log:
SB-97
Ported code to Tiles 2 and Struts 1 - Tiles 2 integration module where possible.
Modified:
struts/sandbox/trunk/tiles/tiles-showcase/pom.xml
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/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
Modified: struts/sandbox/trunk/tiles/tiles-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-showcase/pom.xml?view=diff&rev=493466&r1=493465&r2=493466
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-showcase/pom.xml (original)
+++ struts/sandbox/trunk/tiles/tiles-showcase/pom.xml Sat Jan 6 05:00:16 2007
@@ -68,9 +68,14 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.9</version>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>1.3.6-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-tiles2</artifactId>
+ <version>1.3.6-SNAPSHOT</version>
</dependency>
</dependencies>
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -36,7 +36,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.TilesApplicationContext;
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -35,7 +35,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.TilesApplicationContext;
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.ComponentContext;
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 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.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentContext;
/**
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -36,7 +36,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessages;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.ComponentContext;
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -31,7 +31,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.tiles.DefinitionsUtil;
import org.apache.tiles.definition.ComponentDefinition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.FactoryNotFoundException;
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -27,7 +27,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentAttribute;
import org.apache.tiles.ComponentContext;
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.definition.ComponentDefinition;
import org.apache.tiles.definition.DefinitionsFactoryException;
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=493466&r1=493465&r2=493466
==============================================================================
---
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
Sat Jan 6 05:00:16 2007
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.tiles.actions.TilesAction;
+import org.apache.struts.tiles2.actions.TilesAction;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.definition.DefinitionsFactoryException;
