summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-03-16 13:22:56 +0000
committerRobert Gemmell <robbie@apache.org>2014-03-16 13:22:56 +0000
commit48a5d6fd5bc9fade41358d475f7553a1007ca16f (patch)
treec1a22671d8f1a2797118369636e62275908bd42e
parenta2012be1b8657acdaac647f9b2d8e8c87e658177 (diff)
downloadqpid-python-48a5d6fd5bc9fade41358d475f7553a1007ca16f.tar.gz
QPID-5610: remove bin dir scripts from the manual tests module, using the exec plugin helper profile in the pom instead
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-5610-maven3-build-qmf-tools@1578064 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/AgentExternalTest.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/AgentSubscriptionTestConsole.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/AgentTest.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/AgentTestConsole.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTest.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTestConsole.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/BrokerSubscriptionTestConsole.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/InvokeMethodTest.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/PartialGetObjectsTest.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/SchemaTest.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/Test1.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/Test2.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/Test3.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/Test4.sh30
-rwxr-xr-xqpid/tools/src/java/qpid-qmf2-test/bin/URLTest.sh30
-rw-r--r--qpid/tools/src/java/qpid-qmf2-test/log4j.xml (renamed from qpid/tools/src/java/qpid-qmf2-test/bin/log4j.xml)0
-rw-r--r--qpid/tools/src/java/qpid-qmf2-test/pom.xml2
17 files changed, 1 insertions, 451 deletions
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentExternalTest.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/AgentExternalTest.sh
deleted file mode 100755
index de7778c9fe..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentExternalTest.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.AgentExternalTest "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentSubscriptionTestConsole.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/AgentSubscriptionTestConsole.sh
deleted file mode 100755
index e86860bfea..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentSubscriptionTestConsole.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.AgentSubscriptionTestConsole "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentTest.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/AgentTest.sh
deleted file mode 100755
index 9a0038e073..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentTest.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.AgentTest "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentTestConsole.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/AgentTestConsole.sh
deleted file mode 100755
index d5e958e385..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/AgentTestConsole.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.AgentTestConsole "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTest.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTest.sh
deleted file mode 100755
index e97d99c37a..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTest.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.BigPayloadAgentTest "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTestConsole.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTestConsole.sh
deleted file mode 100755
index 92ad26966f..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/BigPayloadAgentTestConsole.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.BigPayloadAgentTestConsole "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/BrokerSubscriptionTestConsole.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/BrokerSubscriptionTestConsole.sh
deleted file mode 100755
index 9db81c1ccd..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/BrokerSubscriptionTestConsole.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.BrokerSubscriptionTestConsole "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/InvokeMethodTest.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/InvokeMethodTest.sh
deleted file mode 100755
index 520cf8361d..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/InvokeMethodTest.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.InvokeMethodTest "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/PartialGetObjectsTest.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/PartialGetObjectsTest.sh
deleted file mode 100755
index 6a5b4c9ef8..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/PartialGetObjectsTest.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.PartialGetObjectsTest "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/SchemaTest.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/SchemaTest.sh
deleted file mode 100755
index 2ce33a08ca..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/SchemaTest.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.SchemaTest "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/Test1.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/Test1.sh
deleted file mode 100755
index 13bf0ae880..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/Test1.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.Test1 "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/Test2.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/Test2.sh
deleted file mode 100755
index 877655b3d4..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/Test2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.Test2 "$@"
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/Test3.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/Test3.sh
deleted file mode 100755
index 5e0e88ecc6..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/Test3.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.Test3
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/Test4.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/Test4.sh
deleted file mode 100755
index ff694e24fa..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/Test4.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.Test4
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/URLTest.sh b/qpid/tools/src/java/qpid-qmf2-test/bin/URLTest.sh
deleted file mode 100755
index aac91eea53..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/URLTest.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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.
-#
-
-WHEREAMI=`dirname $0`
-if [ -z "$QMF2_HOME" ]; then
- export QMF2_HOME=`cd $WHEREAMI/../../ && pwd`
-fi
-
-QMF2_LIBS=$QMF2_HOME/build/lib
-
-CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/qmf2test.jar
-
-java -cp $CLASSPATH org.apache.qpid.qmf2.test.URLTest
diff --git a/qpid/tools/src/java/qpid-qmf2-test/bin/log4j.xml b/qpid/tools/src/java/qpid-qmf2-test/log4j.xml
index d5169932bc..d5169932bc 100644
--- a/qpid/tools/src/java/qpid-qmf2-test/bin/log4j.xml
+++ b/qpid/tools/src/java/qpid-qmf2-test/log4j.xml
diff --git a/qpid/tools/src/java/qpid-qmf2-test/pom.xml b/qpid/tools/src/java/qpid-qmf2-test/pom.xml
index aff8ca0710..9edce2f221 100644
--- a/qpid/tools/src/java/qpid-qmf2-test/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2-test/pom.xml
@@ -137,7 +137,7 @@
<systemProperties>
<systemProperty>
<key>log4j.configuration</key>
- <value>file://${basedir}/bin/log4j.xml</value>
+ <value>file://${basedir}/log4j.xml</value>
</systemProperty>
</systemProperties>
</configuration>