From 8cc2be4c5197e4a2ceeba1064bf28137b38c9c2f Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Thu, 30 Apr 2015 15:13:50 -0400
Subject: [PATCH 1/2] upgrade Proton to 0.9

This is just increasing the version of Proton
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8556da61c0..53de67ed98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,7 +334,7 @@
          <dependency>
             <groupId>org.apache.qpid</groupId>
             <artifactId>proton-j</artifactId>
-            <version>0.8</version>
+            <version>0.9</version>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>

From e30c82f66e7715595d1da937a7a2e5b67500aea4 Mon Sep 17 00:00:00 2001
From: Clebert <clebertsuconic@apache.org>
Date: Thu, 30 Apr 2015 15:13:26 -0400
Subject: [PATCH 2/2] fixing libaio runtime

The runtime execution is not picking up the libaio wrapper properly
This will fix the script with the library path and the .so placements at the output file
---
 .../org/apache/activemq/artemis/cli/commands/bin/artemis      | 2 +-
 artemis-native/pom.xml                                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 7b6dfcd0a6..c5e973e24a 100755
--- a/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -110,7 +110,7 @@ exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
     -classpath "$CLASSPATH" \
     -Dartemis.home="$ARTEMIS_HOME" \
     -Dartemis.instance="$ARTEMIS_INSTANCE" \
-    -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" \
     -Djava.io.tmpdir="$ARTEMIS_INSTANCE/tmp" \
     -Ddata.dir="$ARTEMIS_DATA_DIR" \
     -Djava.util.logging.manager="$ARTEMIS_LOG_MANAGER" \
diff --git a/artemis-native/pom.xml b/artemis-native/pom.xml
index b3bcdecfe9..99c057a96d 100644
--- a/artemis-native/pom.xml
+++ b/artemis-native/pom.xml
@@ -56,7 +56,7 @@
                         <resource>
                            <directory>bin/</directory>
                            <includes>
-                              <include>libartemisAIO32.so</include>
+                              <include>libartemis-native-32.so</include>
                            </includes>
                         </resource>
                      </resources>
@@ -74,7 +74,7 @@
                         <resource>
                            <directory>bin/</directory>
                            <includes>
-                              <include>libartemisAIO64.so</include>
+                              <include>libartemis-native-64.so</include>
                            </includes>
                         </resource>
                      </resources>