Updated Branches: refs/heads/master 39390da5f -> 801a4647c
[KARAF-2549] Add new hibernate enterprise feature Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/801a4647 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/801a4647 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/801a4647 Branch: refs/heads/master Commit: 801a4647c6d7648747fbc61658e8f87d9af4877a Parents: 39390da Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Dec 20 14:55:12 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Dec 20 14:55:12 2013 +0100 ---------------------------------------------------------------------- .../enterprise/src/main/feature/feature.xml | 25 +++++++++++++++++--- .../resources/etc/org.ops4j.pax.url.mvn.cfg | 3 ++- .../resources/etc/org.ops4j.pax.url.mvn.cfg | 3 ++- manual/src/main/webapp/users-guide/jpa.conf | 6 ++++- pom.xml | 9 +++++++ 5 files changed, 40 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/801a4647/assemblies/features/enterprise/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index 79d176a..cf272bc 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -24,7 +24,7 @@ <feature name='transaction' description='OSGi Transaction Manager' version='${aries.transaction.version}' resolver='(obr)'> <details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</details> - <config name="org.apache.aries.transaction"> + <config name='org.apache.aries.transaction'> aries.transaction.recoverable = true aries.transaction.timeout = 600 aries.transaction.howl.logFileDir = ${karaf.data}/txlog @@ -48,16 +48,35 @@ </feature> <feature name='openjpa' description='Apache OpenJPA persistence engine support' version='${openjpa.version}' resolver='(obr)'> - <details>Install Apache OpenJPA as persistence engine, used by the jpa feature.</details> + <details>Enable Apache OpenJPA as persistence engine.</details> <feature>jpa</feature> <feature>http</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>mvn:commons-pool/commons-pool/${commons-pool.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:commons-lang/commons-lang/${commons-lang.version}</bundle> <bundle>mvn:org.apache.openjpa/openjpa/${openjpa.version}</bundle> </feature> + <feature name='hibernate' description='Hibernate JPA persistence engine support' version='${hibernate.version}' resolver='(obr)'> + <details>Enable Hibernate 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:net.sourceforge.cglib/com.springsource.net.sf.cglib/${cglib2.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/${hibernate.version}</bundle> + </feature> + <feature name='jndi' description='OSGi Service Registry JNDI access' version='${project.version}' resolver='(obr)'> <details>JNDI support provided by Apache Aries JNDI ${aries.jndi.version}, including additional service, commands, and MBean.</details> <bundle start-level='30'>mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/801a4647/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg index dcac072..f2244b2 100644 --- a/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assemblies/features/framework/src/main/release/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -100,6 +100,7 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false # org.ops4j.pax.url.mvn.repositories= \ http://repo1.maven.org/maven2@id=central, \ - http://repository.springsource.com/maven/bundles/release@id=spring.ebr, \ + http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \ + http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, \ file:${karaf.home}/${karaf.default.repository}@id=system.repository, \ file:${karaf.data}/kar@id=kar.repository@multi http://git-wip-us.apache.org/repos/asf/karaf/blob/801a4647/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg index c7b017e..ac31bdd 100644 --- a/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg +++ b/assemblies/features/framework/src/main/snapshot/resources/etc/org.ops4j.pax.url.mvn.cfg @@ -97,7 +97,8 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false org.ops4j.pax.url.mvn.repositories= \ http://repo1.maven.org/maven2@id=central, \ http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \ - http://repository.springsource.com/maven/bundles/release@id=spring.ebr, \ + http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \ + http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, \ http://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease, \ http://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases, \ file:${karaf.home}/${karaf.default.repository}@id=system.repository, \ http://git-wip-us.apache.org/repos/asf/karaf/blob/801a4647/manual/src/main/webapp/users-guide/jpa.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/users-guide/jpa.conf b/manual/src/main/webapp/users-guide/jpa.conf index 63bb833..1e3d6fb 100644 --- a/manual/src/main/webapp/users-guide/jpa.conf +++ b/manual/src/main/webapp/users-guide/jpa.conf @@ -17,6 +17,10 @@ Apache Karaf provides a set of ready to use persistence engine features: karaf@root()> feature:install openjpa {code} -* Hibernate. The {{hibernate}} feature will be available in the next Apache Karaf release. +* Hibernate. The {{hibernate}} feature installs the {{jpa}} feature with the Hibernate persistence engine: + +{code} +karaf@root()> feature:install hibernate +{code} * EclipseLink. The {{eclipselink}} feature will be available in the next Apache Karaf release. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/801a4647/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 96a6726..3dba112 100644 --- a/pom.xml +++ b/pom.xml @@ -120,8 +120,11 @@ <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> <cglib.bundle.version>3.0_1</cglib.bundle.version> + <cglib2.version>2.2.0</cglib2.version> <commons-beanutils.version>1.8.3</commons-beanutils.version> <commons-codec.version>1.8</commons-codec.version> <commons-collections.version>3.2.1</commons-collections.version> @@ -132,6 +135,7 @@ <commons-jexl.version>2.1.1</commons-jexl.version> <commons-lang.version>2.6</commons-lang.version> <commons-pool.version>1.6</commons-pool.version> + <dom4j.bundle.version>1.6.1_2</dom4j.bundle.version> <jasypt.bundle.version>1.9.1_1</jasypt.bundle.version> <servlet.spec.groupId>org.apache.geronimo.specs</servlet.spec.groupId> <servlet.spec.artifactId>geronimo-servlet_3.0_spec</servlet.spec.artifactId> @@ -201,7 +205,12 @@ <aries.util.version>1.1.0</aries.util.version> <gemini.blueprint.version>1.0.0.RELEASE</gemini.blueprint.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> + <hibernate.version>3.3.2.GA</hibernate.version> <jansi.version>1.11</jansi.version> + <javassist.version>3.9.0.GA</javassist.version> <jline.version>2.11</jline.version> <jledit.version>0.2.1</jledit.version> <jsw.version>3.2.3</jsw.version>
