Kaydet (Commit) f50a4143 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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 c97d74b5 "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
üst a9180524
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<node oor:name="Installed" install:module="postgresql"> <node oor:name="Installed" install:module="postgresql">
<node oor:name="sdbc:postgresql:*" oor:op="replace"> <node oor:name="sdbc:postgresql:*" oor:op="replace">
<prop oor:name="Driver"> <prop oor:name="Driver">
<value>org.openoffice.comp.connectivity.pq.Driver</value> <value>org.openoffice.comp.connectivity.pq.Driver.noext</value>
</prop> </prop>
<prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
<value xml:lang="en-US">PostgreSQL</value> <value xml:lang="en-US">PostgreSQL</value>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components"> 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"/> <service name="com.sun.star.sdbc.Connection"/>
</implementation> </implementation>
</component> </component>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<component loader="com.sun.star.loader.SharedLibrary" <component loader="com.sun.star.loader.SharedLibrary"
xmlns="http://openoffice.org/2010/uno-components"> 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"/> <service name="com.sun.star.sdbc.Driver"/>
</implementation> </implementation>
</component> </component>
...@@ -160,7 +160,7 @@ public: ...@@ -160,7 +160,7 @@ public:
OUString ConnectionGetImplementationName() 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) com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void)
{ {
......
...@@ -106,7 +106,7 @@ OUString DriverGetImplementationName() ...@@ -106,7 +106,7 @@ OUString DriverGetImplementationName()
{ {
MutexGuard guard( osl::Mutex::getGlobalMutex() ); MutexGuard guard( osl::Mutex::getGlobalMutex() );
static OUString instance( static OUString instance(
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver" ) ); RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver.noext" ) );
p = &instance; p = &instance;
} }
return *p; return *p;
...@@ -137,7 +137,7 @@ Reference< XConnection > Driver::connect( ...@@ -137,7 +137,7 @@ Reference< XConnection > Driver::connect(
seq[1] <<= info; seq[1] <<= info;
return Reference< XConnection> ( return Reference< XConnection> (
m_smgr->createInstanceWithArgumentsAndContext( 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 ), seq, m_ctx ),
UNO_QUERY ); UNO_QUERY );
} }
......
...@@ -85,7 +85,7 @@ class TestCase(unittest.TestCase): ...@@ -85,7 +85,7 @@ class TestCase(unittest.TestCase):
def setUp( self ): def setUp( self ):
self.driver = self.ctx.ServiceManager.createInstanceWithContext( 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.connection = self.driver.connect( self.dburl, () )
ddl.executeDDLs( self.connection ) ddl.executeDDLs( self.connection )
......
...@@ -81,7 +81,7 @@ class TestCase(unittest.TestCase): ...@@ -81,7 +81,7 @@ class TestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.driver = self.ctx.ServiceManager.createInstanceWithContext( 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.connection = self.driver.connect( self.dburl, () )
ddl.executeDDLs( self.connection ) ddl.executeDDLs( self.connection )
......
...@@ -101,7 +101,7 @@ class TestCase(unittest.TestCase): ...@@ -101,7 +101,7 @@ class TestCase(unittest.TestCase):
def setUp( self ): def setUp( self ):
self.driver = self.ctx.ServiceManager.createInstanceWithContext( 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.connection = self.driver.connect( self.dburl, () )
ddl.executeDDLs( self.connection ) ddl.executeDDLs( self.connection )
......
...@@ -104,7 +104,7 @@ class TestCase(unittest.TestCase): ...@@ -104,7 +104,7 @@ class TestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.driver = self.ctx.ServiceManager.createInstanceWithContext( 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.connection = self.driver.connect( self.dburl, () )
self.stmt = self.connection.createStatement() self.stmt = self.connection.createStatement()
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment