You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2015/04/30 21:38:51 UTC
[2/3] activemq-artemis git commit: fixing libaio runtime
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
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e30c82f6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e30c82f6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e30c82f6
Branch: refs/heads/master
Commit: e30c82f66e7715595d1da937a7a2e5b67500aea4
Parents: 8cc2be4
Author: Clebert <cl...@apache.org>
Authored: Thu Apr 30 15:13:26 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Apr 30 15:14:45 2015 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/bin/artemis | 2 +-
artemis-native/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e30c82f6/artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
----------------------------------------------------------------------
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 7b6dfcd..c5e973e 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" \
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e30c82f6/artemis-native/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-native/pom.xml b/artemis-native/pom.xml
index b3bcdec..99c057a 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>