Repository: karaf Updated Branches: refs/heads/karaf-2.x 2ca10f4bb -> 623563290
[KARAF-3393] Refactore the jpa features to support JPA API 2.0 and 2.1 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/62356329 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/62356329 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/62356329 Branch: refs/heads/karaf-2.x Commit: 623563290b6d2c72c31b610321b1ff3e4be94c58 Parents: 2ca10f4 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sat Dec 27 15:49:05 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sat Dec 27 15:49:05 2014 +0100 ---------------------------------------------------------------------- .../enterprise/src/main/resources/features.xml | 54 +++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/62356329/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 30eb25b..266b5ec 100644 --- a/assemblies/features/enterprise/src/main/resources/features.xml +++ b/assemblies/features/enterprise/src/main/resources/features.xml @@ -42,8 +42,8 @@ </conditional> </feature> - <feature name="transaction" description="OSGi Transaction Manager" version="1.1.1" resolver="(obr)"> - <details>JTA implementation provided by Apache Aries Transaction 1.1.1</details> + <feature name="transaction" description="OSGi Transaction Manager" version="1.0.1" resolver="(obr)"> + <details>JTA implementation provided by Apache Aries Transaction 1.0.1</details> <config name="org.apache.aries.transaction"> aries.transaction.recoverable = true aries.transaction.timeout = 600 @@ -54,15 +54,15 @@ </config> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle> - <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.1</bundle> + <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle> <conditional> <condition>aries-blueprint</condition> <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle> </conditional> </feature> - <feature name="transaction" description="OSGi Transaction Manager" version="1.0.1" resolver="(obr)"> - <details>JTA implementation provided by Apache Aries Transaction 1.0.1</details> + <feature name="transaction" description="OSGi Transaction Manager" version="1.1.1" resolver="(obr)"> + <details>JTA implementation provided by Apache Aries Transaction 1.1.1</details> <config name="org.apache.aries.transaction"> aries.transaction.recoverable = true aries.transaction.timeout = 600 @@ -73,7 +73,7 @@ </config> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle> - <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle> + <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.1</bundle> <conditional> <condition>aries-blueprint</condition> <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.blueprint.version}</bundle> @@ -95,9 +95,9 @@ <bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle> </feature> - <feature name="jpa" description="OSGi Persistence Container 2.0/2.1" version="${aries.jpa.version}" resolver="(obr)"> - <details>JPA 2.0 implementation provided by Apache Aries JPA ${aries.jpa.version}. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details> - <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> + <feature name="jpa" description="OSGi Persistence Container" version="2.0.0" resolver="(obr)"> + <details>JPA implementation provided by Apache Aries JPA ${aries.jpa.version}. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details> + <feature version="[1.1,2)">transaction</feature> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> <bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle> <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.api.version}</bundle> @@ -109,13 +109,26 @@ </conditional> </feature> + <feature name="jpa" description="OSGi Persistence Container" version="2.1.0" resolver="(obr)"> + <details>JPA implementation provided by Apache Aries JPA ${aries.jpa.version}. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details> + <feature version="[1.1,2)">transaction</feature> + <bundle dependency="true" start-level="20">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle> + <bundle dependency="true" start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle> + <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.api.version}</bundle> + <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.container.version}</bundle> + <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/${aries.jpa.container.context.version}</bundle> + <conditional> + <condition>aries-blueprint</condition> + <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/${aries.jpa.blueprint.version}</bundle> + </conditional> + </feature> + <feature name="openjpa" description="Apache OpenJPA 2.2.x persistent engine support" version="2.2.2" resolver="(obr)"> <details>Enable Apache OpenJPA as persistence engine.</details> + <feature version="2.0.0">jpa</feature> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.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> @@ -125,16 +138,14 @@ <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 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)"> <details>Enable Apache OpenJPA as persistence engine.</details> + <feature version="2.0.0">jpa</feature> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.2</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle> - <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle> <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.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> @@ -144,12 +155,11 @@ <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/3.16</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> - <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/${servicemix.specs.version}</bundle> + <feature version="2.0.0">jpa</feature> <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> @@ -162,12 +172,11 @@ <bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate.annotations/${hibernate.annotations.version}</bundle> <bundle start-level="100">mvn:org.hibernate/com.springsource.org.hibernate.ejb/${hibernate.ejb.version}</bundle> <bundle start-level="100">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 version="2.0.0">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> @@ -182,7 +191,6 @@ <bundle start-level="100">mvn:org.hibernate/hibernate-core/${hibernate42.version}</bundle> <bundle start-level="100">mvn:org.hibernate/hibernate-entitymanager/${hibernate42.version}</bundle> <bundle start-level="100">mvn:org.hibernate/hibernate-osgi/${hibernate42.version}</bundle> - <feature>jpa</feature> </feature> <feature name="hibernate-envers" description="Hibernate Envers 4.2.x" version="${hibernate42.version}" resolver="(obr)"> @@ -193,9 +201,8 @@ <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 version="2.1.0">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> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle> @@ -209,7 +216,6 @@ <bundle start-level="100">mvn:org.hibernate/hibernate-core/${hibernate43.version}</bundle> <bundle start-level="100">mvn:org.hibernate/hibernate-entitymanager/${hibernate43.version}</bundle> <bundle start-level="100">mvn:org.hibernate/hibernate-osgi/${hibernate43.version}</bundle> - <feature>jpa</feature> </feature> <feature name="hibernate-envers" description="Hibernate Envers 4.3.x" version="${hibernate43.version}" resolver="(obr)"> @@ -245,7 +251,7 @@ <feature name="jdbc" description="JDBC service and commands" version="${project.version}" resolver="(obr)"> <details>JDBC support providing service, commands, and MBean</details> - <feature>transaction</feature> + <feature version="[1.1,2)">transaction</feature> <feature>management</feature> <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle> <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle> @@ -258,7 +264,7 @@ <feature name="jms" description="JMS service and commands" version="${project.version}" resolver="(obr)"> <details>JMS support provinding service, commands, and MBean.</details> - <feature>transaction</feature> + <feature version="[1.1,2)">transaction</feature> <feature>management</feature> <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle> <bundle>mvn:org.apache.karaf.jms/org.apache.karaf.jms.core/${project.version}</bundle>
