qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1658748 [6/6] - in /qpid/branches/QPID-6262-JavaBrokerNIO: ./ qpid/ qpid/cpp/ qpid/cpp/CMakeModules/ qpid/cpp/src/ qpid/cpp/src/qpid/ qpid/cpp/src/qpid/amqp/ qpid/cpp/src/qpid/broker/ qpid/cpp/src/qpid/broker/amqp/ qpid/cpp/src/qpid/client...
Date Tue, 10 Feb 2015 16:15:10 GMT
Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java?rev=1658748&r1=1658747&r2=1658748&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
(original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
Tue Feb 10 16:15:08 2015
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRes
 
 
 import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.KeyStore;
 import org.apache.qpid.server.security.FileKeyStore;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -52,8 +53,12 @@ public class KeyStoreRestTest extends Qp
         List<Map<String, Object>> keyStores = assertNumberOfKeyStores(1);
 
         Map<String, Object> keystore = keyStores.get(0);
-        assertKeyStoreAttributes(keystore, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE,
-                QPID_HOME + "/../" + TestSSLConstants.BROKER_KEYSTORE, null);
+
+        assertEquals("Unexpected name", TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE,
keystore.get(KeyStore.NAME));
+        assertEquals("unexpected path to key store", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.STORE_URL));
+        assertEquals("unexpected (dummy) password of default systests key store", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
+        assertEquals("unexpected type of default systests key store", java.security.KeyStore.getDefaultType(),
keystore.get(FileKeyStore.KEY_STORE_TYPE));
+        assertFalse("should not be a certificateAlias attribute", keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
     }
 
     public void testCreate() throws Exception
@@ -67,10 +72,14 @@ public class KeyStoreRestTest extends Qp
         createKeyStore(name, certAlias, TestSSLConstants.KEYSTORE, TestSSLConstants.KEYSTORE_PASSWORD);
         assertNumberOfKeyStores(2);
 
-        List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/"
+ name);
+        List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/"
+ name + "?actuals=true");
         assertNotNull("details cannot be null", keyStores);
 
-        assertKeyStoreAttributes(keyStores.get(0), name, TestSSLConstants.KEYSTORE, certAlias);
+        Map<String, Object> keystore = keyStores.get(0);
+        assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
+        assertEquals("unexpected path to key store", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.STORE_URL));
+        assertEquals("unexpected password", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
+        assertEquals("unexpected alias", certAlias, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
     }
 
     public void testCreateWithDataUrl() throws Exception
@@ -85,10 +94,14 @@ public class KeyStoreRestTest extends Qp
         createKeyStore(name, null, dataUrlForKeyStore, TestSSLConstants.KEYSTORE_PASSWORD);
         assertNumberOfKeyStores(2);
 
-        List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/"
+ name);
+        List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/"
+ name + "?actuals=true");
         assertNotNull("details cannot be null", keyStores);
 
-        assertKeyStoreAttributes(keyStores.get(0), name, dataUrlForKeyStore, null);
+        Map<String, Object> keystore = keyStores.get(0);
+        assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
+        assertEquals("unexpected data", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.STORE_URL));
+        assertEquals("unexpected password", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
+        assertEquals("unexpected alias", null, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
     }
 
     public void testDelete() throws Exception
@@ -104,15 +117,17 @@ public class KeyStoreRestTest extends Qp
 
         getRestTestHelper().submitRequest("keystore/" + name, "DELETE", HttpServletResponse.SC_OK);
 
-        List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/"
+ name);
+        List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/"
+ name + "?actuals=true");
         assertNotNull("details should not be null", keyStore);
         assertTrue("details should be empty as the keystore no longer exists", keyStore.isEmpty());
 
         //check only the default systests key store remains
         List<Map<String, Object>> keyStores = assertNumberOfKeyStores(1);
         Map<String, Object> keystore = keyStores.get(0);
