diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-03 14:11:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-03 14:18:59 +0100 |
| commit | a72a7dc500ffd57662e8b9be61e4676266861c33 (patch) | |
| tree | 6cc21e11fbaec37563ad42d5749f103c0a635146 /scp2/source/ooo/common_brand.scp | |
| parent | Use xml2-config and xslt-config from our own copies if not using system ones (diff) | |
| download | core-a72a7dc500ffd57662e8b9be61e4676266861c33.tar.gz core-a72a7dc500ffd57662e8b9be61e4676266861c33.zip | |
fdo#42312: Change bsh and js script providers from extensions to optional modules.
Their jar files reference other non-URE jars, so they cannot be extensions.
bsh.jar has been moved into the optional module (it used to be installed
always, but it looks like only the bsh script provider needs it; also, it
had been added to URE_MORE_JAVA_CLASSPATH_URLS if SYSTEM_BSH, which also
appears unnecessary as it is mentioned with an absolute file URL in the
Class-Path of the script provider jar).
js.jar has been included in the optional module (it used to be not installed
at all?).
Diffstat (limited to 'scp2/source/ooo/common_brand.scp')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 710cdb8863ad..794359cc429d 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1209,14 +1209,11 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls Section = "Bootstrap"; Key = "URE_MORE_JAVA_CLASSPATH_URLS"; Value = ""; -#ifdef SYSTEM_BSH - ValueList1 = BSH_JAR; -#endif #ifdef SYSTEM_HSQLDB - ValueList2 = HSQLDB_JAR; + ValueList1 = HSQLDB_JAR; #endif #ifdef SYSTEM_SAXON - ValueList3 = SAXON_JAR; + ValueList2 = SAXON_JAR; #endif End |