karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3246] Rename jpa feature as jpa20 (with jpa alias) and jpa21
Date Fri, 26 Sep 2014 04:40:51 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 5cba362d6 -> db62e5d83


[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/db62e5d8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/db62e5d8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/db62e5d8

Branch: refs/heads/master
Commit: db62e5d836ba26da0ab8f298bf6ef598d97c0a13
Parents: 5cba362
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Fri Sep 26 06:40:25 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Fri Sep 26 06:40:25 2014 +0200

----------------------------------------------------------------------
 .../features/enterprise/src/main/feature/feature.xml   |  7 +++++--
 .../karaf/itests/features/EnterpriseFeaturesTest.java  | 13 +++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/db62e5d8/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 228ac05..24073ce 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -91,7 +91,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">
+    <feature name="jpa20" description="OSGi Persistence Container 2.0" version="1.0.1">
         <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>
@@ -103,8 +103,11 @@
             <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/1.0.1</bundle>
         </conditional>
     </feature>
+    <feature name="jpa" description="OSGi Persistence Container 2.0" version="1.0.1">
+        <feature>jpa20</feature>
+    </feature>
 
-    <feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}">
+    <feature name="jpa21" description="OSGi Persistence Container 2.1" version="${aries.jpa.version}">
         <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/db62e5d8/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 b04e802..f7d76da 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
@@ -50,13 +50,18 @@ public class EnterpriseFeaturesTest extends KarafTestSupport {
     }
 
     @Test
-    public void installJpa101Feature() throws Exception {
-    	installAssertAndUninstallFeature("jpa", "1.0.1");
+    public void installJpa20Feature() throws Exception {
+    	installAssertAndUninstallFeatures("jpa20");
     }
 
     @Test
-    public void installJpa102Feature() throws Exception {
-        installAssertAndUninstallFeature("jpa", "1.0.2");
+    public void installJpaFeature() throws Exception {
+        installAssertAndUninstallFeatures("jpa");
+    }
+
+    @Test
+    public void installJpa21Feature() throws Exception {
+        installAssertAndUninstallFeatures("jpa21");
     }
 
     @Test


Mime
View raw message