You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2017/01/11 21:04:24 UTC
[1/2] incubator-tamaya-site git commit: TAMAYA-220: Fix injection in
thymeleaf
Repository: incubator-tamaya-site
Updated Branches:
refs/heads/master e5530eeba -> ca2b478ed
TAMAYA-220: Fix injection in thymeleaf
* Need to use the thymeleaf macros th:something and prefix config., a direct injection is not supported.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/commit/1d8ec27b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/1d8ec27b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/1d8ec27b
Branch: refs/heads/master
Commit: 1d8ec27b0e8cf7d91fb59fd77cad9956cff203ba
Parents: e5530ee
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Jan 11 22:02:35 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Jan 11 22:02:35 2017 +0100
----------------------------------------------------------------------
templates/menu.thyme | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/1d8ec27b/templates/menu.thyme
----------------------------------------------------------------------
diff --git a/templates/menu.thyme b/templates/menu.thyme
index 1acde18..7e50638 100644
--- a/templates/menu.thyme
+++ b/templates/menu.thyme
@@ -28,7 +28,7 @@
<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'documentation/core.html'">Core</a></li>
<li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'documentation/extensions.html'">Extension Guide</a></li>
<li class="divider"></li>
- <li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'apidocs/index.html'" th:text="'Javadoc '+ ${tamaya_version} +' (external)'"></a></li>
+ <li><a th:with="rootpath=(${content.rootpath != null} ? ${content.rootpath} : '')" th:href="${rootpath}+'apidocs/index.html'" th:text="'Javadoc '+ ${config.tamaya_version} +' (external)'"></a></li>
</ul>
</li>
<li class="dropdown">
[2/2] incubator-tamaya-site git commit: TAMAYA-220: Markdown
injection still not functional
Posted by po...@apache.org.
TAMAYA-220: Markdown injection still not functional
* Experimenting ....
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/commit/ca2b478e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/ca2b478e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/ca2b478e
Branch: refs/heads/master
Commit: ca2b478edf51713c542ea87f6b545899a69df2a4
Parents: 1d8ec27
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Jan 11 22:04:05 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Jan 11 22:04:05 2017 +0100
----------------------------------------------------------------------
content/start.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/ca2b478e/content/start.md
----------------------------------------------------------------------
diff --git a/content/start.md b/content/start.md
index b1fd3b1..a836d1b 100644
--- a/content/start.md
+++ b/content/start.md
@@ -38,7 +38,7 @@ Quickstart
Using Apache Tamaya is simple:
-1. Add `{configuration.tamaya_mvn_group_id}:tamaya-core:${configuration.tamaya_version}` to your dependencies.
+1. Add `{config.tamaya_mvn_group_id}:tamaya-core:${config.tamaya_version}` to your dependencies.
2. Add your config to `META-INF/javaconfiguration.properties`
3. Access your configuration by `ConfigurationProvider.getConfiguration()` and use it.
4. Look at the [extension modules](extensions.html) to customize your setup!