Liran Zelkha has uploaded a new change for review. Change subject: core: WIP: Add JPA infrastructure to oVirt ......................................................................
core: WIP: Add JPA infrastructure to oVirt Adding JPA infrastructure (dependencies, persistence.xml) to oVirt. Future patches will migrate entities to use JPA Change-Id: I2440162230449d0c335a2c2d418fb9ff7e854793 Signed-off-by: [email protected] <[email protected]> --- A backend/manager/modules/bll/src/main/resources/META-INF/persistence.xml M backend/manager/modules/common/pom.xml M backend/manager/modules/dal/pom.xml A backend/manager/modules/dal/src/test/resources/META-INF/persistence.xml M pom.xml 5 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/33832/1 diff --git a/backend/manager/modules/bll/src/main/resources/META-INF/persistence.xml b/backend/manager/modules/bll/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000..7462400 --- /dev/null +++ b/backend/manager/modules/bll/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,12 @@ +<persistence xmlns="http://java.sun.com/xml/ns/persistence"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; + version="2.0"> + <persistence-unit name="ovirt"> + <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider> + <jta-data-source>java:/ENGINEDataSource</jta-data-source> + <properties> + <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" /> + </properties> + </persistence-unit> +</persistence> \ No newline at end of file diff --git a/backend/manager/modules/common/pom.xml b/backend/manager/modules/common/pom.xml index 1be29ef..323e307 100644 --- a/backend/manager/modules/common/pom.xml +++ b/backend/manager/modules/common/pom.xml @@ -50,6 +50,18 @@ <artifactId>jboss-modules</artifactId> <version>1.1.1.GA</version> </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>4.3.0.Final</version> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.2</version> + </dependency> </dependencies> <build> diff --git a/backend/manager/modules/dal/pom.xml b/backend/manager/modules/dal/pom.xml index 9b5cd5b..846b861 100644 --- a/backend/manager/modules/dal/pom.xml +++ b/backend/manager/modules/dal/pom.xml @@ -70,6 +70,16 @@ <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>4.3.0.Final</version> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.1.Final</version> + </dependency> </dependencies> <build> <filters> diff --git a/backend/manager/modules/dal/src/test/resources/META-INF/persistence.xml b/backend/manager/modules/dal/src/test/resources/META-INF/persistence.xml new file mode 100644 index 0000000..1531157 --- /dev/null +++ b/backend/manager/modules/dal/src/test/resources/META-INF/persistence.xml @@ -0,0 +1,13 @@ +<persistence xmlns="http://java.sun.com/xml/ns/persistence"; version="2.0"> + <persistence-unit name="ovirt"> + <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider> + <properties> + <property name="javax.persistence.jdbc.driver" value="${engine.db.driver}" /> + <property name="javax.persistence.jdbc.user" value="${engine.db.username}" /> + <property name="javax.persistence.jdbc.password" value="${engine.db.password}" /> + <property name="javax.persistence.jdbc.url" value="${engine.db.url}" /> + <property name="javax.persistence.validation.mode" value="NONE" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> + </properties> + </persistence-unit> +</persistence> \ No newline at end of file diff --git a/pom.xml b/pom.xml index cb65696..a61a4b0 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ <mockito.version>1.9.0</mockito.version> <javassist.version>3.12.0.GA</javassist.version> <javax.mail.version>1.4.4</javax.mail.version> - <hibernate-validator.version>4.2.0.Final</hibernate-validator.version> + <hibernate-validator.version>4.3.1.Final</hibernate-validator.version> <jackson-core-asl.version>1.9.9</jackson-core-asl.version> <jackson-mapper-asl.version>1.9.9</jackson-mapper-asl.version> <commons-configuration.version>1.6</commons-configuration.version> -- To view, visit http://gerrit.ovirt.org/33832 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2440162230449d0c335a2c2d418fb9ff7e854793 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
