INTEGRATION: CWS sb71 (1.44.4); FILE MERGED

2007/10/02 10:19:20 sb 1.44.4.8: RESYNC: (1.49-1.50); FILE MERGED
2007/08/23 18:07:56 sb 1.44.4.7: RESYNC: (1.48-1.49); FILE MERGED
2007/08/20 08:57:58 sb 1.44.4.6: #i75466# Set URE_BIN_DIR in rc file on all platforms (instead of in startup scripts on Linux/Solaris etc. and in rc files on others).
2007/07/18 12:33:28 sb 1.44.4.5: RESYNC: (1.45-1.48); FILE MERGED
2007/05/30 14:30:23 sb 1.44.4.4: RESYNC: (1.44-1.45); FILE MERGED
2007/05/08 14:06:47 sb 1.44.4.3: #i75466# Find a place to set URE_BIN_DIR on Windows (set in the soffice etc. start scripts on Unix).
2007/04/26 08:38:29 sb 1.44.4.2: #i75466# UNO_SETTINGS in the Jvmfwk_Ini appears to be unused.
2007/04/16 13:53:37 sb 1.44.4.1: #i75466# Use of vnd.sun.star.expand: URLs in javavendors.xml requires URE_INTERNAL_LIB_DIR to be set in OOo unorc/uno.ini.

scp2/source/ooo/profileitem_ooo.scp

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: profileitem_ooo.scp,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: vg $ $Date: 2007-08-27 16:06:05 $
+ *  last change: $Author: vg $ $Date: 2007-10-15 12:56:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -774,11 +774,20 @@ ProfileItem gid_Profileitem_Uno_Uno_Java_Component_Path
     Value = "$ORIGIN/classes";
 End
 
-ProfileItem gid_Profileitem_Uno_Ure_Internal_Java_Dir
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Lib_Dir
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
     Section = "Bootstrap";
     Order = 10;
+    Key = "URE_INTERNAL_LIB_DIR";
+    Value = "$ORIGIN";
+End
+
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Java_Dir
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 11;
     Key = "URE_INTERNAL_JAVA_DIR";
     Value = "$ORIGIN/classes";
 End
@@ -787,11 +796,20 @@ ProfileItem gid_Profileitem_Uno_Ure_Internal_Java_Classpath
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;
     Section = "Bootstrap";
-    Order = 11;
+    Order = 12;
     Key = "URE_INTERNAL_JAVA_CLASSPATH";
     Value = "$ORIGIN/classes/unoil.jar ${PKG_UserUnoFile:UNO_JAVA_CLASSPATH} ${PKG_SharedUnoFile:UNO_JAVA_CLASSPATH}";
 End
 
+ProfileItem gid_Profileitem_Uno_Ure_Bin_Dir
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 13;
+    Key = "URE_BIN_DIR";
+    Value = "$ORIGIN";
+End
+
 
 ProfileItem gid_Profileitem_Jvmfwk_BaseInstallation
     ProfileID = gid_Profile_Jvmfwk_Ini;
@@ -846,26 +864,13 @@ ProfileItem gid_Profileitem_Jvmfwk_Uno_Java_Jfw_Vendor_Settings
     Value = "$BaseInstallation/share/config/javavendors.xml";
 End
 
-ProfileItem gid_Profileitem_Jvmfwk_UnoSettings
-    ProfileID = gid_Profile_Jvmfwk_Ini;
-    ModuleID = gid_Module_Root;
-    Section = "Bootstrap";
-    Order = 6;
-    Key = "UNO_SETTINGS";
-  #ifdef UNX
-    Value = "unorc";
-  #else
-    Value = "uno.ini";
-  #endif
-End
-
 #if defined SYSTEM_BSH || defined SYSTEM_XML_APIS || \
     defined SYSTEM_XERCES || defined SYSTEM_XALAN || defined SYSTEM_SERIALIZER
 ProfileItem gid_Profileitem_Jvmfwk_Uno_Java_Jfw_Classpath_Urls
     ProfileID = gid_Profile_Jvmfwk_Ini;
     ModuleID = gid_Module_Root;
     Section = "Bootstrap";
-    Order = 7;
+    Order = 6;
     Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
     Value = "";
 #ifdef SYSTEM_BSH