Author: echatellier Date: 2014-05-07 13:30:53 +0200 (Wed, 07 May 2014) New Revision: 422 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/422 Log: Update to 4.6.0 Removed: nuiton-js-jqgrid/trunk/src/main/resources/nuiton-js-jqgrid/ Modified: nuiton-js-jqgrid/trunk/generate-i18n-group.sh nuiton-js-jqgrid/trunk/pom.xml nuiton-js-jqgrid/trunk/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml Modified: nuiton-js-jqgrid/trunk/generate-i18n-group.sh =================================================================== --- nuiton-js-jqgrid/trunk/generate-i18n-group.sh 2014-05-07 10:36:45 UTC (rev 421) +++ nuiton-js-jqgrid/trunk/generate-i18n-group.sh 2014-05-07 11:30:53 UTC (rev 422) @@ -6,5 +6,5 @@ for t in src/main/resources/nuiton-js-jqgrid/js/i18n/*; do f=$(basename $t) n=$(basename $t .js | sed 's/grid.locale-//g') - echo -e " <group name='jqgrid-$n'>\n <css>classpath:nuiton-js-jqgrid/js/i18n/$f</css>\n </group>\n" + echo -e " <group name='jqgrid-$n'>\n <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/$f</css>\n </group>\n" done Modified: nuiton-js-jqgrid/trunk/pom.xml =================================================================== --- nuiton-js-jqgrid/trunk/pom.xml 2014-05-07 10:36:45 UTC (rev 421) +++ nuiton-js-jqgrid/trunk/pom.xml 2014-05-07 11:30:53 UTC (rev 422) @@ -10,11 +10,11 @@ <parent> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-lib</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <artifactId>nuiton-js-jqgrid</artifactId> - <version>4.5.2-1-SNAPSHOT</version> + <version>4.6.0-1-SNAPSHOT</version> <name>Nuiton JS :: jqGrid</name> <description>jqGrid jar packaging</description> @@ -29,11 +29,20 @@ </licenses> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jqgrid-4.5.2-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jqgrid-4.5.2-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-jqgrid-4.5.2-1</url> + <connection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-jqgrid/trunk</connection> + <developerConnection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-jqgrid/trunk</developerConnection> + <url>https://forge.nuiton.org/projects/nuiton-js/repository/show/nuiton-js-jqgrid/trunk</url> </scm> + <properties> + <license.licenseName>mit</license.licenseName> + + <upstreamVersion>4.6.0</upstreamVersion> + <upstreamUrl>https://github.com/tonytomov/jqGrid/archive/</upstreamUrl> + <upstreamFile>v${upstreamVersion}.zip</upstreamFile> + <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> + </properties> + <dependencies> <dependency> <groupId>org.nuiton.js</groupId> @@ -41,6 +50,57 @@ <version>[1.7.2,)</version> <!-- jqgrid compatible avec jquery >= 1.8 --> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-test</artifactId> + <version>1.0.2</version> + <scope>test</scope> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>download-single</goal> + </goals> + <configuration> + <url>${upstreamUrl}</url> + <fromFile>${upstreamFile}</fromFile> + <toFile>${project.build.directory}/${project.artifactId}.zip</toFile> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <echo message="unzip archive" /> + <unzip src="${project.build.directory}/${project.artifactId}.zip" dest="${project.build.directory}" /> + <echo message="moving resources" /> + <copy todir="${destDir}"> + <fileset dir="${project.build.directory}/jqGrid-${upstreamVersion}" includes="css/*" /> + <fileset dir="${project.build.directory}/jqGrid-${upstreamVersion}" includes="js/jquery.jqGrid.js" /> + <fileset dir="${project.build.directory}/jqGrid-${upstreamVersion}" includes="js/i18n/*" /> + <fileset dir="${project.build.directory}/jqGrid-${upstreamVersion}" includes="plugins/*" /> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: nuiton-js-jqgrid/trunk/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml =================================================================== --- nuiton-js-jqgrid/trunk/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml 2014-05-07 10:36:45 UTC (rev 421) +++ nuiton-js-jqgrid/trunk/src/main/resources/META-INF/nuiton-js/wro-jqgrid.xml 2014-05-07 11:30:53 UTC (rev 422) @@ -31,8 +31,8 @@ </group> <group name='jqgrid-only'> - <css>classpath:nuiton-js-jqgrid/css/ui.jqgrid.css</css> - <js>classpath:nuiton-js-jqgrid/js/jquery.jqGrid.src.js</js> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/css/ui.jqgrid.css</css> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/js/jquery.jqGrid.js</js> </group> <!-- @@ -40,33 +40,33 @@ +--> <group name='jqgrid-addons'> - <js>classpath:nuiton-js-jqgrid/plugins/grid.addons.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/grid.addons.js</js> </group> <group name='jqgrid-postext'> - <js>classpath:nuiton-js-jqgrid/plugins/grid.postext.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/grid.postext.js</js> </group> <group name='jqgrid-setcolumns'> - <js>classpath:nuiton-js-jqgrid/plugins/grid.setcolumns.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/grid.setcolumns.js</js> </group> <group name='jqgrid-contextmenu'> - <js>classpath:nuiton-js-jqgrid/plugins/jquery.contextmenu.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/jquery.contextmenu.js</js> </group> <group name='jqgrid-searchFilter'> - <css>classpath:nuiton-js-jqgrid/plugins/searchFilter.css</css> - <js>classpath:nuiton-js-jqgrid/plugins/jquery.searchFilter.js</js> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/searchFilter.css</css> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/jquery.searchFilter.js</js> </group> <group name='jqgrid-tablednd'> - <js>classpath:nuiton-js-jqgrid/plugins/jquery.tablednd.js</js> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/jquery.tablednd.js</js> </group> <group name='jqgrid-multiselect'> - <css>classpath:nuiton-js-jqgrid/plugins/ui.multiselect.css</css> - <js>classpath:nuiton-js-jqgrid/plugins/ui.multiselect.js</js> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/ui.multiselect.css</css> + <js>classpath:META-INF/resources/nuiton-js-jqgrid/plugins/ui.multiselect.js</js> </group> @@ -76,175 +76,175 @@ +--> <group name='jqgrid-ar'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-ar.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ar.js</css> </group> <group name='jqgrid-bg'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-bg.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-bg.js</css> </group> <group name='jqgrid-bg1251'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-bg1251.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-bg1251.js</css> </group> <group name='jqgrid-cat'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-cat.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-cat.js</css> </group> <group name='jqgrid-cn'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-cn.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-cn.js</css> </group> <group name='jqgrid-cs'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-cs.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-cs.js</css> </group> <group name='jqgrid-da'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-da.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-da.js</css> </group> <group name='jqgrid-de'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-de.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-de.js</css> </group> <group name='jqgrid-dk'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-dk.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-dk.js</css> </group> <group name='jqgrid-el'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-el.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-el.js</css> </group> <group name='jqgrid-en'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-en.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-en.js</css> </group> <group name='jqgrid-es'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-es.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-es.js</css> </group> <group name='jqgrid-fa'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-fa.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-fa.js</css> </group> <group name='jqgrid-fi'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-fi.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-fi.js</css> </group> <group name='jqgrid-fr'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-fr.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-fr.js</css> </group> <group name='jqgrid-gl'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-gl.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-gl.js</css> </group> <group name='jqgrid-he'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-he.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-he.js</css> </group> <group name='jqgrid-hr'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-hr.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-hr.js</css> </group> <group name='jqgrid-hr1250'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-hr1250.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-hr1250.js</css> </group> <group name='jqgrid-hu'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-hu.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-hu.js</css> </group> - + <group name='jqgrid-id'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-id.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-id.js</css> </group> <group name='jqgrid-is'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-is.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-is.js</css> </group> <group name='jqgrid-it'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-it.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-it.js</css> </group> <group name='jqgrid-ja'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-ja.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ja.js</css> </group> <group name='jqgrid-kr'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-kr.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-kr.js</css> </group> <group name='jqgrid-lt'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-lt.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-lt.js</css> </group> <group name='jqgrid-mne'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-mne.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-mne.js</css> </group> <group name='jqgrid-nl'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-nl.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-nl.js</css> </group> <group name='jqgrid-no'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-no.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-no.js</css> </group> <group name='jqgrid-pl'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-pl.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pl.js</css> </group> <group name='jqgrid-pt-br'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-pt-br.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt-br.js</css> </group> <group name='jqgrid-pt'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-pt.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-pt.js</css> </group> <group name='jqgrid-ro'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-ro.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ro.js</css> </group> <group name='jqgrid-ru'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-ru.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ru.js</css> </group> <group name='jqgrid-sk'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-sk.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sk.js</css> </group> <group name='jqgrid-sr-latin'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-sr-latin.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr-latin.js</css> </group> <group name='jqgrid-sr'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-sr.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sr.js</css> </group> <group name='jqgrid-sv'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-sv.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-sv.js</css> </group> <group name='jqgrid-th'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-th.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-th.js</css> </group> <group name='jqgrid-tr'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-tr.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tr.js</css> </group> <group name='jqgrid-tw'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-tw.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-tw.js</css> </group> <group name='jqgrid-ua'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-ua.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-ua.js</css> </group> <group name='jqgrid-vi'> - <css>classpath:nuiton-js-jqgrid/js/i18n/grid.locale-vi.js</css> + <css>classpath:META-INF/resources/nuiton-js-jqgrid/js/i18n/grid.locale-vi.js</css> </group> </groups>