[Libreoffice-commits] .: connectivity/registry connectivity/source connectivity/workben
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Aug 13 01:06:11 PDT 2012
connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu | 2 +-
connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component | 2 +-
connectivity/source/drivers/postgresql/postgresql-sdbc.component | 2 +-
connectivity/source/drivers/postgresql/pq_connection.cxx | 2 +-
connectivity/source/drivers/postgresql/pq_driver.cxx | 4 ++--
connectivity/workben/postgresql/metadata.py | 2 +-
connectivity/workben/postgresql/preparedstatement.py | 2 +-
connectivity/workben/postgresql/sdbcx.py | 2 +-
connectivity/workben/postgresql/statement.py | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f50a41437ee99aee499dbabd1d36ef8197db5559
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Aug 13 09:52:43 2012 +0200
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
diff --git a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
index 8958123..75328ef 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 bd3c38c..407a0e6 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 016029e..f691963 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 e1e3754..209ca09 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 98ee8ea..ed8480c 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 8a99a7a..90764d5 100644
--- a/connectivity/workben/postgresql/metadata.py
+++ b/connectivity/workben/postgresql/metadata.py
@@ -85,7 +85,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 0489b18..a44f2ae 100644
--- a/connectivity/workben/postgresql/preparedstatement.py
+++ b/connectivity/workben/postgresql/preparedstatement.py
@@ -81,7 +81,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 3d23214..7c5e971 100644
--- a/connectivity/workben/postgresql/sdbcx.py
+++ b/connectivity/workben/postgresql/sdbcx.py
@@ -101,7 +101,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 e230ab7..1e752e8 100644
--- a/connectivity/workben/postgresql/statement.py
+++ b/connectivity/workben/postgresql/statement.py
@@ -104,7 +104,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:
More information about the Libreoffice-commits
mailing list