-        assertKeyStoreAttributes(keystore, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE,
-                QPID_HOME + "/../" + TestSSLConstants.BROKER_KEYSTORE, null);
+        assertEquals("Unexpected name", TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE,
keystore.get(KeyStore.NAME));
+        assertEquals("unexpected path to key store", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.STORE_URL));
+        assertEquals("unexpected (dummy) password of default systests key store", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
+        assertFalse("should not be a certificateAlias attribute", keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
     }
 
     public void testUpdate() throws Exception
@@ -127,14 +142,18 @@ public class KeyStoreRestTest extends Qp
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(KeyStore.NAME, name);
-        attributes.put(FileKeyStore.PATH, TestSSLConstants.UNTRUSTED_KEYSTORE);
+        attributes.put(FileKeyStore.STORE_URL, TestSSLConstants.UNTRUSTED_KEYSTORE);
 
         getRestTestHelper().submitRequest("keystore/" + name, "PUT", attributes, HttpServletResponse.SC_OK);
 
-        List<Map<String, Object>> keyStore = getRestTestHelper().getJsonAsList("keystore/"
+ name);
-        assertNotNull("details should not be null", keyStore);
+        List<Map<String, Object>> keyStores = getRestTestHelper().getJsonAsList("keystore/"
+ name + "?actuals=true");
+        assertNotNull("details should not be null", keyStores);
 
-        assertKeyStoreAttributes(keyStore.get(0), name, TestSSLConstants.UNTRUSTED_KEYSTORE,
null);
+        Map<String, Object> keystore = keyStores.get(0);
+        assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
+        assertEquals("unexpected data", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.STORE_URL));
+        assertEquals("unexpected password", AbstractConfiguredObject.SECURED_STRING_VALUE,
keystore.get(FileKeyStore.PASSWORD));
+        assertEquals("unexpected alias", null, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
     }
 
 
