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 7f5b8b0016175391915b5fc25e8043dc130ad36d
Author: Hugo Hirsch <git...@hugo-hirsch.de>
AuthorDate: Tue Aug 27 23:11:11 2019 +0200
Harmonize OSGi
---
content/documentation/extensions/mod_cdi.adoc | 2 +-
content/documentation/extensions/mod_features.adoc | 4 ++--
content/documentation/extensions/mod_injection.adoc | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/content/documentation/extensions/mod_cdi.adoc
b/content/documentation/extensions/mod_cdi.adoc
index 8d2c0c6..c609668 100644
--- a/content/documentation/extensions/mod_cdi.adoc
+++ b/content/documentation/extensions/mod_cdi.adoc
@@ -27,7 +27,7 @@ Hereby there are two implementations provided:
* +tamaya-injection-cdi+ implements injection by using CDI's injection
mechanism to inject configuration values into the
beans managed by the CDI systems.
* +tamaya-injection-standalone+ implements injection by integrating the
+tamaya-injection+ SE based injection module (also used
- for Spring and OSGI injection) with CDI. Injection hereby is performed by
the Tamaya SE module, whereas
+ for Spring and OSGi injection) with CDI. Injection hereby is performed by
the Tamaya SE module, whereas
beans and injection control overall are still managed by CDI.
* One difference, of course, is that +tamaya-injection-standalone+ also
provides an SE compatible API (+ConfigurationInjection,
ConfigurationInjector+), which is not available, when using the purely CDI
based variant.
diff --git a/content/documentation/extensions/mod_features.adoc
b/content/documentation/extensions/mod_features.adoc
index 4379fe5..e51c603 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_injection.adoc
b/content/documentation/extensions/mod_injection.adoc
index 1581fc4..96958ef 100644
--- a/content/documentation/extensions/mod_injection.adoc
+++ b/content/documentation/extensions/mod_injection.adoc
@@ -141,7 +141,7 @@ ConfigurationInjector.getInstance().configure(tenant);
--------------------------------------------
NOTE: Configuration injection works similarly, when used with other
integration modules, e.g. when Tamaya is used
-with CDI, Spring or within an OSGI container. For further details refer also
to the corresponding integration module's
+with CDI, Spring or within an OSGi container. For further details refer also
to the corresponding integration module's
documentation.
