Author: echatellier Date: 2014-05-07 14:45:37 +0200 (Wed, 07 May 2014) New Revision: 426 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/426 Log: Update to 2.1.0 Added: nuiton-js-canjs/trunk/generate-extra-group.sh Modified: nuiton-js-canjs/trunk/pom.xml nuiton-js-canjs/trunk/src/main/resources/META-INF/nuiton-js/wro-canjs.xml Added: nuiton-js-canjs/trunk/generate-extra-group.sh =================================================================== --- nuiton-js-canjs/trunk/generate-extra-group.sh (rev 0) +++ nuiton-js-canjs/trunk/generate-extra-group.sh 2014-05-07 12:45:37 UTC (rev 426) @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Permet de genere le code XML necessaire pour la declaration des extras +# il faut ensuite mettre ce qui est genere dans le fichier META-INF/nuiton-js/nuiton-js-angular.xml +# +for t in target/classes/META-INF/resources/nuiton-js-canjs/can.*.js; do + f=$(basename $t) + n=$(basename $t .js) + echo -e " <group name='$n'>\n <js>classpath:META-INF/resources/nuiton-js-canjs/$f</js>\n </group>\n" +done Property changes on: nuiton-js-canjs/trunk/generate-extra-group.sh ___________________________________________________________________ Added: svn:executable + * Modified: nuiton-js-canjs/trunk/pom.xml =================================================================== --- nuiton-js-canjs/trunk/pom.xml 2014-05-07 11:52:31 UTC (rev 425) +++ nuiton-js-canjs/trunk/pom.xml 2014-05-07 12:45:37 UTC (rev 426) @@ -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-canjs</artifactId> - <version>1.1.6-2-SNAPSHOT</version> + <version>2.1.0-1-SNAPSHOT</version> <name>Nuiton JS :: CanJS</name> <description>CanJS jar packaging</description> @@ -29,9 +29,72 @@ </licenses> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-canjs-1.1.6-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-canjs-1.1.6-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-canjs-1.1.6-1</url> + <connection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-canjs/trunk</connection> + <developerConnection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-canjs/trunk</developerConnection> + <url>https://forge.nuiton.org/projects/nuiton-js/repository/show/nuiton-js-canjs/trunk</url> </scm> + <properties> + <license.licenseName>mit</license.licenseName> + + <upstreamVersion>2.1.0</upstreamVersion> + <upstreamUrl>https://github.com/bitovi/canjs.com/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> + <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}/canjs.com-${upstreamVersion}" includes="*.js"> + <filename regex=".*min.*" negate="true" /> + <filename regex=".*dev.*" negate="true" /> + </fileset> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: nuiton-js-canjs/trunk/src/main/resources/META-INF/nuiton-js/wro-canjs.xml =================================================================== --- nuiton-js-canjs/trunk/src/main/resources/META-INF/nuiton-js/wro-canjs.xml 2014-05-07 11:52:31 UTC (rev 425) +++ nuiton-js-canjs/trunk/src/main/resources/META-INF/nuiton-js/wro-canjs.xml 2014-05-07 12:45:37 UTC (rev 426) @@ -4,7 +4,7 @@ $Id:$ $HeadURL:$ %% - Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2014 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -22,76 +22,103 @@ #L% --> <groups xmlns="http://www.isdc.ro/wro"> - <group name='can.jquery'> - <js>classpath:nuiton-js-canjs/can.jquery.js</js> + <group name='can.construct.proxy'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.construct.proxy.js</js> </group> + <group name='can.construct.super'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.construct.super.js</js> + </group> + + <group name='can.control.plugin'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.control.plugin.js</js> + </group> + <group name='can.dojo'> - <js>classpath:nuiton-js-canjs/can.dojo.js</js> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.dojo.js</js> </group> - <group name='can.mootools'> - <js>classpath:nuiton-js-canjs/can.mootools.js</js> + <group name='can.ejs'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.ejs.js</js> </group> - <group name='can.yui'> - <js>classpath:nuiton-js-canjs/can.yui.js</js> + <group name='can.fixture'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.fixture.js</js> </group> - <group name='can.zepto'> - <js>classpath:nuiton-js-canjs/can.zepto.js</js> + <group name='can.jquery'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.jquery.js</js> </group> - <group name='can.construct.super'> - <js>classpath:nuiton-js-canjs/can.construct.super.js</js> + <group name='can.list.promise'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.list.promise.js</js> </group> - <group name='can.control.plugin'> - <js>classpath:nuiton-js-canjs/can.control.plugin.js</js> + <group name='can.list.sort'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.list.sort.js</js> </group> - <group name='can.fixture'> - <js>classpath:nuiton-js-canjs/can.fixture.js</js> + <group name='can.map.attributes'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.attributes.js</js> </group> - <group name='can.model.queue'> - <js>classpath:nuiton-js-canjs/can.model.queue.js</js> + <group name='can.map.backup'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.backup.js</js> </group> - <group name='can.object'> - <js>classpath:nuiton-js-canjs/can.object.js</js> + <group name='can.map.define'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.define.js</js> </group> - <group name='can.observe.attributes'> - <js>classpath:nuiton-js-canjs/can.observe.attributes.js</js> + <group name='can.map.delegate'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.delegate.js</js> </group> - <group name='can.observe.backup'> - <js>classpath:nuiton-js-canjs/can.observe.backup.js</js> + <group name='can.map.lazy'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.lazy.js</js> </group> - <group name='can.observe.delegate'> - <js>classpath:nuiton-js-canjs/can.observe.delegate.js</js> + <group name='can.map.list'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.list.js</js> </group> - <group name='can.observe.setter'> - <js>classpath:nuiton-js-canjs/can.observe.setter.js</js> + <group name='can.map.setter'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.setter.js</js> </group> - <group name='can.observe.validations'> - <js>classpath:nuiton-js-canjs/can.observe.validations.js</js> + <group name='can.map.validations'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.map.validations.js</js> </group> - <group name='can.util.string'> - <js>classpath:nuiton-js-canjs/can.util.string.js</js> + <group name='can.model.queue'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.model.queue.js</js> </group> + <group name='can.mootools'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.mootools.js</js> + </group> + + <group name='can.object'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.object.js</js> + </group> + + <group name='can.route.pushstate'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.route.pushstate.js</js> + </group> + + <group name='can.stache'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.stache.js</js> + </group> + <group name='can.view.modifiers'> - <js>classpath:nuiton-js-canjs/can.view.modifiers.js</js> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.view.modifiers.js</js> </group> - <group name='can.view.mustache'> - <js>classpath:nuiton-js-canjs/can.view.mustache.js</js> + <group name='can.yui'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.yui.js</js> </group> + <group name='can.zepto'> + <js>classpath:META-INF/resources/nuiton-js-canjs/can.zepto.js</js> + </group> </groups>