osaf/services/infrastructure/fm/config/fm_objects.xml       |  2 +-
 osaf/services/infrastructure/fm/config/fm_sc_template.xml   |  2 +-
 osaf/services/infrastructure/rde/config/rde_objects.xml     |  2 +-
 osaf/services/infrastructure/rde/config/rde_sc_template.xml |  2 +-
 osaf/services/saf/amf/config/amf_classes.xml                |  2 +-
 osaf/services/saf/amf/config/amf_objects.xml                |  2 +-
 osaf/services/saf/amf/config/amfwdog_objects.xml            |  2 +-
 osaf/services/saf/amf/config/amfwdog_pl_template.xml        |  2 +-
 osaf/services/saf/amf/config/amfwdog_sc_template.xml        |  2 +-
 osaf/services/saf/amf/config/common_pl_template.xml         |  2 +-
 osaf/services/saf/amf/config/common_sc_template.xml         |  2 +-
 osaf/services/saf/clmsv/config/clmsv_classes.xml            |  2 +-
 osaf/services/saf/clmsv/config/clmsv_objects.xml            |  2 +-
 osaf/services/saf/clmsv/config/clmsv_pl_template.xml        |  2 +-
 osaf/services/saf/clmsv/config/clmsv_plm_pl_template.xml    |  2 +-
 osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml    |  2 +-
 osaf/services/saf/clmsv/config/clmsv_sc_template.xml        |  2 +-
 osaf/services/saf/cpsv/config/cpsv_classes.xml              |  2 +-
 osaf/services/saf/cpsv/config/cpsv_objects.xml              |  2 +-
 osaf/services/saf/cpsv/config/cpsv_pl_template.xml          |  2 +-
 osaf/services/saf/cpsv/config/cpsv_sc_template.xml          |  2 +-
 osaf/services/saf/edsv/config/edsv_classes.xml              |  2 +-
 osaf/services/saf/edsv/config/edsv_objects.xml              |  2 +-
 osaf/services/saf/edsv/config/edsv_sc_template.xml          |  2 +-
 osaf/services/saf/glsv/config/glsv_classes.xml              |  2 +-
 osaf/services/saf/glsv/config/glsv_objects.xml              |  2 +-
 osaf/services/saf/glsv/config/glsv_pl_template.xml          |  2 +-
 osaf/services/saf/glsv/config/glsv_sc_template.xml          |  2 +-
 osaf/services/saf/immsv/config/imm.xml.sample               |  2 +-
 osaf/services/saf/immsv/config/imm_copyright.xml            |  2 +-
 osaf/services/saf/immsv/config/immsv_classes.xml            |  2 +-
 osaf/services/saf/immsv/config/immsv_objects.xml            |  2 +-
 osaf/services/saf/immsv/config/immsv_pl_template.xml        |  2 +-
 osaf/services/saf/immsv/config/immsv_sc_template.xml        |  2 +-
 osaf/services/saf/logsv/config/logsv_classes.xml            |  2 +-
 osaf/services/saf/logsv/config/logsv_objects.xml            |  2 +-
 osaf/services/saf/logsv/config/logsv_sc_template.xml        |  2 +-
 osaf/services/saf/mqsv/config/mqsv_classes.xml              |  2 +-
 osaf/services/saf/mqsv/config/mqsv_objects.xml              |  2 +-
 osaf/services/saf/mqsv/config/mqsv_pl_template.xml          |  2 +-
 osaf/services/saf/mqsv/config/mqsv_sc_template.xml          |  2 +-
 osaf/services/saf/ntfsv/config/ntfsv_objects.xml            |  2 +-
 osaf/services/saf/ntfsv/config/ntfsv_sc_template.xml        |  2 +-
 osaf/services/saf/plmsv/config/plmsv_classes.xml            |  2 +-
 osaf/services/saf/plmsv/config/plmsv_objects.xml            |  2 +-
 osaf/services/saf/plmsv/config/plmsv_objects.xml.atca       |  2 +-
 osaf/services/saf/plmsv/config/plmsv_objects.xml.hp         |  2 +-
 osaf/services/saf/plmsv/config/plmsv_objects.xml.pc         |  2 +-
 osaf/services/saf/plmsv/config/plmsv_pl_template.xml        |  2 +-
 osaf/services/saf/plmsv/config/plmsv_sc_template.xml        |  2 +-
 osaf/services/saf/smfsv/config/smfsv_classes.xml            |  2 +-
 osaf/services/saf/smfsv/config/smfsv_objects.xml            |  2 +-
 osaf/services/saf/smfsv/config/smfsv_pl_template.xml        |  2 +-
 osaf/services/saf/smfsv/config/smfsv_sc_template.xml        |  2 +-
 osaf/tools/safimm/immxml/baseimm.py                         |  2 +-
 osaf/tools/safimm/immxml/immxml-nodegen                     |  2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)


