Author: echatellier Date: 2013-11-23 15:52:10 +0100 (Sat, 23 Nov 2013) New Revision: 306 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/306 Log: Prepare version 1.2.2 Removed: nuiton-js-angularjs/trunk/src/main/resources/META-INF/resources/ Modified: nuiton-js-angularjs/trunk/generate-extra-group.sh nuiton-js-angularjs/trunk/generate-i18n-group.sh nuiton-js-angularjs/trunk/pom.xml Modified: nuiton-js-angularjs/trunk/generate-extra-group.sh =================================================================== --- nuiton-js-angularjs/trunk/generate-extra-group.sh 2013-11-23 14:02:31 UTC (rev 305) +++ nuiton-js-angularjs/trunk/generate-extra-group.sh 2013-11-23 14:52:10 UTC (rev 306) @@ -3,7 +3,7 @@ # 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 src/main/resources/META-INF/resources/nuiton-js-angularjs/angular-*.js; do +for t in target/classes/META-INF/resources/nuiton-js-angularjs/angular-*.js; do f=$(basename $t) n=$(basename $t .js) echo -e " <group name='$n'>\n <js>classpath:META-INF/resources/nuiton-js-angularjs/$f</js>\n </group>\n" Modified: nuiton-js-angularjs/trunk/generate-i18n-group.sh =================================================================== --- nuiton-js-angularjs/trunk/generate-i18n-group.sh 2013-11-23 14:02:31 UTC (rev 305) +++ nuiton-js-angularjs/trunk/generate-i18n-group.sh 2013-11-23 14:52:10 UTC (rev 306) @@ -3,7 +3,7 @@ # Permet de genere le code XML necessaire pour la declaration i18n # il faut ensuite mettre ce qui est genere dans le fichier META-INF/nuiton-js/nuiton-js-angular.xml # -for t in src/main/resources/META-INF/resources/nuiton-js-angularjs/i18n/*.js; do +for t in target/classes/META-INF/resources/nuiton-js-angularjs/i18n/*.js; do f=$(basename $t) n=$(basename $t .js | sed 's/angular-locale_//g') echo -e " <group name='angular-$n'>\n <js>classpath:META-INF/resources/nuiton-js-angularjs/i18n/$f</js>\n </group>\n" Modified: nuiton-js-angularjs/trunk/pom.xml =================================================================== --- nuiton-js-angularjs/trunk/pom.xml 2013-11-23 14:02:31 UTC (rev 305) +++ nuiton-js-angularjs/trunk/pom.xml 2013-11-23 14:52:10 UTC (rev 306) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-js-angularjs</artifactId> - <version>1.2.1-2-SNAPSHOT</version> + <version>1.2.2-1-SNAPSHOT</version> <name>Nuiton JS :: AngularJS</name> <description>AngularJS jar packaging</description> @@ -28,10 +28,67 @@ </license> </licenses> + <properties> + <upstreamVersion>1.2.2</upstreamVersion> + <upstreamUrl>http://code.angularjs.org/${upstreamVersion}</upstreamUrl> + <upstreamFile>angular-${upstreamVersion}.zip</upstreamFile> + <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> + </properties> + <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-angularjs-1.2.1-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-angularjs-1.2.1-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-angularjs-1.2.1-1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/nuiton-js-angularjs/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/nuiton-js-angularjs/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-js/nuiton-js-angularjs/trunk</url> </scm> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0-beta-4</version> + <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> + <version>1.7</version> + <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}/angular-${upstreamVersion}" includes="*"> + <filename regex="angular-?[a-z]*.(js|css)"/> + <filename name="angular-scenario.js" negate="true" /> + <!-- <filename regex="angular-[a-z]*.css"/> + <include name="i18n/*.js"/> --> + </fileset> + <fileset dir="${project.build.directory}/angular-${upstreamVersion}" includes="i18n/*.js" /> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>