Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1B42A200AF7 for ; Mon, 9 May 2016 16:48:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1A7BA16099C; Mon, 9 May 2016 14:48:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 16330160A31 for ; Mon, 9 May 2016 16:48:22 +0200 (CEST) Received: (qmail 80643 invoked by uid 500); 9 May 2016 14:48:22 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 80397 invoked by uid 99); 9 May 2016 14:48:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 May 2016 14:48:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1011BE78B2; Mon, 9 May 2016 14:48:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@karaf.apache.org Date: Mon, 09 May 2016 14:48:53 -0000 Message-Id: <0933120bb3b5416fbab1657f78bb66e8@git.apache.org> In-Reply-To: <1e3eeb57e42d4f938950e5b22b1cb7f9@git.apache.org> References: <1e3eeb57e42d4f938950e5b22b1cb7f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/35] karaf-boot git commit: Working jpa example with hibernate archived-at: Mon, 09 May 2016 14:48:25 -0000 Working jpa example with hibernate Project: http://git-wip-us.apache.org/repos/asf/karaf-boot/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-boot/commit/6e4e7ed2 Tree: http://git-wip-us.apache.org/repos/asf/karaf-boot/tree/6e4e7ed2 Diff: http://git-wip-us.apache.org/repos/asf/karaf-boot/diff/6e4e7ed2 Branch: refs/heads/master Commit: 6e4e7ed2e93845485a26e48dcdabdec6f7c9e3e2 Parents: af03889 Author: Christian Schneider Authored: Wed Apr 27 14:15:01 2016 +0200 Committer: Christian Schneider Committed: Wed Apr 27 14:15:01 2016 +0200 ---------------------------------------------------------------------- samples/jpa/src/main/java/sample/jpa/Task.java | 14 +++++++------- starters/karaf-boot-starter-blueprint/pom.xml | 18 ++++++++++++++---- starters/karaf-boot-starter-jpa/pom.xml | 13 ++++++++++--- .../java/org/apache/karaf/boot/jpa/Hibernate.java | 16 +++++++++++----- .../apache/karaf/boot/jpa/impl/JpaProcessor.java | 9 ++++++++- 5 files changed, 50 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/6e4e7ed2/samples/jpa/src/main/java/sample/jpa/Task.java ---------------------------------------------------------------------- diff --git a/samples/jpa/src/main/java/sample/jpa/Task.java b/samples/jpa/src/main/java/sample/jpa/Task.java index cd431a7..2391d2a 100644 --- a/samples/jpa/src/main/java/sample/jpa/Task.java +++ b/samples/jpa/src/main/java/sample/jpa/Task.java @@ -18,20 +18,21 @@ package sample.jpa; import javax.persistence.Entity; import javax.persistence.Id; -import javax.xml.bind.annotation.XmlRootElement; import org.apache.karaf.boot.jpa.Hibernate; import org.apache.karaf.boot.jpa.PersistentUnit; import org.apache.karaf.boot.jpa.Property; import org.apache.karaf.boot.jpa.Provider; -@PersistentUnit(name = "tasklist", provider = Provider.Hibernate, properties = { - @Property(name = "hibernate.hbm2ddl.auto", value = "create-drop") -}) +@PersistentUnit( // + name = "task", provider = Provider.Hibernate, properties = // + { + @Property(name = "hibernate.hbm2ddl.auto", value = "create-drop"), + @Property(name = "javax.persistence.jdbc.driver", value = "org.apache.derby.jdbc.EmbeddedDriver"), + @Property(name = "javax.persistence.jdbc.url", value = "jdbc:derby:memory:DSFTEST;create=true") + }) @Hibernate.Dialect(Hibernate.Dialect.Value.HSQL) -@Hibernate.Hbm2DdlAuto(Hibernate.Hbm2DdlAuto.Value.CreateDrop) @Entity -@XmlRootElement public class Task { @Id Integer id; @@ -40,7 +41,6 @@ public class Task { public Task() { } - public Task(Integer id, String title) { super(); this.id = id; http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/6e4e7ed2/starters/karaf-boot-starter-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/starters/karaf-boot-starter-blueprint/pom.xml b/starters/karaf-boot-starter-blueprint/pom.xml index 14db02e..e958058 100644 --- a/starters/karaf-boot-starter-blueprint/pom.xml +++ b/starters/karaf-boot-starter-blueprint/pom.xml @@ -42,14 +42,24 @@ 1.0.0 + org.osgi + osgi.cmpn + ${osgi.version} + + org.ops4j.pax.cdi pax-cdi-api - 0.5.0 + ${pax.cdi.version} + + + javax.enterprise + cdi-api + 1.2 - javax.inject - javax.inject - 1 + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + 1.0 http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/6e4e7ed2/starters/karaf-boot-starter-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/starters/karaf-boot-starter-jpa/pom.xml b/starters/karaf-boot-starter-jpa/pom.xml index 7a89d90..6db476f 100644 --- a/starters/karaf-boot-starter-jpa/pom.xml +++ b/starters/karaf-boot-starter-jpa/pom.xml @@ -26,11 +26,18 @@ - org.apache.geronimo.specs - geronimo-jpa_2.0_spec - 1.1 + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + 1.0.0.Final + org.apache.aries.jpa + org.apache.aries.jpa.api + 2.3.0 + + + + net.java.dev.stax-utils stax-utils 20070216 http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/6e4e7ed2/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/Hibernate.java ---------------------------------------------------------------------- diff --git a/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/Hibernate.java b/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/Hibernate.java index ae4dab3..0944c20 100644 --- a/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/Hibernate.java +++ b/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/Hibernate.java @@ -22,13 +22,19 @@ public interface Hibernate { @interface Hbm2DdlAuto { Value value(); enum Value { - Validate, - Update, - Create, - CreateDrop; + Validate("validate"), + Update("update"), + Create("create"), + CreateDrop("create-drop"); + + private String value; + + private Value(String value) { + this.value = value; + } public String toString() { - return super.toString().toLowerCase(); + return value; } } } http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/6e4e7ed2/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/impl/JpaProcessor.java ---------------------------------------------------------------------- diff --git a/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/impl/JpaProcessor.java b/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/impl/JpaProcessor.java index f160fec..622643b 100644 --- a/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/impl/JpaProcessor.java +++ b/starters/karaf-boot-starter-jpa/src/main/java/org/apache/karaf/boot/jpa/impl/JpaProcessor.java @@ -32,6 +32,8 @@ import javanet.staxutils.IndentingXMLStreamWriter; public class JpaProcessor extends AbstractProcessor { + private boolean useHibernate; + public JpaProcessor() { } @@ -59,7 +61,11 @@ public class JpaProcessor extends AbstractProcessor { processingEnv.getMessager().printMessage(Kind.ERROR, "Error: " + e.getMessage()); } try (PrintWriter w = appendResource("META-INF/org.apache.karaf.boot.bnd")) { - w.println("Private-Package: META-INF"); + w.println("Private-Package: META-INF.*"); + w.println("Meta-Persistence: META-INF/persistence.xml"); + if (useHibernate) { + w.println("Import-Package: org.hibernate.proxy, javassist.util.proxy"); + } } catch (Exception e) { processingEnv.getMessager().printMessage(Kind.ERROR, "Error writing to META-INF/org.apache.karaf.boot.bnd: " + e.getMessage()); } @@ -164,6 +170,7 @@ public class JpaProcessor extends AbstractProcessor { if (pu.provider() != null) { switch (pu.provider()) { case Hibernate: + useHibernate = true; return "org.hibernate.jpa.HibernatePersistenceProvider"; default: // TODO