Adapt all (non-extension, SharedLibrary) .components to environment="..."

Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83

16 files changed, 31 insertions, 29 deletions

diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component
index 158a065efdee..ffbddfa34c6d 100644
--- a/connectivity/source/drivers/calc/calc.component
+++ b/connectivity/source/drivers/calc/calc.component
@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="connectivity_calc"
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="connectivity_calc"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.calc.ODriver">
     <service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component
index 8eda9a824f69..3f2cea66b783 100644
--- a/connectivity/source/drivers/dbase/dbase.component
+++ b/connectivity/source/drivers/dbase/dbase.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="dbase"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="dbase" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.dbase.ODriver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>
diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component
index c33e80a7633d..6bd8cb5e38bb 100644
--- a/connectivity/source/drivers/evoab2/evoab.component
+++ b/connectivity/source/drivers/evoab2/evoab.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="evoab2"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="evoab2" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
diff --git a/connectivity/source/drivers/firebird/firebird_sdbc.component b/connectivity/source/drivers/firebird/firebird_sdbc.component
index ea4e4de2cfe2..3d30023ebe7a 100644
--- a/connectivity/source/drivers/firebird/firebird_sdbc.component
+++ b/connectivity/source/drivers/firebird/firebird_sdbc.component
@@ -8,8 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="firebird_sdbc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="firebird_sdbc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.firebird.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component
index e1ccb844e1fb..6fa7fb8e6262 100644
--- a/connectivity/source/drivers/flat/flat.component
+++ b/connectivity/source/drivers/flat/flat.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="flat"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="flat" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.flat.ODriver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component
index 8c7413123445..ab8318861416 100644
--- a/connectivity/source/drivers/hsqldb/hsqldb.component
+++ b/connectivity/source/drivers/hsqldb/hsqldb.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="hsqldb"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="hsqldb" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.sdbcx.comp.hsqldb.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>
diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component
index 4123f66d79ad..1bde060cbfd9 100644
--- a/connectivity/source/drivers/kab/kab1.component
+++ b/connectivity/source/drivers/kab/kab1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="kab"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="kab" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.kab.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
diff --git a/connectivity/source/drivers/kab/tdeab1.component b/connectivity/source/drivers/kab/tdeab1.component
index 5e9e9d52739b..5470decc20b9 100644
--- a/connectivity/source/drivers/kab/tdeab1.component
+++ b/connectivity/source/drivers/kab/tdeab1.component
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
 -->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.tdeab.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component
index 90ff01820a4b..84d17a9cbf78 100644
--- a/connectivity/source/drivers/macab/macab1.component
+++ b/connectivity/source/drivers/macab/macab1.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="macab"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="macab" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.macab.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
diff --git a/connectivity/source/drivers/mork/mork.component b/connectivity/source/drivers/mork/mork.component
index 8b3e95ddad6c..e6cc96391fc6 100644
--- a/connectivity/source/drivers/mork/mork.component
+++ b/connectivity/source/drivers/mork/mork.component
@@ -8,8 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mork"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mork" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.MorkDriver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
index 3b41e02794c7..848112c64e79 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
+++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mozbootstrap"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mozbootstrap" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
     <service name="com.sun.star.mozilla.MozillaBootstrap"/>
   </implementation>
diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component
index be63b8eff420..77375695d1cc 100644
--- a/connectivity/source/drivers/mozab/mozab.component
+++ b/connectivity/source/drivers/mozab/mozab.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mozab"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mozab" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
     <service name="com.sun.star.mozilla.MozillaBootstrap"/>
   </implementation>
diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component
index 18bf73cfccc2..9c3e7ad7c6cd 100644
--- a/connectivity/source/drivers/mysql/mysql.component
+++ b/connectivity/source/drivers/mysql/mysql.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="mysql"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="mysql" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.drivers.MySQL.Driver">
     <service name="com.sun.star.sdbc.Driver"/>
     <service name="com.sun.star.sdbcx.Driver"/>
diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component
index ecbd021c4935..4fa186ea2a0e 100644
--- a/connectivity/source/drivers/odbc/odbc.component
+++ b/connectivity/source/drivers/odbc/odbc.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="odbc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="odbc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdbc.ODBCDriver">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
index 19f4dbf066ed..89164b6e70d8 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component
@@ -8,7 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="postgresql_sdbc_impl"
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="postgresql_sdbc_impl"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.connectivity.pq.Connection.noext">
     <service name="com.sun.star.sdbc.Connection"/>
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
index 605bf0516982..ebb200954632 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
@@ -8,8 +8,8 @@
  *
 -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="postgresql_sdbc"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="postgresql_sdbc" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.connectivity.pq.Driver.noext">
     <service name="com.sun.star.sdbc.Driver"/>
   </implementation>