Author: apetrelli
Date: Mon Feb 12 03:27:16 2007
New Revision: 506421
URL: http://svn.apache.org/viewvc?view=rev&rev=506421
Log:
TILES-11
Fixed class references and removed "controllerUrl" attributes.
Modified:
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp
Modified:
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml?view=diff&rev=506421&r1=506420&r2=506421
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-examples-config.xml
Mon Feb 12 03:27:16 2007
@@ -39,13 +39,13 @@
<!-- Logon form bean -->
<form-bean name="myPortalSettingsForm"
-
type="org.apache.struts.webapp.tiles.portal.PortalSettingsForm"/>
+
type="org.apache.tiles.showcase.portal.PortalSettingsForm"/>
<!-- Menu settings form bean -->
<form-bean name="myMenuSettingsForm"
-
type="org.apache.struts.webapp.tiles.portal.MenuSettingsForm"/>
+ type="org.apache.tiles.showcase.portal.MenuSettingsForm"/>
<!-- Skin settings form bean -->
<form-bean name="mySkinSettingsForm"
-
type="org.apache.struts.webapp.tiles.skin.LayoutSettingsForm"/>
+ type="org.apache.tiles.showcase.skin.LayoutSettingsForm"/>
</form-beans>
@@ -66,12 +66,12 @@
<!-- Dynamic Portal user lists retrieving action -->
<action path="/myPortal"
-
type="org.apache.struts.webapp.tiles.portal.UserPortalAction">
+
type="org.apache.tiles.showcase.portal.UserPortalAction">
</action>
<!-- Tiles Action associated to portal settings -->
<action path="/controller/myPortalSettings"
-
type="org.apache.struts.webapp.tiles.portal.UserPortalSettingsAction"
+
type="org.apache.tiles.showcase.portal.UserPortalSettingsAction"
name="myPortalSettingsForm" >
</action>
@@ -84,7 +84,7 @@
<!-- Tiles Action associated to Tile myMenuSettings -->
<action path="/controller/myMenuSettings"
-
type="org.apache.struts.webapp.tiles.portal.UserMenuSettingsAction"
+
type="org.apache.tiles.showcase.portal.UserMenuSettingsAction"
name="myMenuSettingsForm" >
</action>
@@ -107,19 +107,19 @@
parameter="examples.skin.settings.page"/>
<action path="/controller/mySkinSettings"
- type="org.apache.struts.webapp.tiles.skin.LayoutSettingsAction"
+ type="org.apache.tiles.showcase.skin.LayoutSettingsAction"
name="mySkinSettingsForm" >
</action>
<action path="/controller/layoutSwitch"
- type="org.apache.struts.webapp.tiles.skin.LayoutSwitchAction"
>
+ type="org.apache.tiles.showcase.skin.LayoutSwitchAction" >
</action>
<!-- ======================================================= -->
<!-- Tiles 1.1 Rss Channel -->
<!-- ======================================================= -->
<action path="/controller/rssChannel"
-
type="org.apache.struts.webapp.tiles.rssChannel.RssChannelsAction">
+ type="org.apache.tiles.showcase.rssChannel.RssChannelsAction">
</action>
<!-- ======================================================= -->
Modified:
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml?view=diff&rev=506421&r1=506420&r2=506421
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tests-config.xml
Mon Feb 12 03:27:16 2007
@@ -57,19 +57,19 @@
<!-- Test Struts action and Tiles integration -->
<action path="/testAction"
-
type="org.apache.struts.webapp.tiles.test.TestActionTileAction">
+
type="org.apache.tiles.showcase.test.TestActionTileAction">
<forward name="success" path="test.struts.action"/>
<forward name="failure" path="test.struts.action.fail"/>
</action>
<!-- Test Struts Forwardintegration -->
<action path="/testForward"
-
type="org.apache.struts.webapp.tiles.test.TestActionTileAction"
+
type="org.apache.tiles.showcase.test.TestActionTileAction"
forward="test.struts.action"/>
<!-- Test Struts action and Tiles integration -->
<action path="/testActionForwardJsp"
-
type="org.apache.struts.webapp.tiles.test.TestActionTileAction">
+
type="org.apache.tiles.showcase.test.TestActionTileAction">
<forward name="success" path="/layout.jsp"/>
<forward name="failure" path="test.struts.action.fail"/>
</action>
@@ -83,7 +83,7 @@
<!-- Test Struts action and Tiles integration -->
<action path="/showRequestURI"
- type="org.apache.struts.webapp.tiles.test.NoForward">
+ type="org.apache.tiles.showcase.test.NoForward">
<forward name="success" path="test.action.noforward"/>
</action>
Modified:
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml?view=diff&rev=506421&r1=506420&r2=506421
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/struts-tutorial-config.xml
Mon Feb 12 03:27:16 2007
@@ -40,11 +40,11 @@
<!-- Logon form bean -->
<form-bean name="invoiceForm"
- type="org.apache.struts.webapp.tiles.invoice.InvoiceForm"/>
+ type="org.apache.tiles.showcase.invoice.InvoiceForm"/>
<!-- Portal form bean -->
<form-bean name="portalPrefsForm"
-
type="org.apache.struts.webapp.tiles.dynPortal.PortalPrefsForm"/>
+
type="org.apache.tiles.showcase.dynPortal.PortalPrefsForm"/>
</form-beans>
@@ -69,26 +69,26 @@
<!-- Edit user registration -->
<action path="/forwardExampleAction"
-
type="org.apache.struts.webapp.tiles.tutorial.ForwardExampleAction">
+ type="org.apache.tiles.showcase.tutorial.ForwardExampleAction">
<forward name="success"
path="forward.example.success.page"/>
</action>
<!-- Edit invoice example -->
<action path="/lang"
- type="org.apache.struts.webapp.tiles.lang.SelectLocaleAction">
+ type="org.apache.tiles.showcase.lang.SelectLocaleAction">
<forward name="failure" path="/index.jsp"/>
<forward name="success" path="/index.jsp"/>
</action>
<!-- Dynamic template example -->
<action path="/dynTemplate"
-
type="org.apache.struts.webapp.tiles.template.DynTemplateAction">
+ type="org.apache.tiles.showcase.template.DynTemplateAction">
<forward name="success" path="/dynFramesetPage.jsp"/>
</action>
<!-- Edit invoice example -->
<action path="/invoice/editInvoice"
-
type="org.apache.struts.webapp.tiles.invoice.EditInvoiceAction"
+
type="org.apache.tiles.showcase.invoice.EditInvoiceAction"
name="invoiceForm" >
<forward name="success" path="/invoice/index.jsp"/>
</action>
@@ -98,7 +98,7 @@
<!-- ======================================================= -->
<!-- Dynamic Portal user lists retrieving action -->
<action path="/actions/myPortal"
-
type="org.apache.struts.webapp.tiles.dynPortal.RetrievePortalAction">
+
type="org.apache.tiles.showcase.dynPortal.RetrievePortalAction">
<forward name="success" path="main.portal.body"/>
</action>
@@ -111,7 +111,7 @@
<!-- Dynamic Portal user lists set tile-action -->
<action path="/actions/myPortalPrefs.tile"
-
type="org.apache.struts.webapp.tiles.dynPortal.SetPortalPrefsAction"
+
type="org.apache.tiles.showcase.dynPortal.SetPortalPrefsAction"
name="portalPrefsForm">
<forward name="preferences" path="/dynPortal/myPortalPrefTile.jsp"/>
<forward name="portal" path="dynamic.portal.body"/>
@@ -121,7 +121,7 @@
<!-- Rss Channel -->
<!-- ======================================================= -->
<action path="/actions/rssChannel"
- type="org.apache.struts.webapp.tiles.rssChannel.Channels">
+ type="org.apache.tiles.showcase.rssChannel.Channels">
<forward name="continue" path="/dynPortal/Channels.jsp"/>
<forward name="error" path="/dynPortal/Errors.jsp"/>
</action>
@@ -130,13 +130,13 @@
<!-- test, to be removed -->
<!-- ======================================================= -->
<action path="/testAction"
- type="org.apache.struts.webapp.tiles.lang.SelectLocaleAction">
+ type="org.apache.tiles.showcase.lang.SelectLocaleAction">
<forward name="failure" path="/common/footer.jsp"/>
<forward name="success" path="/common/footer.jsp"/>
</action>
<action path="/testAction2"
-
type="org.apache.struts.webapp.tiles.tutorial.ForwardExampleAction">
+ type="org.apache.tiles.showcase.tutorial.ForwardExampleAction">
<forward name="failure" path="forward.example.success.page"/>
<forward name="success" path="forward.example.success.page"/>
</action>
Modified:
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml?view=diff&rev=506421&r1=506420&r2=506421
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-examples-defs.xml
Mon Feb 12 03:27:16 2007
@@ -103,7 +103,7 @@
Definition only contains default items.
-->
<definition name="examples.userMenu" extends="examples.menu.root"
- preparer="org.apache.struts.webapp.tiles.portal.UserMenuAction" >
+ preparer="org.apache.tiles.showcase.portal.UserMenuAction" >
<putAttribute name="catalogSettings"
value="examples.myMenu.catalog.settings"/>
<putAttribute name="catalogName" value="examples.portal.menuCatalog"/>
<putAttribute name="title" value="My Menu" />
@@ -200,7 +200,7 @@
<!-- Portal Body declaration-->
<definition name="examples.portal.body" template="/layouts/columnsLayout.jsp"
- controllerUrl="/examples/myPortal.do" >
+ preparer="/examples/myPortal.do" >
<putAttribute name="numCols" value="2" />
<putListAttribute name="list0" >
<addAttribute value="/examples/tiles/portal/login.jsp" />
@@ -245,7 +245,7 @@
<definition name="examples.portal.settings.body"
template="/examples/tiles/myPortalSettings.jsp"
extends="examples.portal.body"
-
controllerUrl="/examples/controller/myPortalSettings.do" >
+ preparer="/examples/controller/myPortalSettings.do" >
</definition>
<!-- ======================================================= -->
@@ -263,7 +263,7 @@
<definition name="examples.userMenu.settings.body"
template="/examples/tiles/myMenuSettings.jsp"
extends="examples.userMenu"
-
controllerUrl="/examples/controller/myMenuSettings.do" >
+ preparer="/examples/controller/myMenuSettings.do" >
<putListAttribute name="defaultChoice" >
<addAttribute value="examples.userMenu" />
<addAttribute value="portal.menu.links" />
@@ -344,7 +344,7 @@
<!-- Example to use when connected (online)-->
<definition name="examples.rssChannel.body"
template="/examples/tiles/rssChannels.jsp"
- controllerUrl="/examples/controller/rssChannel.do" >
+ preparer="/examples/controller/rssChannel.do" >
<putListAttribute name="urls" >
<!--<putAttribute value="http://www.newsforge.com/newsforge.rss"; />
-->
<addAttribute value="http://xmlhack.com/rss.php"; />
@@ -356,7 +356,7 @@
<!-- Example whith local feeds (offline)-->
<definition name="examples.rssChannel.offline.body"
template="/examples/tiles/rssChannels.jsp"
- controllerUrl="/examples/controller/rssChannel.do" >
+ preparer="/examples/controller/rssChannel.do" >
<putListAttribute name="urls" >
<addAttribute value="/examples/rssFeed/rss-example.xml" />
<addAttribute value="/examples/rssFeed/apacheweek-headlines.xml" />
@@ -376,7 +376,7 @@
<!-- Skin body declaration-->
<definition name="examples.skin.settings.body"
template="/examples/tiles/mySkinSettings.jsp"
-
controllerUrl="/examples/controller/mySkinSettings.do" >
+ preparer="/examples/controller/mySkinSettings.do" >
<putAttribute name="userSettingsName"
value="tiles.examples.skin.user.settings" />
<!--<putAttribute name="catalogName"
value="tiles.examples.skin.catalog" />-->
<putAttribute name="catalogSettings"
value="examples.available.skins" />
Modified:
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml?view=diff&rev=506421&r1=506420&r2=506421
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/webapp/WEB-INF/tiles-tests-defs.xml
Mon Feb 12 03:27:16 2007
@@ -96,7 +96,7 @@
<!-- Test Tiles Controller -->
<definition name="test.struts.controller"
template="/test/layout.jsp"
- preparer="org.apache.struts.webapp.tiles.test.TestTileController" >
+ preparer="org.apache.tiles.showcase.test.TestTileController" >
<putAttribute name="title" value="Test Tile Controller : call to
Controller" />
<putAttribute name="header" value="header.jsp"/>
<putAttribute name="body" value="body.jsp" />
Modified:
tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp?view=diff&rev=506421&r1=506420&r2=506421
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp
(original)
+++ tiles/examples/trunk/tiles-showcase/src/main/webapp/test/testController.jsp
Mon Feb 12 03:27:16 2007
@@ -35,7 +35,7 @@
<strong>Test controller set in insert</strong>
<br>
<tiles:insertTemplate template="layout.jsp"
-
controllerClass="org.apache.struts.webapp.tiles.test.TestTileController" >
+ preparer="org.apache.tiles.showcase.test.TestTileController" >
<tiles:putAttribute name="title" value="Test controller set in insert" />
<tiles:putAttribute name="header" value="header.jsp" />
<tiles:putAttribute name="body" value="body.jsp" />
@@ -45,7 +45,7 @@
<strong>Test controller set in insert, and attribute from definition</strong>
<br>
<tiles:insertDefinition name="test.layout.test1"
-
controllerClass="org.apache.struts.webapp.tiles.test.TestTileController" >
+ preparer="org.apache.tiles.showcase.test.TestTileController" >
<tiles:putAttribute name="title" value="Test controller set in insert, and
attribute from definition" />
</tiles:insertDefinition>
