Repository: deltaspike
Updated Branches:
  refs/heads/master 47ad61619 -> 09c1c0b8d


DELTASPIKE-772 added hint to the documentation


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/09c1c0b8
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/09c1c0b8
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/09c1c0b8

Branch: refs/heads/master
Commit: 09c1c0b8d90d76247b05755202f8afc84567b83c
Parents: 47ad616
Author: gpetracek <[email protected]>
Authored: Sat Nov 8 22:52:41 2014 +0100
Committer: gpetracek <[email protected]>
Committed: Sat Nov 8 22:52:41 2014 +0100

----------------------------------------------------------------------
 documentation/src/main/asciidoc/core.adoc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/09c1c0b8/documentation/src/main/asciidoc/core.adoc
----------------------------------------------------------------------
diff --git a/documentation/src/main/asciidoc/core.adoc 
b/documentation/src/main/asciidoc/core.adoc
index 5d61420..149dca6 100644
--- a/documentation/src/main/asciidoc/core.adoc
+++ b/documentation/src/main/asciidoc/core.adoc
@@ -149,6 +149,15 @@ BeanManager beanManager = 
BeanManagerProvider.getInstance().getBeanManager();
 //if CDI based injection is not available.
 -----------------------------------------------------------------------------
 
+`BeanManagerProvider` uses an own approach to find the correct `BeanManager`,
+because a portable API for it is only available since CDI 1.1.
+However, once you are using CDI 1.1+ DeltaSpike delegates the lookup to the 
CDI container
+instead of using its own approach.
+If you migrate from CDI 1.0 to a later version of CDI and you would like to 
keep
+the lookup strategy you used before, you can deactivate the delegation to the 
container by adding
+`deltaspike.bean-manager.delegate_lookup=false` to your config-source
+(e.g. in `/META-INF/apache-deltaspike.properties`).
+
 === Type-safe ProjectStage
 
 
@@ -1041,7 +1050,7 @@ public class CustomClassDeactivator implements 
ClassDeactivator
 }
 --------------------------------------------------------------------------
 
-now, we can use the file /META-INF/apache-deltaspike.properties (or any
+now, we can use the file `/META-INF/apache-deltaspike.properties` (or any
 other <<configuration.adoc#_configsources_provided_by_default,ConfigSource>>) 
with the following key/value:
 
 
------------------------------------------------------------------------------------------

Reply via email to