Author: echatellier Date: 2014-05-07 15:01:55 +0200 (Wed, 07 May 2014) New Revision: 428 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/428 Log: Udpate to jstree 3.0.0 Removed: nuiton-js-jstree/trunk/src/main/resources/nuiton-js-jstree/ Modified: nuiton-js-jstree/trunk/pom.xml nuiton-js-jstree/trunk/src/main/resources/META-INF/nuiton-js/wro-jstree.xml Modified: nuiton-js-jstree/trunk/pom.xml =================================================================== --- nuiton-js-jstree/trunk/pom.xml 2014-05-07 12:52:24 UTC (rev 427) +++ nuiton-js-jstree/trunk/pom.xml 2014-05-07 13:01:55 UTC (rev 428) @@ -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-jstree</artifactId> - <version>1.0-rc3-2-SNAPSHOT</version> + <version>3.0.0-1-SNAPSHOT</version> <name>Nuiton JS :: JsTree</name> <description>JsTree jar packaging</description> @@ -28,6 +28,21 @@ </license> </licenses> + <scm> + <connection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-jstree/trunk</connection> + <developerConnection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-jstree/trunk</developerConnection> + <url>https://forge.nuiton.org/projects/nuiton-js/repository/show/nuiton-js-jstree/trunk</url> + </scm> + + <properties> + <license.licenseName>mit</license.licenseName> + + <upstreamVersion>3.0.0</upstreamVersion> + <upstreamUrl>https://github.com/vakata/jstree/archive</upstreamUrl> + <upstreamFile>${upstreamVersion}.zip</upstreamFile> + <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> + </properties> + <dependencies> <dependency> <groupId>org.nuiton.js</groupId> @@ -35,6 +50,57 @@ <version>[1.4.2,)</version> <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}/jstree-${upstreamVersion}/dist" includes="jstree.js" /> + <fileset dir="${project.build.directory}/jstree-${upstreamVersion}/dist" includes="themes/default/*"> + <filename regex=".*min.*" negate="true" /> + </fileset> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: nuiton-js-jstree/trunk/src/main/resources/META-INF/nuiton-js/wro-jstree.xml =================================================================== --- nuiton-js-jstree/trunk/src/main/resources/META-INF/nuiton-js/wro-jstree.xml 2014-05-07 12:52:24 UTC (rev 427) +++ nuiton-js-jstree/trunk/src/main/resources/META-INF/nuiton-js/wro-jstree.xml 2014-05-07 13:01:55 UTC (rev 428) @@ -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 @@ -26,8 +26,8 @@ <import>classpath:META-INF/nuiton-js/wro-jquery.xml</import> <group name='jstree'> - <js>classpath:nuiton-js-jstree/*.js</js> - <css>classpath:nuiton-js-jstree/themes/*.css</css> + <js>classpath:META-INF/resources/nuiton-js-jstree/*.js</js> + <css>classpath:META-INF/resources/nuiton-js-jstree/themes/default/*.css</css> </group> </groups>