You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2014/07/26 03:52:09 UTC
[27/50] git commit: [KARAF-3104] Fix connector features transaction
dependency
[KARAF-3104] Fix connector features transaction dependency
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ced78eb5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ced78eb5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ced78eb5
Branch: refs/remotes/karaf-2.3.x
Commit: ced78eb5177d211006b568df7c77f084ca81693c
Parents: f0fc951
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jul 16 21:51:55 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 16 21:51:55 2014 +0200
----------------------------------------------------------------------
.../enterprise/src/main/resources/features.xml | 21 +++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ced78eb5/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 80fbec6..b014bd2 100644
--- a/assemblies/features/enterprise/src/main/resources/features.xml
+++ b/assemblies/features/enterprise/src/main/resources/features.xml
@@ -22,6 +22,21 @@
<repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax.cdi.version}/xml/features</repository>
+ <feature name="transaction" description="OSGi Transaction Manager" version="1.0.0" resolver="(obr)">
+ <details>JTA implementation provided by Apache Aries Transaction 1.0.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.blueprint/${aries.transaction.blueprint.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.0</bundle>
+ </feature>
+
<feature name="transaction" description="OSGi Transaction Manager" version="1.1.0" resolver="(obr)">
<details>JTA implementation provided by Apache Aries Transaction 1.1.0</details>
<config name="org.apache.aries.transaction">
@@ -52,11 +67,11 @@
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>
</feature>
- <feature name="connector" description="OSGi support for JCA Connector 1.5" version="2.1.3" resolver="(obr)">
+ <feature name="connector" description="OSGi support for JCA Connector 1.5" version="2.2.2" resolver="(obr)">
<details>OSGi support for JCA Connector 1.5</details>
- <feature version="[1.0,1.1)">transaction</feature>
+ <feature version="[1.0.0,1.0.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>
+ <bundle>mvn:org.apache.geronimo.components/geronimo-connector/2.2.2</bundle>
</feature>
<feature name="connector" description="OSGi support for JCA Connector 1.6" version="3.1.1" resolver="(obr)">