Skip to content

Commit

Permalink
Module changes needed for ubccr/xdmod#835
Browse files Browse the repository at this point in the history
  • Loading branch information
jpwhite4 committed Mar 25, 2019
1 parent e7a721a commit 3afc2ec
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 117 deletions.
38 changes: 0 additions & 38 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,3 @@ Name: jsPlumb
License: MIT License
Author: Simon Porritt
Link: https://jsplumbtoolkit.com

The SUPReMM module for Open XDMoD requires use of the following
Node.js packages, which will be downloaded by npm during configuration:

Name: ini
License: MIT License
Author: Isaac Z. Schlueter
Link: https://github.com/npm/ini

Name: MongoDB Node.JS Driver
License: Apache License Version 2.0
Author: Christian Kvalheim
Link: https://github.com/mongodb/node-mongodb-native

Name: mysql
License: MIT License
Author: Felix Geisendörfer and contributors
Link: https://github.com/felixge/node-mysql

Name: Node.js Clone Extend
License: MIT/BSD
Author: Shimon Doodkin
Link: https://github.com/shimondoodkin/nodejs-clone-extend

Name: Tiny Validator (for v4 JSON Schema)
License: MIT
Author: Geraint Luff and others
Link: https://geraintluff.github.io/tv4

Name: Winston
License: MIT License
Author: Charlie Robbins
Link: https://github.com/winstonjs/winston

Name: winston-mysql-transport
License: Unlicense
Author: Severin Julien
Link: https://www.npmjs.com/package/winston-mysql-transport
4 changes: 0 additions & 4 deletions assets/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ assets_dir="$(
module_dir="$assets_dir/.."
xdmod_dir="$module_dir/../../.."

echo Installing node dependencies
cd $xdmod_dir/etl/js
npm install

echo Installing Composer dependencies
cd "$module_dir"
composer install --no-dev
40 changes: 0 additions & 40 deletions classes/OpenXdmod/Setup/SupremmDbSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,52 +112,12 @@ public function handle()
return;
}

$this->nodeNpmSetup();
$this->mongoSetup();

$aclConfig = new AclConfig($this->console);
$aclConfig->handle();
}

/**
* run the npm setup commands
*/
private function nodeNpmSetup()
{
$this->console->displayBlankLine();

$this->console->displayMessage(<<<"EOT"
SUPReMM integration with Open XDMoD uses Node.js for the ETL process.
You need to install the prerequisite packages that are not bundled with
Open XDMoD before you can ingest data from SUPReMM.
EOT
);

$this->console->displayBlankLine();

$installNodePackages = $this->console->prompt(
'Install Node.js packages using npm?',
'y',
array('y', 'n')
);

$etlPath = DATA_DIR . '/etl/js';

if ($installNodePackages === 'y') {
$this->executeCommand("cd $etlPath && npm install");
} else {
$this->console->displayMessage(<<<"EOT"
You will need to install the Node.js packages manually using npm. e.g.:
# cd $etlPath
# npm install
EOT
);
$this->console->displayBlankLine();
$this->console->prompt('Press ENTER to continue.');
}
}

/**
* Obtain the mongodb settings from the user and save to the config
* file.
Expand Down
8 changes: 0 additions & 8 deletions docs/supremm-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@ created, `modw_etl` and `modw_supremm`. The database user that is
specified in your `portal_settings.ini` will be granted access to these
databases.

In addition to the databases, the setup script will also install the
necessary Node.js packages that are required. (The list of required packages
can be found on the [license notices page][notices].) If you prefer to install
these packages manually, you may do so with the following commands:

# cd /usr/share/xdmod/etl/js
# npm install

The script also prompts for the location of the document database that
contains the job summary data. I.e. the MongoDB instance. Enter the uri
in the standard MongoDB connection string format (see the [mongo documentation][] for
Expand Down
27 changes: 1 addition & 26 deletions docs/supremm-notices.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ software libraries.

## Open Source Licenses

The following libraries are licensed using [OSI-approved licenses][osi] except
where denoted. These software products are free for commercial use.
The following libraries are licensed using [OSI-approved licenses][osi]. These software products are free for commercial use.

### Included Libraries

Expand All @@ -15,29 +14,5 @@ The following libraries are included with the SUPReMM modules.
- [jsPlumb](https://jsplumbtoolkit.com), which is available under the
[MIT License][mit].

### Non-Included Libraries

The following libraries are downloaded during installation and configuration.

- [ini (Node.js Package)](https://github.com/npm/ini), which is available under
the [MIT License][mit].
- [MongoDB Node.JS Driver](https://github.com/mongodb/node-mongodb-native),
which is available under the [Apache License Version 2.0][apache2].
- [mysql (Node.js Package)](https://github.com/felixge/node-mysql), which is
available under the [MIT License][mit].
- \*[Node.js Clone Extend](https://github.com/shimondoodkin/nodejs-clone-extend),
which is available
[for any use](https://github.com/shimondoodkin/nodejs-clone-extend#licence).
- [Tiny Validator (for v4 JSON Schema)](https://geraintluff.github.io/tv4),
which is available under the [MIT License][mit].
- [Winston](https://github.com/winstonjs/winston), which is available under the
[MIT License][mit].
- \*[winston-mysql-transport (Node.js Package)](https://www.npmjs.com/package/winston-mysql-transport),
which is available under the [Unlicense][].

\* = Not available under an [OSI-approved license][osi].

[osi]: http://opensource.org/licenses
[mit]: http://en.wikipedia.org/wiki/MIT_License
[apache2]: http://www.apache.org/licenses/LICENSE-2.0
[unlicense]: http://unlicense.org/
1 change: 0 additions & 1 deletion tests/integration_tests/scripts/xdmod-setup.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ selectMenuOption 8
selectMenuOption d
answerQuestion {DB Admin Username:} root
providePassword {DB Admin Password:} {}
provideInput {Install Node.js packages using npm*} {y}
provideInput {MongoDB uri*} {mongodb://localhost:27017/supremm}
provideInput {database name*} {supremm}
enterToContinue
Expand Down

0 comments on commit 3afc2ec

Please sign in to comment.