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 #575

This commit is contained in:
Martyn Taylor 2016-06-09 15:29:09 +01:00
parent 9ae39f663f af8fd87eaf
commit 0c73bbc969
2 changed files with 86 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
artemis-distribution/src/test/scripts/validate-spaces.sh Executable file
View File

@ -0,0 +1,85 @@
#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# This script will validate the distribution works with folders with spaces on Linux machines
rm -rf target/with\ space
mkdir target
mkdir target/with\ space
# Setting the script to fail if anything goes wrong
set -e
export CURRENT_DIR=`pwd`
if [ $# -eq 0 ]; then
export LOCAL_USED=`ls ../../../target/apache-artemis-*bin.zip`
echo Unziping $LOCAL_USED
unzip $LOCAL_USED -d "./target/with space"
cd "./target/with space"
export ARTEMIS_HOME="`pwd`/`ls`"
echo home is $ARTEMIS_HOME
else
if [ -z "$1" ] ; then
echo "Couldn't find folder $1"
exit -1
fi
export ARTEMIS_HOME="$CURRENT_DIR/target/with space/artemis_home"
cp -r "$1" "$ARTEMIS_HOME"
fi
cd $CURRENT_DIR
export ARTEMIS_INSTANCE="$CURRENT_DIR/target/with space/artemis_instance"
echo home used is $ARTEMIS_HOME
echo artemis instance is $ARTEMIS_HOME
cd "$ARTEMIS_HOME/bin"
./artemis create --silent --force "$ARTEMIS_INSTANCE"
cd "$ARTEMIS_INSTANCE/bin"
pwd
./artemis run &
sleep 5
./artemis producer
./artemis consumer
./artemis stop
sleep 5
./artemis data print
./artemis data compact
./artemis data exp
./artemis-service start
sleep 5
./artemis producer
./artemis consumer
./artemis-service stop
cd $CURRENT_DIR
rm -rf target

2
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
View File

@ -169,7 +169,7 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
final String destinationLabel = "toServer" + destination;
final String sourceLabel = "server" + source;
Configuration configuration = createDefaultInVMConfig(source).setSecurityEnabled(false).setJMXManagementEnabled(true).setPersistenceEnabled(false).addConnectorConfiguration(destinationLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(destination))).addConnectorConfiguration(sourceLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(source))).addClusterConfiguration(new ClusterConnectionConfiguration().setName(destinationLabel).setAddress("jms").setConnectorName(sourceLabel).setRetryInterval(1000).setMaxHops(MAX_HOPS).setConfirmationWindowSize(1024).setMessageLoadBalancingType(MessageLoadBalancingType.ON_DEMAND).setStaticConnectors(new ArrayList<String>() {
Configuration configuration = createDefaultInVMConfig(source).setSecurityEnabled(false).setJMXManagementEnabled(true).setPersistenceEnabled(false).addConnectorConfiguration(destinationLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(destination))).addConnectorConfiguration(sourceLabel, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(source))).addClusterConfiguration(new ClusterConnectionConfiguration().setName(destinationLabel).setAddress("jms").setConnectorName(sourceLabel).setRetryInterval(250).setMaxHops(MAX_HOPS).setConfirmationWindowSize(1024).setMessageLoadBalancingType(MessageLoadBalancingType.ON_DEMAND).setStaticConnectors(new ArrayList<String>() {
{
add(destinationLabel);
}