karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-3104] Add connector features
Date Sun, 13 Jul 2014 15:40:00 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 8a0d1289f -> f0aad2014


[KARAF-3104] Add connector features


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f0aad201
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f0aad201
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f0aad201

Branch: refs/heads/master
Commit: f0aad2014cdb08381b72e060fd36664ee4507832
Parents: 8a0d128
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sun Jul 13 17:39:32 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sun Jul 13 17:39:32 2014 +0200

----------------------------------------------------------------------
 .../enterprise/src/main/feature/feature.xml     | 39 ++++++++++++++++++--
 pom.xml                                         |  1 -
 2 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/f0aad201/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 566564c..9d76142 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -22,8 +22,8 @@
 
     <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
 
-    <feature name="transaction" description="OSGi Transaction Manager" version="${aries.transaction.version}">
-        <details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</details>
+    <feature name="transaction" description="OSGi Transaction Manager" version="1.0.1">
+        <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
@@ -33,13 +33,46 @@
             aries.transaction.howl.bufferSizeKBytes = 4
         </config>
         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.manager.version}</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.1.0">
+        <details>JTA implementation provided by Apache Aries Transaction 1.1.0</details>
+        <config name="org.apache.aries.transaction">
+            aries.transaction.recoverable = true
+            aries.transaction.timeout = 600
+            aries.transaction.howl.logFileDir = ${karaf.data}/txlog
+            aries.transaction.howl.maxLogFiles = 2
+            aries.transaction.howl.maxBlocksPerFile = 512
+            aries.transaction.howl.bufferSizeKBytes = 4
+        </config>
+        <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+        <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.1.0</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="connector" description="OSGi support for JCA Connector 1.5" version="2.1.3">
+        <details>OSGi support for JCA Connector 1.5</details>
+        <feature version="[1.0,1.1)">transaction</feature>
+        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
+        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/2.1.3</bundle>
+    </feature>
+
+    <feature name="connector" description="OSGi support for JCA Connector 1.6" version="3.1.1">
+        <details>OSGi support for JCA Connector 1.6</details>
+        <feature version="[1.1,2)">transaction</feature>
+        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.6_spec/1.0</bundle>
+        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-validation_1.0_spec/1.1</bundle>
+        <bundle>mvn:org.apache.geronimo.components/geronimo-connector/3.1.1</bundle>
+    </feature>
+
     <feature name="jpa" description="OSGi Persistence Container" version="${aries.jpa.version}">
         <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>
         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/f0aad201/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0bcad2e..38cea28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,6 @@
         <aries.proxy.version>1.0.3</aries.proxy.version>
         <aries.proxy.api.version>1.0.1</aries.proxy.api.version>
         <aries.subsystem.version>1.0.1-SNAPSHOT</aries.subsystem.version>
-        <aries.transaction.version>1.0.1</aries.transaction.version>
         <aries.transaction.manager.version>1.1.0</aries.transaction.manager.version>
         <aries.transaction.blueprint.version>1.0.1</aries.transaction.blueprint.version>
         <aries.transaction.jdbc.version>1.0.0</aries.transaction.jdbc.version>


Mime
View raw message