Author: apetrelli
Date: Sun Mar 13 12:55:18 2011
New Revision: 1081105
URL: http://svn.apache.org/viewvc?rev=1081105&view=rev
Log:
TILESSHARED-24
Fixed some more trademark symbols in APT files.
Modified:
tiles/framework/trunk/src/site/apt/migration/apis.apt
tiles/framework/trunk/src/site/apt/migration/configuration.apt
tiles/framework/trunk/src/site/apt/migration/extension.apt
tiles/framework/trunk/src/site/apt/migration/index.apt
tiles/framework/trunk/src/site/apt/migration/tags.apt
tiles/framework/trunk/src/site/apt/selenium.apt
tiles/framework/trunk/src/site/apt/tutorial/advanced/preparer.apt
tiles/framework/trunk/src/site/apt/tutorial/configuration.apt
tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt
Modified: tiles/framework/trunk/src/site/apt/migration/apis.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/migration/apis.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/migration/apis.apt (original)
+++ tiles/framework/trunk/src/site/apt/migration/apis.apt Sun Mar 13 12:55:18
2011
@@ -24,14 +24,14 @@
Introduction
In this part of the migration guide we address the differences of the APIs
- in Struts Tiles and Tiles 2.
+ in Struts Tiles and Apache Tiles\u0099.
If you are a Tiles extension developer and you want to convert your existing
extension, see {{{extension.html}Tiles extensions}} migration guide.
Controllers and View Preparers
- In Tiles 2, the concept of a Tiles <<<Controller>>>, i.e. an object that it
is
+ In Apache Tiles\u0099, the concept of a Tiles <<<Controller>>>, i.e. an
object that it is
invoked before rendering a definition, has been replaced with
<<<ViewPreparer>>>.
Modified: tiles/framework/trunk/src/site/apt/migration/configuration.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/migration/configuration.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/migration/configuration.apt (original)
+++ tiles/framework/trunk/src/site/apt/migration/configuration.apt Sun Mar 13
12:55:18 2011
@@ -97,7 +97,7 @@ Tiles configuration files translation
* Definitions attributes
*---------------------------------+--------------------------------+
-| <<Struts-Tiles>> | <<Tiles 2>> |
+| <<Struts-Tiles>> | <<Apache Tiles\u0099>> |
*---------------------------------+--------------------------------+
| <<<\<component-definitions\>>>> | <<<\<tiles-definitions\>>>> |
| <<<\<tiles-definitions\>>>> | |
@@ -113,7 +113,7 @@ Tiles configuration files translation
* \[1\] The default behaviour of <<<preparer>>> is to create and use a
single instance of the specified class. Anyway it is still possible to use a
URL as a preparer under a Struts 1 environment by using the
- {{{http://svn.apache.org/repos/asf/struts/struts1/trunk/tiles2/}Struts 1 -
Tiles 2}}
+ {{{http://svn.apache.org/repos/asf/struts/struts1/trunk/tiles2/}Struts 1 -
Apache Tiles\u0099}}
integration module, still under development.
@@ -124,7 +124,7 @@ Tiles configuration files translation
The rest of the conversion is in the table below.
*-----------------------+-----------------------------------------------+
-| <<Struts-Tiles>> | <<Tiles 2>> |
+| <<Struts-Tiles>> | <<Apache Tiles\u0099>> |
*-----------------------+-----------------------------------------------+
| <<<\<put\>>>> | <<<\<put-attribute\>>>> |
*-----------------------+-----------------------------------------------+
Modified: tiles/framework/trunk/src/site/apt/migration/extension.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/migration/extension.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/migration/extension.apt (original)
+++ tiles/framework/trunk/src/site/apt/migration/extension.apt Sun Mar 13
12:55:18 2011
@@ -33,11 +33,11 @@ Writing definitions factories
Usually, Struts-Tiles extension writing meant writing a
<<<DefinitionsFactory>>> or a <<<FactorySet>>> implementation. Here you will
- find how to convert your definitions factory to work correctly with Tiles 2.
+ find how to convert your definitions factory to work correctly with Apache
Tiles\u0099.
* Requests management
- Tiles 2 is now technology-independent, that means that Tiles 2 is no longer
+ Apache Tiles\u0099 is now technology-independent, that means that Apache
Tiles\u0099 is no longer
bound to a Servlet environment. That means for you that all references to
<<<HttpServletRequest>>> and <<<HttpServletResponse>>> have been removed,
replacing them with <<<TilesRequestContext>>>
@@ -58,11 +58,11 @@ Writing definitions factories
Class and interfaces new names
- The following is a conversion table between Struts-Tiles and Tiles 2 class
+ The following is a conversion table between Struts-Tiles and Apache
Tiles\u0099 class
names.
*---------------------------------+---------------------------------+
-| <<Struts-Tiles>> | <<Tiles 2>> |
+| <<Struts-Tiles>> | <<Apache Tiles\u0099>> |
*---------------------------------+---------------------------------+
| <<<ComponentDefinition>>> | <<<Definition>>> |
*---------------------------------+---------------------------------+
Modified: tiles/framework/trunk/src/site/apt/migration/index.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/migration/index.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/migration/index.apt (original)
+++ tiles/framework/trunk/src/site/apt/migration/index.apt Sun Mar 13 12:55:18
2011
@@ -24,34 +24,34 @@
Migration from Struts-Tiles
This tutorial is intended to provide a help when migrating from the previous
- version of Tiles, known as
+ version of Tiles, known as
<<{{{http://struts.apache.org/1.3.8/struts-tiles/index.html}Struts-Tiles}}>>.
To use Tiles you need to put in your web application library directory:
* <<<tiles-api.jar>>>: it contains the API to manipulate and render Tiles.
-
+
* <<<tiles-core.jar>>>: it contains the "engine" of Tiles, and the basic
implementation of the APIs.
-
+
* <<<tiles-servlet.jar>>>: it contains the servlet support in Tiles.
* <<<tiles-jsp.jar>>>: it contains the JSP support to Tiles, i.e. JSP
specific
classes and the tag library.
-
+
* <<<tiles-compat.jar>>>: it contains the compatibility layer of Tiles to
support Struts-Tiles 1.x XML definition files.
* Further steps
- * {{{configuration.html}Tiles configuration files}}: How to migrate Tiles
+ * {{{./configuration.html}Tiles configuration files}}: How to migrate Tiles
configuration files, the file usually named <<<tiles-defs.xml>>>.
- * {{{tags.html}Tiles JSP tags}}: How to migrate Tiles JSP tags, the
+ * {{{./tags.html}Tiles JSP tags}}: How to migrate Tiles JSP tags, the
<<<\<tiles:...\>>>> tags.
- * {{{apis.html}Java APIs considerations}}: Some information and warnings on
+ * {{{./apis.html}Java APIs considerations}}: Some information and warnings
on
the different behaviour of the Tiles Java API.
-
- * {{{extension.html}Tiles extensions}}: How to migrate Tiles
+
+ * {{{./extension.html}Tiles extensions}}: How to migrate Tiles
extensions, with explanation of main changes in the code structure.
Modified: tiles/framework/trunk/src/site/apt/migration/tags.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/migration/tags.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/migration/tags.apt (original)
+++ tiles/framework/trunk/src/site/apt/migration/tags.apt Sun Mar 13 12:55:18
2011
@@ -36,7 +36,7 @@ Tag library inclusion
Tags differences
- Here is the toughest part: Tiles 2 tags differ a lot comparing to Struts
+ Here is the toughest part: Apache Tiles\u0099 tags differ a lot comparing to
Struts
Tiles. However, after the change you will notice that the JSP code will be
easier to understand.
@@ -47,7 +47,7 @@ Tags differences
changes are summarized in the table below.
*---------------------------------+----------------------------------+
-| <<Struts-Tiles>> | <<Tiles 2>> |
+| <<Struts-Tiles>> | <<Apache Tiles\u0099>> |
*---------------------------------+----------------------------------+
| <<<\<tiles:insert\>>>> | <<<\<tiles:insertTemplate\>>>> |
| | <<<\<tiles:insertAttribute\>>>> |
@@ -72,7 +72,7 @@ Tags differences
* \[1\] The default behaviour of <<<preparer>>> is to create and use a
single instance of the specified class. Anyway it is still possible to use a
URL as a preparer under a Struts 1 environment by using the
- {{{http://svn.apache.org/repos/asf/struts/struts1/trunk/tiles2/}Struts 1 -
Tiles 2}}
+ {{{http://svn.apache.org/repos/asf/struts/struts1/trunk/tiles2/}Struts 1 -
Apache Tiles\u0099}}
integration module, still under development.
* Putting and adding attributes values
@@ -82,7 +82,7 @@ Tags differences
The rest of the conversion is in the table below.
*-------------------------+-----------------------------------------------+
-| <<Struts-Tiles>> | <<Tiles 2>> |
+| <<Struts-Tiles>> | <<Apache Tiles\u0099>> |
*-------------------------+-----------------------------------------------+
| <<<\<tiles:put\>>>> | <<<\<tiles:putAttribute\>>>> |
*-------------------------+-----------------------------------------------+
@@ -110,7 +110,7 @@ Tags differences
* Other changes
*---------------------------------+--------------------------------------------+
-| <<Struts-Tiles>> | <<Tiles 2>>
|
+| <<Struts-Tiles>> | <<Apache Tiles\u0099>>
|
*---------------------------------+--------------------------------------------+
| <<<\<tiles:get\>>>> | <<<\<tiles:insertAttribute\>>>>
|
*---------------------------------+--------------------------------------------+
Modified: tiles/framework/trunk/src/site/apt/selenium.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/selenium.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/selenium.apt (original)
+++ tiles/framework/trunk/src/site/apt/selenium.apt Sun Mar 13 12:55:18 2011
@@ -29,7 +29,7 @@ Selenium Testing
Explorer. The Selenium JavaScript code is deployed alongside your running
application, and interacts with it just as your users do.
- Tiles 2 uses Selenium for functional testing of the example apps.
+ Apache Tiles\u0099 uses Selenium for functional testing of the example apps.
The following example apps include Selenium tests:
* Tiles Test
@@ -148,7 +148,7 @@ mvn package cargo:start -P selenium -Dca
The Selenium IDE Firefox plugin is the easiest way to edit tests. With the
example app running, open the HTML file
(src/test/selenium/TestSomething.html)
- from your svn checkout of Tiles 2. Use the IDE to edit and run the test, and
+ from your svn checkout of Apache Tiles\u0099. Use the IDE to edit and run
the test, and
save your changes.
<<Note>>: Your changes will not be visible to the TestRunner in the deployed
Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/preparer.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/preparer.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/advanced/preparer.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/advanced/preparer.apt Sun Mar
13 12:55:18 2011
@@ -26,7 +26,7 @@ View Preparers
Sometimes a definition, before it is rendered, needs to be "prepared". For
example when showing a menu, the menu structure must be created and stored
in the request scope.
-
+
For this reason, a <<View Preparer>> can be used: it is called <<before>> the
definition is rendered, so all the things needed to render correctly the
definition can be prepared.
@@ -66,7 +66,7 @@ public class TestViewPreparer implements
----------------------------------------------
<definition name="preparer.definition"
preparer="org.apache.tiles.test.preparer.TestViewPreparer">
<put-attribute name="foo" value="/bar/foo.jsp" />
-</definition>
+</definition>
----------------------------------------------
* Customizing View Preparer association
@@ -75,6 +75,6 @@ public class TestViewPreparer implements
There will be only <<one>> instance per unique class name. If you want to
customize this behaviour, you have to create your own implementation of the
<<<PreparerFactory>>> interface.
-
- For example, the {{{../integration/frameworks.html}Struts 1 - Tiles 2
integration}}
+
+ For example, the {{{../integration/frameworks.html}Struts 1 - Apache
Tiles\u0099 integration}}
defines a <<<PreparerFactory>>> that can use a URL as a preparer.
Modified: tiles/framework/trunk/src/site/apt/tutorial/configuration.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/configuration.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/configuration.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/configuration.apt Sun Mar 13
12:55:18 2011
@@ -33,7 +33,7 @@ Configuring Tiles
Starting Tiles in a web application
Tiles has always been a web application package, usually used in conjunction
- with Struts. Tiles 2 evolved to the point of being technology-independent,
but
+ with Struts. Apache Tiles\u0099 evolved to the point of being
technology-independent, but
its use in a Servlet-based web application will be the most frequent use
case.
* Starting Tiles engine
Modified: tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt?rev=1081105&r1=1081104&r2=1081105&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt Sun Mar 13
12:55:18 2011
@@ -23,7 +23,7 @@
Integration with other View Technologies
- Currently Tiles 2 is only integrated with JavaServer Pages but it can be used
+ Currently Apache Tiles\u0099 is not only integrated with JavaServer Pages,
but it can be used
with:
* {{{freemarker.html}FreeMarker}}.
