changes for new module-description.dtd

3 files changed, 345 insertions, 536 deletions

diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml
index a388af244b9c..3a73b2cf246f 100644
--- a/io/source/acceptor/acceptor.xml
+++ b/io/source/acceptor/acceptor.xml
@@ -1,56 +1,42 @@
 <?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.io.Acceptor </Name>
-
-<Description>
-    This component allows
-    to accept an connect-attempt from a different process.
-</Description>
-
-<ModuleName>    acceptor    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.connection.Acceptor    </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    vos         </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   vos2MSC     </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.connection.XAcceptor                          </Type>
-<Type>   com.sun.star.connection.XConnectionBroadcaster                         </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </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>   acceptor    </module-name>
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name>  com.sun.star.comp.io.Acceptor </name>
+        <description>
+            This component allows
+            to accept an connect-attempt from a different process.
+        </description>
+        <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
+        <language>  c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.connection.Acceptor    </supported-service>
+        <service-dependency>    ... </service-dependency>
+        <type>   com.sun.star.connection.XAcceptor                  </type>
+        <type>   com.sun.star.connection.XConnectionBroadcaster     </type>
+        <type>   com.sun.star.io.UnexpectedEOFException             </type>
+        <type>   com.sun.star.io.WrongFormatException               </type>
+        <type>   com.sun.star.lang.XComponent                       </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory            </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.registry.XRegistryKey                 </type>
+        <type>   com.sun.star.registry.XImplementationRegistration  </type>
+        <type>   com.sun.star.test.XSimpleTest                      </type>
+        <type>   com.sun.star.uno.TypeClass                         </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>  vos         </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> vos2MSC     </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>
diff --git a/io/source/connector/connectr.xml b/io/source/connector/connectr.xml
index 9db4ead34efa..a54cefaa6c91 100644
--- a/io/source/connector/connectr.xml
+++ b/io/source/connector/connectr.xml
@@ -1,56 +1,42 @@
 <?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.io.Connector </Name>
-
-<Description>
-    This component allows
-    to establish a connection to another process.
-</Description>
-
-<ModuleName>    connectr    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.connection.Connector   </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.connection.XConnector                         </Type>
-<Type>   com.sun.star.connection.XConnectionBroadcaster                         </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </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>   connectr    </module-name>
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name>  com.sun.star.comp.io.Connector </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.connection.Connector   </supported-service>
+        <service-dependency>    ... </service-dependency>
+        <type>   com.sun.star.connection.XConnector                         </type>
+        <type>   com.sun.star.connection.XConnectionBroadcaster                         </type>
+        <type>   com.sun.star.io.UnexpectedEOFException                     </type>
+        <type>   com.sun.star.io.WrongFormatException                           </type>
+        <type>   com.sun.star.lang.XComponent                               </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </type>
+        <type>   com.sun.star.registry.XImplementationRegistration          </type>
+        <type>   com.sun.star.test.XSimpleTest                              </type>
+        <type>   com.sun.star.uno.TypeClass                                 </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>  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/io/source/stm/stm.xml b/io/source/stm/stm.xml
index 0a0f6f7b31d2..2cfa3927b66c 100644
--- a/io/source/stm/stm.xml
+++ b/io/source/stm/stm.xml
@@ -1,428 +1,265 @@
 <?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.io.stm.Pipe </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    stm </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.Pipe    </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    vos         </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   vos2MSC     </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.io.XObjectInputStream                 </Type>
