This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch vote-0.4-incubating-01
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-site.git
commit aa384b473af35f650064eebb3d7ffc10955432b5
Author: Hugo Hirsch <git...@hugo-hirsch.de>
AuthorDate: Tue Aug 27 23:16:54 2019 +0200
Harmonze OSGi, but not in methods
---
content/documentation/extensions/mod_features.adoc | 4 ++--
content/documentation/extensions/mod_osgi.adoc | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/content/documentation/extensions/mod_features.adoc
b/content/documentation/extensions/mod_features.adoc
index e51c603..bc55ae8 100644
--- a/content/documentation/extensions/mod_features.adoc
+++ b/content/documentation/extensions/mod_features.adoc
@@ -62,7 +62,7 @@ public final class Features {
public static boolean extSpringCoreAvailable();
public static boolean extJndiAvailable();
- public static boolean extOSGiAvailable();
+ public static boolean extOSGIAvailable();
public static boolean checkClassIsLoadable(String classname);
}
@@ -83,5 +83,5 @@ public final class Features {
* +jndiAvailable();+ checks for the link:mod_jndi.html[_tamaya_jndi_] module.
* +extJndiAvailable();+ checks if creation of a new `InitialContext` is
successful.
* +extSpringCoreAvailable();+ checks if Spring Core is on the classpath.
-* +extOSGiAvailable();+ checks the OSGi framework is on the classpath.
+* +extOSGIAvailable();+ checks the OSGi framework is on the classpath.
* Finally +checkClassIsLoaded(String)+ tries to load a class. If it fails,
`false` is returned.
diff --git a/content/documentation/extensions/mod_osgi.adoc
b/content/documentation/extensions/mod_osgi.adoc
index 7384b4d..6d75a1a 100644
--- a/content/documentation/extensions/mod_osgi.adoc
+++ b/content/documentation/extensions/mod_osgi.adoc
@@ -58,7 +58,7 @@ Important to know is that within OSGi class- and resource
loading is not compati
in OSGi, bundles can be loaded or unloaded at any time, so Tamaya's logic must
cope with this as well.
These constraints are handled by Tamaya (implemented in +tamaya-core+ and
+tamaya-osgi+) as follows:
-* Tamaya registers a +OSGiServiceContext+ which reads all
+java.util.ServiceLoader+ configurations and
+* Tamaya registers a +OSGIServiceContext+ which reads all
+java.util.ServiceLoader+ configurations and
registers them as OSGi services. Hereby integration is two-way: The core
module contains an
OSGi +Activator+ that replaces Tamaya's default +ServiceContext+ with an
OSGi based implementation that
will consume all services from the OSGi service API. Consequently you can
also register Tamaya extensions
@@ -415,7 +415,7 @@ public interface TamayaConfigService{
* @param section a subsection to be filter (using startsWith).
* @return the (optionally filtered) OSGi configuration.
*/
- Dictionary<String,Object> getOSGiConfiguration(String pid, String section);
+ Dictionary<String,Object> getOSGIConfiguration(String pid, String section);
/**
* Checks if a backup exists.
@@ -522,7 +522,7 @@ public interface ConfigInjectionService {
<T> T configure(Bundle bundle, T instance);
/**
- * Creates a suzpplier, which supplies events as created by the basic
supplier, which are
+ * Creates a supplier, which supplies events as created by the basic
supplier, which are
* automatically configured, when supplying.
* @param supplier the base supplier, not null.
* @param bundle the target bundle, not null.
@@ -588,7 +588,7 @@ tamaya:tm_backup_create [options] pid
+++
| +tm_backup_delete+
-| Deletes the OSGi configuration backup of Tamya.
+| Deletes the OSGi configuration backup of Tamaya.
| +++
<pre>
<b>SYNTAX</b>
@@ -599,7 +599,7 @@ tamaya:tm_backup_delete pid
+++
| +tm_backup_list+
-| List the backed-up OSGi configuration before Tamya applied changes.
+| List the backed-up OSGi configuration before Tamaya applied changes.
| +++
<pre>
<b>SYNTAX</b>
@@ -610,7 +610,7 @@ tamaya:tm_backup_list [pid]
+++
| +tm_backup_restore+
-| Restores the OSGi configuration backup of Tamya and disabled the PID for
Tamaya configuration.
+| Restores the OSGi configuration backup of Tamaya and disabled the PID for
Tamaya configuration.
| +++
<pre>
<b>SYNTAX</b>
@@ -707,7 +707,7 @@ tamaya:tm_history_maxsize_set size
+++
| +tm_info+
-| Show he current Tamaya status.
+| Show the current Tamaya status.
| +++
<pre>
<b>SYNTAX</b>
