fdo#53246 Fresh postgresql-sdbc implementation names

The descriptions for fdo#53246 "Libo36 does not start, InvalidRegistryException
from program/services/postgresql-sdbc.rdb" make it look like the user had
installed the functionality that comes bundled in postgresql-sdbc.rdb also as an
extension installed per-user or shared.
<http://wiki.documentfoundation.org/PostgreSQL-SDBC> indicates that what is now
bundled due to c97d74b5f0608866bad3f7ae943811bdff4f7986 "fdo#45090: Changed
postgresql-sdbc from bundled oxt to proper optional part" indeed was once
available as a freestanding postgresql-sdbc-*.oxt that could have been installed
per-user or shared.

To prevent problems with such scenarios, rename the relevant implementation
names by adding a ".noext" suffix.

Change-Id: I43414a64461ba643f0ca0b2749450099cb6c8a4d
Signed-off-by: Michael Meeks <michael.meeks@suse.com>

9 files changed, 10 insertions, 10 deletions

diff --git a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
index 8958123c41d5..75328efa9aa2 100644
--- a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -56,7 +56,7 @@
   <node oor:name="Installed" install:module="postgresql">
     <node oor:name="sdbc:postgresql:*" oor:op="replace">
       <prop oor:name="Driver">
-        <value>org.openoffice.comp.connectivity.pq.Driver</value>
+        <value>org.openoffice.comp.connectivity.pq.Driver.noext</value>
       </prop>
       <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
         <value xml:lang="en-US">PostgreSQL</value>
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
index bd3c38ca639a..407a0e6c9f54 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
@@ -29,7 +29,7 @@
 
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="org.openoffice.comp.connectivity.pq.Connection">
+  <implementation name="org.openoffice.comp.connectivity.pq.Connection.noext">
     <service name="com.sun.star.sdbc.Connection"/>
   </implementation>
 </component>
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
index 016029eae227..f691963f9628 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
@@ -29,7 +29,7 @@
 
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="org.openoffice.comp.connectivity.pq.Driver">
+  <implementation name="org.openoffice.comp.connectivity.pq.Driver.noext">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
 </component>
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index e1e3754ca6d3..209ca09dce31 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -160,7 +160,7 @@ public:
 
 OUString    ConnectionGetImplementationName()
 {
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Connection" ) );
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Connection.noext" ) );
 }
 com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void)
 {
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index 98ee8ea7cd77..ed8480c318c4 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -106,7 +106,7 @@ OUString DriverGetImplementationName()
     {
         MutexGuard guard( osl::Mutex::getGlobalMutex() );
         static OUString instance(
-            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver" ) );
+            RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver.noext" ) );
         p = &instance;
     }
     return *p;
@@ -137,7 +137,7 @@ Reference< XConnection > Driver::connect(
     seq[1] <<= info;
     return Reference< XConnection> (
         m_smgr->createInstanceWithArgumentsAndContext(
-            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.connectivity.pq.Connection" ) ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.connectivity.pq.Connection.noext" ) ),
             seq, m_ctx ),
         UNO_QUERY );
 }
diff --git a/connectivity/workben/postgresql/metadata.py b/connectivity/workben/postgresql/metadata.py
index 948567588485..ec60de474f98 100644
--- a/connectivity/workben/postgresql/metadata.py
+++ b/connectivity/workben/postgresql/metadata.py
@@ -91,7 +91,7 @@ class TestCase(unittest.TestCase):
 
       def setUp( self ):
           self.driver = self.ctx.ServiceManager.createInstanceWithContext(
-                   'org.openoffice.comp.connectivity.pq.Driver' , self.ctx )
+                   'org.openoffice.comp.connectivity.pq.Driver.noext' , self.ctx )
           self.connection = self.driver.connect( self.dburl, () )
           ddl.executeDDLs( self.connection )
 
diff --git a/connectivity/workben/postgresql/preparedstatement.py b/connectivity/workben/postgresql/preparedstatement.py
index d049c9f6f5c3..54630b41ba36 100644
--- a/connectivity/workben/postgresql/preparedstatement.py
+++ b/connectivity/workben/postgresql/preparedstatement.py
@@ -87,7 +87,7 @@ class TestCase(unittest.TestCase):
 
       def setUp(self):
           self.driver = self.ctx.ServiceManager.createInstanceWithContext(
-                   'org.openoffice.comp.connectivity.pq.Driver', self.ctx )
+                   'org.openoffice.comp.connectivity.pq.Driver.noext', self.ctx )
           self.connection = self.driver.connect( self.dburl, () )
           ddl.executeDDLs( self.connection )
 
diff --git a/connectivity/workben/postgresql/sdbcx.py b/connectivity/workben/postgresql/sdbcx.py
index b864efc63ebb..bfff70abd360 100644
--- a/connectivity/workben/postgresql/sdbcx.py
+++ b/connectivity/workben/postgresql/sdbcx.py
@@ -107,7 +107,7 @@ class TestCase(unittest.TestCase):
 
       def setUp( self ):
           self.driver = self.ctx.ServiceManager.createInstanceWithContext(
-                   'org.openoffice.comp.connectivity.pq.Driver' , self.ctx )
+                   'org.openoffice.comp.connectivity.pq.Driver.noext' , self.ctx )
           self.connection = self.driver.connect( self.dburl, () )
           ddl.executeDDLs( self.connection )
 
diff --git a/connectivity/workben/postgresql/statement.py b/connectivity/workben/postgresql/statement.py
index b4718386e3df..2d9568fff1fc 100644
--- a/connectivity/workben/postgresql/statement.py
+++ b/connectivity/workben/postgresql/statement.py
@@ -110,7 +110,7 @@ class TestCase(unittest.TestCase):
 
       def setUp(self):
           self.driver = self.ctx.ServiceManager.createInstanceWithContext(
-                   'org.openoffice.comp.connectivity.pq.Driver' , self.ctx )
+                   'org.openoffice.comp.connectivity.pq.Driver.noext' , self.ctx )
           self.connection = self.driver.connect( self.dburl, () )
           self.stmt = self.connection.createStatement()
           try: