QPID-1274 - qmf-gen can now generate code from multiple schema files. Uses __file__ as a better way to locate data files. Added code generation for ACL schema.

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

3 files changed, 51 insertions, 33 deletions

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index d4214ad052..f0d1ea04c9 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -28,8 +28,9 @@ $(rgen_generator):
 
 # Management generator.
 mgen_dir=$(top_srcdir)/managementgen
-mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
-	$(top_srcdir)/../specs/management-schema.xml gen/qpid/management
+mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk -o gen/qpid/management \
+	$(top_srcdir)/../specs/management-schema.xml \
+	$(srcdir)/qpid/acl/management-schema.xml
 
 $(srcdir)/managementgen.mk $(mgen_broker_cpp) $(dist_qpid_management_HEADERS): mgen.timestamp
 mgen.timestamp: $(mgen_generator)
diff --git a/cpp/src/qpid/acl/management-schema.xml b/cpp/src/qpid/acl/management-schema.xml
new file mode 100644
index 0000000000..4f633f6a06
--- /dev/null
+++ b/cpp/src/qpid/acl/management-schema.xml
@@ -0,0 +1,48 @@
+<schema package="ACL">
+
+<!--
+ * Copyright (c) 2008 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+  <class name="plugin">
+    <property name="brokerRef"     type="objId"   references="qpid.Broker" access="RO" index="y" parentRef="y"/>
+    <property name="policyFile"    type="sstr"    access="RO"              desc="Name of the policy file"/>
+    <property name="enforcingAcl"  type="bool"    access="RO"              desc="Currently Enforcing ACL"/>
+    <property name="transferAcl"   type="bool"    access="RO"              desc="Any transfer ACL rules in force"/>
+    <property name="lastAclLoad"   type="absTime" access="RO"              desc="Timestamp of last successful load of ACL"/>
+    <statistic name="aclDenyCount" type="count64" unit="record"            desc="Number of ACL requests denied"/>
+
+    <method name="reloadACLFile" desc="Reload the ACL file"/>
+
+    <event name="aclEvent" defaultSeverity="info" desc="Event generated by the ACL policy">
+      <arg name="denied"  type="bool"/>
+      <arg name="authId"  type="sstr"/>
+      <arg name="action"  type="sstr"/>
+      <arg name="objType" type="sstr"/>
+      <arg name="name"    type="sstr"/>
+      <arg name="params"  type="map"/>
+    </event>
+
+    <event name="fileLoaded" defaultSeverity="warning" desc="ACL file successfully loaded - New policy in effect">
+      <arg name="authId" type="sstr" desc="Name of user who initiated the file load"/>
+    </event>
+
+    <event name="fileNotLoaded" defaultSeverity="error" desc="Replacement ACL file could not be loaded">
+      <arg name="authId" type="sstr" desc="Name of user who initiated the file load"/>
+      <arg name="reason" type="sstr" desc="Reason for failure"/>
+    </event>
+  </class>
+
+</schema>
diff --git a/cpp/src/qpid/acl/management_schema.xml b/cpp/src/qpid/acl/management_schema.xml
deleted file mode 100644
index 8dc9ce41b7..0000000000
--- a/cpp/src/qpid/acl/management_schema.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<schema package="ACL">
-
-<!--
- * Copyright (c) 2008 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-  <class name="plugin">
-    <property name="brokerRef"               type="objId"   references="qpid.Broker" access="RO" index="y" parentRef="y"/>
-    <property name="policyFile"              type="sstr"    access="RO"              desc="Name of the policy file"/>
-    <property name="EnforcingACL"            type="bool"    access="RO"              desc="Currently Enfocing ACL"/>
-    <property name="TransferACL"             type="bool"    access="RO"              desc="Any transfer ACL rules in force"/>
-    <property name="LastACLLoad"             type="absTime" access="RO"              desc="Timestamp last load of ACL"/>
-    <statistic name="ACLDenyCount"           type="count64" unit="record"            desc="Number of ACL requests denied"/>
-
-    <method name="reloadACLFile" desc="Reload the ACL file">
-    </method>
-  </class>
-
-</schema>