Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Java configuration and documentation (#1536) #1541

Merged
merged 2 commits into from
Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,6 @@ License: Creative Commons Attribution-NonCommercial 3.0
Author: Torstein Hønsi
Link: http://www.highcharts.com/

Name: Commons BeanUtils
License: Apache License Version 2.0
Author: The Apache Software Foundation
Link: http://commons.apache.org/proper/commons-beanutils/

Name: Commons Collections
License: Apache License Version 2.0
Author: The Apache Software Foundation
Link: http://commons.apache.org/proper/commons-collections/

Name: Commons Digester
License: Apache License Version 2.0
Author: The Apache Software Foundation
Link: http://commons.apache.org/proper/commons-digester/

Name: Commons Logging
License: Apache License Version 2.0
Author: The Apache Software Foundation
Link: http://commons.apache.org/proper/commons-logging/

Name: iText
License: Affero General Public License
Author: iText Software Corp.
Link: http://itextpdf.com/

Name: Apache POI
License: Apache License Version 2.0
Author: The Apache Software Foundation
Link: http://poi.apache.org/

Name: Xalan-Java
License: Apache License Version 2.0
Author: The Apache Software Foundation
Link: http://xml.apache.org/xalan-j/

Name: RSVP.js
License: MIT license
Author: Yehuda Katz, Tom Dale, Stefan Penner and contributors
Expand Down
18 changes: 0 additions & 18 deletions bin/xdmod-check-config
Original file line number Diff line number Diff line change
Expand Up @@ -234,24 +234,6 @@ try {
# ""
#);

// Java

$javaPath = xd_utilities\getConfiguration('reporting', 'java_path');
_debug('Checking for java executable');
$result = file_exists($javaPath) && is_executable($javaPath);
displayResult(
$result,
'Java executable configured'
);

$javacPath = xd_utilities\getConfiguration('reporting', 'javac_path');
_debug('Checking for javac executable');
$result = file_exists($javacPath) && is_executable($javacPath);
displayResult(
$result,
'Javac executable configured'
);

$chromiumPath
= xd_utilities\getConfiguration('reporting', 'chromium_path');
_debug('Checking for chromium executable');
Expand Down
25 changes: 2 additions & 23 deletions classes/OpenXdmod/Setup/GeneralSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,33 +68,12 @@ public function handle()

$this->console->displayBlankLine();
$this->console->displayMessage(<<<"EOT"
Java and Chromium are required by the report generator for constructing
reports. Setup will attempt to detect the presence of java, and
chromium on your system.
Chromium is required by the report generator for constructing reports. Setup
will attempt to detect the presence of chromium on your system.
EOT
);
$this->console->displayBlankLine();

if ($settings['reporting_java_path'] == '') {
$settings['reporting_java_path']
= exec('which java 2>/dev/null');
}

$settings['reporting_java_path'] = $this->console->prompt(
'Java Path:',
$settings['reporting_java_path']
);

if ($settings['reporting_javac_path'] == '') {
$settings['reporting_javac_path']
= exec('which javac 2>/dev/null');
}

$settings['reporting_javac_path'] = $this->console->prompt(
'Javac Path:',
$settings['reporting_javac_path']
);

if ($settings['reporting_chromium_path'] == '') {
$chromiumPath = '/usr/lib64/chromium-browser/headless_shell';
$settings['reporting_chromium_path'] = is_executable($chromiumPath) ? $chromiumPath : '';
Expand Down
7 changes: 2 additions & 5 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ The general settings include:
- Site address (The URL you will use to access Open XDMoD)
- Email address (The email address Open XDMoD will use when sending
emails)
- Java path
- Javac path
- PhantomJS path
- Chromium path
- Header logo (see [Logo Image Guide](logo-image.html) for details)
- Whether to enable the Dashboard tab (see the [Dashboard Guide](dashboard.html) for details)

Expand Down Expand Up @@ -258,8 +256,7 @@ Primary configuration file. Contains:
- Site address (The URL you will use to access Open XDMoD)
- Email address (The email address Open XDMoD will use when sending
emails)
- Java path
- PhantomJS path
- Chromium path
- Header logo (see [Logo Image Guide](logo-image.html) for details)
- Database configuration
- Integration settings (see [Integrations](integrations.html) for details)
Expand Down
2 changes: 0 additions & 2 deletions docs/dev-code-organization.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ Log Files
Report Generator Code
---------------------

Includes the Java code used to generate reports.

- Source Tarball: `reporting/`
- RPM Installation: `/usr/share/xdmod/reporting/`
- Source Installation: `/opt/xdmod/share/reporting/`
Expand Down
14 changes: 0 additions & 14 deletions docs/notices.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,6 @@ where denoted. These software products are free for commercial use.
under the [New BSD License][new-bsd].
- [jQuery](http://jquery.com/), which is available under the
[MIT License][mit].
- [Commons BeanUtils](http://commons.apache.org/proper/commons-beanutils/),
which is available under the [Apache License Version 2.0][apache2].
- [Commons Collections](http://commons.apache.org/proper/commons-collections/),
which is available under the [Apache License Version 2.0][apache2].
- [Commons Digester](http://commons.apache.org/proper/commons-digester/),
which is available under the [Apache License Version 2.0][apache2].
- [Commons Logging](http://commons.apache.org/proper/commons-logging/),
which is available under the [Apache License Version 2.0][apache2].
- [iText](http://itextpdf.com/), which is available under the
[Affero General Public License][agpl].
- [Apache POI](http://poi.apache.org/), which is available under the
[Apache License Version 2.0][apache2].
- [Xalan-Java](http://xml.apache.org/xalan-j/), which is available under
the [Apache License Version 2.0][apache2].
- [RSVP.js](https://github.com/tildeio/rsvp.js), which is available
under the [MIT License][mit].
- [Silex](http://silex.sensiolabs.org), which is available under the
Expand Down
2 changes: 0 additions & 2 deletions tests/ci/scripts/xdmod-setup-start.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ spawn "xdmod-setup"
selectMenuOption 1
answerQuestion {Site Address} https://localhost/
provideInput {Email Address:} [email protected]
answerQuestion {Java Path} /usr/bin/java
answerQuestion {Javac Path} /usr/bin/javac
provideInput {Chromium Path:} /usr/lib64/chromium-browser/headless_shell
provideInput {Center Logo Path:} {}
provideInput {Enable Dashboard Tab*} {off}
Expand Down