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 2016/11/02 22:43:55 UTC
[1/4] incubator-tamaya-site git commit: TAMAYA-178: Move jbake
skeleton to 2016.
Repository: incubator-tamaya-site
Updated Branches:
refs/heads/master 3d91bad59 -> 8839473ba
TAMAYA-178: Move jbake skeleton to 2016.
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/1b6880dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/1b6880dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/1b6880dc
Branch: refs/heads/master
Commit: 1b6880dc6fe20ebd0197485d84d07489dc04cfd9
Parents: 3d91bad
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Nov 2 22:57:58 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Nov 2 22:57:58 2016 +0100
----------------------------------------------------------------------
content/blog/2016/first-post.html | 34 +++++++++++++++++++++++++++++++++
content/blog/2016/fourth-post.adoc | 20 +++++++++++++++++++
content/blog/2016/second-post.md | 19 ++++++++++++++++++
content/blog/2016/third-post.adoc | 22 +++++++++++++++++++++
4 files changed, 95 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/1b6880dc/content/blog/2016/first-post.html
----------------------------------------------------------------------
diff --git a/content/blog/2016/first-post.html b/content/blog/2016/first-post.html
new file mode 100644
index 0000000..346525f
--- /dev/null
+++ b/content/blog/2016/first-post.html
@@ -0,0 +1,34 @@
+title=First Post
+date=2013-07-24
+type=post
+tags=blog
+status=published
+~~~~~~
+
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.</p>
+
+<ul>
+<li><a href="http://example.org">http://example.org</a></li>
+<li><a href="http://example.org">Example.org</a></li>
+</ul>
+
+<p>Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse leo arcu,
+mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris nec leo
+ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor elit sit amet
+ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus,
+id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales.</p>
+
+<pre class="prettyprint">
+<code>
+package org.jbake;
+
+public class Oven {
+ public static void main(String[] args) {
+ System.out.print("Baking!");
+ }
+}
+</code>
+</pre>
+
+<p>In consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere
+libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.</p>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/1b6880dc/content/blog/2016/fourth-post.adoc
----------------------------------------------------------------------
diff --git a/content/blog/2016/fourth-post.adoc b/content/blog/2016/fourth-post.adoc
new file mode 100644
index 0000000..f22ec22
--- /dev/null
+++ b/content/blog/2016/fourth-post.adoc
@@ -0,0 +1,20 @@
+= Fourth Post
+Jonathan Bullock
+2013-10-17
+:jbake-type: post
+:jbake-status: published
+:jbake-tags: blog, asciidoc
+:idprefix:
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
+
+* http://example.org
+* http://example.org[Example.org]
+
+Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse leo arcu,
+mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris nec leo
+ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor elit sit amet
+ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus,
+id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales. In
+consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere
+libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/1b6880dc/content/blog/2016/second-post.md
----------------------------------------------------------------------
diff --git a/content/blog/2016/second-post.md b/content/blog/2016/second-post.md
new file mode 100644
index 0000000..936fa14
--- /dev/null
+++ b/content/blog/2016/second-post.md
@@ -0,0 +1,19 @@
+title=Second Post
+date=2013-08-25
+type=post
+tags=blog
+status=published
+~~~~~~
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
+
+* [http://example.org](http://example.org)
+* [Example.org](http://example.org)
+
+Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse leo arcu,
+mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris nec leo
+ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor elit sit amet
+ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus,
+id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales. In
+consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere
+libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/1b6880dc/content/blog/2016/third-post.adoc
----------------------------------------------------------------------
diff --git a/content/blog/2016/third-post.adoc b/content/blog/2016/third-post.adoc
new file mode 100644
index 0000000..c334f5a
--- /dev/null
+++ b/content/blog/2016/third-post.adoc
@@ -0,0 +1,22 @@
+title=Third Post
+date=2013-09-26
+type=post
+tags=blog, asciidoc
+status=published
+~~~~~~
+= Third Post
+Jonathan Bullock
+2013-10-17
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
+
+* http://example.org
+* http://example.org[Example.org]
+
+Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse leo arcu,
+mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris nec leo
+ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor elit sit amet
+ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus,
+id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales. In
+consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere
+libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
\ No newline at end of file
[2/4] incubator-tamaya-site git commit: TAMAYA-178: Markdown does not
like spaces.
Posted by po...@apache.org.
TAMAYA-178: Markdown does not like spaces.
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/699f6b37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/699f6b37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/699f6b37
Branch: refs/heads/master
Commit: 699f6b375c9397711fdbe38660ddec283d41b818
Parents: 1b6880d
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Nov 2 23:03:58 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Nov 2 23:03:58 2016 +0100
----------------------------------------------------------------------
content/start.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/699f6b37/content/start.md
----------------------------------------------------------------------
diff --git a/content/start.md b/content/start.md
index 0909d7f..e41da81 100644
--- a/content/start.md
+++ b/content/start.md
@@ -1,6 +1,6 @@
-title = About Apache Tamaya
-type = page
-status = published
+title=About Apache Tamaya
+type=page
+status=published
~~~~~~
About Apache Tamaya
[4/4] incubator-tamaya-site git commit: TAMAYA-178: Fix setup for
placeholders in ASCIIDOC
Posted by po...@apache.org.
TAMAYA-178: Fix setup for placeholders in ASCIIDOC
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/8839473b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/8839473b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/8839473b
Branch: refs/heads/master
Commit: 8839473ba8b2762498500298d4d18f5b9084b026
Parents: df6e5dd
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Nov 2 23:43:36 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Nov 2 23:43:36 2016 +0100
----------------------------------------------------------------------
bake.sh | 1 +
content/extensions/mod_builder.adoc | 24 +++---------------------
content/extensions/mod_resolver.adoc | 24 +++---------------------
content/extensions/mod_resources.adoc | 24 +++---------------------
content/extensions/mod_yaml.adoc | 2 +-
content/quickstart.adoc | 7 +++----
content/start.md | 2 +-
content/usecases.adoc | 2 +-
jbake.properties | 4 ++++
9 files changed, 20 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/bake.sh
----------------------------------------------------------------------
diff --git a/bake.sh b/bake.sh
index 2b3b70d..07268aa 100755
--- a/bake.sh
+++ b/bake.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+clear
echo "Starting to bake our project homepage ...."
export JBAKE_HOME="$(dirname "$0")/bin/jbake-2.5.0"
echo $JBAKE_HOME
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/content/extensions/mod_builder.adoc
----------------------------------------------------------------------
diff --git a/content/extensions/mod_builder.adoc b/content/extensions/mod_builder.adoc
index d734fec..a589374 100644
--- a/content/extensions/mod_builder.adoc
+++ b/content/extensions/mod_builder.adoc
@@ -1,26 +1,8 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-= Apache Tamaya -- Extension: Builder
-
-// include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
+= Apache Tamaya -- Extension: Builder
+
[[BuilderCore]]
== Tamaya Builder (Extension Module)
=== Overview
@@ -56,7 +38,7 @@ dependency to your module:
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-builder</artifactId>
- <version>{tamaya_version_development}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/content/extensions/mod_resolver.adoc
----------------------------------------------------------------------
diff --git a/content/extensions/mod_resolver.adoc b/content/extensions/mod_resolver.adoc
index 6f8f93a..366c97e 100644
--- a/content/extensions/mod_resolver.adoc
+++ b/content/extensions/mod_resolver.adoc
@@ -1,26 +1,8 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-= Apache Tamaya -- Extension: Resolver
-
-// include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
+= Apache Tamaya -- Extension: Resolver
+
[[Core]]
== Tamaya Resolver (Extension Module)
@@ -48,7 +30,7 @@ To benefit from dynamic value resolution you only must add the corresponding dep
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-resolver</artifactId>
- <version>{tamaya_version_development}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/content/extensions/mod_resources.adoc
----------------------------------------------------------------------
diff --git a/content/extensions/mod_resources.adoc b/content/extensions/mod_resources.adoc
index c5f07f7..3081149 100644
--- a/content/extensions/mod_resources.adoc
+++ b/content/extensions/mod_resources.adoc
@@ -1,26 +1,8 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-= Apache Tamaya -- Extension: Resources
-
-// include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
+= Apache Tamaya -- Extension: Resources
+
[[Core]]
== Tamaya Resources (Extension Module)
=== Overview
@@ -38,7 +20,7 @@ ant-styled resource patterns. To use this module add the following dependency:
<dependency>
<grooupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-resources</artifactId>
- <version>{tamaya_version_development}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/content/extensions/mod_yaml.adoc
----------------------------------------------------------------------
diff --git a/content/extensions/mod_yaml.adoc b/content/extensions/mod_yaml.adoc
index e931129..eeb352c 100644
--- a/content/extensions/mod_yaml.adoc
+++ b/content/extensions/mod_yaml.adoc
@@ -44,7 +44,7 @@ To benefit from configuration builder support you only must add the correspondin
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-yaml</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya-version}</version>
</dependency>
-----------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/content/quickstart.adoc
----------------------------------------------------------------------
diff --git a/content/quickstart.adoc b/content/quickstart.adoc
index 4567c7b..8bcba76 100644
--- a/content/quickstart.adoc
+++ b/content/quickstart.adoc
@@ -32,7 +32,7 @@ Maven dependency to your project:
<dependency>
<groupId>{tamaya_mvn_group_id}</groupId>
<artifactId>tamaya-core</artifactId>
- <version>{tamaya_version_released}</version>
+ <version>{tamaya_version}</version>
</dependency>
----
@@ -103,7 +103,7 @@ small extract of most important modules available (or available soon):
<dependency>
<artifactId>org.apache.tamaya.ext</id>
<artifactId>tamaya-resolver</artifactId>
- <version>{tamaya_version_development}</version>
+ <version>{tamaya_version}</version>
</dependency>
----
@@ -127,7 +127,7 @@ String resolved = Resolver.evaluateExpression(myExpression);
<dependency>
<artifactId>org.apache.tamaya.ext</id>
<artifactId>tamaya-resolution</artifactId>
- <version>{tamaya_version_development}</version>
+ <version>{tamaya_version}</version>
</dependency>
----
@@ -205,4 +205,3 @@ Currently the following resolvers are available:
| Reference to classpath resource, replacing the expression with the resource's text value.
|===
-
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/content/start.md
----------------------------------------------------------------------
diff --git a/content/start.md b/content/start.md
index e41da81..a4f2181 100644
--- a/content/start.md
+++ b/content/start.md
@@ -38,7 +38,7 @@ Quickstart
Using Apache Tamaya is simple:
-1. Add `org.apache.tamaya:tamaya-core:TBDreleased_version` to your dependencies.
+1. Add `{tamaya_mvn_group_id}:tamaya-core:{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!
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/content/usecases.adoc
----------------------------------------------------------------------
diff --git a/content/usecases.adoc b/content/usecases.adoc
index 19bbca6..cb455c0 100644
--- a/content/usecases.adoc
+++ b/content/usecases.adoc
@@ -164,7 +164,7 @@ In multi tenancy setups or complex systems a hierarchical/graph model of context
within the same VN. What sounds normal for EE also may be the case for pure SE environments:
* Users want to be able to model different layers of runtime context
-* Users want to identiofy the current layer, so configuration used may be adapted.
+* Users want to identify the current layer, so configuration used may be adapted.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/8839473b/jbake.properties
----------------------------------------------------------------------
diff --git a/jbake.properties b/jbake.properties
index ee53714..063e4a1 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -8,3 +8,7 @@ template.sitemap.file=sitemap.thyme
template.post.file=post.thyme
template.page.file=page.thyme
template.feed.file=feed.thyme
+# Make properties available in templates
+asciidoctor.attributes.export=true
+tamaya_version=0.3-SNAPSHOT
+tamaya_mvn_group_id=org.apache.tamaya
[3/4] incubator-tamaya-site git commit: TAMAYA-178: Add fix for error
spotted by Werner
Posted by po...@apache.org.
TAMAYA-178: Add fix for error spotted by Werner
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/df6e5dd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/tree/df6e5dd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/diff/df6e5dd8
Branch: refs/heads/master
Commit: df6e5dd8bf8a9a30ac54550218da7de4ee5b3196
Parents: 699f6b3
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Nov 2 23:40:20 2016 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Nov 2 23:40:20 2016 +0100
----------------------------------------------------------------------
content/extensions/mod_cdi.adoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-site/blob/df6e5dd8/content/extensions/mod_cdi.adoc
----------------------------------------------------------------------
diff --git a/content/extensions/mod_cdi.adoc b/content/extensions/mod_cdi.adoc
index db86633..41d91a8 100644
--- a/content/extensions/mod_cdi.adoc
+++ b/content/extensions/mod_cdi.adoc
@@ -51,14 +51,14 @@ components will be compatible regardless if deployed in a pure SE, a Java EE (CD
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-api</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya-version}</version>
</dependency>
-----------------------------------------------
=== Compatibility
-Both modules are based on Java 7, so they will not run on Java 7 and beyond.
+Both modules are based on Java 7, so they will only run on Java 7 and beyond.
=== Installation
@@ -72,7 +72,7 @@ you never have installed both CDI extensions at the same time because this may b
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-cdi-ee</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya-version}</version>
</dependency>
-----------------------------------------------
@@ -82,7 +82,7 @@ you never have installed both CDI extensions at the same time because this may b
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-cdi-se</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya-version}</version>
</dependency>
-----------------------------------------------