Author: bpoussin Date: 2013-07-26 18:11:03 +0200 (Fri, 26 Jul 2013) New Revision: 2913 Url: http://chorem.org/projects/jtimer/repository/revisions/2913 Log: change wro generation during devel time Modified: branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/jtimer-server/src/main/config/wro.xml branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-07-26 16:06:59 UTC (rev 2912) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-07-26 16:11:03 UTC (rev 2913) @@ -53,6 +53,7 @@ <plugin> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-maven-plugin</artifactId> + <executions> <execution> <phase>generate-resources</phase> @@ -65,8 +66,13 @@ <configuration> <targetGroups>jtimer</targetGroups> <contextFolder>${basedir}/src/main/webapp/web/</contextFolder> - <cssDestinationFolder>${basedir}/target/classes/web/css</cssDestinationFolder> - <jsDestinationFolder>${basedir}/target/classes/web/js</jsDestinationFolder> +<!-- hack during devel, otherwize tomcat don't find generated file (perhaps it's not the good place ?) + <cssDestinationFolder>${basedir}/target/${projectId}-${project.version}/css</cssDestinationFolder> + <jsDestinationFolder>${basedir}/target/${projectId}-${project.version}/js</jsDestinationFolder> + --> + <cssDestinationFolder>${basedir}/src/main/webapp/css</cssDestinationFolder> + <jsDestinationFolder>${basedir}/src/main/webapp/js</jsDestinationFolder> + <!-- end devel hack--> <wroManagerFactory>org.nuiton.js.wro.NuitonJsMavenWroManagerFactory</wroManagerFactory> <wroFile>${basedir}/src/main/config/wro.xml</wroFile> <extraConfigFile>${basedir}/src/main/config/wro.properties</extraConfigFile> Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-07-26 16:06:59 UTC (rev 2912) +++ branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-07-26 16:11:03 UTC (rev 2913) @@ -3,7 +3,11 @@ <group-ref>angular</group-ref> <group-ref>jquery</group-ref> <group-ref>bootstrap</group-ref> - <css>/styles/*.css</css> - <js>/scripts/*.js</js> + <group-ref>font-awesome</group-ref> + <group-ref>moment</group-ref> + <!-- direct import in html file during development + <css>/webtimer/css/*.css</css> + <js>/webtimer/js/*.js</js> + --> </group> </groups> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-07-26 16:06:59 UTC (rev 2912) +++ branches/ng-jtimer/pom.xml 2013-07-26 16:11:03 UTC (rev 2913) @@ -66,6 +66,16 @@ <version>2.3.2-1</version> </dependency> <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-moment</artifactId> + <version>2.0.0-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-font-awesome</artifactId> + <version>3.2.1-1-SNAPSHOT</version> + </dependency> + <dependency> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-extensions</artifactId> <version>1.7.0</version>