diff --git a/osaf/services/infrastructure/fm/config/fm_objects.xml 
b/osaf/services/infrastructure/fm/config/fm_objects.xml
--- a/osaf/services/infrastructure/fm/config/fm_objects.xml
+++ b/osaf/services/infrastructure/fm/config/fm_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfCompBaseType">
                <dn>safCompType=OpenSafCompTypeFMS</dn>
        </object>
diff --git a/osaf/services/infrastructure/fm/config/fm_sc_template.xml 
b/osaf/services/infrastructure/fm/config/fm_sc_template.xml
--- a/osaf/services/infrastructure/fm/config/fm_sc_template.xml
+++ b/osaf/services/infrastructure/fm/config/fm_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=FMS,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/infrastructure/rde/config/rde_objects.xml 
b/osaf/services/infrastructure/rde/config/rde_objects.xml
--- a/osaf/services/infrastructure/rde/config/rde_objects.xml
+++ b/osaf/services/infrastructure/rde/config/rde_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfCompBaseType">
                <dn>safCompType=OpenSafCompTypeRDE</dn>
        </object>
diff --git a/osaf/services/infrastructure/rde/config/rde_sc_template.xml 
b/osaf/services/infrastructure/rde/config/rde_sc_template.xml
--- a/osaf/services/infrastructure/rde/config/rde_sc_template.xml
+++ b/osaf/services/infrastructure/rde/config/rde_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=RDE,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/amf/config/amf_classes.xml 
b/osaf/services/saf/amf/config/amf_classes.xml
--- a/osaf/services/saf/amf/config/amf_classes.xml
+++ b/osaf/services/saf/amf/config/amf_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaAmfCluster">
                <category>SA_CONFIG</category>
                <rdn>
diff --git a/osaf/services/saf/amf/config/amf_objects.xml 
b/osaf/services/saf/amf/config/amf_objects.xml
--- a/osaf/services/saf/amf/config/amf_objects.xml
+++ b/osaf/services/saf/amf/config/amf_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfAppBaseType">
                <dn>safAppType=OpenSafApplicationType</dn>
        </object>
diff --git a/osaf/services/saf/amf/config/amfwdog_objects.xml 
b/osaf/services/saf/amf/config/amfwdog_objects.xml
--- a/osaf/services/saf/amf/config/amfwdog_objects.xml
+++ b/osaf/services/saf/amf/config/amfwdog_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfCompBaseType">
                <dn>safCompType=OpenSafCompTypeAMFWDOG</dn>
        </object>
diff --git a/osaf/services/saf/amf/config/amfwdog_pl_template.xml 
b/osaf/services/saf/amf/config/amfwdog_pl_template.xml
--- a/osaf/services/saf/amf/config/amfwdog_pl_template.xml
+++ b/osaf/services/saf/amf/config/amfwdog_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=AMFWDOG,safSu=PL_2_3,safSg=NoRed,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/amf/config/amfwdog_sc_template.xml 
b/osaf/services/saf/amf/config/amfwdog_sc_template.xml
--- a/osaf/services/saf/amf/config/amfwdog_sc_template.xml
+++ b/osaf/services/saf/amf/config/amfwdog_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=AMFWDOG,safSu=SC_2_1,safSg=NoRed,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/amf/config/common_pl_template.xml 
b/osaf/services/saf/amf/config/common_pl_template.xml
--- a/osaf/services/saf/amf/config/common_pl_template.xml
+++ b/osaf/services/saf/amf/config/common_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfNode">
                <dn>safAmfNode=PL_2_3,safAmfCluster=myAmfCluster</dn>
                <attr>
diff --git a/osaf/services/saf/amf/config/common_sc_template.xml 
b/osaf/services/saf/amf/config/common_sc_template.xml
--- a/osaf/services/saf/amf/config/common_sc_template.xml
+++ b/osaf/services/saf/amf/config/common_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfNode">
                <dn>safAmfNode=SC_2_1,safAmfCluster=myAmfCluster</dn>
                <attr>
