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 <[email protected]> Authored: Wed Nov 2 23:43:36 2016 +0100 Committer: Phil Ottlinger <[email protected]> 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
