launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/cleanup-jslibs into lp:maas.

Commit message:
Use the packaged version of yui and raphaeljs.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/cleanup-jslibs/+merge/131191

This branch is the first in a series of two branches aimed at getting rid of the 2 js libraries which are now packaged as separate packages. The packaged version of MAAS uses the packaged libraries since a long time already.

The only usage was in tests and in the dev instance.

The tests use the non-minified version of yui and the dev instance uses the minified version.

The follow-up branch actually gets rid of the libraries (warning: huge diff coming up https://code.launchpad.net/~rvb/maas/cleanup-jslibs-remove-libs/+merge/131192).
-- 
https://code.launchpad.net/~rvb/maas/cleanup-jslibs/+merge/131191
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/cleanup-jslibs into lp:maas.

=== modified file 'required-packages/base'
--- required-packages/base	2012-10-02 06:29:49 +0000
+++ required-packages/base	2012-10-24 14:21:33 +0000
@@ -7,6 +7,8 @@
 dnsutils
 freeipmi-tools
 isc-dhcp-common
+libjs-yui3-min
+libjs-raphael
 libpq-dev
 postgresql-9.1
 python-amqplib

=== modified file 'required-packages/dev'
--- required-packages/dev	2012-10-15 09:48:02 +0000
+++ required-packages/dev	2012-10-24 14:21:33 +0000
@@ -3,6 +3,7 @@
 curl
 firefox
 ipython
+libjs-yui3-full
 make
 python-lxml
 python-pip

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-10-18 13:21:00 +0000
+++ src/maas/settings.py	2012-10-24 14:21:33 +0000
@@ -92,16 +92,16 @@
 # path relative to the 'static' directory.
 # Use an absolute path (like '/usr/share/javascript/raphael/') to serve the
 # files from a custom location.
-RAPHAELJS_LOCATION = os.path.join('jslibs', 'raphael')
+RAPHAELJS_LOCATION = '/usr/share/javascript/raphael/'
 
 YUI_DEBUG = DEBUG
 
 # Set this to where YUI3 files can be found.
 # Use a relative path (i.e. a path not starting with '/') to indicate a
 # path relative to the 'static' directory.
-# Use an absolute path (like '/usr/share/javascript/yui/') to serve the files
+# Use an absolute path (like '/usr/share/javascript/yui3/') to serve the files
 # from a custom location.
-YUI_LOCATION = os.path.join('jslibs', 'yui')
+YUI_LOCATION = '/usr/share/javascript/yui3/'
 
 STATIC_LOCAL_SERVE = DEBUG
 

=== modified file 'src/maasserver/static/js/tests/test_enums.html'
--- src/maasserver/static/js/tests/test_enums.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_enums.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <script type="text/javascript" src="../node.js"></script>

=== modified file 'src/maasserver/static/js/tests/test_longpoll.html'
--- src/maasserver/static/js/tests/test_longpoll.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_longpoll.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <!-- The module under test -->

=== modified file 'src/maasserver/static/js/tests/test_morph.html'
--- src/maasserver/static/js/tests/test_morph.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_morph.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <!-- The module under test -->

=== modified file 'src/maasserver/static/js/tests/test_node.html'
--- src/maasserver/static/js/tests/test_node.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_node.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <!-- The module under test -->
     <script type="text/javascript" src="../node.js"></script>

=== modified file 'src/maasserver/static/js/tests/test_node_add.html'
--- src/maasserver/static/js/tests/test_node_add.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_node_add.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <script type="text/javascript" src="../morph.js"></script>

=== modified file 'src/maasserver/static/js/tests/test_node_views.html'
--- src/maasserver/static/js/tests/test_node_views.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_node_views.html	2012-10-24 14:21:33 +0000
@@ -4,9 +4,9 @@
     <title>Test maas.node_views</title>
 
     <!-- YUI and test setup -->
-    <script type="text/javascript" src="../../jslibs/raphael/raphael-min.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/raphael/raphael-min.js"></script>
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <script type="text/javascript" src="../enums.js"></script>

=== modified file 'src/maasserver/static/js/tests/test_nodes_chart.html'
--- src/maasserver/static/js/tests/test_nodes_chart.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_nodes_chart.html	2012-10-24 14:21:33 +0000
@@ -4,9 +4,9 @@
     <title>Test maas.nodes_chart</title>
 
     <!-- YUI and test setup -->
-    <script type="text/javascript" src="../../jslibs/raphael/raphael-min.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/raphael/raphael-min.js"></script>
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <!-- The module under test -->

=== modified file 'src/maasserver/static/js/tests/test_power_parameters.html'
--- src/maasserver/static/js/tests/test_power_parameters.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_power_parameters.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <!-- The module under test -->

=== modified file 'src/maasserver/static/js/tests/test_prefs.html'
--- src/maasserver/static/js/tests/test_prefs.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_prefs.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <!-- The module under test -->

=== modified file 'src/maasserver/static/js/tests/test_user_panel.html'
--- src/maasserver/static/js/tests/test_user_panel.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_user_panel.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <!-- The module under test -->

=== modified file 'src/maasserver/static/js/tests/test_utils.html'
--- src/maasserver/static/js/tests/test_utils.html	2012-06-13 11:02:58 +0000
+++ src/maasserver/static/js/tests/test_utils.html	2012-10-24 14:21:33 +0000
@@ -5,7 +5,7 @@
 
     <!-- YUI and test setup -->
     <script type="text/javascript" src="../testing/yui_test_conf.js"></script>
-    <script type="text/javascript" src="../../jslibs/yui/yui/yui.js"></script>
+    <script type="text/javascript" src="/usr/share/javascript/yui3/yui/yui.js"></script>
     <script type="text/javascript" src="../testing/testrunner.js"></script>
     <script type="text/javascript" src="../testing/testing.js"></script>
     <!-- The module under test -->