qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cctriel...@apache.org
Subject svn commit: r695327 - in /incubator/qpid/trunk/qpid: cpp/src/qpid/broker/Broker.cpp cpp/src/qpid/broker/Connection.cpp specs/management-schema.xml
Date Mon, 15 Sep 2008 02:30:35 GMT
Author: cctrieloff
Date: Sun Sep 14 19:30:34 2008
New Revision: 695327

URL: http://svn.apache.org/viewvc?rev=695327&view=rev
Log:
- removed cluster methods in mgnt, will add them to a new cluster object in
upcoming commit
- added flag on connection object to mark user versus system connections
- added help text


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
    incubator/qpid/trunk/qpid/specs/management-schema.xml

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=695327&r1=695326&r2=695327&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Sun Sep 14 19:30:34 2008
@@ -349,8 +349,7 @@
         status = Manageable::STATUS_OK;
         break;
       }
-    case management::Broker::METHOD_JOINCLUSTER :
-    case management::Broker::METHOD_LEAVECLUSTER :
+   default:
         status = Manageable::STATUS_NOT_IMPLEMENTED;
         break;
     }

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?rev=695327&r1=695326&r2=695327&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Sun Sep 14 19:30:34 2008
@@ -64,9 +64,11 @@
     if (parent != 0)
     {
         ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
-
+		
+		
+        // TODO set last bool true if system connection
         if (agent != 0)
-            mgmtObject = new management::Connection(agent, this, parent, mgmtId, !isLink);
+            mgmtObject = new management::Connection(agent, this, parent, mgmtId, !isLink,false);
         agent->addObject(mgmtObject);
     }
 }

Modified: incubator/qpid/trunk/qpid/specs/management-schema.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/specs/management-schema.xml?rev=695327&r1=695326&r2=695327&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/specs/management-schema.xml (original)
+++ incubator/qpid/trunk/qpid/specs/management-schema.xml Sun Sep 14 19:30:34 2008
@@ -68,16 +68,9 @@
     <property name="connBacklog"      type="uint16" access="RO" desc="Connection backlog
limit for listening socket"/>
     <property name="stagingThreshold" type="uint32" access="RO" desc="Broker stages messages
over this size to disk"/>
     <property name="mgmtPubInterval"  type="uint16" access="RW" unit="second" min="1"
desc="Interval for management broadcasts"/>
-    <property name="clusterName"      type="sstr"   access="RO" desc="Name of cluster
this server is a member of"/>
     <property name="version"          type="sstr"   access="RO" desc="Running software
version"/>
     <property name="dataDir"          type="sstr"   access="RO" optional="y" desc="Persistent
configuration storage location"/>
 
-    <method name="joinCluster">
-      <arg name="clusterName" dir="I" type="sstr"/>
-    </method>
-
-    <method name="leaveCluster"/>
-
     <method name="echo" desc="Request a response to test the path to the management broker">
       <arg name="sequence" dir="IO" type="uint32" default="0"/>
       <arg name="body"     dir="IO" type="lstr"   default=""/>
@@ -218,9 +211,10 @@
     <property name="vhostRef" type="objId"  references="Vhost" access="RC" index="y" parentRef="y"/>
     <property name="address"  type="sstr"   access="RC" index="y"/>
     <property name="incoming" type="bool"   access="RC"/>
+    <property name="SystemConnection"   type="bool"   access="RC" desc="Infrastucture/
Inter-system connection (Cluster, Federation ,...)"/>
 
     <statistic name="closing"          type="bool" desc="This client is closing by management
request"/>
-    <statistic name="authIdentity"     type="sstr"/>
+    <statistic name="authIdentity"     type="sstr" desc="authId of connection if authentication
enabled"/>
     <statistic name="framesFromClient" type="count64"/>
     <statistic name="framesToClient"   type="count64"/>
     <statistic name="bytesFromClient"  type="count64"/>



Mime
View raw message