merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663717 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 42 insertions, 12 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
index e609d73268..19708353aa 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
@@ -76,6 +76,9 @@ public class Asserts
                                 ConfiguredObject.DESCRIPTION,
                                 ConfiguredObject.CONTEXT,
                                 ConfiguredObject.DESIRED_STATE,
+                                VirtualHost.ENABLED_CONNECTION_VALIDATORS,
+                                VirtualHost.DISABLED_CONNECTION_VALIDATORS,
+                                VirtualHost.GLOBAL_ADDRESS_DOMAINS,
                                 VirtualHost.TYPE);
 
         assertEquals("Unexpected value of attribute " + VirtualHost.NAME,
@@ -126,7 +129,9 @@ public class Asserts
                                         Queue.MESSAGE_GROUP_SHARED_GROUPS,
                                         PriorityQueue.PRIORITIES,
                                         ConfiguredObject.CONTEXT,
-                                        ConfiguredObject.DESIRED_STATE);
+                                        ConfiguredObject.DESIRED_STATE,
+                                        Queue.DEFAULT_FILTERS,
+                                        Queue.ENSURE_NONDESTRUCTIVE_CONSUMERS);
 
         assertEquals("Unexpected value of queue attribute " + Queue.NAME, queueName, queueData.get(Queue.NAME));
         assertNotNull("Unexpected value of queue attribute " + Queue.ID, queueData.get(Queue.ID));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
index df87432344..91447677a5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
@@ -36,7 +36,6 @@ import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
 public class QpidRestTestCase extends QpidBrokerTestCase
 {
-    public static final String ANONYMOUS_AUTHENTICATION_PROVIDER = "testAnonymous";
     public static final String EXTERNAL_AUTHENTICATION_PROVIDER = "testExternal";
 
     public static final String TEST1_VIRTUALHOST = "test";
@@ -88,11 +87,6 @@ public class QpidRestTestCase extends QpidBrokerTestCase
         config.removeObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_JMX_PORT);
         config.removeObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_RMI_PORT);
 
-        Map<String, Object> anonymousProviderAttributes = new HashMap<String, Object>();
-        anonymousProviderAttributes.put(AuthenticationProvider.TYPE, AnonymousAuthenticationManager.PROVIDER_TYPE);
-        anonymousProviderAttributes.put(AuthenticationProvider.NAME, ANONYMOUS_AUTHENTICATION_PROVIDER);
-        config.addObjectConfiguration(AuthenticationProvider.class, anonymousProviderAttributes);
-
         config.setObjectAttribute(AuthenticationProvider.class, TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER,
                                   "secureOnlyMechanisms",
                                   "{}");
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
index 469e6ce52b..67978a264e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
@@ -31,10 +31,11 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
 import java.util.Collections;
@@ -303,7 +304,7 @@ public class RestTestHelper
     public void createNewGroupMember(String groupProviderName, String groupName, String memberName, int responseCode) throws IOException
     {
         HttpURLConnection connection = openManagementConnection(
-                "groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" +  URLDecoder.decode(memberName, "UTF-8"),
+                "groupmember/" + encodeAsUTF(groupProviderName) + "/"+ encodeAsUTF(groupName) + "/" +  encodeAsUTF(memberName),
                 "PUT");
 
         Map<String, Object> groupMemberData = new HashMap<String, Object>();
@@ -323,7 +324,7 @@ public class RestTestHelper
     public void removeMemberFromGroup(String groupProviderName, String groupName, String memberName, int responseCode) throws IOException
     {
         HttpURLConnection connection = openManagementConnection(
-                "groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" +  URLDecoder.decode(memberName, "UTF-8"),
+                "groupmember/" + encodeAsUTF(groupProviderName) + "/"+ encodeAsUTF(groupName) + "/" +  encodeAsUTF(memberName),
                 "DELETE");
 
         Assert.assertEquals("Unexpected response code", responseCode, connection.getResponseCode());
@@ -356,7 +357,7 @@ public class RestTestHelper
     public void createGroup(String groupName, String groupProviderName, int responseCode) throws IOException
     {
         HttpURLConnection connection = openManagementConnection(
-                "group/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8"),
+                "group/" + encodeAsUTF(groupProviderName) + "/"+ encodeAsUTF(groupName),
                 "PUT");
 
         Map<String, Object> groupData = new HashMap<String, Object>();
@@ -389,7 +390,7 @@ public class RestTestHelper
     public void removeGroup(String groupName, String groupProviderName, int responseCode) throws IOException
     {
         HttpURLConnection connection = openManagementConnection(
-                "group/" + URLDecoder.decode(groupProviderName, "UTF-8") + "/"+ URLDecoder.decode(groupName, "UTF-8"),
+                "group/" + encodeAsUTF(groupProviderName) + "/"+ encodeAsUTF(groupName),
                 "DELETE");
 
         Assert.assertEquals("Unexpected response code", responseCode, connection.getResponseCode());
@@ -575,4 +576,20 @@ public class RestTestHelper
         }
     }
 
+    public String encode(String value, String encoding) throws UnsupportedEncodingException
+    {
+        return URLEncoder.encode(value, encoding).replace("+", "%20");
+    }
+
+    public String encodeAsUTF(String value)
+    {
+        try
+        {
+            return encode(value, "UTF8");
+        }
+        catch(UnsupportedEncodingException e)
+        {
+            throw new RuntimeException("Unsupported encoding UTF8", e);
+        }
+    }
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 9a3308603b..9bcc2cb3ae 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -59,6 +59,7 @@ import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.server.Broker;
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -189,6 +190,19 @@ public class QpidBrokerTestCase extends QpidTestCase
         _brokerConfigurations = new HashMap<Integer, TestBrokerConfiguration>();
         initialiseSpawnedBrokerLogConfigFile();
         _brokerCommandTemplate = BROKER_COMMAND_TEMPLATE;
+
+
+        if (JAVA.equals(_brokerLanguage))
+        {
+            try
+            {
+                Broker.populateSystemPropertiesFromDefaults(null);
+            }
+            catch (IOException ioe)
+            {
+                throw new RuntimeException("Failed to load Java broker system properties", ioe);
+            }
+        }
     }
 
     public TestBrokerConfiguration getBrokerConfiguration(int port)