The jndi-name accepts now java:. Added the entity-module-unit-name to specify the persistence unit name when using the JPA store. Code refactoring.