TAMAYA-178: Fix broken teplates
* Removed old headers, old variable references.
* Adapted to new references from jbake.properties.
* Reduces the number of errors during jbake runs.
diff --git a/content/about.html b/content/about.html
index 1036c7f..5c9e36d 100644
--- a/content/about.html
+++ b/content/about.html
@@ -4,11 +4,11 @@
status=published
~~~~~~
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
-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
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
+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.
diff --git a/content/api.adoc b/content/api.adoc
index 98256ce..1dd1d41 100644
--- a/content/api.adoc
+++ b/content/api.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/content/community.adoc b/content/community.adoc
index a3219f7..ad9e1dc 100644
--- a/content/community.adoc
+++ b/content/community.adoc
@@ -1,23 +1,3 @@
-//
-// 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.
-//
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
@@ -43,14 +23,14 @@
bug or if there is an ongoing discussion in case of a feature.
You are very welcome to follow our twitter account
-http://twitter.com/{twitterhandle}[@{twitterhandle}^] and spread the word
+https://twitter.com/{twitterhandle}[@{twitterhandle}^] and spread the word
of Tamaya with tweets, blog entries,...
== Getting Involved
Everybody is welcome to get involved with our community. You can find general
-information at http://apache.org/foundation/getinvolved.html and
-http://apache.org/foundation/how-it-works.html.
+information at https://apache.org/foundation/getinvolved.html and
+https://apache.org/foundation/how-it-works.html.
The following sections provides some details about the different levels of getting involved.
If you want to contribute to the
@@ -64,8 +44,8 @@
Before you get a committer you have to contribute to our effort.
E.g. you can help users, participate in discussions on the dev list,
submit patches,... . Therefore, it's essential to file
-a http://www.apache.org/licenses/icla.txt[Individual Contributor License Agreement (ICLA)^]
-or http://www.apache.org/licenses/cla-corporate.txt[Software Grant and Corporate Contributor License Agreement (CCLA)^]
+a https://www.apache.org/licenses/icla.txt[Individual Contributor License Agreement (ICLA)^]
+or https://www.apache.org/licenses/cla-corporate.txt[Software Grant and Corporate Contributor License Agreement (CCLA)^]
and send it to secretary at apache dot org (or fax it) as early as possible.
If you would like to submit a patch through Jira, you can have a look at the
@@ -88,7 +68,7 @@
mailto:commits@tamaya.incubator.apache.org[mailing list for commits].
Furthermore, you can check our link:community.html#mailing-lists[mail-archives].
-Further details are available at http://www.apache.org/dev/[http://www.apache.org/dev/^].
+Further details are available at https://www.apache.org/dev/[https://www.apache.org/dev/^].
=== Mailing lists
@@ -127,7 +107,7 @@
You are very welcome e.g. to write blog entries, mention our twitter handle
@{twitterhandle} if you tweet about the project or just follow our twitter
-account http://twitter.com/{twitterhandle}[@{twitterhandle}^]
+account https://twitter.com/{twitterhandle}[@{twitterhandle}^]
=== IRC
diff --git a/content/core.adoc b/content/core.adoc
index ea3a7c6..139eade 100644
--- a/content/core.adoc
+++ b/content/core.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/content/devguide.adoc b/content/devguide.adoc
index 6d28edc..1135098 100644
--- a/content/devguide.adoc
+++ b/content/devguide.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/content/download.adoc b/content/download.adoc
index 37e8c98..3e8bf34 100644
--- a/content/download.adoc
+++ b/content/download.adoc
@@ -1,23 +1,5 @@
-// 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.
-
//:source-highlighter: coderay
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
@@ -68,7 +50,7 @@
== Previous Releases
All previous releases can also be found at the
-http://www.apache.org/dist/incubator/tamaya/[Apache Software Foundation Distribution Directory^].
+https://www.apache.org/dist/incubator/tamaya/[Apache Software Foundation Distribution Directory^].
In our link:history.html[release history overview] you can find all previous releases of Tamaya.
== Verifying Releases
@@ -76,15 +58,15 @@
It is essential that you verify the integrity of any downloaded files using
the PGP or MD5 signatures. For more information on signing artifacts and
why we do it, check out the
-http://www.apache.org/dev/release-signing.html[Release Signing FAQ^].
+https://www.apache.org/dev/release-signing.html[Release Signing FAQ^].
The PGP signatures can be verified using PGP or GPG. First download the
-http://www.apache.org/dist/incubator/tamaya/KEYS[KEYS file^]
+https://www.apache.org/dist/incubator/tamaya/KEYS[KEYS file^]
as well as the asc signature file for the artifact. Make sure you get
these files from the
-http://www.apache.org/dist/incubator/tamaya/[main distribution directory^]
+https://www.apache.org/dist/incubator/tamaya/[main distribution directory^]
rather than from a
-http://www.apache.org/dyn/closer.cgi/tamaya/[mirror^].
+https://www.apache.org/dyn/closer.cgi/tamaya/[mirror^].
Then verify the signatures using e.g.:
[source,shell]
diff --git a/content/examples.adoc b/content/examples.adoc
index 3bc94ef..cbf08dc 100644
--- a/content/examples.adoc
+++ b/content/examples.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/content/extensions.adoc b/content/extensions.adoc
index 577fd67..a95f22f 100644
--- a/content/extensions.adoc
+++ b/content/extensions.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
@@ -57,7 +39,7 @@
and the may also have severe issues. So use at your own risk or join and help us getting them stable and
well tested!
-NOTE All extensions currently run on Java 7 as well as on Java 8.
+NOTE: All extensions currently run on Java 7 as well as on Java 8.
[width="100%",frame="1",options="header",grid="all"]
|=======
@@ -78,4 +60,3 @@
|+org.apache.tamaya.ext:tamaya-server+ |Lets a Tamaya configuration instance provide scoped configuration as a REST service. |link:extensions/mod_server.html[Documentation]
|+org.apache.tamaya.ext:tamaya-ui+ |Provides a web UI for a VM running Tamaya. |link:extensions/mod_ui.html[Documentation]
|=======
-
diff --git a/content/extensions/mod_camel.adoc b/content/extensions/mod_camel.adoc
index abb5199..9690dda 100644
--- a/content/extensions/mod_camel.adoc
+++ b/content/extensions/mod_camel.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Integration with Apache Camel
@@ -42,7 +28,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-camel</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -140,4 +126,4 @@
</bean>
</beans>
------------------------------------------------
\ No newline at end of file
+-----------------------------------------------
diff --git a/content/extensions/mod_cdi.adoc b/content/extensions/mod_cdi.adoc
index e5fe95e..c49a61c 100644
--- a/content/extensions/mod_cdi.adoc
+++ b/content/extensions/mod_cdi.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Classloader Isolation Support
@@ -49,7 +35,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-api</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -70,7 +56,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-cdi-ee</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -80,7 +66,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-cdi-se</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -228,4 +214,4 @@
--------------------------------------------------------------------------------------
In the example above +legacy.bKey+ defines an absolute key, which is not combined with any defined
-default section parts.
\ No newline at end of file
+default section parts.
diff --git a/content/extensions/mod_classloader_support.adoc b/content/extensions/mod_classloader_support.adoc
index f8bf529..9a2d0df 100644
--- a/content/extensions/mod_classloader_support.adoc
+++ b/content/extensions/mod_classloader_support.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Classloader Isolation Support
@@ -41,7 +27,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-classloader-support</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -49,7 +35,7 @@
with an instance of type +org.apache.tamaya.clsupport.internal.CLAwareServiceContext+. This implementation returns
a priority of +10+.
-=== How it Works
+=== How it works
Basically the component manages a +Map+ of all classloaders encountered. When services are accessed, the component
will evaluate the services as follows:
@@ -87,4 +73,3 @@
* +PropertySource+, +PropertySourceProviders+
* +PropertyFilters+, +PropertyCombinationPolicy+
-
diff --git a/content/extensions/mod_collections.adoc b/content/extensions/mod_collections.adoc
index 835a20c..e758756 100644
--- a/content/extensions/mod_collections.adoc
+++ b/content/extensions/mod_collections.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Collection Support
@@ -41,7 +27,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-collections</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -243,4 +229,4 @@
redefined-map=0==none | 1==single | 2==any
_redefined-map.map-entry-separator===
_redefined-map.item-separator=|
------------------------------------------------
\ No newline at end of file
+-----------------------------------------------
diff --git a/content/extensions/mod_consul.adoc b/content/extensions/mod_consul.adoc
index 5aa3055..4407ed3 100644
--- a/content/extensions/mod_consul.adoc
+++ b/content/extensions/mod_consul.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Integration with consul (Hashicorp)
@@ -43,7 +29,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-consul</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -70,4 +56,4 @@
server can be established a warning will be logged, but deployment will not fail.
* The +ConsulPropertySource+ finally also allows the values read from the consul cluster to be mapped to prefixed
context. This can be activated by setting the +-Dtamaya.consul.prefix=<PREFIX>+ system property. E.g. when the prefix is
- set to +cluster-config.+ a consul key of +host:known/all+ is mapped to +cluster-config.host:known/all+.
\ No newline at end of file
+ set to +cluster-config.+ a consul key of +host:known/all+ is mapped to +cluster-config.host:known/all+.
diff --git a/content/extensions/mod_environment.adoc b/content/extensions/mod_environment.adoc
index 2e5921f..c0224a1 100644
--- a/content/extensions/mod_environment.adoc
+++ b/content/extensions/mod_environment.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Classloader Isolation Support
@@ -42,7 +28,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-envionment</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -54,4 +40,3 @@
=== Reusable Base Classes
tbd
-
diff --git a/content/extensions/mod_etcd.adoc b/content/extensions/mod_etcd.adoc
index bfb4b30..149d843 100644
--- a/content/extensions/mod_etcd.adoc
+++ b/content/extensions/mod_etcd.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Integration with etcd (Core OS)
@@ -43,7 +29,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-etcd</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -200,4 +186,4 @@
system or environment property.
* The +EtcdPropertySource+ finally also allows the values read from the etcd cluster to be mapped to prefixed
context. This can be activated by setting the +-Dtamaya.etcd.prefix=<PREFIX>+ system property. E.g. when the prefix is
- set to +cluster-config.+ a etcd key of +host:known/all+ is mapped to +cluster-config.host:known/all+.
\ No newline at end of file
+ set to +cluster-config.+ a etcd key of +host:known/all+ is mapped to +cluster-config.host:known/all+.
diff --git a/content/extensions/mod_events.adoc b/content/extensions/mod_events.adoc
index 7c2d8ef..c0a3809 100644
--- a/content/extensions/mod_events.adoc
+++ b/content/extensions/mod_events.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Events
@@ -42,7 +28,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-events</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -290,5 +276,3 @@
Summarizing with the events module you can easily observe configuration changes, record the
state of any configuration and compare configuration states to create and publish related
change events.
-
-
diff --git a/content/extensions/mod_filter.adoc b/content/extensions/mod_filter.adoc
index 0df0035..670faa0 100644
--- a/content/extensions/mod_filter.adoc
+++ b/content/extensions/mod_filter.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: User Filtering
@@ -43,7 +29,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-filter</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -103,12 +89,12 @@
[source, java]
-----------------------------------------------
-try{
+try {
ConfigurationFilter.getMapFilters().addFilter(new myFilter());
// do your code with filtering active
}
-finally{
+finally {
// cleanup
ConfigurationFilter.clearFilters();
}
@@ -119,7 +105,7 @@
[source, java]
-----------------------------------------------
-public final class FilterContext implements PropertyFilter{
+public final class FilterContext implements PropertyFilter {
public void addIncludes(PropertyFilter filter);
public void addExcludes(int pos, PropertyFilter filter);
@@ -131,4 +117,3 @@
}
-----------------------------------------------
-
diff --git a/content/extensions/mod_formats.adoc b/content/extensions/mod_formats.adoc
index 19b89f3..401a755 100644
--- a/content/extensions/mod_formats.adoc
+++ b/content/extensions/mod_formats.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Formats
@@ -47,7 +33,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -110,7 +96,7 @@
-------------------------------------------------------
public interface ConfigurationFormat {
- public String getName();
+ String getName();
boolean accepts(URL url);
ConfigurationData readConfiguration(String resource, InputStream inputStream);
}
@@ -218,5 +204,3 @@
* +PropertiesFormat+ providing support for .properties files.
* +PropertiesXmlFormat+ providing support for xml.property files.
* +IniConfiguratonFormat+ providing support for xml.property files.
-
-
diff --git a/content/extensions/mod_functions.adoc b/content/extensions/mod_functions.adoc
index 041ef75..6e2c172 100644
--- a/content/extensions/mod_functions.adoc
+++ b/content/extensions/mod_functions.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Functions
@@ -52,7 +38,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-functions</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -120,4 +106,3 @@
select of the returned values should be relative to its selection of be fully qualified.
* *String stripSectionKeys(String key, String... sectionKeys)* This function strips away the matching section key as given
in _sectionKeys_ from a given _key_.
-
diff --git a/content/extensions/mod_injection.adoc b/content/extensions/mod_injection.adoc
index 47f8872..941351e 100644
--- a/content/extensions/mod_injection.adoc
+++ b/content/extensions/mod_injection.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Injection
@@ -48,7 +34,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection-api</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -59,7 +45,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -82,7 +68,7 @@
--------------------------------------------
package foo.bar;
-public class ConfiguredClass{
+public class ConfiguredClass {
// resolved by default, using property name, class and package name: foo.bar.ConfiguredClass.testProperty
private String testProperty;
@@ -123,7 +109,7 @@
package a.b;
@ConfigAutoInject
-public final class Tenant{
+public final class Tenant {
private int id;
private String name;
private String description;
@@ -205,7 +191,7 @@
});
--------------------------------------------
-With Java 8 it's even more simpler:
+With Java 8 it's even more simple:
[source, java]
--------------------------------------------
@@ -418,7 +404,7 @@
public interface ConfiguredType {
Class getType();
String getName();
- public Collection<ConfiguredField> getConfiguredFields();
+ Collection<ConfiguredField> getConfiguredFields();
Collection<ConfiguredMethod> getConfiguredMethods();
void configure(Object instance, Configuration config);
}
@@ -442,6 +428,3 @@
void configure(Object instance, Configuration config);
}
----------------------------------------
-
-
-
diff --git a/content/extensions/mod_jodatime.adoc b/content/extensions/mod_jodatime.adoc
index 6dd05b6..4ebae7a 100644
--- a/content/extensions/mod_jodatime.adoc
+++ b/content/extensions/mod_jodatime.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: JodaTime
@@ -39,7 +25,7 @@
<dependency>
<grooupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-jodatime</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -60,6 +46,3 @@
=== Specifing periods and durations
To be written.
-
-
-
diff --git a/content/extensions/mod_json.adoc b/content/extensions/mod_json.adoc
index 691b27b..66c12fa 100644
--- a/content/extensions/mod_json.adoc
+++ b/content/extensions/mod_json.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Builder
@@ -24,12 +10,12 @@
== Tamaya JSON (Extension Module)
=== Overview
-The Tamaya json module provides support for reading configuration using the JSON format:
+The Tamaya json module provides support for reading configuration using JSON format:
=== Compatibility
-The module is based on Java 7, so it will not run on Java 7 and beyond.
+The module is based on Java 7, so it will run on Java 7 and beyond.
=== Installation
@@ -41,7 +27,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-json</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -74,5 +60,3 @@
}
}
----------------------------------------------------------------
-
-
diff --git a/content/extensions/mod_management.adoc b/content/extensions/mod_management.adoc
index b9f8de0..b912747 100644
--- a/content/extensions/mod_management.adoc
+++ b/content/extensions/mod_management.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: JMX Management Access
@@ -28,7 +14,7 @@
=== Compatibility
-The module is based on Java 7, so it will not run on Java 7 and beyond.
+The module is based on Java 7, so it will run on Java 7 and beyond.
=== Installation
@@ -40,7 +26,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-management</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -103,4 +89,4 @@
NOTE: The instance of +ManagedConfigMBean+ to be created and registered is evaluated by use og the
+ServiceContextManager+. So you can replace the bean implementation by registering your
overriding implementation using the current +ServiceContext+ (by default using
- +java.util.ServiceLoader+ and +@Priority+ annotation.
\ No newline at end of file
+ +java.util.ServiceLoader+ and +@Priority+ annotation.
diff --git a/content/extensions/mod_metamodel-staged.adoc b/content/extensions/mod_metamodel-staged.adoc
index 7482d1a..cf02806 100644
--- a/content/extensions/mod_metamodel-staged.adoc
+++ b/content/extensions/mod_metamodel-staged.adoc
@@ -1,24 +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: Staged PropertySources
:jbake-type: page
:jbake-status: published
+= Apache Tamaya -- Extension: Staged PropertySources
+
toc::[]
@@ -32,7 +16,7 @@
=== Compatibility
-The module is based on Java 7, so it will not run on Java 7 and beyond.
+The module is based on Java 7, so it will run on Java 7 and beyond.
=== Installation
@@ -44,7 +28,7 @@
<dependency>
<groupId>org.apache.tamaya.ext.metamodels</groupId>
<artifactId>tamaya-metamodel.staged</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
diff --git a/content/extensions/mod_model.adoc b/content/extensions/mod_model.adoc
index 2b05026..e454eb1 100644
--- a/content/extensions/mod_model.adoc
+++ b/content/extensions/mod_model.adoc
@@ -1,24 +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: Model Documentation and Validation
:jbake-type: page
:jbake-status: published
+= Apache Tamaya -- Extension: Model Documentation and Validation
+
toc::[]
@@ -47,7 +31,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-model</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
diff --git a/content/extensions/mod_mutable_config.adoc b/content/extensions/mod_mutable_config.adoc
index d38626e..cb8869d 100644
--- a/content/extensions/mod_mutable_config.adoc
+++ b/content/extensions/mod_mutable_config.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Mutable Configuration
@@ -41,7 +27,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-mutable-config</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -279,5 +265,3 @@
Implementations are registered with the current +ServiceContext+ (using by default the
+java.util.ServiceLoader+ service).
-
-
diff --git a/content/extensions/mod_optional.adoc b/content/extensions/mod_optional.adoc
index 369df68..1a4b967 100644
--- a/content/extensions/mod_optional.adoc
+++ b/content/extensions/mod_optional.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Optional Tamaya Configuration
@@ -46,7 +32,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-optional</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -66,4 +52,3 @@
.get("com.mycomp.ratecalculator.rate", BigDecimal.class))
.orElse(BigDecimal.of(0.05d));
-----------------------------------------------
-
diff --git a/content/extensions/mod_osgi.adoc b/content/extensions/mod_osgi.adoc
index 52518a7..3a3ffd4 100644
--- a/content/extensions/mod_osgi.adoc
+++ b/content/extensions/mod_osgi.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extensions: OSGI Integrations
@@ -72,19 +58,19 @@
[source, listing]
-----------------------------------------------
# API and core
-org.apache.tamaya:tamaya-api:{tamayaVersion}
-org.apache.tamaya:tamaya-core:{tamayaVersion}
+org.apache.tamaya:tamaya-api:{tamaya_version}
+org.apache.tamaya:tamaya-core:{tamaya_version}
org.apache.geronimo.specs:geronimo-annotation_1.2_spec:1.0-alpha-1
# injection API. SE injection module and dependencies
-org.apache.tamaya.ext:tamaya-injection-api:{tamayaVersion}
-org.apache.tamaya.ext:tamaya-injection:{tamayaVersion}
+org.apache.tamaya.ext:tamaya-injection-api:{tamaya_version}
+org.apache.tamaya.ext:tamaya-injection:{tamaya_version}
org.apache.geronimo.specs:geronimo-atinject_1.0_spec:1.0
org.apache.geronimo.specs:geronimo-el_2.2_spec:1.0.4
org.apache.geronimo.specs:geronimo-interceptor_1.1_spec:1.0
org.apache.geronimo.specs:geronimo-jcdi_1.1_spec:1.0
# OSGI integration and dependencies
-org.apache.tamaya.ext:tamaya-osgi:{tamayaVersion}
-org.apache.tamaya.ext:tamaya-functions:{tamayaVersion}
+org.apache.tamaya.ext:tamaya-osgi:{tamaya_version}
+org.apache.tamaya.ext:tamaya-functions:{tamaya_version}
-----------------------------------------------
@@ -112,7 +98,7 @@
=== SPI
-By defauklt the OSGI pid or factory pid is mapped to a corresponding root section in Tamaya's configuration. We are
+By default the OSGI pid or factory pid is mapped to a corresponding root section in Tamaya's configuration. We are
well aware that this might not always be the desired approach. Therefore there as an SPI service provided that allows
to determine this mapping:
diff --git a/content/extensions/mod_remote.adoc b/content/extensions/mod_remote.adoc
index d82b7ba..ce303ed 100644
--- a/content/extensions/mod_remote.adoc
+++ b/content/extensions/mod_remote.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Remote Configuration
@@ -43,14 +29,14 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-remote</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
=== Reading Remote configuration from a Tamaya Configuration Server
-The remote module allows reading JSON formatted onfiguration as provided by the _Tamaya server extension_ . The JSON
+The remote module allows reading JSON formatted configuration as provided by the _Tamaya server extension_ . The JSON
format used looks as follows:
[source, json]
@@ -126,4 +112,4 @@
}
}
------------------------------------------------
\ No newline at end of file
+-----------------------------------------------
diff --git a/content/extensions/mod_resolver.adoc b/content/extensions/mod_resolver.adoc
index c502272..366c97e 100644
--- a/content/extensions/mod_resolver.adoc
+++ b/content/extensions/mod_resolver.adoc
@@ -1,25 +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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Resolver
-include::temp-properties-files-for-site/attributes.adoc[]
-
-
[[Core]]
== Tamaya Resolver (Extension Module)
@@ -47,7 +30,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-resolver</artifactId>
- <version>{tamaya_version_development}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
diff --git a/content/extensions/mod_resources.adoc b/content/extensions/mod_resources.adoc
index 7506859..3081149 100644
--- a/content/extensions/mod_resources.adoc
+++ b/content/extensions/mod_resources.adoc
@@ -1,24 +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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Resources
-include::temp-properties-files-for-site/attributes.adoc[]
-
[[Core]]
== Tamaya Resources (Extension Module)
=== Overview
@@ -36,7 +20,7 @@
<dependency>
<grooupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-resources</artifactId>
- <version>{tamaya_version_development}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -169,4 +153,3 @@
Additionally a +BaseResourceResolver+ class can be used to reduce the amount of code to be written
on your own.
-
diff --git a/content/extensions/mod_server.adoc b/content/extensions/mod_server.adoc
index 44398d7..025da45 100644
--- a/content/extensions/mod_server.adoc
+++ b/content/extensions/mod_server.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Configuration Server
@@ -42,7 +28,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-server</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -378,5 +364,3 @@
}
-----------------------------------------------
-
-
diff --git a/content/extensions/mod_spi-support.adoc b/content/extensions/mod_spi-support.adoc
index c507c1a..7aca208 100644
--- a/content/extensions/mod_spi-support.adoc
+++ b/content/extensions/mod_spi-support.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Classloader Isolation Support
@@ -50,7 +36,7 @@
=== Compatibility
-The module is based on Java 7, so it will not run on Java 7 and beyond.
+The module is based on Java 7, so it will run on Java 7 and beyond.
=== Installation
@@ -62,11 +48,10 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-spisupport</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
The component will not register any components but only providing portable base classes for some common SPI
implementation tasks. It only depends on the API, so it should be safely reusable also with other implementations
of the Tamaya API similarly.
-
diff --git a/content/extensions/mod_spring.adoc b/content/extensions/mod_spring.adoc
index 5f6d65e..3960dc1 100644
--- a/content/extensions/mod_spring.adoc
+++ b/content/extensions/mod_spring.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Spring Integration
@@ -37,7 +23,7 @@
=== Compatibility
-Both modules are based on Java 7, so they will not run on Java 7 and beyond. The extension shown here works similarly
+Both modules are based on Java 7, so they will run on Java 7 and beyond. The extension shown here works similarly
with Spring Framework as well as Spring Boot.
@@ -50,7 +36,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-spring</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -145,4 +131,4 @@
}
--------------------------------------------------------
-Summarizing you get all the nice features of Tamaya out of the box running with your Spring code.
\ No newline at end of file
+Summarizing you get all the nice features of Tamaya out of the box running with your Spring code.
diff --git a/content/extensions/mod_yaml.adoc b/content/extensions/mod_yaml.adoc
index 85c1871..b7e53cb 100644
--- a/content/extensions/mod_yaml.adoc
+++ b/content/extensions/mod_yaml.adoc
@@ -1,19 +1,5 @@
-// 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.
+:jbake-type: page
+:jbake-status: published
= Apache Tamaya -- Extension: Builder
@@ -30,7 +16,7 @@
=== Compatibility
-The YAML module is based on Java 7, so it will not run on Java 7 and beyond.
+The YAML module is based on Java 7, so it will run on Java 7 and beyond.
=== Installation
@@ -42,7 +28,7 @@
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-yaml</artifactId>
- <version>{tamayaVersion}</version>
+ <version>{tamaya_version}</version>
</dependency>
-----------------------------------------------
@@ -124,4 +110,3 @@
total -> 4443.52
comments -> Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.
----------------------------------------------------------------
-
diff --git a/content/highleveldesign.adoc b/content/highleveldesign.adoc
index f58957f..41d15f0 100644
--- a/content/highleveldesign.adoc
+++ b/content/highleveldesign.adoc
@@ -1,21 +1,4 @@
-// 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.
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/content/history.adoc b/content/history.adoc
index bb09f0b..97bb56d 100644
--- a/content/history.adoc
+++ b/content/history.adoc
@@ -1,23 +1,6 @@
-// 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.
-
//:source-highlighter: coderay
-//include::temp-properties-files-for-site/attributes.adoc[]
+
:jbake-type: page
:jbake-status: published
:linkattrs: true
diff --git a/content/quickstart.adoc b/content/quickstart.adoc
index 8bcba76..14ab438 100644
--- a/content/quickstart.adoc
+++ b/content/quickstart.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/content/release-guide.adoc b/content/release-guide.adoc
index 9c74090..332b758 100644
--- a/content/release-guide.adoc
+++ b/content/release-guide.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
@@ -273,4 +255,4 @@
== Announce the new version
Announce the new version on @TamayaConf and other social media channels.
-Also drop a short mail on the amiling list.
+Also drop a short mail on the mailing list.
diff --git a/content/source.adoc b/content/source.adoc
index e6334d4..441bec8 100644
--- a/content/source.adoc
+++ b/content/source.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-//include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/content/usecases.adoc b/content/usecases.adoc
index cb455c0..0d0d4e0 100644
--- a/content/usecases.adoc
+++ b/content/usecases.adoc
@@ -1,21 +1,3 @@
-// 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.
-
-// include::temp-properties-files-for-site/attributes.adoc[]
:jbake-type: page
:jbake-status: published
diff --git a/jbake.properties b/jbake.properties
index 063e4a1..7e2d607 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -10,5 +10,7 @@
template.feed.file=feed.thyme
# Make properties available in templates
asciidoctor.attributes.export=true
+twitterhandle=TBD_tamaya
+tamaya_version_released=0.2
tamaya_version=0.3-SNAPSHOT
tamaya_mvn_group_id=org.apache.tamaya
