From 46df777edb64ec6cdf265a702017e66086b70628 Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Tue, 19 May 2015 14:50:07 -0400
Subject: [PATCH] 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
---
 .../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(-)

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 30b3d27238..d99f287d74 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", ""));
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 6ba2295b5c..0f5dc3e5d0 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>
 
diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index f31e35163a..a91cf5c1ef 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 $@