You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/08/05 14:53:20 UTC

svn commit: r1755341 - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java

Author: rgodfrey
Date: Fri Aug  5 14:53:20 2016
New Revision: 1755341

URL: http://svn.apache.org/viewvc?rev=1755341&view=rev
Log:
QPID-7380 : Fix MessagesRestTest which depends on performing message operations on an insecure channel

Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
    qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java?rev=1755341&r1=1755340&r2=1755341&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java Fri Aug  5 14:53:20 2016
@@ -37,6 +37,7 @@ public interface HttpPort<X extends Http
     String DEFAULT_HTTP_WANT_CLIENT_AUTH = "false";
     String THREAD_POOL_MINIMUM = "threadPoolMinimum";
     String THREAD_POOL_MAXIMUM = "threadPoolMaximum";
+    String ALLOW_CONFIDENTIAL_OPERATIONS_ON_INSECURE_CHANNELS = "allowConfidentialOperationsOnInsecureChannels";
 
     @ManagedAttribute(defaultValue = "*")
     String getBindingAddress();

Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java?rev=1755341&r1=1755340&r2=1755341&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java Fri Aug  5 14:53:20 2016
@@ -38,6 +38,10 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.port.HttpPort;
+import org.apache.qpid.test.utils.TestBrokerConfiguration;
+
 public class MessagesRestTest extends QpidRestTestCase
 {
 
@@ -83,6 +87,17 @@ public class MessagesRestTest extends Qp
         _session.commit();
     }
 
+    @Override
+    protected void customizeConfiguration() throws Exception
+    {
+        super.customizeConfiguration();
+        // Allow retrieval of message information on an insecure (non-tls) connection
+        getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT,
+                                                           HttpPort.ALLOW_CONFIDENTIAL_OPERATIONS_ON_INSECURE_CHANNELS,
+                                                           true);
+
+    }
+
     public void testGet() throws Exception
     {
         String queueName = getTestQueueName();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org