Author: echatellier Date: 2014-05-07 13:51:19 +0200 (Wed, 07 May 2014) New Revision: 424 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/424 Log: Update to 1.0.8r1250 Removed: nuiton-js-jqplot/trunk/src/main/resources/nuiton-js-jqplot/ Modified: nuiton-js-jqplot/trunk/generate-plugin-group.sh nuiton-js-jqplot/trunk/pom.xml nuiton-js-jqplot/trunk/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml Modified: nuiton-js-jqplot/trunk/generate-plugin-group.sh =================================================================== --- nuiton-js-jqplot/trunk/generate-plugin-group.sh 2014-05-07 11:50:31 UTC (rev 423) +++ nuiton-js-jqplot/trunk/generate-plugin-group.sh 2014-05-07 11:51:19 UTC (rev 424) @@ -4,7 +4,7 @@ # il faut ensuite mettre ce qui est genere dans le fichier META-INF/nuiton-js/nuiton-js-jqplot.xml # -for t in src/main/resources/nuiton-js-jqplot/plugins/*; do +for t in target/classes/META-INF/resources/nuiton-js-jqplot/plugins/*; do n=$(basename $t .js) - echo -e " <group name='$n'>\n <js>classpath:nuiton-js-jqplot/plugins/$n.js</js>\n </group>\n" + echo -e " <group name='$n'>\n <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/$n.js</js>\n </group>\n" done Modified: nuiton-js-jqplot/trunk/pom.xml =================================================================== (Binary files differ) Modified: nuiton-js-jqplot/trunk/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml =================================================================== --- nuiton-js-jqplot/trunk/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml 2014-05-07 11:50:31 UTC (rev 423) +++ nuiton-js-jqplot/trunk/src/main/resources/META-INF/nuiton-js/wro-jqplot.xml 2014-05-07 11:51:19 UTC (rev 424) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2012 - 2013 CodeLutin + Copyright (C) 2012 - 2014 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -31,16 +31,16 @@ </group> <group name='jqplot-only'> - <css>classpath:nuiton-js-jqplot/jquery.jqplot.css</css> - <js>classpath:nuiton-js-jqplot/jquery.jqplot.js</js> + <css>classpath:META-INF/resources/nuiton-js-jqplot/jquery.jqplot.css</css> + <js>classpath:META-INF/resources/nuiton-js-jqplot/jquery.jqplot.js</js> </group> <group name='jqplot-excanvas'> - <js>classpath:nuiton-js-jqplot/excanvas.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/excanvas.js</js> </group> <group name='jqplot-all-plugins'> - <js>classpath:nuiton-js-jqplot/plugins/*.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/*.js</js> </group> <!-- @@ -48,124 +48,124 @@ | racine du module +--> - <group name='jqplot.BezierCurveRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js</js> + <group name='jqplot.BezierCurveRenderer'> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.BezierCurveRenderer.js</js> </group> <group name='jqplot.barRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.barRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.barRenderer.js</js> </group> <group name='jqplot.blockRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.blockRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.blockRenderer.js</js> </group> <group name='jqplot.bubbleRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.bubbleRenderer.js</js> </group> <group name='jqplot.canvasAxisLabelRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisLabelRenderer.js</js> </group> <group name='jqplot.canvasAxisTickRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.canvasAxisTickRenderer.js</js> </group> <group name='jqplot.canvasOverlay'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.canvasOverlay.js</js> </group> <group name='jqplot.canvasTextRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.canvasTextRenderer.js</js> </group> <group name='jqplot.categoryAxisRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.categoryAxisRenderer.js</js> </group> <group name='jqplot.ciParser'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.ciParser.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.ciParser.js</js> </group> <group name='jqplot.cursor'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.cursor.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.cursor.js</js> </group> <group name='jqplot.dateAxisRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.dateAxisRenderer.js</js> </group> <group name='jqplot.donutRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.donutRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.donutRenderer.js</js> </group> <group name='jqplot.dragable'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.dragable.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.dragable.js</js> </group> <group name='jqplot.enhancedLegendRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.enhancedLegendRenderer.js</js> </group> <group name='jqplot.funnelRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.funnelRenderer.js</js> </group> <group name='jqplot.highlighter'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.highlighter.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.highlighter.js</js> </group> <group name='jqplot.json2'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.json2.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.json2.js</js> </group> <group name='jqplot.logAxisRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.logAxisRenderer.js</js> </group> <group name='jqplot.mekkoAxisRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.mekkoAxisRenderer.js</js> </group> <group name='jqplot.mekkoRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.mekkoRenderer.js</js> </group> <group name='jqplot.meterGaugeRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.meterGaugeRenderer.js</js> </group> <group name='jqplot.mobile'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.mobile.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.mobile.js</js> </group> <group name='jqplot.ohlcRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.ohlcRenderer.js</js> </group> <group name='jqplot.pieRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.pieRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.pieRenderer.js</js> </group> <group name='jqplot.pointLabels'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.pointLabels.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.pointLabels.js</js> </group> <group name='jqplot.pyramidAxisRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.pyramidAxisRenderer.js</js> </group> <group name='jqplot.pyramidGridRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.pyramidGridRenderer.js</js> </group> <group name='jqplot.pyramidRenderer'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.pyramidRenderer.js</js> </group> <group name='jqplot.trendline'> - <js>classpath:nuiton-js-jqplot/plugins/jqplot.trendline.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqplot/plugins/jqplot.trendline.js</js> </group> </groups>