diff --git a/osaf/services/saf/clmsv/config/clmsv_classes.xml 
b/osaf/services/saf/clmsv/config/clmsv_classes.xml
--- a/osaf/services/saf/clmsv/config/clmsv_classes.xml
+++ b/osaf/services/saf/clmsv/config/clmsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaClmNode">
                 <category>SA_CONFIG</category>
                 <rdn>
diff --git a/osaf/services/saf/clmsv/config/clmsv_objects.xml 
b/osaf/services/saf/clmsv/config/clmsv_objects.xml
--- a/osaf/services/saf/clmsv/config/clmsv_objects.xml
+++ b/osaf/services/saf/clmsv/config/clmsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safClmService</dn>
                <attr>
diff --git a/osaf/services/saf/clmsv/config/clmsv_pl_template.xml 
b/osaf/services/saf/clmsv/config/clmsv_pl_template.xml
--- a/osaf/services/saf/clmsv/config/clmsv_pl_template.xml
+++ b/osaf/services/saf/clmsv/config/clmsv_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaClmNode">
                 <dn>safNode=CLM_TOKEN,safCluster=myClmCluster</dn>
                 <attr>
diff --git a/osaf/services/saf/clmsv/config/clmsv_plm_pl_template.xml 
b/osaf/services/saf/clmsv/config/clmsv_plm_pl_template.xml
--- a/osaf/services/saf/clmsv/config/clmsv_plm_pl_template.xml
+++ b/osaf/services/saf/clmsv/config/clmsv_plm_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaClmNode">
                 <dn>safNode=CLM_TOKEN,safCluster=myClmCluster</dn>
 <!-- By default, no SaClmNode is mapped to SaPlmEE. If this mapping is needed 
then uncomment the following lines -->
diff --git a/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml 
b/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml
--- a/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml
+++ b/osaf/services/saf/clmsv/config/clmsv_plm_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=CLM,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/clmsv/config/clmsv_sc_template.xml 
b/osaf/services/saf/clmsv/config/clmsv_sc_template.xml
--- a/osaf/services/saf/clmsv/config/clmsv_sc_template.xml
+++ b/osaf/services/saf/clmsv/config/clmsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=CLM,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/cpsv/config/cpsv_classes.xml 
b/osaf/services/saf/cpsv/config/cpsv_classes.xml
--- a/osaf/services/saf/cpsv/config/cpsv_classes.xml
+++ b/osaf/services/saf/cpsv/config/cpsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaCkptCheckpoint">
                <category>SA_RUNTIME</category>
                <rdn>
diff --git a/osaf/services/saf/cpsv/config/cpsv_objects.xml 
b/osaf/services/saf/cpsv/config/cpsv_objects.xml
--- a/osaf/services/saf/cpsv/config/cpsv_objects.xml
+++ b/osaf/services/saf/cpsv/config/cpsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safCkptService</dn>
                <attr>
diff --git a/osaf/services/saf/cpsv/config/cpsv_pl_template.xml 
b/osaf/services/saf/cpsv/config/cpsv_pl_template.xml
--- a/osaf/services/saf/cpsv/config/cpsv_pl_template.xml
+++ b/osaf/services/saf/cpsv/config/cpsv_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=CPND,safSu=PL_2_3,safSg=NoRed,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/cpsv/config/cpsv_sc_template.xml 
b/osaf/services/saf/cpsv/config/cpsv_sc_template.xml
--- a/osaf/services/saf/cpsv/config/cpsv_sc_template.xml
+++ b/osaf/services/saf/cpsv/config/cpsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=CPD,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/edsv/config/edsv_classes.xml 
b/osaf/services/saf/edsv/config/edsv_classes.xml
--- a/osaf/services/saf/edsv/config/edsv_classes.xml
+++ b/osaf/services/saf/edsv/config/edsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaEvtChannel">
                <category>SA_RUNTIME</category>
                <rdn>
diff --git a/osaf/services/saf/edsv/config/edsv_objects.xml 
b/osaf/services/saf/edsv/config/edsv_objects.xml
--- a/osaf/services/saf/edsv/config/edsv_objects.xml
+++ b/osaf/services/saf/edsv/config/edsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safEvtService</dn>
                <attr>
diff --git a/osaf/services/saf/edsv/config/edsv_sc_template.xml 
b/osaf/services/saf/edsv/config/edsv_sc_template.xml
--- a/osaf/services/saf/edsv/config/edsv_sc_template.xml
+++ b/osaf/services/saf/edsv/config/edsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=EDS,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/glsv/config/glsv_classes.xml 
b/osaf/services/saf/glsv/config/glsv_classes.xml
--- a/osaf/services/saf/glsv/config/glsv_classes.xml
+++ b/osaf/services/saf/glsv/config/glsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaLckResource">
                <category>SA_RUNTIME</category>
                <rdn>
