Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
8c1738d
[maven-release-plugin] copy for branch TILES_3_0_X
nlebas May 4, 2012
057b258
[maven-release-plugin] prepare release tiles-parent-3.0.0
nlebas May 4, 2012
5b5d43b
[maven-release-plugin] prepare for next development iteration
nlebas May 4, 2012
27d7683
TILES-549 - Improve code quality (post 3.0 release)
nlebas Jul 11, 2012
d5f20ef
update to autotag 1.1
nlebas Jul 11, 2012
5a6180c
TILES-548: mvn release:perfom fails on Maven 3.0.4
nlebas Jul 11, 2012
cba6cb0
[maven-release-plugin] prepare release tiles-parent-3.0.1
nlebas Jul 11, 2012
e2d70b5
[maven-release-plugin] prepare for next development iteration
nlebas Jul 11, 2012
0261c4c
[maven-release-plugin] rollback the release of tiles-parent-3.0.1
nlebas Jul 11, 2012
af6818d
TILES-548: mvn release:perfom fails on Maven 3.0.4
nlebas Jul 11, 2012
b172003
[maven-release-plugin] prepare release tiles-parent-3.0.1
nlebas Jul 11, 2012
edc09b2
[maven-release-plugin] prepare for next development iteration
nlebas Jul 11, 2012
ca1adae
backport r1427572
michaelsembwever Jan 1, 2013
0756682
backport doc improvements from Michael Isvy
michaelsembwever Jan 2, 2013
828ae53
TILES-563: Typo on configuration tiles 3 page
nlebas Mar 5, 2013
8b05318
have the constant public.
michaelsembwever May 19, 2013
a2767c1
back port from trunk r1368433 (TILES-557) and r1422025
michaelsembwever May 19, 2013
8347610
add link to Download page on each microsite
michaelsembwever May 27, 2013
2a2e7d1
compile against Java6
michaelsembwever May 27, 2013
9ca0d6e
upgrade to tiles-master-5.
michaelsembwever Oct 28, 2013
b98027f
Use the new tiles-master-6
michaelsembwever Nov 3, 2013
816f794
[maven-release-plugin] prepare release tiles-parent-3.0.2
michaelsembwever Nov 3, 2013
abc80cc
[maven-release-plugin] prepare for next development iteration
michaelsembwever Nov 3, 2013
d02515d
lessons learnt from the tiles-3.0.2 release
michaelsembwever Nov 3, 2013
276a725
TILES-573 – Tiles.xml definitions not reloaded when using expressions
michaelsembwever Nov 6, 2013
9477bdc
[maven-release-plugin] prepare release tiles-parent-3.0.3
michaelsembwever Nov 6, 2013
5192836
[maven-release-plugin] prepare for next development iteration
michaelsembwever Nov 6, 2013
d391ba1
fix documentation after feedback from Emi Lu.
michaelsembwever Nov 7, 2013
b347a93
-Duser.name needs to be defined inside the deploy goal too
michaelsembwever Nov 7, 2013
b19a0eb
add mustache to the list of templating languages supported
michaelsembwever Nov 7, 2013
fea6efc
new website style, and update after tiles-3.0.3 release.
michaelsembwever Nov 13, 2013
20c7ff4
redo r1541483
michaelsembwever Nov 13, 2013
ac67bbf
TILES-574 – Tiles expressions do not work after wildcard
michaelsembwever Nov 18, 2013
c328921
TILES-576 – Please delete old releases from mirroring system
michaelsembwever Nov 27, 2013
f07e17d
Use blank strings instead of nulls as placeholder values when replaci…
michaelsembwever Feb 25, 2014
32fa836
TILES-571 – Please make the significance of underscore (_) in tiles d…
michaelsembwever Mar 30, 2014
fff6c31
clean up slf4j dependencies
michaelsembwever Mar 30, 2014
ca209f7
tiles-request-1.0.4
michaelsembwever May 3, 2014
d6e4c7f
[maven-release-plugin] prepare release tiles-parent-3.0.4
michaelsembwever May 3, 2014
d10fa23
[maven-release-plugin] prepare for next development iteration
michaelsembwever May 3, 2014
a8f6948
further fixes on
michaelsembwever May 14, 2014
b2d71c3
tiles-request-1.0.5-SNAPSHOT
michaelsembwever May 29, 2014
c7b5518
TILES-580 getAsString does not support expressions
nlebas Sep 16, 2014
c77693c
fix jenkins
nlebas Sep 16, 2014
f2c0d16
bump to tiles-request 1.0.6
nlebas Sep 22, 2014
1d067ea
[maven-release-plugin] prepare release tiles-parent-3.0.5
nlebas Sep 22, 2014
abf103f
[maven-release-plugin] prepare for next development iteration
nlebas Sep 22, 2014
ef97bd6
TILES-583 changed the broken link
michaelsembwever Mar 12, 2015
cc11955
TILES-584: EL expressions not working for list attributes
nlebas Mar 14, 2015
d58f149
Documentation spelling errors fixed – https://github.com/apache/tiles…
michaelsembwever Oct 1, 2015
f43c78c
TILES-585 – Definition cascade attributes duplicated values under hig…
michaelsembwever Jul 13, 2016
bdf91ee
[maven-release-plugin] prepare release tiles-parent-3.0.6
michaelsembwever Jul 14, 2016
c294ecf
[maven-release-plugin] prepare for next development iteration
michaelsembwever Jul 14, 2016
58043d6
use Tiles AutoTag-1.2
michaelsembwever Aug 11, 2016
2b9b8e5
[maven-release-plugin] prepare release tiles-parent-3.0.7
michaelsembwever Aug 11, 2016
40d2b49
[maven-release-plugin] prepare for next development iteration
michaelsembwever Aug 11, 2016
32e4808
fix log and release docs (svnpub)
michaelsembwever Sep 30, 2017
6a87fe0
use tiles-request-1.0.7
michaelsembwever Sep 30, 2017
74fd7b5
[maven-release-plugin] prepare release tiles-parent-3.0.8
michaelsembwever Sep 30, 2017
e3adc6a
[maven-release-plugin] copy for tag tiles-parent-3.0.8
michaelsembwever Sep 30, 2017
2e5b123
[maven-release-plugin] prepare for next development iteration
michaelsembwever Sep 30, 2017
f1b0bf7
fix generation of digests and signatures in assembly subproject
michaelsembwever Nov 7, 2017
692a436
svn merge -c1814482 ^/tiles/framework/tags/tiles-parent-3.0.8
michaelsembwever Nov 7, 2017
c7657a7
Backport r1840285
michaelsembwever Sep 7, 2018
39d461d
fix build – bump maven-remote-resources-plugin to 1.5
michaelsembwever Sep 7, 2018
5c5dc27
Fix stuck thread on hashmap
michaelsembwever Sep 7, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.9-SNAPSHOT</version>
</parent>

