You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/07/13 17:26:37 UTC
git commit: [KARAF-3104] Add connector features
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x dca779192 -> c6040c777
[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/c6040c77
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c6040c77
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c6040c77
Branch: refs/heads/karaf-3.0.x
Commit: c6040c777a52d36f2598012ca001cbd0e5a91aad
Parents: dca7791
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sun Jul 13 17:26:03 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sun Jul 13 17:26:03 2014 +0200
----------------------------------------------------------------------
.../enterprise/src/main/feature/feature.xml | 34 ++++++++++++++++++--
pom.xml | 1 -
2 files changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6040c77/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 06905e4..5467c7c 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -22,7 +22,7 @@
<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}" resolver="(obr)">
+ <feature name="transaction" description="OSGi Transaction Manager" version="1.0.1" resolver="(obr)">
<details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</details>
<config name="org.apache.aries.transaction">
aries.transaction.recoverable = true
@@ -34,7 +34,37 @@
</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/${aries.transaction.manager.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>
+ </feature>
+
+ <feature name="transaction" description="OSGi Transaction Manager" version="1.1.0" resolver="(obr)">
+ <details>JTA implementation provided by Apache Aries Transaction ${aries.transaction.version}</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.1.0</bundle>
+ </feature>
+
+ <feature name="connector" description="OSGi Support for JCA Connector 1.5" version="2.1.3" resolver="(obr)">
+ <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" resolver="(obr)">
+ <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}" resolver="(obr)">
http://git-wip-us.apache.org/repos/asf/karaf/blob/c6040c77/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bedd932..c195fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,6 @@
<aries.jndi.api.version>1.0.0</aries.jndi.api.version>
<aries.proxy.version>1.0.3</aries.proxy.version>
<aries.proxy.api.version>1.0.1</aries.proxy.api.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>