From 9ed364774c6e26e14409bd927e03e6da7fe01b60 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 17 Dec 2013 11:05:35 +0100
Subject: Adapt all (non-extension, SharedLibrary) .components to
 environment="..."

Change-Id: I56f38bd786f3a026cb2908f28540dc9c4003af83
---
 stoc/source/corereflection/reflection.component            | 4 ++--
 stoc/source/inspect/introspection.component                | 4 ++--
 stoc/source/invocation/invocation.component                | 4 ++--
 stoc/source/invocation_adapterfactory/invocadapt.component | 4 ++--
 stoc/source/javaloader/javaloader.component                | 4 ++--
 stoc/source/javavm/javavm.component                        | 4 ++--
 stoc/source/namingservice/namingservice.component          | 4 ++--
 stoc/source/proxy_factory/proxyfac.component               | 4 ++--
 stoc/util/bootstrap.component                              | 4 ++--
 stoc/util/stocservices.component                           | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'stoc')

diff --git a/stoc/source/corereflection/reflection.component b/stoc/source/corereflection/reflection.component
index 4835f31ea6a6..b1ca1a3c77c2 100644
--- a/stoc/source/corereflection/reflection.component
+++ b/stoc/source/corereflection/reflection.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="reflection"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="reflection" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.CoreReflection">
     <service name="com.sun.star.reflection.CoreReflection"/>
     <singleton name="com.sun.star.reflection.theCoreReflection"/>
diff --git a/stoc/source/inspect/introspection.component b/stoc/source/inspect/introspection.component
index 79f16686ea64..52cd9df90e74 100644
--- a/stoc/source/inspect/introspection.component
+++ b/stoc/source/inspect/introspection.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="introspection"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="introspection" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.Introspection">
     <service name="com.sun.star.beans.Introspection"/>
   </implementation>
diff --git a/stoc/source/invocation/invocation.component b/stoc/source/invocation/invocation.component
index d2ca9c492d3d..c5aa8b5a33af 100644
--- a/stoc/source/invocation/invocation.component
+++ b/stoc/source/invocation/invocation.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="invocation"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="invocation" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.Invocation">
     <service name="com.sun.star.script.Invocation"/>
   </implementation>
diff --git a/stoc/source/invocation_adapterfactory/invocadapt.component b/stoc/source/invocation_adapterfactory/invocadapt.component
index 551f4abaac76..85f29833808f 100644
--- a/stoc/source/invocation_adapterfactory/invocadapt.component
+++ b/stoc/source/invocation_adapterfactory/invocadapt.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="invocadapt"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="invocadapt" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.InvocationAdapterFactory">
     <service name="com.sun.star.script.InvocationAdapterFactory"/>
   </implementation>
diff --git a/stoc/source/javaloader/javaloader.component b/stoc/source/javaloader/javaloader.component
index 5fd7d8671a5f..9299097c4fd0 100644
--- a/stoc/source/javaloader/javaloader.component
+++ b/stoc/source/javaloader/javaloader.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="javaloader"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="javaloader" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.JavaComponentLoader">
     <service name="com.sun.star.loader.Java"/>
     <service name="com.sun.star.loader.Java2"/>
diff --git a/stoc/source/javavm/javavm.component b/stoc/source/javavm/javavm.component
index 570ce4c635d4..04367fad7ee3 100644
--- a/stoc/source/javavm/javavm.component
+++ b/stoc/source/javavm/javavm.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="javavm"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="javavm" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.JavaVirtualMachine">
     <service name="com.sun.star.java.JavaVirtualMachine"/>
     <singleton name="com.sun.star.java.theJavaVirtualMachine"/>
diff --git a/stoc/source/namingservice/namingservice.component b/stoc/source/namingservice/namingservice.component
index 0f6a41f4809c..523c0037363b 100644
--- a/stoc/source/namingservice/namingservice.component
+++ b/stoc/source/namingservice/namingservice.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="namingservice"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="namingservice" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.NamingService">
     <service name="com.sun.star.uno.NamingService"/>
   </implementation>
diff --git a/stoc/source/proxy_factory/proxyfac.component b/stoc/source/proxy_factory/proxyfac.component
index 912ed1529d5f..69e573f5e761 100644
--- a/stoc/source/proxy_factory/proxyfac.component
+++ b/stoc/source/proxy_factory/proxyfac.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="proxyfac"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="proxyfac" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.reflection.ProxyFactory">
     <service name="com.sun.star.reflection.ProxyFactory"/>
   </implementation>
diff --git a/stoc/util/bootstrap.component b/stoc/util/bootstrap.component
index f61c85aafead..ee62700b3e81 100644
--- a/stoc/util/bootstrap.component
+++ b/stoc/util/bootstrap.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="bootstrap"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="bootstrap" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.DLLComponentLoader">
     <service name="com.sun.star.loader.SharedLibrary"/>
   </implementation>
diff --git a/stoc/util/stocservices.component b/stoc/util/stocservices.component
index 5bd0dd207e64..d94f0acf6f51 100644
--- a/stoc/util/stocservices.component
+++ b/stoc/util/stocservices.component
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-<component loader="com.sun.star.loader.SharedLibrary" prefix="stocservices"
-    xmlns="http://openoffice.org/2010/uno-components">
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+    prefix="stocservices" xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.stoc.TypeConverter">
     <service name="com.sun.star.script.Converter"/>
   </implementation>
-- 
cgit