<scm>
Expand Down Expand Up @@ -58,6 +58,13 @@
</configuration>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.5</version>
</extension>
</extensions>
</build>
<profiles>
<profile>
Expand All @@ -67,12 +74,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-4</version>
<version>3.1.0</version>
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>attached</goal>
<goal>single</goal>
</goals>
<phase>package</phase>
</execution>
Expand All @@ -93,6 +100,28 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<goals>
<goal>artifacts</goal>
</goals>
</execution>
</executions>
<configuration>
<attachChecksums>true</attachChecksums>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<ascDirectory>${project.build.directory}/..</ascDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -192,12 +221,9 @@
<type>jar</type>
</dependency>

<!-- Optional dependencies that will be redistributed -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.5.8</version>
<scope>runtime</scope>
<artifactId>slf4j-api</artifactId>
</dependency>

</dependencies>
Expand Down
52 changes: 49 additions & 3 deletions assembly/src/site/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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&#8482;</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&#8482;">
<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>
38 changes: 24 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
<parent>
<artifactId>tiles-master</artifactId>
<groupId>org.apache.tiles</groupId>
<version>4</version>
<version>6</version>
<relativePath />
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tiles 3</name>
<description>Tiles 3: A framework for page composition.</description>
Expand Down Expand Up @@ -71,7 +71,7 @@
<distributionManagement>
<site>
<id>apache-site</id>
<url>scp://people.apache.org/www/tiles.apache.org/framework</url>
<url>scm:svn:https://svn.apache.org/repos/asf/tiles/site/staging/framework</url>
</site>
</distributionManagement>
<dependencyManagement>
Expand Down Expand Up @@ -216,14 +216,13 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.5.8</version>
<optional>true</optional>
<artifactId>slf4j-api</artifactId>
<version>1.7.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.5.8</version>
<version>1.7.6</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -255,6 +254,10 @@
<version>2.3.7</version>
<inherited>true</inherited>
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -292,11 +295,11 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<releaseProfiles>apache-release</releaseProfiles><!-- xxx tiles still uses "release" instead of "apache-release" -->
<goals>deploy site-deploy</goals>
<pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/tiles/site/staging/framework</pubScmUrl>
</configuration>
</plugin>
</plugins>
Expand All @@ -312,11 +315,18 @@
<tiles.osgi.private />
<tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tiles.request.version>1.0.0</tiles.request.version>
<tiles.autotag.version>1.0.0</tiles.autotag.version>
<tiles.request.version>1.0.7</tiles.request.version>
<tiles.autotag.version>1.2</tiles.autotag.version>
</properties>

<dependencies />
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.8</version>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
Expand Down
47 changes: 26 additions & 21 deletions src/site/apt/config-reference.apt
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,14 @@ Configuring Tiles internals

The reason to use a custom Tiles application context could be:

* supporting a platform not supported yet;
* supporting a platform not supported yet;

* providing custom behaviour, such as loading resources in a different manner.
* providing custom behaviour, such as loading resources in a different manner.


