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/15 14:27:41 UTC
git commit: [KARAF-2188] Set jpa container start-level earlier than
the aries one
Updated Branches:
refs/heads/master 19c874532 -> 768894019
[KARAF-2188] Set jpa container start-level earlier than the aries one
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/76889401
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/76889401
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/76889401
Branch: refs/heads/master
Commit: 768894019c6323f918e4b6a553f6cb02444f3953
Parents: 19c8745
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 15 14:26:47 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 15 14:26:47 2014 +0100
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 34 +++++++++++---------
1 file changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/76889401/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 c92cdbc..81bc2c4 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -62,7 +62,8 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/3.3_2</bundle>
- <bundle>mvn:org.apache.openjpa/openjpa/2.2.2</bundle>
+ <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.2.2</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="openjpa" description="Apache OpenJPA 2.3.x persistence engine support" version="2.3.0" resolver="(obr)">
@@ -80,12 +81,12 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
<bundle dependency="true">mvn:org.apache.xbean/xbean-asm4-shaded/${xbean.version}</bundle>
- <bundle>mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
+ <bundle start-level="29">mvn:org.apache.openjpa/openjpa/2.3.0</bundle>
+ <feature>jpa</feature>
</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>
@@ -95,16 +96,16 @@
<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/${hibernate3.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/com.springsource.org.hibernate.annotations.common/${hibernate.annotations.common.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/com.springsource.org.hibernate.annotations/${hibernate.annotations.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/com.springsource.org.hibernate.ejb/${hibernate.ejb.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/com.springsource.org.hibernate/${hibernate3.version}</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="hibernate" description="Hibernate 4.2.x JPA persistence engine support" version="${hibernate42.version}" resolver="(obr)">
<details>Enable Hibernate 4.2.x as persistence engine.</details>
<feature>transaction</feature>
- <feature>jpa</feature>
<feature>http</feature>
<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.ant/${ant.bundle.version}</bundle>
@@ -116,16 +117,16 @@
<bundle dependency="true">wrap:mvn:org.jboss/jandex/1.1.0.Final</bundle>
<bundle dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle>
<bundle dependency="true">mvn:org.hibernate.common/hibernate-commons-annotations/4.0.4.Final</bundle>
- <bundle>mvn:org.hibernate/hibernate-core/${hibernate42.version}</bundle>
- <bundle>mvn:org.hibernate/hibernate-entitymanager/${hibernate42.version}</bundle>
- <bundle>mvn:org.hibernate/hibernate-envers/${hibernate42.version}</bundle>
- <bundle>mvn:org.hibernate/hibernate-osgi/${hibernate42.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/hibernate-core/${hibernate42.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/hibernate-entitymanager/${hibernate42.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/hibernate-envers/${hibernate42.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/hibernate-osgi/${hibernate42.version}</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="hibernate" description="Hibernate 4.3.x JPA persistence engine support" version="${hibernate43.version}" resolver="(obr)">
<details>Enable Hibernate 4.3.x as persistence engine.</details>
<feature>transaction</feature>
- <feature>jpa</feature>
<feature>http</feature>
<bundle dependency="true" start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
@@ -138,9 +139,10 @@
<bundle dependency="true">wrap:mvn:org.jboss/jandex/1.1.0.Final</bundle>
<bundle dependency="true">mvn:org.jboss.logging/jboss-logging/3.1.4.GA</bundle>
<bundle dependency="true">mvn:org.hibernate.common/hibernate-commons-annotations/4.0.4.Final</bundle>
- <bundle>mvn:org.hibernate/hibernate-core/${hibernate43.version}</bundle>
- <bundle>mvn:org.hibernate/hibernate-entitymanager/${hibernate43.version}</bundle>
- <bundle>mvn:org.hibernate/hibernate-osgi/${hibernate43.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/hibernate-core/${hibernate43.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/hibernate-entitymanager/${hibernate43.version}</bundle>
+ <bundle start-level="29">mvn:org.hibernate/hibernate-osgi/${hibernate43.version}</bundle>
+ <feature>jpa</feature>
</feature>
<feature name="jndi" description="OSGi Service Registry JNDI access" version="${project.version}" resolver="(obr)">