QPID-1327 - Event support for Management

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

3 files changed, 10 insertions, 6 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/management/Names.java b/java/client/src/main/java/org/apache/qpid/management/Names.java
index 8ab9e13d4f..64e5c0fef2 100644
--- a/java/client/src/main/java/org/apache/qpid/management/Names.java
+++ b/java/client/src/main/java/org/apache/qpid/management/Names.java
@@ -35,7 +35,7 @@ public interface Names
     String METHOD_REPLY_QUEUE_PREFIX = "reply.";
    
     String AMQ_DIRECT_QUEUE = "amq.direct";
-    String AGENT_ROUTING_KEY = "agent.0";
+    String AGENT_ROUTING_KEY = "agent.1.0";
    
     String BROKER_ROUTING_KEY = "broker";
     
@@ -49,4 +49,4 @@ public interface Names
     String CONFIGURATION_FILE_NAME = "/org/apache/qpid/management/config.xml";
     
     String ARG_COUNT_PARAM_NAME = "argCount";
-}
\ No newline at end of file
+}
diff --git a/java/client/src/main/java/org/apache/qpid/management/Protocol.java b/java/client/src/main/java/org/apache/qpid/management/Protocol.java
index f50a85f28a..185f417448 100644
--- a/java/client/src/main/java/org/apache/qpid/management/Protocol.java
+++ b/java/client/src/main/java/org/apache/qpid/management/Protocol.java
@@ -27,8 +27,8 @@ package org.apache.qpid.management;
  */
 public interface Protocol
 {
-    String MAGIC_NUMBER = "AM1";
+    String MAGIC_NUMBER = "AM2";
     
     byte [] METHOD_REQUEST_FIRST_FOUR_BYTES = (MAGIC_NUMBER+"M").getBytes();
     byte [] SCHEMA_REQUEST_FIRST_FOUR_BYTES = (MAGIC_NUMBER+"S").getBytes();  
-}
\ No newline at end of file
+}
diff --git a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java b/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
index 7a0ee556d2..497e264581 100644
--- a/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
+++ b/java/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java
@@ -49,6 +49,10 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
     {        
         try 
         {
+            int classKind = decoder.readUint8();
+            if (classKind != 1) {
+                return;
+            }
             String packageName = decoder.readStr8();
             String className = decoder.readStr8();
             
@@ -57,7 +61,7 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
             int howManyProperties = decoder.readUint16();
             int howManyStatistics = decoder.readUint16();
             int howManyMethods = decoder.readUint16();
-            int howManyEvents = decoder.readUint16();
+            int howManyEvents = 0;
                                     
             // FIXME : Divide between schema error and raw data conversion error!!!!
             _domainModel.addSchema(
@@ -155,4 +159,4 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler
         }        
         return result;
     }
- }
\ No newline at end of file
+ }