Mercurial > lada > lada-server
changeset 826:90343e38225f
!!!CAUTION!!! Changed persistence unit JNDI name!
If you are updating to this version you have to change the JNDI name of the
persistence units in the application server.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Fri, 18 Dec 2015 17:42:24 +0100 |
| parents | e49494d97437 |
| children | 5bdd1631a451 |
| files | src/main/resources/META-INF/persistence.xml src/test/resources/META-INF/test-persistence.xml |
| diffstat | 2 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/resources/META-INF/persistence.xml Fri Dec 18 17:34:40 2015 +0100 +++ b/src/main/resources/META-INF/persistence.xml Fri Dec 18 17:42:24 2015 +0100 @@ -5,8 +5,7 @@ <!-- PU for bund datasource. Maps to the schema 'bund' in the Lada database. --> <persistence-unit name="bund"> <!-- The JTA datasource configured in the Wildfly AS --> - <jta-data-source>java:/jboss/lada-bund</jta-data-source> - <exclude-unlisted-classes>false</exclude-unlisted-classes> + <jta-data-source>java:jboss/lada-bund</jta-data-source> <properties> <!-- The JNDI name for lookups in the application --> <property name="jboss.entity.manager.jndi.name" value="java:app/entitymanager/bund"/> @@ -19,7 +18,7 @@ </persistence-unit> <persistence-unit name="land"> <!-- The JTA datasource configured in the Wildfly AS --> - <jta-data-source>java:/jboss/lada-land</jta-data-source> + <jta-data-source>java:jboss/lada-land</jta-data-source> <exclude-unlisted-classes>false</exclude-unlisted-classes> <properties> <!-- The JNDI name for lookups in the application --> @@ -33,7 +32,7 @@ </persistence-unit> <persistence-unit name="stamm"> <!-- The JTA datasource configured in the Wildfly AS --> - <jta-data-source>java:/jboss/lada-stamm</jta-data-source> + <jta-data-source>java:jboss/lada-stamm</jta-data-source> <properties> <!-- The JNDI name for lookups in the application --> <property name="jboss.entity.manager.jndi.name" value="java:app/entitymanager/stamm"/>
--- a/src/test/resources/META-INF/test-persistence.xml Fri Dec 18 17:34:40 2015 +0100 +++ b/src/test/resources/META-INF/test-persistence.xml Fri Dec 18 17:42:24 2015 +0100 @@ -3,12 +3,10 @@ xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> <persistence-unit name="bund" transaction-type="JTA"> - <!--provider>org.hibernate.jpa.HibernatePersistenceProvider</provider--> - <jta-data-source>java:/jboss/lada-bund</jta-data-source> + <jta-data-source>java:jboss/lada-bund</jta-data-source> <exclude-unlisted-classes>false</exclude-unlisted-classes> <properties> <property name="jboss.entity.manager.jndi.name" value="java:app/entitymanager/bund"/> - <!-- Properties for Hibernate --> <property name="hibernate.show_sql" value="false" /> <property name="hibernate.dialect" value="org.hibernate.spatial.dialect.postgis.PostgisDialect"/> <property name="hibernate.hbm2ddl.auto" value="none"/> @@ -17,7 +15,7 @@ </persistence-unit> <persistence-unit name="land"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/jboss/lada-land</jta-data-source> + <jta-data-source>java:jboss/lada-land</jta-data-source> <exclude-unlisted-classes>false</exclude-unlisted-classes> <properties> <property name="jboss.entity.manager.jndi.name" value="java:app/entitymanager/land"/> @@ -28,7 +26,7 @@ </persistence-unit> <persistence-unit name="stamm"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/jboss/lada-stamm</jta-data-source> + <jta-data-source>java:jboss/lada-stamm</jta-data-source> <properties> <property name="jboss.entity.manager.jndi.name" value="java:app/entitymanager/stamm"/> <property name="hibernate.show_sql" value="false" />