You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/01/10 15:44:18 UTC
[1/2] git commit: [KARAF-2666] Add hibernate 3 enterprise features
Updated Branches:
refs/heads/karaf-2.3.x bb3ac068d -> 2423ba782
[KARAF-2666] Add hibernate 3 enterprise features
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dfb8f6c4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dfb8f6c4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dfb8f6c4
Branch: refs/heads/karaf-2.3.x
Commit: dfb8f6c41801c103eac134c5277d65e5a4675a05
Parents: d3b0506
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 10 15:43:20 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 10 15:43:20 2014 +0100
----------------------------------------------------------------------
.../enterprise/src/main/resources/features.xml | 18 ++++++++++++++++++
pom.xml | 14 +++++++++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfb8f6c4/assemblies/features/enterprise/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/resources/features.xml b/assemblies/features/enterprise/src/main/resources/features.xml
index a5fd625..0c2b43b 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -57,6 +57,24 @@
<bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle>
</feature>
+ <feature name="hibernate" description="Hibernate 3.x JPA persistence engine support" version="${hibernate3.version}" resolver="(obr)">
+ <details>Enable Hibernate 3.x as persistence engine.</details>
+ <feature>jpa</feature>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle>
+ <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+ <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
+ <bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.objectweb.asm/com.springsource.org.objectweb.asm/${asm.springsource.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.jboss.javassist/com.springsource.javassist/${javassist.version}</bundle>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations.common/${hibernate.annotations.common.version}</bundle>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations/${hibernate.annotations.version}</bundle>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate.ejb/${hibernate.ejb.version}</bundle>
+ <bundle>mvn:org.hibernate/com.springsource.org.hibernate/${hibernate3.version}</bundle>
+ </feature>
+
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${aries.jndi.version}" resolver="(obr)">
<details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}</details>
<bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.api.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dfb8f6c4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db62d4d..c618f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,9 @@
<properties>
<aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
+ <antlr.bundle.version>2.7.7_5</antlr.bundle.version>
<asm.version>4.1</asm.version>
+ <asm.springsource.version>1.5.3</asm.springsource.version>
<bndlib.version>1.50.0</bndlib.version>
<cglib.bundle.version>2.2.2_1</cglib.bundle.version>
<commons-beanutils.version>1.8.3</commons-beanutils.version>
@@ -115,12 +117,16 @@
<commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-pool.version>1.6</commons-pool.version>
+ <dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
<injection.bundle.version>1.0</injection.bundle.version>
<jasypt.bundle.version>1.9.1_1</jasypt.bundle.version>
+ <javassist.version>3.9.0.GA</javassist.version>
<jetty.version>7.6.8.v20121106</jetty.version>
<junit.version>4.10</junit.version>
<junit.bundle.version>4.10_1</junit.bundle.version>
<org.json.version>20131018</org.json.version>
+ <geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version>
+ <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
<geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
@@ -142,6 +148,12 @@
<felix.obr.version>1.0.2</felix.obr.version>
<felix.scr.version>1.8.0</felix.scr.version>
<felix.scr.webconsole.plugin.version>1.0.0</felix.scr.webconsole.plugin.version>
+
+ <hibernate.annotations.common.version>3.3.0.ga</hibernate.annotations.common.version>
+ <hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
+ <hibernate.ejb.version>3.4.0.GA</hibernate.ejb.version>
+ <hibernate3.version>3.3.2.GA</hibernate3.version>
+
<aries.application.version>1.0.0</aries.application.version>
<aries.application.api.version>1.0.0</aries.application.api.version>
<aries.application.management.version>1.0.0</aries.application.management.version>
@@ -188,7 +200,7 @@
<portlet-api.version>2.0</portlet-api.version>
<servicemix.specs.version>2.4.0</servicemix.specs.version>
<servlet.api.version>2.5</servlet.api.version>
- <slf4j.version>1.7.2</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
<spring2.version>2.5.6.SEC03</spring2.version>
<spring30.version>3.0.7.RELEASE</spring30.version>
[2/2] git commit: Merge branch 'karaf-2.3.x' of
https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x
Posted by jb...@apache.org.
Merge branch 'karaf-2.3.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.3.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2423ba78
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2423ba78
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2423ba78
Branch: refs/heads/karaf-2.3.x
Commit: 2423ba782e659e249e35cae5545661bbcfc0a87f
Parents: dfb8f6c bb3ac06
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jan 10 15:44:00 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jan 10 15:44:00 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/karaf/admin/internal/AdminServiceImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------