changes for new module-description.dtd

4 files changed, 153 insertions, 215 deletions

diff --git a/remotebridges/source/bridge/remotebridge.xml b/remotebridges/source/bridge/remotebridge.xml
index 4ddce3ca6d13..a2681368f855 100644
--- a/remotebridges/source/bridge/remotebridge.xml
+++ b/remotebridges/source/bridge/remotebridge.xml
@@ -1,60 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.remotebridges.Bridge.various </Name>
-
-<Description>
-    This component initializes the bridge between two processes
-    using either iiop or urp (UnoRemoteProtocol) protocol.
-</Description>
-
-<ModuleName>    remotebridge    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.bridge.Bridge  </SupportedService>
-<SupportedService>  com.sun.star.bridge.IiopBridge  </SupportedService>
-<SupportedService>  com.sun.star.bridge.UrpBridge   </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-<RuntimeModuleDependency>   rmcxt           </RuntimeModuleDependency>
-
-
-<RuntimeModuleDependency>   cppuhelper2 </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-<RuntimeModuleDependency>   rmcxt2      </RuntimeModuleDependency>
-
-
-<Type>   com.sun.star.bridge.XBridgeFactory                     </Type>
-<Type>   com.sun.star.bridge.XInstanceProvider                  </Type>
-<Type>   com.sun.star.bridge.XBridge                                </Type>
-<Type>   com.sun.star.bridge.BridgeExistsException              </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory         </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                </Type>
-<Type>   com.sun.star.lang.XInitialization                      </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XServiceInfo                         </Type>
-<Type>   com.sun.star.lang.XTypeProvider                </Type>
-<Type>   com.sun.star.lang.IllegalArgumentException             </Type>
-<Type>   com.sun.star.lang.XInitialization                          </Type>
-<Type>   com.sun.star.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.TypeClass                             </Type>
-<Type>   com.sun.star.uno.XAggregation                          </Type>
-
-</COMPONENTDESCRIPTION>
-
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>   remotebridge    </module-name>
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name>  com.sun.star.comp.remotebridges.Bridge.various </name>
+        <description>
+            This component initializes the bridge between two processes
+            using either iiop or urp (UnoRemoteProtocol) protocol.
+        </description>
+        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
+        <language>  c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.bridge.Bridge  </supported-service>
+        <supported-service> com.sun.star.bridge.IiopBridge  </supported-service>
+        <supported-service> com.sun.star.bridge.UrpBridge   </supported-service>
+        <service-dependency>    ... </service-dependency>
+        <type>   com.sun.star.bridge.XBridgeFactory         </type>
+        <type>   com.sun.star.bridge.XInstanceProvider      </type>
+        <type>   com.sun.star.bridge.XBridge                </type>
+        <type>   com.sun.star.bridge.BridgeExistsException  </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory     </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory    </type>
+        <type>   com.sun.star.lang.XInitialization          </type>
+        <type>   com.sun.star.lang.XComponent               </type>
+        <type>   com.sun.star.lang.XServiceInfo             </type>
+        <type>   com.sun.star.lang.XTypeProvider            </type>
+        <type>   com.sun.star.lang.IllegalArgumentException </type>
+        <type>   com.sun.star.lang.XInitialization          </type>
+        <type>   com.sun.star.registry.XRegistryKey         </type>
+        <type>   com.sun.star.uno.XWeak                     </type>
+        <type>   com.sun.star.uno.TypeClass                 </type>
+        <type>   com.sun.star.uno.XAggregation              </type>
+    </component-description>
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <runtime-module-dependency> rmcxt           </runtime-module-dependency>
+    <runtime-module-dependency> cppuhelper2 </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <runtime-module-dependency> rmcxt2      </runtime-module-dependency>
+</module-description>
diff --git a/remotebridges/source/dynamicloader/dynamicloader.xml b/remotebridges/source/dynamicloader/dynamicloader.xml
index 732dca7c1151..268e4664b26f 100644
--- a/remotebridges/source/dynamicloader/dynamicloader.xml
+++ b/remotebridges/source/dynamicloader/dynamicloader.xml
@@ -1,50 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Kay Ramme </Author>
-
-<Name>  com.sun.star.loader.Dynamic </Name>
-
-<Description>
-   This service allows the delegation of the resolution
-   of a SingleServiceFactory for a service to be
-   delegated to a resolver (e.g. UnoUrlResolver).
-</Description>
-
-<ModuleName>    dynamicloader   </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.loader.Dynamic </SupportedService>
-
-<ServiceDependency> com.sun.star.bridge.UnoUrlResolver  </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper2 </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-
-
-<Type>  com.sun.star.bridge.XUnoUrlResolver       </Type>
-<Type>  com.sun.star.lang.XMultiServiceFactory    </Type>
-<Type>  com.sun.star.lang.XServiceInfo            </Type>
-<Type>  com.sun.star.lang.XSingleServiceFactory   </Type>
-<Type>  com.sun.star.lang.XTypeProvider           </Type>
-<Type>  com.sun.star.loader.XImplementationLoader </Type>
-<Type>  com.sun.star.registry.XRegistryKey        </Type>
-<Type>  com.sun.star.uno.XWeak                    </Type>
-<Type>  com.sun.star.uno.XAggregation             </Type>
-
-</COMPONENTDESCRIPTION>
-
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>   dynamicloader   </module-name>
+    <component-description>
+        <author> Kay Ramme </author>
+        <name>  com.sun.star.loader.Dynamic </name>
+        <description>
+           This service allows the delegation of the resolution
+           of a SingleServiceFactory for a service to be
+           delegated to a resolver (e.g. UnoUrlResolver).
+        </description>
+        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
+        <language>  c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.loader.Dynamic </supported-service>
+        <service-dependency>    com.sun.star.bridge.UnoUrlResolver  </service-dependency>
+        <type>  com.sun.star.bridge.XUnoUrlResolver       </type>
+        <type>  com.sun.star.lang.XMultiServiceFactory    </type>
+        <type>  com.sun.star.lang.XServiceInfo            </type>
+        <type>  com.sun.star.lang.XSingleServiceFactory   </type>
+        <type>  com.sun.star.lang.XTypeProvider           </type>
+        <type>  com.sun.star.loader.XImplementationLoader </type>
+        <type>  com.sun.star.registry.XRegistryKey        </type>
+        <type>  com.sun.star.uno.XWeak                    </type>
+        <type>  com.sun.star.uno.XAggregation             </type>
+    </component-description>
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <runtime-module-dependency> cppuhelper2 </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>
diff --git a/remotebridges/source/factory/brdgfctr.xml b/remotebridges/source/factory/brdgfctr.xml
index 2bfd1e8fb2d5..41949cda736f 100644
--- a/remotebridges/source/factory/brdgfctr.xml
+++ b/remotebridges/source/factory/brdgfctr.xml
@@ -1,58 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.remotebridges.BridgeFactory </Name>
-
-<Description>
-    This component allows
-    to establish a connection to another process.
-</Description>
-
-<ModuleName>    brdgfctr    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.bridge.BridgeFactory   </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    vos         </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper2 </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   vos2            </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-
-<Type>   com.sun.star.bridge.XBridgeFactory                     </Type>
-<Type>   com.sun.star.bridge.XInstanceProvider                  </Type>
-<Type>   com.sun.star.bridge.XBridge                                </Type>
-<Type>   com.sun.star.bridge.BridgeExistsException              </Type>
-<Type>   com.sun.star.container.XContentEnumerationAccess           </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory         </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                </Type>
-<Type>   com.sun.star.lang.XInitialization                      </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XServiceInfo                         </Type>
-<Type>   com.sun.star.lang.XTypeProvider                </Type>
-<Type>   com.sun.star.lang.IllegalArgumentException             </Type>
-<Type>   com.sun.star.lang.XInitialization                          </Type>
-<Type>   com.sun.star.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.TypeClass                             </Type>
-<Type>   com.sun.star.uno.XAggregation                          </Type>
-
-</COMPONENTDESCRIPTION>
-
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>   brdgfctr    </module-name>
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name>  com.sun.star.comp.remotebridges.BridgeFactory </name>
+        <description>
+            This component allows
+            to establish a connection to another process.
+        </description>
+        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
+        <language>  c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.bridge.BridgeFactory   </supported-service>
+        <service-dependency>    ... </service-dependency>
+        <type>   com.sun.star.bridge.XBridgeFactory                 </type>
+        <type>   com.sun.star.bridge.XInstanceProvider              </type>
+        <type>   com.sun.star.bridge.XBridge                        </type>
+        <type>   com.sun.star.bridge.BridgeExistsException          </type>
+        <type>   com.sun.star.container.XContentEnumerationAccess   </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory            </type>
+        <type>   com.sun.star.lang.XInitialization                  </type>
+        <type>   com.sun.star.lang.XComponent                       </type>
+        <type>   com.sun.star.lang.XServiceInfo                     </type>
+        <type>   com.sun.star.lang.XTypeProvider                    </type>
+        <type>   com.sun.star.lang.IllegalArgumentException         </type>
+        <type>   com.sun.star.lang.XInitialization                  </type>
+        <type>   com.sun.star.registry.XRegistryKey                 </type>
+        <type>   com.sun.star.uno.XWeak                             </type>
+        <type>   com.sun.star.uno.TypeClass                         </type>
+        <type>   com.sun.star.uno.XAggregation                      </type>
+    </component-description>
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  vos         </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <runtime-module-dependency> cppuhelper2 </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> vos2            </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>
diff --git a/remotebridges/source/unourl_resolver/uuresolver.xml b/remotebridges/source/unourl_resolver/uuresolver.xml
index 82645f838d2e..9599efb955b6 100644
--- a/remotebridges/source/unourl_resolver/uuresolver.xml
+++ b/remotebridges/source/unourl_resolver/uuresolver.xml
@@ -1,51 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "componentdescription.dtd">
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Daniel Boelzle </Author>
-
-<Name>  com.sun.star.comp.bridge.UnoUrlResolver </Name>
-
-<Description>
-    This component allows
-    to retrieve an object reference from another process.
-</Description>
-
-<ModuleName>    uuresolver  </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.bridge.UnoUrlResolver  </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper2 </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-
-<Type>   com.sun.star.uno.TypeClass                         </Type>
-<Type>   com.sun.star.lang.XTypeProvider                    </Type>
-<Type>   com.sun.star.lang.XServiceInfo                         </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory            </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory     </Type>
-<Type>   com.sun.star.lang.XComponent                       </Type>
-<Type>   com.sun.star.registry.XRegistryKey                 </Type>
-<Type>   com.sun.star.connection.XConnector                     </Type>
-<Type>   com.sun.star.bridge.XBridgeFactory                 </Type>
-<Type>   com.sun.star.bridge.XUnoUrlResolver        </Type>
-<Type>   com.sun.star.uno.XAggregation                      </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-
-</COMPONENTDESCRIPTION>
-
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>   uuresolver  </module-name>
+    <component-description>
+        <author> Daniel Boelzle </author>
+        <name>  com.sun.star.comp.bridge.UnoUrlResolver </name>
+        <description>
+            This component allows
+            to retrieve an object reference from another process.
+        </description>
+        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
+        <language>  c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.bridge.UnoUrlResolver </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>   com.sun.star.uno.TypeClass                 </type>
+        <type>   com.sun.star.lang.XTypeProvider            </type>
+        <type>   com.sun.star.lang.XServiceInfo             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory    </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory     </type>
+        <type>   com.sun.star.lang.XComponent               </type>
+        <type>   com.sun.star.registry.XRegistryKey         </type>
+        <type>   com.sun.star.connection.XConnector         </type>
+        <type>   com.sun.star.bridge.XBridgeFactory         </type>
+        <type>   com.sun.star.bridge.XUnoUrlResolver        </type>
+        <type>   com.sun.star.uno.XAggregation              </type>
+        <type>   com.sun.star.uno.XWeak                     </type>
+    </component-description>
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <runtime-module-dependency> cppuhelper2 </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>