Repository: deltaspike Updated Branches: refs/heads/master 42e379d2b -> 807baa1ed
improve our EntityManager section Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/807baa1e Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/807baa1e Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/807baa1e Branch: refs/heads/master Commit: 807baa1eda10e20f2596da55e75de97a6bf56348 Parents: 42e379d Author: Mark Struberg <strub...@apache.org> Authored: Thu Aug 30 09:02:58 2018 +0200 Committer: Mark Struberg <strub...@apache.org> Committed: Thu Aug 30 09:02:58 2018 +0200 ---------------------------------------------------------------------- documentation/src/main/asciidoc/jpa.adoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/807baa1e/documentation/src/main/asciidoc/jpa.adoc ---------------------------------------------------------------------- diff --git a/documentation/src/main/asciidoc/jpa.adoc b/documentation/src/main/asciidoc/jpa.adoc index 32f8ae8..874b517 100644 --- a/documentation/src/main/asciidoc/jpa.adoc +++ b/documentation/src/main/asciidoc/jpa.adoc @@ -191,7 +191,11 @@ First, the EntityManagers or EntityManagerFactories must be obtained from the JP In EE managed environments the EntityManager can be obtained directly or through an EntityManagerFactory using standard JPA annotations `@PersistenceContext` for an EntityManager or `@PersistenceUnit` for an EntityManagerFactory. -.JPA Managed EntityManager +When using `@PersistenceContext` the Container has the full control over the EntityManager. +In this case transactions have to be conducted via a `TransactionManager` or `UserTransaction`. +If the Database connection is set up to be JTA aware then please also see our <<JTA Support>> section. + +.Container Managed EntityManager [source,java] ---- public class EntityManagerProducer {