diff --git a/osaf/services/saf/glsv/config/glsv_objects.xml 
b/osaf/services/saf/glsv/config/glsv_objects.xml
--- a/osaf/services/saf/glsv/config/glsv_objects.xml
+++ b/osaf/services/saf/glsv/config/glsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safLockService</dn>
                <attr>
diff --git a/osaf/services/saf/glsv/config/glsv_pl_template.xml 
b/osaf/services/saf/glsv/config/glsv_pl_template.xml
--- a/osaf/services/saf/glsv/config/glsv_pl_template.xml
+++ b/osaf/services/saf/glsv/config/glsv_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=GLND,safSu=PL_2_3,safSg=NoRed,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/glsv/config/glsv_sc_template.xml 
b/osaf/services/saf/glsv/config/glsv_sc_template.xml
--- a/osaf/services/saf/glsv/config/glsv_sc_template.xml
+++ b/osaf/services/saf/glsv/config/glsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=GLD,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/immsv/config/imm.xml.sample 
b/osaf/services/saf/immsv/config/imm.xml.sample
--- a/osaf/services/saf/immsv/config/imm.xml.sample
+++ b/osaf/services/saf/immsv/config/imm.xml.sample
@@ -17,7 +17,7 @@
  * Author(s): Ericsson
  *
 -->
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaSmfSwBundle">
                <category>SA_CONFIG</category>
                <rdn>
diff --git a/osaf/services/saf/immsv/config/imm_copyright.xml 
b/osaf/services/saf/immsv/config/imm_copyright.xml
--- a/osaf/services/saf/immsv/config/imm_copyright.xml
+++ b/osaf/services/saf/immsv/config/imm_copyright.xml
@@ -17,5 +17,5 @@
  * Author(s): Ericsson
  *
 -->
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
 </imm:IMM-contents>
diff --git a/osaf/services/saf/immsv/config/immsv_classes.xml 
b/osaf/services/saf/immsv/config/immsv_classes.xml
--- a/osaf/services/saf/immsv/config/immsv_classes.xml
+++ b/osaf/services/saf/immsv/config/immsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaImmMngt">
                <category>SA_CONFIG</category>
                <rdn>
diff --git a/osaf/services/saf/immsv/config/immsv_objects.xml 
b/osaf/services/saf/immsv/config/immsv_objects.xml
--- a/osaf/services/saf/immsv/config/immsv_objects.xml
+++ b/osaf/services/saf/immsv/config/immsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safImmService</dn>
                <attr>
diff --git a/osaf/services/saf/immsv/config/immsv_pl_template.xml 
b/osaf/services/saf/immsv/config/immsv_pl_template.xml
--- a/osaf/services/saf/immsv/config/immsv_pl_template.xml
+++ b/osaf/services/saf/immsv/config/immsv_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=IMMND,safSu=PL_2_3,safSg=NoRed,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/immsv/config/immsv_sc_template.xml 
b/osaf/services/saf/immsv/config/immsv_sc_template.xml
--- a/osaf/services/saf/immsv/config/immsv_sc_template.xml
+++ b/osaf/services/saf/immsv/config/immsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=IMMD,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/logsv/config/logsv_classes.xml 
b/osaf/services/saf/logsv/config/logsv_classes.xml
--- a/osaf/services/saf/logsv/config/logsv_classes.xml
+++ b/osaf/services/saf/logsv/config/logsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaLogStream">
                <category>SA_RUNTIME</category>
                <rdn>
diff --git a/osaf/services/saf/logsv/config/logsv_objects.xml 
b/osaf/services/saf/logsv/config/logsv_objects.xml
--- a/osaf/services/saf/logsv/config/logsv_objects.xml
+++ b/osaf/services/saf/logsv/config/logsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safLogService</dn>
                <attr>
diff --git a/osaf/services/saf/logsv/config/logsv_sc_template.xml 
b/osaf/services/saf/logsv/config/logsv_sc_template.xml
--- a/osaf/services/saf/logsv/config/logsv_sc_template.xml
+++ b/osaf/services/saf/logsv/config/logsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=LOG,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/mqsv/config/mqsv_classes.xml 
b/osaf/services/saf/mqsv/config/mqsv_classes.xml
--- a/osaf/services/saf/mqsv/config/mqsv_classes.xml
+++ b/osaf/services/saf/mqsv/config/mqsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaMsgQueue">
                <category>SA_RUNTIME</category>
                <rdn>
