You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/19 21:28:40 UTC
[1/2] activemq-artemis git commit: Fixing libaio integration /
creation
Repository: activemq-artemis
Updated Branches:
refs/heads/master 50c3dda87 -> 89adfaa11
Fixing libaio integration / creation
My last patch had a little flaw around libaio load (The main script is not finding the .so properly) and my configuration was wrong
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/46df777e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/46df777e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/46df777e
Branch: refs/heads/master
Commit: 46df777edb64ec6cdf265a702017e66086b70628
Parents: 50c3dda
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 19 14:50:07 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 19 15:18:04 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/artemis/cli/commands/Create.java | 2 +-
.../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 2 +-
artemis-distribution/src/main/resources/bin/artemis | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46df777e/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 30b3d27..d99f287 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -418,7 +418,7 @@ public class Create extends ActionAbstract
}
else
{
- filters.put("${journal.settings}", "AIO");
+ filters.put("${journal.settings}", "ASYNCIO");
}
filters.put("${user}", System.getProperty("user.name", ""));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46df777e/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 6ba2295..0f5dc3e 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -29,7 +29,7 @@ under the License.
<core xmlns="urn:activemq:core">
- <!-- this could be AIO or NIO
+ <!-- this could be ASYNCIO or NIO
-->
<journal-type>${journal.settings}</journal-type>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/46df777e/artemis-distribution/src/main/resources/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index f31e351..a91cf5c 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -103,6 +103,6 @@ fi
exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
-classpath "$CLASSPATH" \
-Dartemis.home="$ARTEMIS_HOME" \
- -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-i686:$ARTEMIS_INSTANCE/bin/lib/linux-x86_64" \
+ -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-i686:$ARTEMIS_HOME/bin/lib/linux-x86_64" \
$DEBUG_ARGS \
org.apache.activemq.artemis.boot.Artemis $@
[2/2] activemq-artemis git commit: This closes #269 on libaio fix
Posted by cl...@apache.org.
This closes #269 on libaio fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/89adfaa1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/89adfaa1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/89adfaa1
Branch: refs/heads/master
Commit: 89adfaa1125fe5baaa9e97bf496456b5f58502eb
Parents: 50c3dda 46df777
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 19 15:28:14 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 19 15:28:14 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/artemis/cli/commands/Create.java | 2 +-
.../org/apache/activemq/artemis/cli/commands/etc/broker.xml | 2 +-
artemis-distribution/src/main/resources/bin/artemis | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------