QPID-5266: include the client product string in connection open log message

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1536163 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 33 insertions, 7 deletions

diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java
index 73708d9841..9e41a5234c 100755
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java
+++ b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java
@@ -79,8 +79,8 @@ public class ProtocolEngine_0_10  extends InputHandler implements ServerProtocol
         _connection.setSender(new Disassembler(wrapSender(sender), MAX_FRAME_SIZE));
         _connection.setPeerPrincipal(_network.getPeerPrincipal());
         // FIXME Two log messages to maintain compatibility with earlier protocol versions
-        _connection.getLogActor().message(ConnectionMessages.OPEN(null, null, null, false, false, false));
-        _connection.getLogActor().message(ConnectionMessages.OPEN(null, "0-10", null, false, true, false));
+        _connection.getLogActor().message(ConnectionMessages.OPEN(null, null, null, null, false, false, false, false));
+        _connection.getLogActor().message(ConnectionMessages.OPEN(null, "0-10", null, null, false, true, false, false));
     }
 
     private Sender<ByteBuffer> wrapSender(final Sender<ByteBuffer> sender)
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
index 0015988ab7..72d6a0832d 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
+++ b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
@@ -106,7 +106,7 @@ public class ServerConnection extends Connection implements AMQConnectionModel,
             {
                 _onOpenTask.run();
             }
-            _actor.message(ConnectionMessages.OPEN(getClientId(), "0-10", getClientVersion(), true, true, true));
+            _actor.message(ConnectionMessages.OPEN(getClientId(), "0-10", getClientVersion(), getClientProduct(), true, true, true, true));
 
             getVirtualHost().getConnectionRegistry().registerConnection(this);
         }
@@ -499,17 +499,24 @@ public class ServerConnection extends Connection implements AMQConnectionModel,
         return _lastIoTime.longValue();
     }
 
-
+    @Override
     public String getClientId()
     {
         return getConnectionDelegate().getClientId();
     }
 
+    @Override
     public String getClientVersion()
     {
         return getConnectionDelegate().getClientVersion();
     }
 
+    @Override
+    public String getClientProduct()
+    {
+        return getConnectionDelegate().getClientProduct();
+    }
+
     public String getPrincipalAsString()
     {
         return getAuthorizedPrincipal() == null ? null : getAuthorizedPrincipal().getName();
diff --git a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
index 6634627805..129a811b61 100644
--- a/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
+++ b/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
@@ -347,4 +347,9 @@ public class ServerConnectionDelegate extends ServerDelegate
     {
         return _clientProperties == null ? null : (String) _clientProperties.get(ConnectionStartProperties.VERSION_0_10);
     }
+
+    public String getClientProduct()
+    {
+        return _clientProperties == null ? null : (String) _clientProperties.get(ConnectionStartProperties.PRODUCT);
+    }
 }
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index 34cbd90b8c..33300e9e59 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -114,6 +114,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
     private AMQShortString _contextKey;
 
     private String _clientVersion = null;
+    private String _clientProduct = null;
 
     private VirtualHost _virtualHost;
 
@@ -212,7 +213,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
 
         _logSubject = new ConnectionLogSubject(this);
 
-        _actor.message(ConnectionMessages.OPEN(null, null, null, false, false, false));
+        _actor.message(ConnectionMessages.OPEN(null, null, null, null, false, false, false, false));
 
         _closeWhenNoRoute = (Boolean)_broker.getAttribute(Broker.CONNECTION_CLOSE_WHEN_NO_ROUTE);
 
@@ -476,7 +477,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         try
         {
             // Log incomming protocol negotiation request
-            _actor.message(ConnectionMessages.OPEN(null, pi.getProtocolMajor() + "-" + pi.getProtocolMinor(), null, false, true, false));
+            _actor.message(ConnectionMessages.OPEN(null, pi.getProtocolMajor() + "-" + pi.getProtocolMinor(), null, null, false, true, false, false));
 
             ProtocolVersion pv = pi.checkVersion(); // Fails if not correct
 
@@ -1109,6 +1110,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
             }
 
             _clientVersion = _clientProperties.getString(ConnectionStartProperties.VERSION_0_8);
+            _clientProduct = _clientProperties.getString(ConnectionStartProperties.PRODUCT);
 
             String clientId = _clientProperties.getString(ConnectionStartProperties.CLIENT_ID_0_8);
             if (clientId != null)
@@ -1116,7 +1118,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
                 setContextKey(new AMQShortString(clientId));
             }
 
-            _actor.message(ConnectionMessages.OPEN(clientId, _protocolVersion.toString(), _clientVersion, true, true, true));
+            _actor.message(ConnectionMessages.OPEN(clientId, _protocolVersion.toString(), _clientVersion, _clientProduct, true, true, true, true));
         }
     }
 
@@ -1350,6 +1352,12 @@ public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSessi
         return _clientVersion;
     }
 
+    @Override
+    public String getClientProduct()
+    {
+        return _clientProduct;
+    }
+
     public String getPrincipalAsString()
     {
         return getAuthId();
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
index 320875cc97..4cb9767514 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
+++ b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
@@ -224,6 +224,12 @@ public class Connection_1_0 implements ConnectionEventListener
         }
 
         @Override
+        public String getClientProduct()
+        {
+            return "";  //TODO
+        }
+
+        @Override
         public String getPrincipalAsString()
         {
             return String.valueOf(_conn.getUser());