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 2015/04/08 16:32:40 UTC
[1/2] karaf git commit: [KARAF-3632] Fix transaction
aries.transaction.howl.bufferSize property name
Repository: karaf
Updated Branches:
refs/heads/master 51f6c2ab9 -> 65e79730c
[KARAF-3632] Fix transaction aries.transaction.howl.bufferSize property name
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ed6a7ddb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ed6a7ddb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ed6a7ddb
Branch: refs/heads/master
Commit: ed6a7ddb37ba1a9ce14cd7b98cfded80344448e2
Parents: 813d5bf
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 8 16:31:21 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 8 16:31:21 2015 +0200
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/feature/feature.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ed6a7ddb/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 90c4585..905cddb 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -31,7 +31,7 @@
aries.transaction.howl.logFileDir = ${karaf.data}/txlog
aries.transaction.howl.maxLogFiles = 2
aries.transaction.howl.maxBlocksPerFile = 512
- aries.transaction.howl.bufferSizeKBytes = 4
+ aries.transaction.howl.bufferSize = 4
</config>
<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.aries/org.apache.aries.util/${aries.util.version}</bundle>
@@ -50,7 +50,7 @@
aries.transaction.howl.logFileDir = ${karaf.data}/txlog
aries.transaction.howl.maxLogFiles = 2
aries.transaction.howl.maxBlocksPerFile = 512
- aries.transaction.howl.bufferSizeKBytes = 4
+ aries.transaction.howl.bufferSize = 4
</config>
<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.aries/org.apache.aries.util/${aries.util.version}</bundle>
@@ -69,7 +69,7 @@
aries.transaction.howl.logFileDir = ${karaf.data}/txlog
aries.transaction.howl.maxLogFiles = 2
aries.transaction.howl.maxBlocksPerFile = 512
- aries.transaction.howl.bufferSizeKBytes = 4
+ aries.transaction.howl.bufferSize = 4
</config>
<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.aries/org.apache.aries.util/${aries.util.version}</bundle>
[2/2] karaf git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/karaf
Posted by jb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/65e79730
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/65e79730
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/65e79730
Branch: refs/heads/master
Commit: 65e79730c7b92f7a66061443ac7cd6d80b94f05f
Parents: ed6a7dd 51f6c2a
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Apr 8 16:32:04 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Apr 8 16:32:04 2015 +0200
----------------------------------------------------------------------
assemblies/features/base/pom.xml | 1 +
diagnostic/boot/pom.xml | 4 ++
.../diagnostic/core/internal/Activator.java | 44 ++++----------
.../diagnostic/core/internal/DumpHandler.java | 55 +++++++++++++++++
.../features/internal/service/Deployer.java | 25 +++++---
.../internal/service/FeaturesServiceImpl.java | 62 +++++++++-----------
.../org/apache/karaf/main/InstanceHelper.java | 8 ++-
.../main/java/org/apache/karaf/main/Main.java | 10 +++-
8 files changed, 131 insertions(+), 78 deletions(-)
----------------------------------------------------------------------