QPID-1274 - Changed C++ namespace for generated management code. Improved efficiency of generated functions to use const references for non-simple types.

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

1 files changed, 20 insertions, 22 deletions

diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp
index f9c307c7d3..0a793c88e0 100644
--- a/cpp/src/qpid/acl/Acl.cpp
+++ b/cpp/src/qpid/acl/Acl.cpp
@@ -24,39 +24,38 @@
 #include "qpid/Options.h"
 #include "qpid/shared_ptr.h"
 #include "qpid/log/Logger.h"
-#include "qpid/management/PackageACL.h"
+#include "qmf/org/apache/qpid/acl/Package.h"
 
 #include <map>
 
 #include <boost/utility/in_place_factory.hpp>
 
-namespace qpid {
-namespace acl {
-
 using namespace std;
+using namespace qpid::acl;
 using qpid::management::ManagementAgent;
 using qpid::management::ManagementObject;
 using qpid::management::Manageable;
 using qpid::management::Args;
+namespace _qmf = qmf::org::apache::qpid::acl;
 
-   Acl::Acl (AclValues& av, broker::Broker& b): aclValues(av), broker(&b), transferAcl(false)
-   {
+Acl::Acl (AclValues& av, broker::Broker& b): aclValues(av), broker(&b), transferAcl(false)
+{
 	   
-	   ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
-
-       if (agent != 0){
-            management::PackageACL  packageInit(agent);
-            mgmtObject = new management::Acl (agent, this, broker);
-			agent->addObject (mgmtObject);
-       }
-
-       if (!readAclFile()){
-	       throw Exception("Could not read ACL file");
-		   if (mgmtObject!=0) mgmtObject->set_enforcingAcl(0);
-	   }
-	   QPID_LOG(info, "ACL Plugin loaded");
+    ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
+
+    if (agent != 0){
+        _qmf::Package  packageInit(agent);
+        mgmtObject = new _qmf::Acl (agent, this, broker);
+        agent->addObject (mgmtObject);
+    }
+
+    if (!readAclFile()){
+        throw Exception("Could not read ACL file");
+        if (mgmtObject!=0) mgmtObject->set_enforcingAcl(0);
+    }
+    QPID_LOG(info, "ACL Plugin loaded");
 	   if (mgmtObject!=0) mgmtObject->set_enforcingAcl(1);
-   }
+}
 
    bool Acl::authorise(const std::string& id, const Action& action, const ObjectType& objType, const std::string& name, std::map<Property, std::string>* params)
    {
@@ -147,7 +146,7 @@ using qpid::management::Args;
 
       switch (methodId)
       {
-      case management::Acl::METHOD_RELOADACLFILE :
+      case _qmf::Acl::METHOD_RELOADACLFILE :
           readAclFile();
           status = Manageable::STATUS_OK;
           break;
@@ -155,4 +154,3 @@ using qpid::management::Args;
 
     return status;
 }    
-}} // namespace qpid::acl