@@ -151,7 +170,7 @@ public class KeyStoreRestTest extends Qp
     {
         Map<String, Object> keyStoreAttributes = new HashMap<>();
         keyStoreAttributes.put(KeyStore.NAME, name);
-        keyStoreAttributes.put(FileKeyStore.PATH, keyStorePath);
+        keyStoreAttributes.put(FileKeyStore.STORE_URL, keyStorePath);
         keyStoreAttributes.put(FileKeyStore.PASSWORD, keystorePassword);
         if (certAlias != null)
         {
@@ -161,26 +180,4 @@ public class KeyStoreRestTest extends Qp
         getRestTestHelper().submitRequest("keystore/" + name, "PUT", keyStoreAttributes,
HttpServletResponse.SC_CREATED);
     }
 
-    private void assertKeyStoreAttributes(Map<String, Object> keystore, String name,
String path, String certAlias)
-    {
-        assertEquals("default systests key store is missing",
-                name, keystore.get(KeyStore.NAME));
-        assertEquals("unexpected path to key store",
-                path, keystore.get(FileKeyStore.PATH));
-        assertEquals("unexpected (dummy) password of default systests key store",
-                     AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.PASSWORD));
-        assertEquals("unexpected type of default systests key store",
-                java.security.KeyStore.getDefaultType(), keystore.get(FileKeyStore.KEY_STORE_TYPE));
-        if(certAlias == null)
-        {
-            assertFalse("should not be a certificateAlias attribute",
-                            keystore.containsKey(FileKeyStore.CERTIFICATE_ALIAS));
-        }
-        else
-        {
-            assertEquals("unexpected certificateAlias value",
-                         certAlias, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
-
-        }
-    }
 }

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java?rev=1658748&r1=1658747&r2=1658748&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
(original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/TrustStoreRestTest.java
Tue Feb 10 16:15:08 2015
@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.TrustStore;
 import org.apache.qpid.server.security.FileTrustStore;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -36,6 +37,7 @@ import org.apache.qpid.util.FileUtils;
 
 public class TrustStoreRestTest extends QpidRestTestCase
 {
+
     @Override
     public void setUp() throws Exception
     {
@@ -51,8 +53,14 @@ public class TrustStoreRestTest extends
         List<Map<String, Object>> trustStores = assertNumberOfTrustStores(1);
 
         Map<String, Object> truststore = trustStores.get(0);
-        assertTrustStoreAttributes(truststore, TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE,
-                QPID_HOME + "/../" + TestSSLConstants.BROKER_TRUSTSTORE, false);
+        assertEquals("default systests trust store is missing",
+                TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE, truststore.get(TrustStore.NAME));
+        assertEquals("unexpected store URL", ConfiguredObject.OVER_SIZED_ATTRIBUTE_ALTERNATIVE_TEXT,
truststore.get(FileTrustStore.STORE_URL));
+        assertEquals("unexpected (dummy) password of default systests trust store",
+                     AbstractConfiguredObject.SECURED_STRING_VALUE, truststore.get(FileTrustStore.PASSWORD));
+        assertEquals("unexpected type of default systests trust store",
+                java.security.KeyStore.getDefaultType(), truststore.get(FileTrustStore.TRUST_STORE_TYPE));
+        assertEquals("unexpected peersOnly value", false, truststore.get(FileTrustStore.PEERS_ONLY));
     }
 
     public void testCreate() throws Exception
@@ -68,7 +76,12 @@ public class TrustStoreRestTest extends
         List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("truststore/"
+ name);
         assertNotNull("details cannot be null", trustStores);
 
-        assertTrustStoreAttributes(trustStores.get(0), name, TestSSLConstants.TRUSTSTORE,
true);
+        Map<String, Object> truststore = trustStores.get(0);
+        assertEquals("unexpected trust store name", name, truststore.get(TrustStore.NAME));
+        assertEquals("unexpected store URL", TestSSLConstants.TRUSTSTORE, truststore.get(FileTrustStore.STORE_URL));
+        assertEquals("unexpected password value", AbstractConfiguredObject.SECURED_STRING_VALUE,
truststore.get(FileTrustStore.PASSWORD));
+        assertEquals("unexpected type", java.security.KeyStore.getDefaultType(), truststore.get(FileTrustStore.TRUST_STORE_TYPE));
+        assertEquals("unexpected peersOnly value", true, truststore.get(FileTrustStore.PEERS_ONLY));
     }
 
     public void testCreateUsingDataUrl() throws Exception
@@ -88,7 +101,12 @@ public class TrustStoreRestTest extends
         List<Map<String, Object>> trustStores = getRestTestHelper().getJsonAsList("truststore/"
+ name);
         assertNotNull("details cannot be null", trustStores);
 
-        assertTrustStoreAttributes(trustStores.get(0), name, dataUrlForTruststore, false);
+        Map<String, Object> truststore = trustStores.get(0);
+        assertEquals("nexpected trust store name", name, truststore.get(TrustStore.NAME));
+        assertEquals("unexpected store URL value",  ConfiguredObject.OVER_SIZED_ATTRIBUTE_ALTERNATIVE_TEXT,
truststore.get(FileTrustStore.STORE_URL));
+        assertEquals("unexpected password value", AbstractConfiguredObject.SECURED_STRING_VALUE,
truststore.get(FileTrustStore.PASSWORD));
+        assertEquals("unexpected type of trust store", java.security.KeyStore.getDefaultType(),
truststore.get(FileTrustStore.TRUST_STORE_TYPE));
+        assertEquals("unexpected peersOnly value", false, truststore.get(FileTrustStore.PEERS_ONLY));
     }
 
     public void testDelete() throws Exception
@@ -110,8 +128,11 @@ public class TrustStoreRestTest extends
         //check only the default systests trust store remains
         List<Map<String, Object>> trustStores = assertNumberOfTrustStores(1);
         Map<String, Object> truststore = trustStores.get(0);
-        assertTrustStoreAttributes(truststore, TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE,
-                QPID_HOME + "/../" + TestSSLConstants.BROKER_TRUSTSTORE, false);
+        assertEquals("unexpected name", TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE,
truststore.get(TrustStore.NAME));
+        assertEquals("unexpected store URL value",  ConfiguredObject.OVER_SIZED_ATTRIBUTE_ALTERNATIVE_TEXT,
truststore.get(FileTrustStore.STORE_URL));
+        assertEquals("unexpected password value", AbstractConfiguredObject.SECURED_STRING_VALUE,
truststore.get(FileTrustStore.PASSWORD));
+        assertEquals("unexpected type of  trust store", java.security.KeyStore.getDefaultType(),
truststore.get(FileTrustStore.TRUST_STORE_TYPE));
+        assertEquals("unexpected peersOnly value", false, truststore.get(FileTrustStore.PEERS_ONLY));
     }
 
 
