Author: echatellier Date: 2013-11-16 20:37:08 +0100 (Sat, 16 Nov 2013) New Revision: 231 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/231 Log: Update site documentation Modified: trunk/src/site/rst/index.rst.vm trunk/src/site/rst/packaging.rst.vm Modified: trunk/src/site/rst/index.rst.vm =================================================================== --- trunk/src/site/rst/index.rst.vm 2013-11-14 21:54:31 UTC (rev 230) +++ trunk/src/site/rst/index.rst.vm 2013-11-16 19:37:08 UTC (rev 231) @@ -32,14 +32,14 @@ Nuiton-js is a libraries used to: * package javascript and css libraries as `maven <http://maven.apache.org/>`_ artifacts * aggregate severals libraries into a single file - * minimize and reduce size using wro mechanisms + * minimize and reduce size using `wro4j <https://github.com/alexo/wro4j>`_ mechanisms * simply package new libraries Using Servlet 3 API ------------------- To use nuiton-js in a servlet 3 container, you just have to add following -dependencies in your project pom.xml file:: +dependencies in your project ``pom.xml`` file:: <dependency> <groupId>org.nuiton.js</groupId> @@ -107,7 +107,7 @@ Using wro to manage application own resources ============================================= -You can create a file in W``EB-INF/wro.xml`` to manage your own resources +You can create a file in ``WEB-INF/wro.xml`` to manage your own resources with wro. You can also reference libraries package by nuiton-js. Libraries group name is resources group name. For example, if you use ``nuiton-js-jquery``, group name will be ``jquery``. @@ -177,7 +177,7 @@ <plugin> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-maven-plugin</artifactId> - <version>1.7.0</version> + <version>1.7.2</version> <dependencies> <dependency> @@ -188,7 +188,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery</artifactId> - <version>1.10.1-1</version> + <version>2.0.3-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> Modified: trunk/src/site/rst/packaging.rst.vm =================================================================== --- trunk/src/site/rst/packaging.rst.vm 2013-11-14 21:54:31 UTC (rev 230) +++ trunk/src/site/rst/packaging.rst.vm 2013-11-16 19:37:08 UTC (rev 231) @@ -33,9 +33,9 @@ a few rules: - setup module version using the same packaged resource's version with an additional - packaging number. For example, to package jquery 1.9.1, module version have to be - ``1.9.1-1`` for the first packaging release -- put resources in directory ``src/main/resources/nuiton-js-<resource name>`` + packaging number. For example, to package jquery 1.10.2, module version have to be + ``1.10.2-1`` for the first packaging release +- put resources in directory ``src/main/resources/META-INF/resources/nuiton-js-<resource name>`` - add resource configuration file ``src/main/resources/META-INF/nuiton-js/wro-<resource name>.xml`` - define a group name according to resource name in wro configuration file @@ -51,8 +51,8 @@ <import>classpath:META-INF/nuiton-js/wro-jquery.xml</import> <group name='jquery-ui'> <group-ref>jquery</group-ref> - <js>classpath:nuiton-js-jquery-ui/js/**.js</js> - <css>classpath:nuiton-js-jquery-ui/css/**.css</css> + <js>classpath:META-INF/resource/nuiton-js-jquery-ui/js/**.js</js> + <css>classpath:META-INF/resource/nuiton-js-jquery-ui/css/**.css</css> </group> </groups>