sb129: #i113189# change UNO components to use passive registration

4 files changed, 238 insertions, 0 deletions

diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component
new file mode 100644
index 000000000000..46b39d81bafb
--- /dev/null
+++ b/dbaccess/util/dba.component
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.chart2.data.DatabaseDataProvider">
+    <service name="com.sun.star.chart2.data.DatabaseDataProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.DataAccessDescriptorFactory">
+    <service name="com.sun.star.sdb.DataAccessDescriptorFactory"/>
+    <singleton name="com.sun.star.sdb.DataAccessDescriptorFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.OCommandDefinition">
+    <service name="com.sun.star.sdb.CommandDefinition"/>
+    <service name="com.sun.star.sdb.QueryDefinition"/>
+    <service name="com.sun.star.ucb.Content"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.OComponentDefinition">
+    <service name="com.sun.star.sdb.TableDefinition"/>
+    <service name="com.sun.star.ucb.Content"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ODatabaseContext">
+    <service name="com.sun.star.sdb.DatabaseContext"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ODatabaseDocument">
+    <service name="com.sun.star.document.OfficeDocument"/>
+    <service name="com.sun.star.sdb.OfficeDatabaseDocument"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ODatabaseSource">
+    <service name="com.sun.star.sdb.DataSource"/>
+    <service name="com.sun.star.sdb.DocumentDataSource"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ORowSet">
+    <service name="com.sun.star.sdb.ResultSet"/>
+    <service name="com.sun.star.sdb.RowSet"/>
+    <service name="com.sun.star.sdbc.ResultSet"/>
+    <service name="com.sun.star.sdbc.RowSet"/>
+    <service name="com.sun.star.sdbcx.ResultSet"/>
+  </implementation>
+</component>
diff --git a/dbaccess/util/dbu.component b/dbaccess/util/dbu.component
new file mode 100644
index 000000000000..cee329fe43f0
--- /dev/null
+++ b/dbaccess/util/dbu.component
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.dbaccess.DatabaseInteractionHandler">
+    <service name="com.sun.star.sdb.DatabaseInteractionHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbaccess.LegacyInteractionHandler">
+    <service name="com.sun.star.sdb.InteractionHandler"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.dbaccess.OTextConnectionSettingsDialog">
+    <service name="com.sun.star.sdb.TextConnectionSettings"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbu.OColumnControl">
+    <service name="com.sun.star.awt.UnoControl"/>
+    <service name="com.sun.star.sdb.ColumnDescriptorControl"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbu.OColumnControlModel">
+    <service name="com.sun.star.awt.UnoControlModel"/>
+    <service name="com.sun.star.sdb.ColumnDescriptorControlModel"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbu.SbaXGridControl">
+    <service name="com.sun.star.awt.UnoControl"/>
+    <service name="com.sun.star.form.control.GridControl"/>
+    <service name="com.sun.star.form.control.InteractionGridControl"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sdb.DirectSQLDialog">
+    <service name="org.openoffice.comp.dbu.DirectSqlDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.sdb.ApplicationStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.sdb.ApplicationToolboxController">
+    <service name="com.sun.star.frame.ToolboxController"/>
+  </implementation>
+  <implementation name="com.sun.star.uno.comp.sdb.RowsetFilterDialog">
+    <service name="com.sun.star.sdb.FilterDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.uno.comp.sdb.RowsetOrderDialog">
+    <service name="com.sun.star.sdb.OrderDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.CopyTableWizard">
+    <service name="com.sun.star.sdb.application.CopyTableWizard"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.DBContentLoader">
+    <service name="com.sun.star.frame.FrameLoader"/>
+    <service name="com.sun.star.sdb.ContentLoader"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OAdvancedSettingsDialog">
+    <service name="com.sun.star.sdb.AdvancedDatabaseSettingsDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OApplicationController">
+    <service name="com.sun.star.sdb.application.DefaultViewController"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ODBTypeWizDialog">
+    <service name="com.sun.star.sdb.DataSourceTypeChangeDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ODBTypeWizDialogSetup">
+    <service name="com.sun.star.sdb.DatabaseWizardDialog"/>
+  </implementation>
+  <implementation
+      name="org.openoffice.comp.dbu.ODatasourceAdministrationDialog">
+    <service name="com.sun.star.sdb.DatasourceAdministrationDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ODatasourceBrowser">
+    <service name="com.sun.star.sdb.DataSourceBrowser"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OFormGridView">
+    <service name="com.sun.star.sdb.FormGridView"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OQueryDesign">
+    <service name="com.sun.star.sdb.QueryDesign"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ORelationDesign">
+    <service name="com.sun.star.sdb.RelationDesign"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OSQLMessageDialog">
+    <service name="com.sun.star.sdb.ErrorMessageDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OTableDesign">
+    <service name="com.sun.star.sdb.TableDesign"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OTableFilterDialog">
+    <service name="com.sun.star.sdb.TableFilterDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OUserSettingsDialog">
+    <service name="com.sun.star.sdb.UserAdministrationDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OViewDesign">
+    <service name="com.sun.star.sdb.ViewDesign"/>
+  </implementation>
+</component>
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
index 8430b5edf8dc..d59855961c79 100644
--- a/dbaccess/util/makefile.mk
+++ b/dbaccess/util/makefile.mk
@@ -239,3 +239,23 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
 .ENDIF
 
 .ENDIF
+
+ALLTAR : $(MISC)/dba.component $(MISC)/dbu.component $(MISC)/sdbt.component
+
+$(MISC)/dba.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dba.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dba.component
+
+$(MISC)/dbu.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbu.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbu.component
+
+$(MISC)/sdbt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sdbt.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sdbt.component
diff --git a/dbaccess/util/sdbt.component b/dbaccess/util/sdbt.component
new file mode 100644
index 000000000000..0038c0cad27f
--- /dev/null
+++ b/dbaccess/util/sdbt.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.dbaccess.ConnectionTools">
+    <service name="com.sun.star.sdb.tools.ConnectionTools"/>
+  </implementation>
+</component>