[Libreoffice-commits] core.git: jvmfwk/plugins jvmfwk/source

[Stephan Bergmann (via logerrit)]

 jvmfwk/plugins/sunmajor/pluginlib/sunjavapluginrc |    2 --
 jvmfwk/source/jvmfwk3rc                           |    4 ----
 jvmfwk/source/readme.txt                          |    4 ----
 3 files changed, 10 deletions(-)

New commits:
commit 6f5dcd30d4035652d4ee3cf9708f481cd2f53977
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Dec 14 09:16:40 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Dec 14 10:53:50 2019 +0100

    Remove unused jvmfwk *rc files
    
    ...and accompanying readme.txt.  In the past, they got copied to "solver" and
    were used during the build.  bf0e30f9cdee963d3cf889305c85b53c21b8c974 "jvmfwk:
    remove Package_*solver" stopped copying them.
    
    From jvmfwk3rc, the UNO_JAVA_JFW_ENV_JREHOME/CLASSPATH=true settings are found
    in OfficeConnection::setUp (unotest/source/cpp/officeconnection.cxx) and
    org.openoffice.test.OfficeConnection.setup
    (unotest/source/java/org/openoffice/test/OfficeConnection.java), used during
    tests.  Setting UNO_JAVA_JFW_VENDOR_SETTINGS appears to not be necessary there
    (presumably because those UNO_JAVA_JFW_ENV_* settings override its use anyway?).
    
    The JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 in sunjavapluginrc had been added
    as the fix for <https://bz.apache.org/ooo/show_bug.cgi?id=40879> "java
    framework: registration of Java components may fail", most of the relevant
    commit messages mention "#i40879# in build environment the JRE is not tested for
    accessibility, because of potential X server problems".  There appears to be no
    replacement that still sets it in post "solver" times, presumably because that
    hack is just no longer relevant.
    
    Change-Id: I3028b2f69c00eed3c5d2103345773b8daac409a0
    Reviewed-on: https://gerrit.libreoffice.org/85136
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavapluginrc b/jvmfwk/plugins/sunmajor/pluginlib/sunjavapluginrc
deleted file mode 100644
index 0f2fb31eef90..000000000000
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavapluginrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[Bootstrap]
-JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1
\ No newline at end of file
diff --git a/jvmfwk/source/jvmfwk3rc b/jvmfwk/source/jvmfwk3rc
deleted file mode 100644
index 048b16e7ab3b..000000000000
--- a/jvmfwk/source/jvmfwk3rc
+++ /dev/null
@@ -1,4 +0,0 @@
-[Bootstrap]
-UNO_JAVA_JFW_ENV_JREHOME=true
-UNO_JAVA_JFW_ENV_CLASSPATH=true
-UNO_JAVA_JFW_VENDOR_SETTINGS=javavendors.xml
\ No newline at end of file
diff --git a/jvmfwk/source/readme.txt b/jvmfwk/source/readme.txt
deleted file mode 100644
index b39576a7e863..000000000000
--- a/jvmfwk/source/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The file jvfwk3rc is intended for providing bootstrap parameter for the java 
-framework within the build environment. It is not part of a product. Tools 
-which are started in the environment, such as regcomp.exe and uno.exe, use
-this rc file when Java is needed.