renamed mof files according to LMI convention

Mof files prefixed with digits ensuring their correct order of parsing
upon their installation. This avoids problems with sfcbmof compiler,
which can not handle dependent classes being parsed before their
antecedents.

Convention is specified in mof/README.

Removed inclusion of LMI_Qualifiers in LMI_Jobs. LMI_Qualifiers should
be registered in cimom instead of included in dependent mof files.
This allows it to be used by any other providers simultaneously.

Modified references to mof files in cmake build files.

17 files changed, 45 insertions, 19 deletions

diff --git a/mof/LMI_Qualifiers.mof b/mof/05_LMI_Qualifiers.mof
index d6b11ec..d6b11ec 100644
--- a/mof/LMI_Qualifiers.mof
+++ b/mof/05_LMI_Qualifiers.mof
diff --git a/mof/LMI_Jobs.mof b/mof/30_LMI_Jobs.mof
index ace5ec3..6c8ddd1 100644
--- a/mof/LMI_Jobs.mof
+++ b/mof/30_LMI_Jobs.mof
@@ -20,8 +20,6 @@
  *   Michal Minar <miminar@redhat.com
  */
 
-#pragma include ("LMI_Qualifiers.mof")
-
 [Association]
 class LMI_AffectedJobElement : CIM_AffectedJobElement
 {
@@ -69,27 +67,27 @@ class LMI_ConcreteJob : CIM_ConcreteJob
     [ Implemented(true), Override("GetError"),
       Deprecated{"CIM_ConcreteJob.GetErrors"} ]
    uint32 GetError(
-         [OUT, Description ( 
+         [OUT, Description (
              "If the OperationalStatus on the Job is not \"OK\", "
              "then this method will return a CIM Error instance. "
              "Otherwise, when the Job is \"OK\", null is "
-             "returned." ), 
+             "returned." ),
           EmbeddedInstance ( "CIM_Error" )]
       string Error);
 
     [Implemented(true), Override("GetErrors")]
    uint32 GetErrors(
-         [OUT, Description ( 
+         [OUT, Description (
              "If the OperationalStatus on the Job is not \"OK\", "
              "then this method will return one or more CIM Error "
              "instance(s). Otherwise, when the Job is \"OK\", "
-             "null is returned." ), 
+             "null is returned." ),
           EmbeddedInstance ( "CIM_Error" )]
       string Errors[]);
 
     [Implemented(true), Override("RequestStateChange")]
    uint32 RequestStateChange(
-         [IN, Description ( 
+         [IN, Description (
              "RequestStateChange changes the state of a job. The "
              "possible values are as follows: \n"
              "Start (2) changes the state to \'Running\'. \n"
@@ -105,13 +103,13 @@ class LMI_ConcreteJob : CIM_ConcreteJob
              "requirement to save data or preserve the state. \n"
              "Service (6) puts the job into a vendor-specific "
              "service state. It might be possible to restart the "
-             "job." ), 
-          ValueMap { "2", "3", "4", "5", "6", "7..32767", 
-             "32768..65535" }, 
-          Values { "Start", "Suspend", "Terminate", "Kill", 
+             "job." ),
+          ValueMap { "2", "3", "4", "5", "6", "7..32767",
+             "32768..65535" },
+          Values { "Start", "Suspend", "Terminate", "Kill",
              "Service", "DMTF Reserved", "Vendor Reserved" }]
-      uint16 RequestedState, 
-         [IN, Description ( 
+      uint16 RequestedState,
+         [IN, Description (
              "A timeout period that specifies the maximum amount "
              "of time that the client expects the transition to "
              "the new state to take. The interval format must be "
diff --git a/mof/LMI_Account.mof b/mof/60_LMI_Account.mof
index d79db35..d79db35 100644
--- a/mof/LMI_Account.mof
+++ b/mof/60_LMI_Account.mof
diff --git a/mof/LMI_Fan.mof b/mof/60_LMI_Fan.mof
index 3c964cf..3c964cf 100644
--- a/mof/LMI_Fan.mof
+++ b/mof/60_LMI_Fan.mof
diff --git a/mof/LMI_Hardware.mof b/mof/60_LMI_Hardware.mof
index 3ceb886..3ceb886 100644
--- a/mof/LMI_Hardware.mof
+++ b/mof/60_LMI_Hardware.mof
diff --git a/mof/LMI_LogicalFile.mof b/mof/60_LMI_LogicalFile.mof
index 7ae2e82..7ae2e82 100644
--- a/mof/LMI_LogicalFile.mof
+++ b/mof/60_LMI_LogicalFile.mof
diff --git a/mof/LMI_PowerManagement.mof b/mof/60_LMI_PowerManagement.mof
index c285f79..c285f79 100644
--- a/mof/LMI_PowerManagement.mof
+++ b/mof/60_LMI_PowerManagement.mof
diff --git a/mof/LMI_Service.mof b/mof/60_LMI_Service.mof
index d6c3715..d6c3715 100644
--- a/mof/LMI_Service.mof
+++ b/mof/60_LMI_Service.mof
diff --git a/mof/LMI_Software.mof b/mof/60_LMI_Software.mof
index 9f2f2ce..9f2f2ce 100644
--- a/mof/LMI_Software.mof
+++ b/mof/60_LMI_Software.mof
diff --git a/mof/LMI_SoftwareIndicationFilters.mof b/mof/70_LMI_SoftwareIndicationFilters.mof
index e3af599..e3af599 100644
--- a/mof/LMI_SoftwareIndicationFilters.mof
+++ b/mof/70_LMI_SoftwareIndicationFilters.mof
diff --git a/mof/README b/mof/README
new file mode 100644
index 0000000..f942fe1
--- /dev/null
+++ b/mof/README
@@ -0,0 +1,28 @@
+This directory contains MOF and registration files for openlmi-providers.
+Registration files for c providers using KonkretCMPI are generated during
+build time from MOFs.
+
+Mof files are named according to this convetion:
+  <NN>_LMI_<Profile>.mof
+
+where <NN> is a string of two digits ensuring the correct order of
+their parsing by cimom tools like sfcbrepos [1]. Some mof files depend
+on others and thus need to be parsed after them.
+
+Here is a convention for choosing the right number:
+  05 - 10
+        Qualifiers and other simple mofs without any dependencies on LMI or
+        anything outside of cim-schema (05_LMI_Qualifiers.mof). These are
+        shipped with openlmi-providers.
+  20 - 40
+        Mofs with base classes for our providers (30_LMI_Jobs.mof). Also
+        shipped with openlmi-providers.
+  50 - 80
+        Mofs of our profiles shipped in their own package
+        (60_LMI_Software.mof).
+
+Mof files containing static indication filters[2] referencing other LMI
+classes should have higher number than mof files containing them.
+
+[1] belongs to sblim-sfcb
+[2] for example 70_LMI_SoftwareIndicationFilters.mof
diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt
index 776ce87..38ecd02 100644
--- a/src/account/CMakeLists.txt
+++ b/src/account/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME Account)
 set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME})
-set(MOF LMI_Account.mof)
+set(MOF 60_LMI_Account.mof)
 set(ACCOUNT_SCRIPT cmpiLMI_${PROVIDER_NAME}-cimprovagt)
 
 set(provider_SRCS
diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt
index 7cb801a..e8e87aa 100644
--- a/src/fan/CMakeLists.txt
+++ b/src/fan/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME Fan)
 set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME})
-set(MOF LMI_Fan.mof)
+set(MOF 60_LMI_Fan.mof)
 
 set(provider_SRCS
     fan.c
diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt
index c50acef..eb45adc 100644
--- a/src/hardware/CMakeLists.txt
+++ b/src/hardware/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(PROVIDER_NAME Hardware)
 set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME})
-set(MOF LMI_Hardware.mof)
+set(MOF 60_LMI_Hardware.mof)
 
 set(provider_SRCS
     utils.c
diff --git a/src/logicalfile/CMakeLists.txt b/src/logicalfile/CMakeLists.txt
index 8b0097a..3a80353 100644
--- a/src/logicalfile/CMakeLists.txt
+++ b/src/logicalfile/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME LogicalFile)
 set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME})
-set(MOF LMI_LogicalFile.mof)
+set(MOF 60_LMI_LogicalFile.mof)
 
 set(provider_SRCS
     file.c
diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt
index 73725d3..f77b3ae 100644
--- a/src/power/CMakeLists.txt
+++ b/src/power/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME PowerManagement)
 set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME})
-set(MOF LMI_PowerManagement.mof)
+set(MOF 60_LMI_PowerManagement.mof)
 
 set(provider_SRCS
     power.c
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index c0f236f..34d766e 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(PROVIDER_NAME Service)
 set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME})
-set(MOF LMI_Service.mof)
+set(MOF 60_LMI_Service.mof)
 
 set(provider_SRCS
     util/serviceutil.c