Author: apetrelli
Date: Mon Mar 14 16:21:08 2011
New Revision: 1081442
URL: http://svn.apache.org/viewvc?rev=1081442&view=rev
Log:
TILESSHARED-24
Merge from trunk to sandbox.
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/assembly/src/site/site.xml
tiles/sandbox/trunk/tiles3/pom.xml
tiles/sandbox/trunk/tiles3/src/site/apt/migration/apis.apt
tiles/sandbox/trunk/tiles3/src/site/apt/migration/configuration.apt
tiles/sandbox/trunk/tiles3/src/site/apt/migration/extension.apt
tiles/sandbox/trunk/tiles3/src/site/apt/migration/index.apt
tiles/sandbox/trunk/tiles3/src/site/apt/migration/tags.apt
tiles/sandbox/trunk/tiles3/src/site/apt/selenium.apt
tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/advanced/preparer.apt
tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/configuration.apt
tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/view.apt
tiles/sandbox/trunk/tiles3/src/site/site.xml
tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/building.xml
tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/snapshots.xml
tiles/sandbox/trunk/tiles3/src/site/xdoc/index.xml
tiles/sandbox/trunk/tiles3/tiles-api/src/site/site.xml
tiles/sandbox/trunk/tiles3/tiles-compat/src/site/site.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/site/site.xml
tiles/sandbox/trunk/tiles3/tiles-freemarker/pom.xml
tiles/sandbox/trunk/tiles3/tiles-jsp/src/site/site.xml
tiles/sandbox/trunk/tiles3/tiles-servlet/src/site/site.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/ (props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
(props changed)
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/site/site.xml
tiles/sandbox/trunk/tiles3/tiles-velocity/pom.xml
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 16:21:08 2011
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367,989864-990230,996297,1042419,1061995,1080544,1080580-1081105
Modified: tiles/sandbox/trunk/tiles3/assembly/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/assembly/src/site/site.xml?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/assembly/src/site/site.xml (original)
+++ tiles/sandbox/trunk/tiles3/assembly/src/site/site.xml Mon Mar 14 16:21:08
2011
@@ -24,7 +24,7 @@
<project name="Apache Tiles - Assembly">
<body>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../../index.html"/>
Modified: tiles/sandbox/trunk/tiles3/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/pom.xml?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/pom.xml Mon Mar 14 16:21:08 2011
@@ -181,6 +181,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
<reportSets>
<reportSet>
<id>aggregated</id>
@@ -286,6 +287,122 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0-beta-3</version>
+ <configuration>
+ <reportingPlugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+
<artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+
<configLocation>http://svn.eu.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks.xml
+ </configLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+
<artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ <configuration>
+
<excludePackageNames>org.apache.tiles.test</excludePackageNames>
+ <links>
+
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+
<link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
+
<link>http://commons.apache.org/chain/apidocs</link>
+
<link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
+
<link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
+ </links>
+
<doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
+ <docletArtifact>
+ <groupId>gr.spinellis</groupId>
+
<artifactId>UmlGraph</artifactId>
+ <version>4.6</version>
+ </docletArtifact>
+ <additionalparam>
+ -inferrel
+ -inferdep -quiet
+ -hide
+ java.*
+ -collpackages
+ java.util.*
+ -qualify
+ -postfixpackage
+ -nodefontsize 9
+ -nodefontpackagesize 7
+ </additionalparam>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+
<exclude>**/*LICENSE.txt</exclude>
+
<exclude>**/*MANIFEST.MF</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>emma-maven-plugin</artifactId>
+ <version>1.0-alpha-3-SNAPSHOT</version>
+ </plugin>
+ </reportingPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/sandbox/trunk/tiles3/src/site/apt/migration/apis.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/migration/apis.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/migration/apis.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/migration/apis.apt Mon Mar 14
16:21:08 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/sandbox/trunk/tiles3/src/site/apt/migration/configuration.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/migration/configuration.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/migration/configuration.apt
(original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/migration/configuration.apt Mon Mar
14 16:21:08 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/sandbox/trunk/tiles3/src/site/apt/migration/extension.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/migration/extension.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/migration/extension.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/migration/extension.apt Mon Mar 14
16:21:08 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/sandbox/trunk/tiles3/src/site/apt/migration/index.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/migration/index.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/migration/index.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/migration/index.apt Mon Mar 14
16:21:08 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/sandbox/trunk/tiles3/src/site/apt/migration/tags.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/migration/tags.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/migration/tags.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/migration/tags.apt Mon Mar 14
16:21:08 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/sandbox/trunk/tiles3/src/site/apt/selenium.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/selenium.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/selenium.apt (original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/selenium.apt Mon Mar 14 16:21:08
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/sandbox/trunk/tiles3/src/site/apt/tutorial/advanced/preparer.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/advanced/preparer.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/advanced/preparer.apt
(original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/advanced/preparer.apt Mon
Mar 14 16:21:08 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/sandbox/trunk/tiles3/src/site/apt/tutorial/configuration.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/configuration.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/configuration.apt
(original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/configuration.apt Mon Mar
14 16:21:08 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/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/view.apt
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/view.apt?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/view.apt
(original)
+++ tiles/sandbox/trunk/tiles3/src/site/apt/tutorial/integration/view.apt Mon
Mar 14 16:21:08 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}}.
Modified: tiles/sandbox/trunk/tiles3/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/site.xml?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/site.xml (original)
+++ tiles/sandbox/trunk/tiles3/src/site/site.xml Mon Mar 14 16:21:08 2011
@@ -28,7 +28,7 @@
<href>http://www.apache.org</href>
</bannerLeft>
<bannerRight>
- <name>Apache Tiles 2</name>
+ <name>Apache Tiles™</name>
<src>http://tiles.apache.org/images/logo.png</src>
<href>http://tiles.apache.org</href>
</bannerRight>
@@ -36,11 +36,11 @@
<links>
<item name="Apache" href="http://www.apache.org"; />
- <item name="Tiles 2" href="http://tiles.apache.org"; />
+ <item name="Tiles" href="http://tiles.apache.org"; />
</links>
- <menu name="Apache Tiles">
+ <menu name="Apache Tiles™">
<item
name="Home"
href="../index.html"/>
Modified: tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/building.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/building.xml?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/building.xml (original)
+++ tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/building.xml Mon Mar 14
16:21:08 2011
@@ -24,7 +24,7 @@
<document>
<properties>
- <title>Apache Tiles 2</title>
+ <title>Apache Tiles</title>
</properties>
<body>
@@ -41,7 +41,7 @@
notice missing pictures inside JavaDocs pages.</p>
</subsection>
<subsection name="Building main packages">
- <p>To build Tiles 2 from source you need to:</p>
+ <p>To build Tiles from source you need to:</p>
<ul>
<li><p><a href="../download.html">download</a> the source
distribution, or checkout the latest version:</p>
Modified: tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/snapshots.xml
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/snapshots.xml?rev=1081442&r1=1081441&r2=1081442&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/snapshots.xml (original)
+++ tiles/sandbox/trunk/tiles3/src/site/xdoc/dev/snapshots.xml Mon Mar 14
16:21:08 2011
@@ -24,11 +24,11 @@
<document>
<properties>
- <title>Apache Tiles 2</title>
+ <title>Apache Tiles</title>
</properties>
<body>
- <section name="Tiles 2">
+ <section name="Apache Tiles™">
<subsection name="Snapshots">
<p>Looking for snapshot builds of the latest version of Tiles?
@@ -46,7 +46,7 @@
</source>
<p>After configuring the repository, declare a dependency on
- Tiles 2:</p>
+ Tiles:</p>
<source><