-<Type>   com.sun.star.io.XObjectOutputStream                    </Type>
-<Type>   com.sun.star.io.XActiveDataSource                  </Type>
-<Type>   com.sun.star.io.XActiveDataSink                    </Type>
-<Type>   com.sun.star.io.XMarkableStream                    </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
-
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.io.stm.DataInputStream </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    acceptor    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.DataInputStream </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.io.XObjectInputStream                 </Type>
-<Type>   com.sun.star.io.XObjectOutputStream                    </Type>
-<Type>   com.sun.star.io.XActiveDataSource                  </Type>
-<Type>   com.sun.star.io.XActiveDataSink                    </Type>
-<Type>   com.sun.star.io.XMarkableStream                    </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.io.stm.DataOutputStream </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    acceptor    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.DataOutputStream    </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.io.XObjectInputStream                 </Type>
-<Type>   com.sun.star.io.XObjectOutputStream                    </Type>
-<Type>   com.sun.star.io.XActiveDataSource                  </Type>
-<Type>   com.sun.star.io.XActiveDataSink                    </Type>
-<Type>   com.sun.star.io.XMarkableStream                    </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.io.stm.ObjectInputStream </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    acceptor    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.ObjectInputStream   </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.io.XObjectInputStream                 </Type>
-<Type>   com.sun.star.io.XObjectOutputStream                    </Type>
-<Type>   com.sun.star.io.XActiveDataSource                  </Type>
-<Type>   com.sun.star.io.XActiveDataSink                    </Type>
-<Type>   com.sun.star.io.XMarkableStream                    </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.io.stm.ObjectOutputStream </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    acceptor    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.ObjectOutputStream  </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.io.XObjectInputStream                 </Type>
-<Type>   com.sun.star.io.XObjectOutputStream                    </Type>
-<Type>   com.sun.star.io.XActiveDataSource                  </Type>
-<Type>   com.sun.star.io.XActiveDataSink                    </Type>
-<Type>   com.sun.star.io.XMarkableStream                    </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.io.stm.MarkableInputStream </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    acceptor    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.MarkableInputStream </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.io.XObjectInputStream                 </Type>
-<Type>   com.sun.star.io.XObjectOutputStream                    </Type>
-<Type>   com.sun.star.io.XActiveDataSource                  </Type>
-<Type>   com.sun.star.io.XActiveDataSink                    </Type>
-<Type>   com.sun.star.io.XMarkableStream                    </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Joerg Budischewski </Author>
-
-<Name>  com.sun.star.comp.io.stm.MarkableOutputStream </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    acceptor    </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.MarkableOutputStream    </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu2       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal2        </RuntimeModuleDependency>
-
-<Type>   com.sun.star.io.XObjectInputStream                 </Type>
-<Type>   com.sun.star.io.XObjectOutputStream                    </Type>
-<Type>   com.sun.star.io.XActiveDataSource                  </Type>
-<Type>   com.sun.star.io.XActiveDataSink                    </Type>
-<Type>   com.sun.star.io.XMarkableStream                    </Type>
-<Type>   com.sun.star.io.UnexpectedEOFException                     </Type>
-<Type>   com.sun.star.io.WrongFormatException                           </Type>
-<Type>   com.sun.star.lang.XComponent                               </Type>
-<Type>   com.sun.star.lang.XMultiServiceFactory             </Type>
-<Type>   com.sun.star.lang.XSingleServiceFactory                    </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.registry.XRegistryKey                         </Type>
-<Type>   com.sun.star.registry.XImplementationRegistration          </Type>
-<Type>   com.sun.star.test.XSimpleTest                              </Type>
-<Type>   com.sun.star.uno.TypeClass                                 </Type>
-<Type>   com.sun.star.uno.XWeak                                 </Type>
-<Type>   com.sun.star.uno.XAggregation                              </Type>
-
-</COMPONENTDESCRIPTION>
-
-
-<COMPONENTDESCRIPTION
-    xmlns:xlink="http://www.w3.org/1999/xlink/Namespace" >
-
-<Author> Juergen Schmidt </Author>
-
-<Name>  com.sun.star.comp.stoc.Pump </Name>
-
-<Description>
-    This component provides ...
-</Description>
-
-<ModuleName>    io  </ModuleName>
-
-<LoaderName>    com.sun.star.loader.SharedLibrary   </LoaderName>
-
-<Language>  c++ </Language>
-
-<Status StatusValue="final"/>
-
-<SupportedService>  com.sun.star.io.Pump    </SupportedService>
-
-<ServiceDependency> ... </ServiceDependency>
-
-<ProjectBuildDependency>    cppuhelper  </ProjectBuildDependency>
-<ProjectBuildDependency>    cppu        </ProjectBuildDependency>
-<ProjectBuildDependency>    sal         </ProjectBuildDependency>
-
-<RuntimeModuleDependency>   cppuhelper  </RuntimeModuleDependency>
-<RuntimeModuleDependency>   cppu1       </RuntimeModuleDependency>
-<RuntimeModuleDependency>   sal1        </RuntimeModuleDependency>
-
-<Type>  com.sun.star.io.XConnectable                </Type>
-<Type>  com.sun.star.io.XActiveDataSource           </Type>
-<Type>  com.sun.star.io.XActiveDataSink             </Type>
-<Type>  com.sun.star.io.XActiveDataControl          </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.registry.XRegistryKey          </Type>
-<Type>  com.sun.star.uno.XAggregation               </Type>
-<Type>  com.sun.star.uno.XWeak                      </Type>
-<Type>  com.sun.star.uno.TypeClass                  </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> stm </module-name>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.io.stm.Pipe </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language>  c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.Pipe </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>   com.sun.star.io.XObjectInputStream                 </type>
+        <type>   com.sun.star.io.XObjectOutputStream                </type>
+        <type>   com.sun.star.io.XActiveDataSource                  </type>
+        <type>   com.sun.star.io.XActiveDataSink                    </type>
+        <type>   com.sun.star.io.XMarkableStream                    </type>
+        <type>   com.sun.star.io.UnexpectedEOFException             </type>
+        <type>   com.sun.star.io.WrongFormatException               </type>
+        <type>   com.sun.star.lang.XComponent                       </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory            </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.registry.XRegistryKey                 </type>
+        <type>   com.sun.star.registry.XImplementationRegistration  </type>
+        <type>   com.sun.star.test.XSimpleTest                      </type>
+        <type>   com.sun.star.uno.TypeClass                         </type>
+        <type>   com.sun.star.uno.XWeak                             </type>
+        <type>   com.sun.star.uno.XAggregation                      </type>
+    </component-description>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.io.stm.DataInputStream </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language>  c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.DataInputStream </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>   com.sun.star.io.XObjectInputStream                 </type>
+        <type>   com.sun.star.io.XObjectOutputStream                </type>
+        <type>   com.sun.star.io.XActiveDataSource                  </type>
+        <type>   com.sun.star.io.XActiveDataSink                    </type>
+        <type>   com.sun.star.io.XMarkableStream                    </type>
+        <type>   com.sun.star.io.UnexpectedEOFException             </type>
+        <type>   com.sun.star.io.WrongFormatException               </type>
+        <type>   com.sun.star.lang.XComponent                       </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory            </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.registry.XRegistryKey                 </type>
+        <type>   com.sun.star.registry.XImplementationRegistration  </type>
+        <type>   com.sun.star.test.XSimpleTest                      </type>
+        <type>   com.sun.star.uno.TypeClass                         </type>
+        <type>   com.sun.star.uno.XWeak                             </type>
+        <type>   com.sun.star.uno.XAggregation                      </type>
+    </component-description>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.io.stm.DataOutputStream </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.DataOutputStream </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>  com.sun.star.io.XObjectInputStream                  </type>
+        <type>  com.sun.star.io.XObjectOutputStream                 </type>
+        <type>  com.sun.star.io.XActiveDataSource                   </type>
+        <type>  com.sun.star.io.XActiveDataSink                     </type>
+        <type>  com.sun.star.io.XMarkableStream                     </type>
+        <type>  com.sun.star.io.UnexpectedEOFException              </type>
+        <type>  com.sun.star.io.WrongFormatException                </type>
+        <type>  com.sun.star.lang.XComponent                        </type>
+        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
+        <type>  com.sun.star.lang.XSingleServiceFactory             </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.registry.XRegistryKey                  </type>
+        <type>  com.sun.star.registry.XImplementationRegistration   </type>
+        <type>  com.sun.star.test.XSimpleTest                       </type>
+        <type>  com.sun.star.uno.TypeClass                          </type>
+        <type>  com.sun.star.uno.XWeak                              </type>
+        <type>  com.sun.star.uno.XAggregation                       </type>
+    </component-description>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.io.stm.ObjectInputStream </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.ObjectInputStream </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>  com.sun.star.io.XObjectInputStream                  </type>
+        <type>  com.sun.star.io.XObjectOutputStream                 </type>
+        <type>  com.sun.star.io.XActiveDataSource                   </type>
+        <type>  com.sun.star.io.XActiveDataSink                     </type>
+        <type>  com.sun.star.io.XMarkableStream                     </type>
+        <type>  com.sun.star.io.UnexpectedEOFException              </type>
+        <type>  com.sun.star.io.WrongFormatException                </type>
+        <type>  com.sun.star.lang.XComponent                        </type>
+        <type>  com.sun.star.lang.XMultiServiceFactory              </type>
+        <type>  com.sun.star.lang.XSingleServiceFactory             </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.registry.XRegistryKey                  </type>
+        <type>  com.sun.star.registry.XImplementationRegistration   </type>
+        <type>  com.sun.star.test.XSimpleTest                       </type>
+        <type>  com.sun.star.uno.TypeClass                          </type>
+        <type>  com.sun.star.uno.XWeak                              </type>
+        <type>  com.sun.star.uno.XAggregation                       </type>
+    </component-description>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.io.stm.ObjectOutputStream </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.ObjectOutputStream </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>   com.sun.star.io.XObjectInputStream                 </type>
+        <type>   com.sun.star.io.XObjectOutputStream                </type>
+        <type>   com.sun.star.io.XActiveDataSource                  </type>
+        <type>   com.sun.star.io.XActiveDataSink                    </type>
+        <type>   com.sun.star.io.XMarkableStream                    </type>
+        <type>   com.sun.star.io.UnexpectedEOFException             </type>
+        <type>   com.sun.star.io.WrongFormatException               </type>
+        <type>   com.sun.star.lang.XComponent                       </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory            </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.registry.XRegistryKey                 </type>
+        <type>   com.sun.star.registry.XImplementationRegistration  </type>
+        <type>   com.sun.star.test.XSimpleTest                      </type>
+        <type>   com.sun.star.uno.TypeClass                         </type>
+        <type>   com.sun.star.uno.XWeak                             </type>
+        <type>   com.sun.star.uno.XAggregation                      </type>
+    </component-description>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.io.stm.MarkableInputStream </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.MarkableInputStream </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>   com.sun.star.io.XObjectInputStream                 </type>
+        <type>   com.sun.star.io.XObjectOutputStream                </type>
+        <type>   com.sun.star.io.XActiveDataSource                  </type>
+        <type>   com.sun.star.io.XActiveDataSink                    </type>
+        <type>   com.sun.star.io.XMarkableStream                    </type>
+        <type>   com.sun.star.io.UnexpectedEOFException             </type>
+        <type>   com.sun.star.io.WrongFormatException               </type>
+        <type>   com.sun.star.lang.XComponent                       </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory            </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.registry.XRegistryKey                 </type>
+        <type>   com.sun.star.registry.XImplementationRegistration  </type>
+        <type>   com.sun.star.test.XSimpleTest                      </type>
+        <type>   com.sun.star.uno.TypeClass                         </type>
+        <type>   com.sun.star.uno.XWeak                             </type>
+        <type>   com.sun.star.uno.XAggregation                      </type>
+    </component-description>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.io.stm.MarkableOutputStream </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.MarkableOutputStream </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>   com.sun.star.io.XObjectInputStream                 </type>
+        <type>   com.sun.star.io.XObjectOutputStream                </type>
+        <type>   com.sun.star.io.XActiveDataSource                  </type>
+        <type>   com.sun.star.io.XActiveDataSink                    </type>
+        <type>   com.sun.star.io.XMarkableStream                    </type>
+        <type>   com.sun.star.io.UnexpectedEOFException             </type>
+        <type>   com.sun.star.io.WrongFormatException               </type>
+        <type>   com.sun.star.lang.XComponent                       </type>
+        <type>   com.sun.star.lang.XMultiServiceFactory             </type>
+        <type>   com.sun.star.lang.XSingleServiceFactory            </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.registry.XRegistryKey                 </type>
+        <type>   com.sun.star.registry.XImplementationRegistration  </type>
+        <type>   com.sun.star.test.XSimpleTest                      </type>
+        <type>   com.sun.star.uno.TypeClass                         </type>
+        <type>   com.sun.star.uno.XWeak                             </type>
+        <type>   com.sun.star.uno.XAggregation                      </type>
+    </component-description>
+
+    <component-description>
+        <author> Joerg Budischewski </author>
+        <name> com.sun.star.comp.stoc.Pump </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.io.Pump </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type>  com.sun.star.io.XConnectable                </type>
+        <type>  com.sun.star.io.XActiveDataSource           </type>
+        <type>  com.sun.star.io.XActiveDataSink             </type>
+        <type>  com.sun.star.io.XActiveDataControl          </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.registry.XRegistryKey          </type>
+        <type>  com.sun.star.uno.XAggregation               </type>
+        <type>  com.sun.star.uno.XWeak                      </type>
+        <type>  com.sun.star.uno.TypeClass                  </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> cppuhelper  </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> vos2MSC     </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>