Author: mck Date: Sat Nov 16 19:17:25 2013 New Revision: 1542554 URL: http://svn.apache.org/r1542554 Log: forward port changes from r1539480 to r1541580 with svn merge -r1539480:1541580 ^/tiles/framework/branches/TILES_3_0_X .
>------------------------------------------------------------------------ >r1541580 | mck | 2013-11-13 17:14:06 +0100 (Wed, 13 Nov 2013) | 3 lines > >redo r1541483 > fixing links in site.xml ( http://jira.codehaus.org/browse/MSITE-159 ) > >------------------------------------------------------------------------ >r1541483 | mck | 2013-11-13 12:52:29 +0100 (Wed, 13 Nov 2013) | 9 lines > >new website style, and update after tiles-3.0.3 release. >proper trademark and logo attribute. > >references: > - http://thread.gmane.org/gmane.comp.apache.tiles.devel/602 > - http://svn.apache.org/viewvc?view=revision&revision=1539491 > - http://thread.gmane.org/gmane.comp.apache.tiles.devel/599 > - http://www.apache.org/foundation/marks/pmcs#graphics > >------------------------------------------------------------------------ >r1539842 | mck | 2013-11-07 23:11:58 +0100 (Thu, 07 Nov 2013) | 2 lines > >add mustache to the list of templating languages supported > >------------------------------------------------------------------------ >r1539841 | mck | 2013-11-07 23:11:13 +0100 (Thu, 07 Nov 2013) | 2 lines > >-Duser.name needs to be defined inside the deploy goal too > >------------------------------------------------------------------------ >r1539840 | mck | 2013-11-07 23:09:46 +0100 (Thu, 07 Nov 2013) | 3 lines > >fix documentation after feedback from Emi Lu. >Reference: http://article.gmane.org/gmane.comp.apache.tiles.user/661 > Modified: tiles/framework/trunk/ (props changed) tiles/framework/trunk/assembly/src/site/site.xml tiles/framework/trunk/src/site/apt/dev/release.apt tiles/framework/trunk/src/site/apt/tutorial/advanced/list-attributes.apt tiles/framework/trunk/src/site/apt/tutorial/integration/frameworks.apt tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt tiles/framework/trunk/src/site/site.xml tiles/framework/trunk/tiles-api/src/site/site.xml tiles/framework/trunk/tiles-compat/src/site/site.xml tiles/framework/trunk/tiles-core/src/site/site.xml tiles/framework/trunk/tiles-el/src/site/site.xml tiles/framework/trunk/tiles-extras/src/site/site.xml tiles/framework/trunk/tiles-freemarker/src/site/site.xml tiles/framework/trunk/tiles-jsp/src/site/site.xml tiles/framework/trunk/tiles-mvel/src/site/site.xml tiles/framework/trunk/tiles-ognl/src/site/site.xml tiles/framework/trunk/tiles-servlet/src/site/site.xml tiles/framework/trunk/tiles-template/src/site/site.xml tiles/framework/trunk/tiles-test-pom/src/site/site.xml tiles/framework/trunk/tiles-test-pom/tiles-test/ (props changed) tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml tiles/framework/trunk/tiles-velocity/src/site/site.xml Propchange: tiles/framework/trunk/ ------------------------------------------------------------------------------ Merged /tiles/framework/branches/TILES_3_0_X:r1539481-1541580 Modified: tiles/framework/trunk/assembly/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/assembly/src/site/site.xml (original) +++ tiles/framework/trunk/assembly/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,65 @@ */ --> <project name="Apache Tiles - Assembly"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> ${modules} ${reports} + + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/src/site/apt/dev/release.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/dev/release.apt?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/src/site/apt/dev/release.apt (original) +++ tiles/framework/trunk/src/site/apt/dev/release.apt Sat Nov 16 19:17:25 2013 @@ -146,7 +146,7 @@ mvn release:prepare -Dusername=YOUR_SVN_ To perform the release, i.e. creating and deploying Maven artifacts, use: ----------------------------------- -mvn release:perform +mvn release:perform -Duser.name=YOUR_PEOPLE_APACHE_SSH_USER -Darguments="-Duser.name=YOUR_PEOPLE_APACHE_SSH_USER" ----------------------------------- It should compile and test everything, build and upload the artifacts and the website for the project. Modified: tiles/framework/trunk/src/site/apt/tutorial/advanced/list-attributes.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/advanced/list-attributes.apt?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/src/site/apt/tutorial/advanced/list-attributes.apt (original) +++ tiles/framework/trunk/src/site/apt/tutorial/advanced/list-attributes.apt Sat Nov 16 19:17:25 2013 @@ -48,8 +48,9 @@ List Attributes --------------------------------------- <%@ taglib uri="http://tiles.apache.org/tags-tiles"; prefix="tiles" %> +<%@ taglib uri="http://tiles.apache.org/tags-tiles-extras"; prefix="tilesx" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt"; prefix="c" %> -<tiles:useAttribute id="list" name="items" classname="java.util.List" /> +<tilesx:useAttribute id="list" name="items" classname="java.util.List" /> <c:forEach var="item" items="${list}"> <tiles:insertAttribute value="${item}" flush="true" /> <br/> @@ -93,4 +94,3 @@ List Attributes * /tiles/credits.jsp * /tiles/greetings.jsp - \ No newline at end of file Modified: tiles/framework/trunk/src/site/apt/tutorial/integration/frameworks.apt URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/integration/frameworks.apt?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/src/site/apt/tutorial/integration/frameworks.apt (original) +++ tiles/framework/trunk/src/site/apt/tutorial/integration/frameworks.apt Sat Nov 16 19:17:25 2013 @@ -25,17 +25,19 @@ Integration with other web Frameworks Tiles can be integrated with other web frameworks. Usually this kind of integration is made through extensions/plugins to Tiles. - + * {{{http://struts.apache.org/1.x/index.html}Struts 1}}: Currently under development. A Struts 1 plugin is available in the SVN trunk, that presumably will be released along with Struts 1.4. - - * {{{http://struts.apache.org/2.x/docs/tiles-plugin.html}Struts 2}}: at the time of this + + * {{{http://struts.apache.org/development/2.x/struts2-plugins/struts2-tiles-plugin/apidocs/index.html}Struts 2}}: at the time of this writing, the Struts 2 Tiles plugin still uses Tiles version 2. - - * {{{http://static.springsource.org/spring/docs/current/spring-framework-reference/html/view.html#view-tiles}Spring MVC}}: - At the time of this writing, Spring uses Tiles version 2. - - * {{{http://shale.apache.org/shale-tiles/index.html}Shale}}: An integration - layer is provided, but it needs to be updated to the latest released version - of Tiles. + + * {{{http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/view.html#view-tiles}Spring MVC}}: + Spring-3.2 can integration up to Tiles-2 and Tiles-3. + + + + For a closer look at custom integrations the + {{{https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3}spring code}}: + forms a good example. 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=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt (original) +++ tiles/framework/trunk/src/site/apt/tutorial/integration/view.apt Sat Nov 16 19:17:25 2013 @@ -29,3 +29,5 @@ Integration with other View Technologies * {{{./freemarker.html}FreeMarker}}. * {{{./velocity.html}Velocity}}. + + * Mustache. Modified: tiles/framework/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/src/site/site.xml (original) +++ tiles/framework/trunk/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,40 +22,60 @@ */ --> <project name="Apache Tiles - Framework"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> <bannerLeft> - <name>Apache Software Foundation</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> - </bannerLeft> - <bannerRight> <name>Apache Tiles™</name> <src>http://tiles.apache.org/images/logo.png</src> <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> </bannerRight> <body> - <links> - <item name="Apache" href="http://www.apache.org"; /> - <item name="Tiles" href="http://tiles.apache.org"; /> - </links> - - <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../index.html"/> <item - name="Tiles project start page" - href="./index.html"/> + name="Tiles 3.0.x" + href="index.html"/> + <item + name="Autotag 1.0.x" + href="../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../tiles-request/index.html"/> <item name="Security bulletins" href="security/index.html"/> </menu> - <menu name="Documentation"> + <menu name="User Documentation"> <item name="What's new" href="whats-new.html"/> <item + name="Getting Started" + href="getting_started.html"/> + <item name="Tutorial" href="tutorial/index.html" collapse="true"> @@ -137,14 +157,11 @@ name="Wiki" href="http://cwiki.apache.org/TILES/"/> <item - name="Migration" + name="Struts Migration" href="migration/index.html"/> </menu> <menu name="Reference"> <item - name="Getting Started" - href="getting_started.html"/> - <item name="Configuration reference" href="config-reference.html"/> <item @@ -164,20 +181,26 @@ <menu name="Developers"> <item name="Building" - href="/dev/building.html"/> + href="dev/building.html"/> <item name="Snapshots" - href="/dev/snapshots.html"/> + href="dev/snapshots.html"/> <item name="Release Process" - href="/dev/release.html"/> + href="dev/release.html"/> <item name="Selenium Testing" - href="/selenium.html"/> + href="selenium.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-api/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-api/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-api/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - API"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-compat/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-compat/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-compat/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Compatibility Library"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-core/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-core/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-core/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Core Library"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-el/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-el/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-el/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-el/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - EL Support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-extras/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-extras/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-extras/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-extras/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Extras"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-freemarker/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-freemarker/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-freemarker/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Freemarker Support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-jsp/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-jsp/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-jsp/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - JSP support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-mvel/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-mvel/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-mvel/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-mvel/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - MVEL Support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-ognl/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-ognl/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-ognl/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-ognl/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - OGNL Support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-servlet/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-servlet/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-servlet/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Servlet Support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-template/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-template/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-template/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Template Technologies Support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-test-pom/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-test-pom/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-test-pom/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Test Webapp Module Collector"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Propchange: tiles/framework/trunk/tiles-test-pom/tiles-test/ ------------------------------------------------------------------------------ Merged /tiles/framework/branches/TILES_3_0_X/tiles-test-pom/tiles-test:r1539481-1541580 Modified: tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-test-pom/tiles-test/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Test web application"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project> Modified: tiles/framework/trunk/tiles-velocity/src/site/site.xml URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/site/site.xml?rev=1542554&r1=1542553&r2=1542554&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/site/site.xml (original) +++ tiles/framework/trunk/tiles-velocity/src/site/site.xml Sat Nov 16 19:17:25 2013 @@ -22,19 +22,64 @@ */ --> <project name="Apache Tiles - Velocity Support"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <gitHub> + <projectId>apache/tiles</projectId> + <ribbonOrientation>right</ribbonOrientation> + <ribbonColor>darkblue</ribbonColor> + </gitHub> + </fluidoSkin> + </custom> + <bannerLeft> + <name>Apache Tiles™</name> + <src>http://tiles.apache.org/images/logo.png</src> + <href>http://tiles.apache.org</href> + </bannerLeft> + <bannerRight> + <name>Apache Software Foundation</name> + <src>http://struts.apache.org/images/asf-logo.gif</src> + <href>http://www.apache.org</href> + </bannerRight> <body> <menu name="Apache Tiles™"> <item - name="Home" + name="Welcome" href="../../index.html"/> <item - name="Parent module" - href="../index.html"/> + name="Tiles 3.0.x" + href="../../framework/index.html"/> + <item + name="Autotag 1.0.x" + href="../../tiles-autotag/index.html"/> + <item + name="Request 1.0.x" + href="../../tiles-request/index.html"/> + <item + name="Security bulletins" + href="../security/index.html"/> + <item + name="Download" + href="http://tiles.apache.org/download.html"/> </menu> <menu ref="modules" /> <menu ref="reports" /> + <footer> + <div class="row span12"> + Apache Tiles, Tiles, Apache, the Apache feather logo, and the Apache Tiles + project logos are trademarks of The Apache Software Foundation. + </div> + </footer> </body> </project>
