Repository: deltaspike Updated Branches: refs/heads/master 391558fd3 -> 4f4dc13d7
DELTASPIKE-769 updated documentation Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/4f4dc13d Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/4f4dc13d Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/4f4dc13d Branch: refs/heads/master Commit: 4f4dc13d7d46d643a3c15bd460b1cdb40c2010d4 Parents: 391558f Author: gpetracek <[email protected]> Authored: Sun Nov 16 20:45:22 2014 +0100 Committer: gpetracek <[email protected]> Committed: Sun Nov 16 20:45:22 2014 +0100 ---------------------------------------------------------------------- documentation/src/main/asciidoc/jpa.adoc | 5 +++-- documentation/src/main/asciidoc/security.adoc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4f4dc13d/documentation/src/main/asciidoc/jpa.adoc ---------------------------------------------------------------------- diff --git a/documentation/src/main/asciidoc/jpa.adoc b/documentation/src/main/asciidoc/jpa.adoc index d7eaa68..76eccad 100644 --- a/documentation/src/main/asciidoc/jpa.adoc +++ b/documentation/src/main/asciidoc/jpa.adoc @@ -14,13 +14,14 @@ using the annotation, it's required to implement a CDI producer for an bean which uses `@Transactional`. As shown later on it's also possible to use multiple qualifiers for using different `EntityManager`s. -*Hint:* If you are using features described by this page and the CDI -container you are using is Weld (or OpenWebBeans in BDA mode), you have +*Hint:* If you are using features described by this page with CDI 1.0 +(or DeltaSpike up to v1.1.0 with CDI 1.1+), you have to enable the transaction interceptor in your beans.xml file: [source,xml] ------------------------------------------------------------------------------------------ <beans> + <!-- Not needed with CDI 1.1+ and DeltaSpike v1.1.1+ --> <interceptors> <class>org.apache.deltaspike.jpa.impl.transaction.TransactionalInterceptor</class> </interceptors> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4f4dc13d/documentation/src/main/asciidoc/security.adoc ---------------------------------------------------------------------- diff --git a/documentation/src/main/asciidoc/security.adoc b/documentation/src/main/asciidoc/security.adoc index f43d4c2..200b7c6 100644 --- a/documentation/src/main/asciidoc/security.adoc +++ b/documentation/src/main/asciidoc/security.adoc @@ -6,13 +6,14 @@ == Hint -If you are using features described by this page and the CDI -container you are using is Weld (or OpenWebBeans in BDA mode), you have +*Hint:* If you are using features described by this page with CDI 1.0 +(or DeltaSpike up to v1.1.0 with CDI 1.1+), you have to enable the security interceptor in your beans.xml file: [source,xml] ---------------------------------------------------------------------------------------- <beans> + <!-- Not needed with CDI 1.1+ and DeltaSpike v1.1.1+ --> <interceptors> <class>org.apache.deltaspike.security.impl.extension.SecurityInterceptor</class> </interceptors>
