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 2016/09/21 20:16:49 UTC
[1/2] activemq-artemis git commit: This closes #788
Repository: activemq-artemis
Updated Branches:
refs/heads/master 4b5672379 -> 905b7eace
This closes #788
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/905b7eac
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/905b7eac
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/905b7eac
Branch: refs/heads/master
Commit: 905b7eace0ddbd5a9b7962bf2c8bddd9f55a5dc7
Parents: 4b56723 f85a9cc
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Sep 21 16:16:33 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 16:16:33 2016 -0400
----------------------------------------------------------------------
.../resources/org/apache/activemq/artemis/cli/commands/bin/artemis | 2 +-
artemis-distribution/src/main/resources/bin/artemis | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-732 loading wrong arch lib
Posted by cl...@apache.org.
ARTEMIS-732 loading wrong arch lib
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f85a9cce
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f85a9cce
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f85a9cce
Branch: refs/heads/master
Commit: f85a9cce821848dce1506d8a1ba9c7f25d990fff
Parents: 4b56723
Author: jbertram <jb...@apache.com>
Authored: Wed Sep 21 12:41:22 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Sep 21 16:16:33 2016 -0400
----------------------------------------------------------------------
.../resources/org/apache/activemq/artemis/cli/commands/bin/artemis | 2 +-
artemis-distribution/src/main/resources/bin/artemis | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f85a9cce/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 8129341..88713c3 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -113,7 +113,7 @@ exec "$JAVACMD" ${java-opts} \
-classpath "$CLASSPATH" \
-Dartemis.home="$ARTEMIS_HOME" \
-Dartemis.instance="$ARTEMIS_INSTANCE" \
- -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-i686:$ARTEMIS_HOME/bin/lib/linux-x86_64" \
+ -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-$(uname -m)" \
-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/f85a9cce/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 9aef511..c53c6f9 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -93,6 +93,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_HOME/bin/lib/linux-x86_64" \
+ -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-$(uname -m)" \
$DEBUG_ARGS \
org.apache.activemq.artemis.boot.Artemis "$@"