When loading resources (by {{{/tiles-request/apidocs/org/apache/tiles/request/locale/PostfixedApplicationResource.html}default}})
an underscore in the name of a file is used to indicate locale information.
See the documentation for {{{/framework/tutorial/advanced/l10n.html}localization}}.

* Custom {TilesContainerFactory}

Expand All @@ -160,41 +165,41 @@ Configuring Tiles internals
{{{./apidocs/org/apache/tiles/factory/BasicTilesContainerFactory.html}Javadoc documentation of BasicTilesContainerFactory}}
documents all the methods that can be overridden to use your own
configuration.

** Changing the path for the Tiles Definitions file

The <<<BasicTilesContainerFactory>>> loads the "/WEB-INF/tiles.xml" file; the <<<CompleteAutoloadTilesContainerFactory>>>
loads all the files named "tiles*.xml" under /WEB-INF and under every META-INF in any part of the classpath.

If this behaviour doesn't suits you, you can override the method <<<getSources>>> and retrieve whatever resource you
prefer. Just specify the path for the default locale; Tiles will extrapolate and load the localized files as needed.

* Custom components

These components can be used by overriding the appropriate <<<create>>> method in a custom TilesContainerFactory.

** Custom {LocaleResolver}

The default implementation is {{{./apidocs/org/apache/tiles/locale/impl/DefaultLocaleResolver.html}DefaultLocaleResolver}}.

** Custom {DefinitionDAO}

The default implementation is {{{./apidocs/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.html}ResolvingLocaleUrlDefinitionDAO}}.

** Custom {AttributeEvaluatorFactory}

The default implementation is {{{./apidocs/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactory.html}BasicAttributeEvaluatorFactory}}.

It can be used with a number of AttributeEvaluators like:

* the {{{./apidocs/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.html}DirectAttributeEvaluator}},

* the {{{./apidocs/org/apache/tiles/el/ELAttributeEvaluator.html}ELAttributeEvaluator}},
* the {{{./apidocs/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.html}DirectAttributeEvaluator}},

* the {{{./apidocs/org/apache/tiles/el/ELAttributeEvaluator.html}ELAttributeEvaluator}},

* the {{{./apidocs/org/apache/tiles/mvel/MVELAttributeEvaluator.html}MVELAttributeEvaluator}},

* the {{{./apidocs/org/apache/tiles/mvel/MVELAttributeEvaluator.html}MVELAttributeEvaluator}},
* the {{{./apidocs/org/apache/tiles/ognl/OGNLAttributeEvaluator.html}OGNLAttributeEvaluator}}.

* the {{{./apidocs/org/apache/tiles/ognl/OGNLAttributeEvaluator.html}OGNLAttributeEvaluator}}.

Please see {{{./xref/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.html}CompleteAutoloadTilesContainerFactory}}
for an example of how to configure those.

Expand All @@ -214,20 +219,20 @@ Configuring Tiles internals

The default implementation is {{{./apidocs/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.html}BasicPatternDefinitionResolver}},
that implements the <wildcard> syntax.
<<<CompleteAutoloadTilesContainerFactory>>> defines a <<<PrefixedPatternDefinitionResolver>>> to enable the use of

<<<CompleteAutoloadTilesContainerFactory>>> defines a <<<PrefixedPatternDefinitionResolver>>> to enable the use of
both the <wildcard> syntax and the <regexp> syntax, with appropriate prefixes.

* Registering {Renderers}

Custom {{{/tiles-request/apidocs/org/apache/tiles/request/render/Renderer.html}Renderers}} can be registered by overriding the methods
<<<registerAttributeRenderers>>> and <<<createDefaultAttributeRenderer>>>.

<<<BasicTilesContainerFactory>>> registers 3 renderers: <<<string>>>, <<<template>>>, and <<<definition>>>, in order to
render plain strings, JSPs and tiles definitions.
<<<CompleteAutoloadTilesContainerFactory>>> registers 5 renderers: <<<string>>>, <<<template>>>, <<<freemarker>>>,
<<<velocity>>> and <<<definition>>>, in order to render plain strings, JSPs, freemarker and velocity templates

<<<CompleteAutoloadTilesContainerFactory>>> registers 5 renderers: <<<string>>>, <<<template>>>, <<<freemarker>>>,
<<<velocity>>> and <<<definition>>>, in order to render plain strings, JSPs, freemarker and velocity templates
and tiles definitions.

* Changing the {definition files}
Expand All @@ -245,6 +250,6 @@ protected List<ApplicationResource> getSources(ApplicationContext applicationCon
-----------

Please note that when using <<<CompleteAutoloadTilesContainerFactory>>>,
the <<<ApplicationContext>>> loads the resources via spring, and supports
the <<<ApplicationContext>>> loads the resources via spring, and supports
{{{http://static.springsource.org/spring/docs/2.5.x/reference/resources.html#resources-resource-strings}the spring syntax}} for locating resources.

Loading