summaryrefslogtreecommitdiff
path: root/java/common/src
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-06-06 12:45:26 +0000
committerRobert Gemmell <robbie@apache.org>2013-06-06 12:45:26 +0000
commit7d75a4a61749bb0b4a6f97346879f0b9744de479 (patch)
treea3e83dc65d6ed12efc7c373f9833851415731b72 /java/common/src
parent26b3bfb4e4d834722c55a7fdf891695e2fc4b3d1 (diff)
downloadqpid-python-7d75a4a61749bb0b4a6f97346879f0b9744de479.tar.gz
QPID-4900: Add the server properties to the AMQP 1.0 SASL ProtocolEngine as well. Use the same base property names for all protocol versions, using the standard 'version' and 'product' property names from AMQP 0-x specs.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1490260 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/src')
-rw-r--r--java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java b/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
index 5b73b26af3..3d792459a9 100644
--- a/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
+++ b/java/common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
@@ -22,7 +22,7 @@ package org.apache.qpid.common;
/**
* Keys names used within the serverProperties argument of the ConnectionStart
- * method. These property names are Qpid specific.
+ * method. Property names which start with "qpid." are Qpid specific.
*/
public final class ServerPropertyNames
{
@@ -45,10 +45,16 @@ public final class ServerPropertyNames
*/
public static final String FEATURE_QPID_JMS_SELECTOR = "qpid.jms-selector";
+ /**
+ * Server property: 'name' attribute of the server instance.
+ */
+ public static final String QPID_INSTANCE_NAME = "qpid.instance_name";
- public static final String QPID_PRODUCT = "qpid.product";
- public static final String QPID_SERVER_VERSION = "qpid.server_version";
- public static final String QPID_SERVER_NAME = "qpid.server_name";
- public static final String QPID_SERVER_BUILD_VERSION = "qpid.server_build_version";
+ /**
+ * Server property: build number.
+ */
+ public static final String QPID_BUILD = "qpid.build";
+ public static final String PRODUCT = "product";
+ public static final String VERSION = "version";
}