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 2008/10/05 18:04:41 UTC
svn commit: r701818 - in /tiles/framework/branches/TILES_2_0_X: ./
src/site/apt/ src/site/apt/dev/ src/site/apt/migration/
src/site/apt/tutorial/ src/site/apt/tutorial/advanced/
src/site/apt/tutorial/basic/ src/site/resources/images/ src/site/xdoc/dev/...
Author: apetrelli
Date: Sun Oct 5 09:04:40 2008
New Revision: 701818
URL: http://svn.apache.org/viewvc?rev=701818&view=rev
Log:
TILES-313
Merge from trunk to TILES_2_0_X branch.
Pages fixed.
Modified:
tiles/framework/branches/TILES_2_0_X/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/ (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/utils.apt
tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/pages.apt
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg (props changed)
tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg (props changed)
tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/ (props changed)
Propchange: tiles/framework/branches/TILES_2_0_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807
+/tiles/framework/trunk:676655,680114-680116,693549-693560,694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/config-reference.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807
+/tiles/framework/trunk/src/site/apt/config-reference.apt:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807
+/tiles/framework/trunk/src/site/apt/dev:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/getting_started.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807
+/tiles/framework/trunk/src/site/apt/getting_started.apt:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/migration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807
+/tiles/framework/trunk/src/site/apt/migration:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/selenium.apt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807
+/tiles/framework/trunk/src/site/apt/selenium.apt:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807
+/tiles/framework/trunk/src/site/apt/tutorial:694754,700541,701807,701815
Modified: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/utils.apt
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/utils.apt?rev=701818&r1=701817&r2=701818&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/utils.apt (original)
+++ tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/advanced/utils.apt Sun Oct 5 09:04:40 2008
@@ -40,7 +40,7 @@
------------------------------------
<servlet>
<servlet-name>Tiles Dispatch Servlet</servlet-name>
- <servlet-class>org.apache.tiles.web.TilesDispatchServlet</servlet-class>
+ <servlet-class>org.apache.tiles.web.util.TilesDispatchServlet</servlet-class>
</servlet>
...
<servlet-mapping>
Modified: tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/pages.apt
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/pages.apt?rev=701818&r1=701817&r2=701818&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/pages.apt (original)
+++ tiles/framework/branches/TILES_2_0_X/src/site/apt/tutorial/basic/pages.apt Sun Oct 5 09:04:40 2008
@@ -88,7 +88,7 @@
------------------------------------
<servlet>
<servlet-name>tiles</servlet-name>
- <servlet-class>org.apache.tiles.servlet.TilesServlet</servlet-class>
+ <servlet-class>org.apache.tiles.servlet.startup.TilesServlet</servlet-class>
<init-param>
<param-name>org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG</param-name>
<param-value>/WEB-INF/tiles-defs.xml</param-value>
@@ -104,13 +104,15 @@
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
-<definition name="myapp.homepage" template="/layouts/classic.jsp">
- <put-attribute name="title" value="Tiles tutorial homepage" />
- <put-attribute name="header" value="/tiles/banner.jsp" />
- <put-attribute name="menu" value="/tiles/common_menu.jsp" />
- <put-attribute name="body" value="/tiles/home_body.jsp" />
- <put-attribute name="footer" value="/tiles/credits.jsp" />
-</definition>
+<tiles-definitions>
+ <definition name="myapp.homepage" template="/layouts/classic.jsp">
+ <put-attribute name="title" value="Tiles tutorial homepage" />
+ <put-attribute name="header" value="/tiles/banner.jsp" />
+ <put-attribute name="menu" value="/tiles/common_menu.jsp" />
+ <put-attribute name="body" value="/tiles/home_body.jsp" />
+ <put-attribute name="footer" value="/tiles/credits.jsp" />
+ </definition>
+</tiles-definitions>
------------------------------------
* Render the definition
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/resources/images/page_to_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807
+/tiles/framework/trunk/src/site/resources/images/page_to_page.png:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/resources/images/tiled_page.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807
+/tiles/framework/trunk/src/site/resources/images/tiled_page.png:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/building.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807
+/tiles/framework/trunk/src/site/xdoc/dev/building.xml:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/dev/snapshots.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807
+/tiles/framework/trunk/src/site/xdoc/dev/snapshots.xml:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/page_to_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807
+/tiles/framework/trunk/src/site/xdoc/images/page_to_page.svg:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/src/site/xdoc/images/tiled_page.svg
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807
+/tiles/framework/trunk/src/site/xdoc/images/tiled_page.svg:694754,700541,701807,701815
Propchange: tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/reflect/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 5 09:04:40 2008
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807
+/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect:693549-693560,694754,700541,701807,701815