diff --git a/osaf/services/saf/mqsv/config/mqsv_objects.xml 
b/osaf/services/saf/mqsv/config/mqsv_objects.xml
--- a/osaf/services/saf/mqsv/config/mqsv_objects.xml
+++ b/osaf/services/saf/mqsv/config/mqsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safMsgService</dn>
                <attr>
diff --git a/osaf/services/saf/mqsv/config/mqsv_pl_template.xml 
b/osaf/services/saf/mqsv/config/mqsv_pl_template.xml
--- a/osaf/services/saf/mqsv/config/mqsv_pl_template.xml
+++ b/osaf/services/saf/mqsv/config/mqsv_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=MQND,safSu=PL_2_3,safSg=NoRed,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/mqsv/config/mqsv_sc_template.xml 
b/osaf/services/saf/mqsv/config/mqsv_sc_template.xml
--- a/osaf/services/saf/mqsv/config/mqsv_sc_template.xml
+++ b/osaf/services/saf/mqsv/config/mqsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=MQD,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/ntfsv/config/ntfsv_objects.xml 
b/osaf/services/saf/ntfsv/config/ntfsv_objects.xml
--- a/osaf/services/saf/ntfsv/config/ntfsv_objects.xml
+++ b/osaf/services/saf/ntfsv/config/ntfsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfCompBaseType">
                <dn>safCompType=OpenSafCompTypeNTF</dn>
        </object>
diff --git a/osaf/services/saf/ntfsv/config/ntfsv_sc_template.xml 
b/osaf/services/saf/ntfsv/config/ntfsv_sc_template.xml
--- a/osaf/services/saf/ntfsv/config/ntfsv_sc_template.xml
+++ b/osaf/services/saf/ntfsv/config/ntfsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=NTF,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/plmsv/config/plmsv_classes.xml 
b/osaf/services/saf/plmsv/config/plmsv_classes.xml
--- a/osaf/services/saf/plmsv/config/plmsv_classes.xml
+++ b/osaf/services/saf/plmsv/config/plmsv_classes.xml
@@ -17,7 +17,7 @@
  * Author(s): Emerson Network Power
  *
 -->
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaPlmDomain">
                <category>SA_CONFIG</category> 
        <rdn>
diff --git a/osaf/services/saf/plmsv/config/plmsv_objects.xml 
b/osaf/services/saf/plmsv/config/plmsv_objects.xml
--- a/osaf/services/saf/plmsv/config/plmsv_objects.xml
+++ b/osaf/services/saf/plmsv/config/plmsv_objects.xml
@@ -17,7 +17,7 @@
  * Author(s): Emerson
  *
 -->
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
         <object class="SaAmfApplication">
                 <dn>safApp=safPlmService</dn>
                 <attr>
diff --git a/osaf/services/saf/plmsv/config/plmsv_objects.xml.atca 
b/osaf/services/saf/plmsv/config/plmsv_objects.xml.atca
--- a/osaf/services/saf/plmsv/config/plmsv_objects.xml.atca
+++ b/osaf/services/saf/plmsv/config/plmsv_objects.xml.atca
@@ -17,7 +17,7 @@
  * Author(s): Emerson 
  *
 -->
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
         <object class="SaAmfApplication">
                 <dn>safApp=safPlmService</dn>
                 <attr>
diff --git a/osaf/services/saf/plmsv/config/plmsv_objects.xml.hp 
b/osaf/services/saf/plmsv/config/plmsv_objects.xml.hp
--- a/osaf/services/saf/plmsv/config/plmsv_objects.xml.hp
+++ b/osaf/services/saf/plmsv/config/plmsv_objects.xml.hp
@@ -17,7 +17,7 @@
  * Author(s): Emerson
  *
 -->
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
         <object class="SaAmfApplication">
                 <dn>safApp=safPlmService</dn>
                 <attr>
diff --git a/osaf/services/saf/plmsv/config/plmsv_objects.xml.pc 
b/osaf/services/saf/plmsv/config/plmsv_objects.xml.pc
--- a/osaf/services/saf/plmsv/config/plmsv_objects.xml.pc
+++ b/osaf/services/saf/plmsv/config/plmsv_objects.xml.pc
@@ -17,7 +17,7 @@ n?xml version="1.0" encoding="utf-8"?>
  * Author(s): Emerson
  *
 -->
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
         <object class="SaAmfApplication">
                 <dn>safApp=safPlmService</dn>
                 <attr>
