Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #217 proton/libaio updates

This commit is contained in:
jbertram 2015-04-30 14:37:20 -05:00
parent 63a857d18d e30c82f66e
commit 903c8a2527
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
View File

@ -110,7 +110,7 @@ exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \
-Dartemis.home="$ARTEMIS_HOME" \ -Dartemis.home="$ARTEMIS_HOME" \
-Dartemis.instance="$ARTEMIS_INSTANCE" \ -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" \ -Djava.io.tmpdir="$ARTEMIS_INSTANCE/tmp" \
-Ddata.dir="$ARTEMIS_DATA_DIR" \ -Ddata.dir="$ARTEMIS_DATA_DIR" \
-Djava.util.logging.manager="$ARTEMIS_LOG_MANAGER" \ -Djava.util.logging.manager="$ARTEMIS_LOG_MANAGER" \

4
artemis-native/pom.xml
View File

@ -56,7 +56,7 @@
<resource> <resource>
<directory>bin/</directory> <directory>bin/</directory>
<includes> <includes>
<include>libartemisAIO32.so</include> <include>libartemis-native-32.so</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>
@ -74,7 +74,7 @@
<resource> <resource>
<directory>bin/</directory> <directory>bin/</directory>
<includes> <includes>
<include>libartemisAIO64.so</include> <include>libartemis-native-64.so</include>
</includes> </includes>
</resource> </resource>
</resources> </resources>

2
pom.xml
View File

@ -334,7 +334,7 @@
<dependency> <dependency>
<groupId>org.apache.qpid</groupId> <groupId>org.apache.qpid</groupId>
<artifactId>proton-j</artifactId> <artifactId>proton-j</artifactId>
<version>0.8</version> <version>0.9</version>
<!-- License: Apache 2.0 --> <!-- License: Apache 2.0 -->
</dependency> </dependency>
<dependency> <dependency>