You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/06/09 14:29:33 UTC
[1/3] activemq-artemis git commit: Fixing a few intermittent test
failures
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9ae39f663 -> 0c73bbc96
Fixing a few intermittent test failures
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/24905636
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/24905636
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/24905636
Branch: refs/heads/master
Commit: 249056367d78224e7833ab071b14970c27c17d6e
Parents: 9ae39f6
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jun 8 13:56:15 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 9 10:10:58 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/tests/util/JMSClusteredTestBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/24905636/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index 6dc148d..c624322 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -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);
}
[2/3] activemq-artemis git commit: validate script
Posted by ma...@apache.org.
validate script
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/af8fd87e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/af8fd87e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/af8fd87e
Branch: refs/heads/master
Commit: af8fd87eaf6fc0cb7bda34f0ec3cb0a8d4f31572
Parents: 2490563
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jun 8 21:22:55 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jun 9 10:12:28 2016 -0400
----------------------------------------------------------------------
.../src/test/scripts/validate-spaces.sh | 85 ++++++++++++++++++++
1 file changed, 85 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af8fd87e/artemis-distribution/src/test/scripts/validate-spaces.sh
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/test/scripts/validate-spaces.sh b/artemis-distribution/src/test/scripts/validate-spaces.sh
new file mode 100755
index 0000000..8381230
--- /dev/null
+++ b/artemis-distribution/src/test/scripts/validate-spaces.sh
@@ -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
[3/3] activemq-artemis git commit: This closes #575
Posted by ma...@apache.org.
This closes #575
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0c73bbc9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0c73bbc9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0c73bbc9
Branch: refs/heads/master
Commit: 0c73bbc9696f11feac142dcabc2992e4876fdce5
Parents: 9ae39f6 af8fd87
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Jun 9 15:29:09 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Jun 9 15:29:09 2016 +0100
----------------------------------------------------------------------
.../src/test/scripts/validate-spaces.sh | 85 ++++++++++++++++++++
.../tests/util/JMSClusteredTestBase.java | 2 +-
2 files changed, 86 insertions(+), 1 deletion(-)
----------------------------------------------------------------------