DISPATCH-834 Switch to npm instead of deprecated bower
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/251e142b Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/251e142b Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/251e142b Branch: refs/heads/master Commit: 251e142b1f91cbb68fdc293d4ad637955e009dd6 Parents: 6f7107d Author: Ernest Allen <eal...@redhat.com> Authored: Tue Oct 17 11:43:32 2017 -0400 Committer: Ernest Allen <eal...@redhat.com> Committed: Tue Oct 17 11:43:32 2017 -0400 ---------------------------------------------------------------------- console/config/README | 12 ++++++++---- console/config/bower.json | 35 ----------------------------------- console/config/index.html | 32 ++++++++++++++++---------------- console/config/package.json | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/251e142b/console/config/README ---------------------------------------------------------------------- diff --git a/console/config/README b/console/config/README index e4ca1ac..bf495e8 100644 --- a/console/config/README +++ b/console/config/README @@ -1,21 +1,25 @@ Qpid Dispatch config file read/update/write utility ============= -A utility to read, update, and write dispatch router config files. +A utility to read, update, write, and deploy dispatch router config files. Dependencies ============ - tested using python 2.7 -- bower to install the 3rd party javascript libraries +- npm to install the 3rd party javascript libraries + http://blog.npmjs.org/post/85484771375/how-to-install-npm + +- ansible if you wish to deploy the routers +http://docs.ansible.com/ansible/latest/intro_installation.html Running ==================== Install the 3rd party javascript libraries: - in the console/config/ directory run - bower install -This will create a bower_components/ directory and install the needed files + npm install +This will create a node_modules/ directory and install the needed files - run ./config.py - in the address bar of a browser, enter localhost:8000 http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/251e142b/console/config/bower.json ---------------------------------------------------------------------- diff --git a/console/config/bower.json b/console/config/bower.json deleted file mode 100644 index 47ce9b5..0000000 --- a/console/config/bower.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "dispach-config", - "homepage": "https://github.com/apache/qpid-dispatch", - "authors": [], - "description": "Bower components for dispatch config utility", - "main": "", - "license": "Apache 2", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "angular": "^1.6.2", - "angular-animate": "^1.6.2", - "angular-resource": "^1.6.2", - "angular-patternfly": "~0", - "angular-sanitize": "^1.6.2", - "angular-bootstrap": "^2.*", - "jquery": "^3.*", - "jquery-ui": "^1.*", - "html5shiv": "^3.*", - "d3": "^3.*", - "notifyjs": "^0.4.2", - "patternfly": "^3.2.2", - "font-awesome": "font-awsome#^4.7.0" - }, - "resolutions": { - "angular": "1.6.6", - "patternfly": "^3.2.2" - } -} http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/251e142b/console/config/index.html ---------------------------------------------------------------------- diff --git a/console/config/index.html b/console/config/index.html index f32a174..dab41de 100644 --- a/console/config/index.html +++ b/console/config/index.html @@ -27,10 +27,10 @@ under the License. <link rel="shortcut icon" type="image/png" href="favicon-32x32.png" sizes="32x32" /> - <link href='bower_components/font-awsome/css/font-awesome.min.css' type="text/css"> - <link href="bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css" rel="stylesheet" type='text/css'> - <link href="bower_components/patternfly/dist/css/patternfly.min.css" rel="stylesheet" type='text/css'> - <link href="bower_components/patternfly/dist/css/patternfly-additions.min.css" rel="stylesheet" type='text/css'> + <link href='node_modules/font-awsome/css/font-awesome.min.css' type="text/css"> + <link href="node_modules/jquery-ui-themes/themes/smoothness/jquery-ui.min.css" rel="stylesheet" type='text/css'> + <link href="node_modules/patternfly/dist/css/patternfly.min.css" rel="stylesheet" type='text/css'> + <link href="node_modules/patternfly/dist/css/patternfly-additions.min.css" rel="stylesheet" type='text/css'> <link rel="stylesheet" href="css/plugin.css" type="text/css"/> <link rel="stylesheet" href="css/dispatch.css" type="text/css"/> @@ -59,22 +59,22 @@ under the License. <!--[if lt IE 9]> -<script src="bower_components/html5shiv/dist/html5shiv.min.js"></script> +<script src="node_modules/html5shiv/dist/html5shiv.min.js"></script> <![endif]--> -<script src="bower_components/jquery/dist/jquery.min.js"></script> -<script src="bower_components/jquery-ui/jquery-ui.min.js"></script> +<script src="node_modules/jquery/dist/jquery.min.js"></script> +<script src="node_modules/jquery-ui-dist/jquery-ui.min.js"></script> <!-- Angular --> -<script src="bower_components/angular/angular.min.js"></script> -<script src="bower_components/angular-resource/angular-resource.min.js"></script> -<script src="bower_components/angular-animate/angular-animate.min.js"></script> -<script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script> -<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script> -<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> - -<script src='bower_components/d3/d3.min.js'></script> -<script src="bower_components/notifyjs/dist/notify.js"></script> +<script src="node_modules/angular/angular.min.js"></script> +<script src="node_modules/angular-animate/angular-animate.min.js"></script> +<script src="node_modules/angular-ui-bootstrap/dist/ui-bootstrap.js"></script> +<script src="node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script> +<script src="node_modules/angular-resource/angular-resource.min.js"></script> +<script src="node_modules/angular-sanitize/angular-sanitize.min.js"></script> + +<script src='node_modules/d3/d3.min.js'></script> +<script src="node_modules/notifyjs-browser/dist/notify.js"></script> <script type="text/javascript" src="js/dispatchPlugin.js"></script> <script type="text/javascript" src="js/qdrService.js"></script> http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/251e142b/console/config/package.json ---------------------------------------------------------------------- diff --git a/console/config/package.json b/console/config/package.json new file mode 100644 index 0000000..25b9849 --- /dev/null +++ b/console/config/package.json @@ -0,0 +1,37 @@ +{ + "name": "qpid-dispatch-console-config", + "version": "0.1.0", + "description": "Apache Qpid Dispatch Console Config and Deploy Utility", + "main": "index.html", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [ + "Apache", + "Qpid", + "Dispatch", + "Console" + ], + "author": "Redhat", + "license": "Apache-2.0", + "dependencies": { + "angular": "^1.6.6", + "angular-animate": "^1.6.6", + "angular-resource": "^1.6.6", + "angular-sanitize": "^1.6.6", + "angular-ui-bootstrap": "^2.5.6", + "d3": "^3.5.17", + "font-awesome": "^4.7.0", + "html5shiv": "^3.7.3", + "jquery": "^3.2.1", + "jquery-ui-dist": "^1.12.1", + "jquery-ui-themes": "^1.12.0", + "notifyjs-browser": "^0.4.2", + "patternfly": "^3.28.1" + }, + "devDependencies": {}, + "repository": { + "type": "git", + "url": "https://git-wip-us.apache.org/repos/asf/qpid-dispatch" + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org