@@ -127,14 +148,19 @@ public class TrustStoreRestTest extends
 
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put(TrustStore.NAME, name);
-        attributes.put(FileTrustStore.PATH, TestSSLConstants.TRUSTSTORE);
+        attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.TRUSTSTORE);
 
         getRestTestHelper().submitRequest("truststore/" + name , "PUT", attributes, HttpServletResponse.SC_OK);
 
         List<Map<String, Object>> trustStore = getRestTestHelper().getJsonAsList("truststore/"
+ name);
         assertNotNull("details should not be null", trustStore);
 
-        assertTrustStoreAttributes(trustStore.get(0), name, TestSSLConstants.TRUSTSTORE,
false);
+        Map<String, Object> truststore = trustStore.get(0);
+        assertEquals("unexpected name", name, truststore.get(TrustStore.NAME));
+        assertEquals("unexpected path to trust store",  TestSSLConstants.TRUSTSTORE, truststore.get(FileTrustStore.STORE_URL));
+        assertEquals("unexpected password", AbstractConfiguredObject.SECURED_STRING_VALUE,
truststore.get(FileTrustStore.PASSWORD));
+        assertEquals("unexpected type", java.security.KeyStore.getDefaultType(), truststore.get(FileTrustStore.TRUST_STORE_TYPE));
+        assertEquals("unexpected peersOnly value", false, truststore.get(FileTrustStore.PEERS_ONLY));
     }
 
     private List<Map<String, Object>> assertNumberOfTrustStores(int numberOfTrustStores)
throws Exception
@@ -151,24 +177,11 @@ public class TrustStoreRestTest extends
         Map<String, Object> trustStoreAttributes = new HashMap<String, Object>();
         trustStoreAttributes.put(TrustStore.NAME, name);
         //deliberately using the client trust store to differentiate from the one we are
already for broker
-        trustStoreAttributes.put(FileTrustStore.PATH, truststorePath);
+        trustStoreAttributes.put(FileTrustStore.STORE_URL, truststorePath);
         trustStoreAttributes.put(FileTrustStore.PASSWORD, truststorePassword);
         trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
 
         getRestTestHelper().submitRequest("truststore/" + name, "PUT", trustStoreAttributes,
HttpServletResponse.SC_CREATED);
     }
 
-    private void assertTrustStoreAttributes(Map<String, Object> truststore, String
name, String path, boolean peersOnly)
-    {
-        assertEquals("default systests trust store is missing",
-                name, truststore.get(TrustStore.NAME));
-        assertEquals("unexpected path to trust store",
-                path, truststore.get(FileTrustStore.PATH));
-        assertEquals("unexpected (dummy) password of default systests trust store",
-                     AbstractConfiguredObject.SECURED_STRING_VALUE, truststore.get(FileTrustStore.PASSWORD));
-        assertEquals("unexpected type of default systests trust store",
-                java.security.KeyStore.getDefaultType(), truststore.get(FileTrustStore.TRUST_STORE_TYPE));
-        assertEquals("unexpected peersOnly value",
-                peersOnly, truststore.get(FileTrustStore.PEERS_ONLY));
-    }
 }

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1658748&r1=1658747&r2=1658748&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
(original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Tue Feb 10 16:15:08 2015
@@ -183,7 +183,7 @@ public class BrokerACLTest extends QpidR
         assertEquals("Setting of provider attribites should be allowed", 403, responseCode);
 
         Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/"
+ providerName);
-        assertEquals("Unexpected PATH attribute value",
+        assertEquals("Unexpected STORE_URL attribute value",
                 providerData.get(ExternalFileBasedAuthenticationManager.PATH),
                 provider.get(ExternalFileBasedAuthenticationManager.PATH));
     }
