Make firebird-sdbc install consistent with other drivers.

Change-Id: I01673bda5a08ca793f4fba89ddae036e3f1483e2

7 files changed, 13 insertions, 25 deletions

diff --git a/connectivity/Configuration_firebird.mk b/connectivity/Configuration_firebird.mk
index 49b95b591f3e..47873c7df704 100644
--- a/connectivity/Configuration_firebird.mk
+++ b/connectivity/Configuration_firebird.mk
@@ -7,12 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Configuration_Configuration,driver_firebird))
+$(eval $(call gb_Configuration_Configuration,driver_firebird_sdbc))
 
-$(eval $(call gb_Configuration_add_spool_modules,driver_firebird,connectivity/registry/firebird,\
+$(eval $(call gb_Configuration_add_spool_modules,driver_firebird_sdbc,connectivity/registry/firebird,\
 	org/openoffice/Office/DataAccess/Drivers-firebird.xcu \
 ))
 
-$(eval $(call gb_Configuration_add_localized_datas,driver_firebird,connectivity/registry/firebird,\
+$(eval $(call gb_Configuration_add_localized_datas,driver_firebird_sdbc,connectivity/registry/firebird,\
 	org/openoffice/Office/DataAccess/Drivers.xcu \
 ))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index ad2401b78ac4..f52b8099882f 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -88,7 +88,6 @@ ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_firebird \
 	Library_firebird_sdbc \
-	Rdb_firebird_sdbc \
 ))
 endif
 
diff --git a/connectivity/Rdb_firebird_sdbc.mk b/connectivity/Rdb_firebird_sdbc.mk
deleted file mode 100644
index 2679186f333b..000000000000
--- a/connectivity/Rdb_firebird_sdbc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Rdb_Rdb,firebird_sdbc))
-
-$(eval $(call gb_Rdb_add_components,firebird_sdbc,\
-	connectivity/source/drivers/firebird/firebird_sdbc \
-))
diff --git a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index 3179fd24c03c..2c3fc4f0d5a0 100644
--- a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -32,10 +32,10 @@
  *
  ************************************************************************ -->
 <oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <node oor:name="Installed" install:module="firebird">
+  <node oor:name="Installed" install:module="firebird_sdbc">
     <node oor:name="sdbc:embedded:firebird" oor:op="replace">
       <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.FirebirdDriver</value>
+        <value>com.sun.star.comp.sdbc.firebird.Driver</value>
       </prop>
       <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
         <value xml:lang="en-US">Firebird</value>
@@ -63,7 +63,7 @@
     </node>
     <node oor:name="sdbc:firebird:*" oor:op="replace">
       <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.FirebirdDriver</value>
+        <value>com.sun.star.comp.sdbc.firebird.Driver</value>
       </prop>
       <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
         <value xml:lang="en-US">Firebird</value>
diff --git a/connectivity/source/drivers/firebird/FDriver.cxx b/connectivity/source/drivers/firebird/FDriver.cxx
index 112a5d5411fa..1b4faf6f26da 100644
--- a/connectivity/source/drivers/firebird/FDriver.cxx
+++ b/connectivity/source/drivers/firebird/FDriver.cxx
@@ -89,7 +89,7 @@ void FirebirdDriver::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString FirebirdDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.comp.sdbc.FirebirdDriver");
+    return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver");
         // this name is referenced in the configuration and in the firebird.xml
         // Please take care when changing it.
 }
diff --git a/connectivity/source/drivers/firebird/FServices.cxx b/connectivity/source/drivers/firebird/FServices.cxx
index 9cc8197e84c0..42f34c538c5a 100644
--- a/connectivity/source/drivers/firebird/FServices.cxx
+++ b/connectivity/source/drivers/firebird/FServices.cxx
@@ -118,7 +118,7 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* pRegistryKey)
diff --git a/connectivity/source/drivers/firebird/firebird_sdbc.component b/connectivity/source/drivers/firebird/firebird_sdbc.component
index 2624f2e7b00b..ea4e4de2cfe2 100644
--- a/connectivity/source/drivers/firebird/firebird_sdbc.component
+++ b/connectivity/source/drivers/firebird/firebird_sdbc.component
@@ -8,9 +8,10 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird_sdbc"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.sdbc.FirebirdDriver">
+  <implementation name="com.sun.star.comp.sdbc.firebird.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
 </component>
+