Remove SubsystemInclude xml tag

SubsystemInclude is correspond to an XInclude. This patch removes this tag handling and replaces it by the standard xml inclusion tag. Signed-off-by: Jules Clero <[email protected]>
intel · May 5, 2015 · 7742656 · 7742656
1 parent 23ea6ff
commit 7742656
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 248 deletions.
diff --git a/Schemas/SystemClass.xsd b/Schemas/SystemClass.xsd
@@ -7,7 +7,6 @@
 		<xs:complexType>
 			<xs:sequence>
 				<xs:choice maxOccurs="unbounded">
-					<xs:element name="SubsystemInclude" type="FileIncluderType"/>
 					<xs:element ref="Subsystem"/>
 				</xs:choice>
 			</xs:sequence>

diff --git a/bindings/c/Test.cpp b/bindings/c/Test.cpp
@@ -134,17 +134,15 @@ TEST_CASE_METHOD(Test, "Parameter-framework c api use") {
     // Create valid pfw config file
     const char *intParameterPath = "/test/system/integer";
     const char *stringParameterPath = "/test/system/string";
-    TmpFile system("<?xml version='1.0' encoding='UTF-8'?>\
-        <Subsystem Name='system' Type='Virtual' Endianness='Little'>\
-            <ComponentLibrary/>\
-            <InstanceDefinition>\
-                <IntegerParameter Name='integer' Size='32' Signed='true' Max='100'/>\
-                <StringParameter Name='string' MaxLength='9'/>\
-            </InstanceDefinition>\
-        </Subsystem>");
     TmpFile libraries("<?xml version='1.0' encoding='UTF-8'?>\
         <SystemClass Name='test'>\
-            <SubsystemInclude Path='" + system.path() + "'/>\
+            <Subsystem Name='system' Type='Virtual' Endianness='Little'>\
+                <ComponentLibrary/>\
+                <InstanceDefinition>\
+                    <IntegerParameter Name='integer' Size='32' Signed='true' Max='100'/>\
+                    <StringParameter Name='string' MaxLength='9'/>\
+                </InstanceDefinition>\
+            </Subsystem>\
         </SystemClass>");
     TmpFile config("<?xml version='1.0' encoding='UTF-8'?>\
         <ParameterFrameworkConfiguration\

diff --git a/parameter/Android.mk b/parameter/Android.mk
@@ -114,7 +114,6 @@ common_src_files := \
         VirtualSubsystem.cpp \
         VirtualSyncer.cpp \
         XmlElementSerializingContext.cpp \
-        XmlFileIncluderElement.cpp \
         XmlParameterSerializingContext.cpp
 
 common_module := libparameter

diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt
@@ -99,7 +99,6 @@ add_library(parameter SHARED
     VirtualSubsystem.cpp
     VirtualSyncer.cpp
     XmlElementSerializingContext.cpp
-    XmlFileIncluderElement.cpp
     XmlParameterSerializingContext.cpp)
 
 include_directories(
@@ -132,7 +131,6 @@ install(FILES
     Element.h
     ElementBuilder.h
     ElementLibrary.h
-    FileIncluderElementBuilder.h
     FormattedSubsystemObject.h
     InstanceConfigurableElement.h
     Mapper.h

diff --git a/parameter/FileIncluderElementBuilder.h b/parameter/FileIncluderElementBuilder.h
diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp
@@ -37,7 +37,6 @@
 #include "ElementBuilderTemplate.h"
 #include "SelectionCriterionType.h"
 #include "SubsystemElementBuilder.h"
-#include "FileIncluderElementBuilder.h"
 #include "ComponentType.h"
 #include "ComponentInstance.h"
 #include "ParameterBlockType.h"
@@ -2518,7 +2517,6 @@ void CParameterMgr::feedElementLibraries()
     pParameterCreationLibrary->addElementBuilder("EnumParameter", new TNamedElementBuilderTemplate<CEnumParameterType>());
     pParameterCreationLibrary->addElementBuilder("ValuePair", new TElementBuilderTemplate<CEnumValuePair>());
     pParameterCreationLibrary->addElementBuilder("FixedPointParameter", new TNamedElementBuilderTemplate<CFixedPointParameterType>());
-    pParameterCreationLibrary->addElementBuilder("SubsystemInclude", new CFileIncluderElementBuilder(_bValidateSchemasOnStart));
 
     _pElementLibrarySet->addElementLibrary(pParameterCreationLibrary);
 

diff --git a/parameter/XmlFileIncluderElement.cpp b/parameter/XmlFileIncluderElement.cpp
diff --git a/parameter/XmlFileIncluderElement.h b/parameter/XmlFileIncluderElement.h
diff --git a/test/functional-tests/xml/configuration/Structure/Test/TestClass.xml b/test/functional-tests/xml/configuration/Structure/Test/TestClass.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemClass Name="Test">
-    <SubsystemInclude Path="TestSubsystem.xml"/>
+<SystemClass xmlns:xi="http://www.w3.org/2001/XInclude" Name="Test">
+    <xi:include href="TestSubsystem.xml"/>
 </SystemClass>
diff --git a/test/test-fixed-point-parameter/TestClass.xml b/test/test-fixed-point-parameter/TestClass.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemClass Name="Test">
-    <SubsystemInclude Path="VirtualSubsystem.xml"/>
+<SystemClass xmlns:xi="http://www.w3.org/2001/XInclude" Name="Test">
+    <xi:include href="VirtualSubsystem.xml"/>
 </SystemClass>