@@ -922,7 +922,7 @@ public class BrokerACLTest extends QpidR
     {
         Map<String, Object> keyStoreAttributes = new HashMap<String, Object>();
         keyStoreAttributes.put(KeyStore.NAME, name);
-        keyStoreAttributes.put(FileKeyStore.PATH, TestSSLConstants.KEYSTORE);
+        keyStoreAttributes.put(FileKeyStore.STORE_URL, TestSSLConstants.KEYSTORE);
         keyStoreAttributes.put(FileKeyStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
         keyStoreAttributes.put(FileKeyStore.CERTIFICATE_ALIAS, certAlias);
 
@@ -933,7 +933,7 @@ public class BrokerACLTest extends QpidR
     {
         Map<String, Object> trustStoreAttributes = new HashMap<String, Object>();
         trustStoreAttributes.put(TrustStore.NAME, name);
-        trustStoreAttributes.put(FileTrustStore.PATH, TestSSLConstants.KEYSTORE);
+        trustStoreAttributes.put(FileTrustStore.STORE_URL, TestSSLConstants.KEYSTORE);
         trustStoreAttributes.put(FileTrustStore.PASSWORD, TestSSLConstants.KEYSTORE_PASSWORD);
         trustStoreAttributes.put(FileTrustStore.PEERS_ONLY, peersOnly);
 

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/Java010Excludes
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/Java010Excludes?rev=1658748&r1=1658747&r2=1658748&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/Java010Excludes (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/Java010Excludes Tue Feb
10 16:15:08 2015
@@ -34,7 +34,6 @@ org.apache.qpid.test.unit.topic.DurableS
 org.apache.qpid.server.logging.ChannelLoggingTest#testChannelStartsFlowStopped
 org.apache.qpid.server.logging.ChannelLoggingTest#testChannelStartConsumerFlowStarted
 org.apache.qpid.server.logging.ConsumerLoggingTest#testSubscriptionSuspend
-org.apache.qpid.server.logging.ChannelLoggingTest#testChannelClosedOnQueueArgumentsMismatch
 
 // 0-10 is not supported by the MethodRegistry
 org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*

Propchange: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/python/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 10 16:15:08 2015
@@ -3,4 +3,4 @@
 /qpid/branches/java-network-refactor/qpid/python:805429-825319
 /qpid/branches/qmfv2/qpid/python:902858,902894
 /qpid/branches/qpid-2935/qpid/python:1061302-1072333
-/qpid/trunk/qpid/python:1643238-1655056
+/qpid/trunk/qpid/python:1643238-1658732

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/python/qpid/messaging/driver.py
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/python/qpid/messaging/driver.py?rev=1658748&r1=1658747&r2=1658748&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/python/qpid/messaging/driver.py (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/python/qpid/messaging/driver.py Tue Feb 10
16:15:08 2015
@@ -962,8 +962,11 @@ class Engine:
             lnk.options['node'] = {}
           if 'x-declare' not in lnk.options['node']:
             lnk.options['node']['x-declare'] = {}
-          lnk.options['node']['x-declare']['auto-delete'] = "True"
-          lnk.options['node']['x-declare']['exclusive'] = "True"
+          xdeclare = lnk.options['node']['x-declare']
+          if 'auto-delete' not in xdeclare:
+            xdeclare['auto-delete'] = "True"
+          if 'exclusive' not in xdeclare:
+            xdeclare['exclusive'] = "True"
       except address.LexError, e:
         return MalformedAddress(text=str(e))
       except address.ParseError, e:

Modified: qpid/branches/QPID-6262-JavaBrokerNIO/qpid/tools/setup.py
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/tools/setup.py?rev=1658748&r1=1658747&r2=1658748&view=diff
==============================================================================
--- qpid/branches/QPID-6262-JavaBrokerNIO/qpid/tools/setup.py (original)
+++ qpid/branches/QPID-6262-JavaBrokerNIO/qpid/tools/setup.py Tue Feb 10 16:15:08 2015
@@ -50,7 +50,7 @@ setup(name="qpid-tools",
       data_files=[("libexec", ["src/py/qpid-qls-analyze"]),
                   ("share/qpid-tools/python/qlslibs",
                    ["src/py/qlslibs/__init__.py",
-                    "src/py/qlslibs/anal.py",
+                    "src/py/qlslibs/analyze.py",
                     "src/py/qlslibs/efp.py",
                     "src/py/qlslibs/err.py",
                     "src/py/qlslibs/jrnl.py",



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


Mime
View raw message