Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 2ea914381 -> eaa6488e4
[KARAF-3246] Rename jpa feature as jpa20 (with jpa alias) and jpa21 Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/eaa6488e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/eaa6488e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/eaa6488e Branch: refs/heads/karaf-3.0.x Commit: eaa6488e4b38059f374055ee1f94ea41933372b9 Parents: 2ea9143 Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Fri Sep 26 06:19:04 2014 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Fri Sep 26 06:19:04 2014 +0200 ---------------------------------------------------------------------- assemblies/features/enterprise/src/main/feature/feature.xml | 7 +++++-- .../karaf/itests/features/EnterpriseFeaturesTest.java | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/eaa6488e/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 6d9260c..a325671 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -85,7 +85,7 @@ <bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle> </feature> - <feature name="jpa" description="OSGi Persistence Container" version="1.0.1" resolver="(obr)"> + <feature name="jpa20" description="OSGi Persistence Container 2.0" version="1.0.1" resolver="(obr)"> <details>JPA 2.0 implementation provided by Apache Aries JPA 1.0.1. 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> <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle> @@ -94,8 +94,11 @@ <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/1.0.0</bundle> <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/1.0.1</bundle> </feature> + <feature name="jpa" description="OSGi Persistence Container 2.0" version="1.0.1" resolver="(obr)"> + <feature>jpa20</feature> + </feature> - <feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}" resolver="(obr)"> + <feature name="jpa21" description="OSGi Persistence Container 2.1" version="${aries.jpa.version}" resolver="(obr)"> <details>JPA 2.1 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> <bundle dependency="true" start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle> http://git-wip-us.apache.org/repos/asf/karaf/blob/eaa6488e/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java index ccb7eb1..cb8ce6c 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java @@ -30,8 +30,13 @@ public class EnterpriseFeaturesTest extends KarafTestSupport { } @Test - public void installJpaFeature() throws Exception { - installAssertAndUninstallFeature("jpa"); + public void installJpa20Feature() throws Exception { + installAssertAndUninstallFeature("jpa20"); + } + + @Test + public void installJpa21Feature() throws Exception { + installAssertAndUninstallFeature("jpa21"); } @Test