diff --git a/osaf/services/saf/plmsv/config/plmsv_pl_template.xml 
b/osaf/services/saf/plmsv/config/plmsv_pl_template.xml
--- a/osaf/services/saf/plmsv/config/plmsv_pl_template.xml
+++ b/osaf/services/saf/plmsv/config/plmsv_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaPlmEE">
                <dn>safEE=PL_2_3,safDomain=domain_1</dn> 
                <attr>
diff --git a/osaf/services/saf/plmsv/config/plmsv_sc_template.xml 
b/osaf/services/saf/plmsv/config/plmsv_sc_template.xml
--- a/osaf/services/saf/plmsv/config/plmsv_sc_template.xml
+++ b/osaf/services/saf/plmsv/config/plmsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
         <object class="SaAmfComp">
                 <dn>safComp=PLMS,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                 <attr>
diff --git a/osaf/services/saf/smfsv/config/smfsv_classes.xml 
b/osaf/services/saf/smfsv/config/smfsv_classes.xml
--- a/osaf/services/saf/smfsv/config/smfsv_classes.xml
+++ b/osaf/services/saf/smfsv/config/smfsv_classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <class name="SaSmfCampaign">
                <category>SA_CONFIG</category>
                <rdn>
diff --git a/osaf/services/saf/smfsv/config/smfsv_objects.xml 
b/osaf/services/saf/smfsv/config/smfsv_objects.xml
--- a/osaf/services/saf/smfsv/config/smfsv_objects.xml
+++ b/osaf/services/saf/smfsv/config/smfsv_objects.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfApplication">
                <dn>safApp=safSmfService</dn>
                <attr>
diff --git a/osaf/services/saf/smfsv/config/smfsv_pl_template.xml 
b/osaf/services/saf/smfsv/config/smfsv_pl_template.xml
--- a/osaf/services/saf/smfsv/config/smfsv_pl_template.xml
+++ b/osaf/services/saf/smfsv/config/smfsv_pl_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=SMFND,safSu=PL_2_3,safSg=NoRed,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/services/saf/smfsv/config/smfsv_sc_template.xml 
b/osaf/services/saf/smfsv/config/smfsv_sc_template.xml
--- a/osaf/services/saf/smfsv/config/smfsv_sc_template.xml
+++ b/osaf/services/saf/smfsv/config/smfsv_sc_template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
        <object class="SaAmfComp">
                <dn>safComp=SMF,safSu=SC_2_1,safSg=2N,safApp=OpenSAF</dn>
                <attr>
diff --git a/osaf/tools/safimm/immxml/baseimm.py 
b/osaf/tools/safimm/immxml/baseimm.py
--- a/osaf/tools/safimm/immxml/baseimm.py
+++ b/osaf/tools/safimm/immxml/baseimm.py
@@ -30,7 +30,7 @@ class BaseOptions:
 class BaseImmDocument:
     imm_content_element_name = "imm:IMM-contents"
     imm_content_no_namespace_spec = "<imm:IMM-contents>"
-    imm_content_with_namespace_spec = "<imm:IMM-contents 
xmlns:imm=\"http://www.saforum.org/IMMSchema\"; 
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; 
xsi:noNamespaceSchemaLocation=\"SAI-AIS-IMM-XSD-A.01.01.xsd\">"
+    imm_content_with_namespace_spec = "<imm:IMM-contents 
xmlns:imm=\"http://www.saforum.org/IMMSchema\"; 
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; 
xsi:noNamespaceSchemaLocation=\"SAI-AIS-IMM-XSD-A.02.13.xsd\">"
     
      # helper function to identify a problem where python/minidom
     # fails to parse some imm.xml files where the imm: namespace is missing
diff --git a/osaf/tools/safimm/immxml/immxml-nodegen 
b/osaf/tools/safimm/immxml/immxml-nodegen
--- a/osaf/tools/safimm/immxml/immxml-nodegen
+++ b/osaf/tools/safimm/immxml/immxml-nodegen
@@ -81,7 +81,7 @@ imm_file_header()
    local FILE=$1
    cat <<EOF >>$FILE
 <?xml version="1.0" encoding="utf-8"?>
-<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.01.01.xsd">
+<imm:IMM-contents xmlns:imm="http://www.saforum.org/IMMSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:noNamespaceSchemaLocation="SAI-AIS-IMM-XSD-A.02.13.xsd">
 EOF
 }
 

------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works. 
Faster operations. Version large binaries.  Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to