This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 533edc1 AXIS2-6028 remove Qpid from JMS unit tests because the
ancient version has a log4j 1.x dep and the new version is uphill due to a
completely new API that makes unit testing difficult
533edc1 is described below
commit 533edc173f217cb3529ed46ef557e582e6c987de
Author: Robert Lazarski
AuthorDate: Wed Mar 9 05:41:46 2022 -1000
AXIS2-6028 remove Qpid from JMS unit tests because the ancient version has
a log4j 1.x dep and the new version is uphill due to a completely new API that
makes unit testing difficult
---
.../transport/jms/src/test/conf/qpid/config.xml| 37 --
modules/transport/jms/src/test/conf/qpid/passwd| 19 -
.../jms/src/test/conf/qpid/virtualhosts.xml| 58 ---
.../axis2/transport/jms/JMSTransportTest.java | 12 ++-
.../axis2/transport/jms/QpidTestEnvironment.java | 85 --
.../org/apache/axis2/transport/jms/QpidUtil.java | 51 -
6 files changed, 5 insertions(+), 257 deletions(-)
diff --git a/modules/transport/jms/src/test/conf/qpid/config.xml
b/modules/transport/jms/src/test/conf/qpid/config.xml
deleted file mode 100644
index 2cf0ee2..000
--- a/modules/transport/jms/src/test/conf/qpid/config.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-src/test/conf/qpid
-
-
-
-
org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase
-
-
-passwordFile
-${conf}/passwd
-
-
-
-
-false
-
-${conf}/virtualhosts.xml
-
\ No newline at end of file
diff --git a/modules/transport/jms/src/test/conf/qpid/passwd
b/modules/transport/jms/src/test/conf/qpid/passwd
deleted file mode 100644
index 966a161..000
--- a/modules/transport/jms/src/test/conf/qpid/passwd
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-guest:guest
diff --git a/modules/transport/jms/src/test/conf/qpid/virtualhosts.xml
b/modules/transport/jms/src/test/conf/qpid/virtualhosts.xml
deleted file mode 100644
index 5d0d6bd..000
--- a/modules/transport/jms/src/test/conf/qpid/virtualhosts.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-test
-
-test
-
-
-org.apache.qpid.server.store.MemoryMessageStore
-
-
-3
-50
-
-queue
-
-amq.direct
-4235264
-
-2117632
-
-60
-
-
-
-
-ping
-
-amq.direct
-4235264
-
-2117632
-
-60
-
-
-
-
-
-
-
diff --git
a/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
b/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
index e611813..3e0deb7 100644
---
a/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
+++
b/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
@@ -52,11 +52,9 @@ public class JMSTransportTest extends TestCase {
// SYNAPSE-436:
suite.addExclude("(&(test=EchoXML)(replyDestType=topic)(endpoint=axis))");
-// Although Qpid is compiled for Java 1.5, it uses classes only
present in 1.6.
-if (System.getProperty("java.version").startsWith("1.5.")) {
-System.out.println("Excluding Qpid tests; please run the build
