#i10000# Merge new pkgchk settings with MultiStratumBackend support

1 files changed, 6 insertions, 24 deletions

diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 4c0741897f28..eedbaa3611e0 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: profileitem_ooo.scp,v $
 *
-*  $Revision: 1.4 $
+*  $Revision: 1.5 $
 *
-*  last change: $Author: hr $ $Date: 2004-04-14 12:17:15 $
+*  last change: $Author: hr $ $Date: 2004-04-14 14:58:56 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -206,7 +206,7 @@ ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemadataurl
     Section = "Bootstrap";
     Order = 6;
     Key = "CFG_SchemaDataUrl";
-    Value = "$BaseInstallation/share/registry/schema ?$PKG_UserConfig/schema ?$PKG_SharedConfig/schema";
+    Value = "$BaseInstallation/share/registry/schema ?$CFG_UnoUserPackages/schema ?$CFG_UnoSharedPackages/schema";
 End
 
 ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultdataurl
@@ -215,7 +215,7 @@ ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultdataurl
     Section = "Bootstrap";
     Order = 7;
     Key = "CFG_DefaultLayerUrls";
-    Value = "$BaseInstallation/share/registry $PKG_SharedConfig $PKG_UserConfig";
+    Value = "$BaseInstallation/share/registry $CFG_UnoSharedPackages $CFG_UnoUserPackages";
 End
 
 ProfileItem gid_Profileitem_Configmgr_Cachedisposal
@@ -287,7 +287,7 @@ ProfileItem gid_Profileitem_Configmgr_Localcfg_Unosharedpackages
     Section   = "Bootstrap";
     Order = 15;
     Key  = "CFG_UnoSharedPackages";
-    Value  = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry";
+    Value = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
 End
 
 ProfileItem gid_Profileitem_Configmgr_Localcfg_Unouserpackages
@@ -296,7 +296,7 @@ ProfileItem gid_Profileitem_Configmgr_Localcfg_Unouserpackages
     Section   = "Bootstrap";
     Order = 16;
     Key  = "CFG_UnoUserPackages";
-    Value  = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry";
+    Value = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
 End
 
  ProfileItem gid_Profileitem_Configmgr_Unocfg_Backendservice
@@ -327,24 +327,6 @@ ProfileItem gid_Profileitem_Configmgr_Localcfg_Strata
     Value  = "com.sun.star.comp.configuration.backend.LocalSingleStratum:$CFG_DefaultLayerUrl;com.sun.star.comp.configuration.backend.LocalSingleStratum:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;?com.sun.star.comp.configuration.backend.PolicyLayerBackend:;com.sun.star.comp.configuration.backend.LocalSingleStratum:$CFG_UnoUserPackages;com.sun.star.comp.configuration.backend.LocalSingleStratum:$CFG_UserLayerUrl;";
 End
 
-ProfileItem gid_Profileitem_Configmgr_Pkg_SharedConfig
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 13;
-    Key = "PKG_SharedConfig";
-    Value = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
-ProfileItem gid_Profileitem_Configmgr_Pkg_UserConfig
-    ProfileID = gid_Profile_Configmgr_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 14;
-    Key = "PKG_UserConfig";
-    Value = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry";
-End
-
 //end configmgr
 
 ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath