Replace use_internal_api with use_udk_api etc. where appropriate

Change-Id: I5e216ca01830a6568159ee8e9265938667f201a1

10 files changed, 3 insertions, 521 deletions

diff --git a/io/InternalUnoApi_acceptor.mk b/io/InternalUnoApi_acceptor.mk
deleted file mode 100644
index ddd31d2252b2..000000000000
--- a/io/InternalUnoApi_acceptor.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,acceptor))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,acceptor,io/source/acceptor/acceptor.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/io/InternalUnoApi_connectr.mk b/io/InternalUnoApi_connectr.mk
deleted file mode 100644
index 489606978772..000000000000
--- a/io/InternalUnoApi_connectr.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,connectr))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,connectr,io/source/connector/connectr.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/io/InternalUnoApi_stm.mk b/io/InternalUnoApi_stm.mk
deleted file mode 100644
index 723e5fa689d1..000000000000
--- a/io/InternalUnoApi_stm.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InternalUnoApi_InternalUnoApi,stm))
-
-$(eval $(call gb_InternalUnoApi_set_xmlfile,stm,io/source/stm/stm.xml))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk
index 426460012f06..80062249654c 100644
--- a/io/Library_acceptor.mk
+++ b/io/Library_acceptor.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,acceptor))
 
-$(eval $(call gb_Library_use_internal_api,acceptor,\
-    acceptor \
-))
+$(eval $(call gb_Library_use_udk_api,acceptor))
 
 $(eval $(call gb_Library_use_libraries,acceptor,\
     cppu \
diff --git a/io/Library_connector.mk b/io/Library_connector.mk
index 95a03c0a8429..c2147e7d3f31 100644
--- a/io/Library_connector.mk
+++ b/io/Library_connector.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,connector))
 
-$(eval $(call gb_Library_use_internal_api,connector,\
-    connectr \
-))
+$(eval $(call gb_Library_use_udk_api,connector))
 
 $(eval $(call gb_Library_use_libraries,connector,\
     cppu \
diff --git a/io/Library_streams.mk b/io/Library_streams.mk
index 2745bf3e6af8..696bc4716c77 100644
--- a/io/Library_streams.mk
+++ b/io/Library_streams.mk
@@ -27,9 +27,7 @@
 
 $(eval $(call gb_Library_Library,streams))
 
-$(eval $(call gb_Library_use_internal_api,streams,\
-    stm \
-))
+$(eval $(call gb_Library_use_udk_api,streams))
 
 $(eval $(call gb_Library_use_libraries,streams,\
     cppu \
diff --git a/io/Module_io.mk b/io/Module_io.mk
index b66e33d2ef95..44a4b02f8037 100644
--- a/io/Module_io.mk
+++ b/io/Module_io.mk
@@ -28,9 +28,6 @@
 $(eval $(call gb_Module_Module,io))
 
 $(eval $(call gb_Module_add_targets,io,\
-    InternalUnoApi_acceptor \
-    InternalUnoApi_connectr \
-    InternalUnoApi_stm \
     Library_acceptor \
     Library_connector \
     Library_streams \
diff --git a/io/source/acceptor/acceptor.xml b/io/source/acceptor/acceptor.xml
deleted file mode 100644
index 60589de6f7f8..000000000000
--- a/io/source/acceptor/acceptor.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   acceptor.uno    </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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>  sal         </project-build-dependency>
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </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
deleted file mode 100644
index 82d8f16a9198..000000000000
--- a/io/source/connector/connectr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name>   connector.uno   </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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>  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/io/source/stm/stm.xml b/io/source/stm/stm.xml
deleted file mode 100644
index 154c76eb0d08..000000000000
--- a/io/source/stm/stm.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
-    <module-name> streams.uno </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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.DisposedException         </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.lang.XSingleComponentFactory          </type>
-        <type>   com.sun.star.uno.XComponentContext                 </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>  sal         </project-build-dependency>
-
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu2       </runtime-module-dependency>
-    <runtime-module-dependency> sal2        </runtime-module-dependency>
-</module-description>
-