Author: echatellier Date: 2014-07-24 13:42:04 +0200 (Thu, 24 Jul 2014) New Revision: 436 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/436 Log: Fix nuiton-js configuration for full ie8 support Fix wro cache Modified: trunk/faxtomail-ui-web/pom.xml trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-24 10:20:05 UTC (rev 435) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-24 11:42:04 UTC (rev 436) @@ -49,6 +49,12 @@ <!-- XXX voir le profil le profil removeSlf4jJclFromClassPath --> <slf4jJclScope>runtime</slf4jJclScope> + + <devMode>true</devMode> + <jsMinimize>false</jsMinimize> + <jsCachePeriod>1</jsCachePeriod> + <jsPreProcessors>preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender</jsPreProcessors> + <jsPostProcessors>postProcessors=cssVariables</jsPostProcessors> </properties> <dependencies> @@ -312,6 +318,24 @@ <build> <finalName>faxtomail-${project.version}</finalName> + + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>*.properties</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <excludes> + <exclude>*.properties</exclude> + </excludes> + <filtering>false</filtering> + </resource> + </resources> + <pluginManagement> <plugins> <plugin> @@ -364,23 +388,6 @@ </execution> </executions> </plugin> - - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp/WEB-INF/decorators</directory> - <targetPath>WEB-INF/decorators</targetPath> - <includes> - <include>version.jsp</include> - </includes> - <filtering>true</filtering> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> </build> @@ -392,5 +399,23 @@ <slf4jJclScope>provided</slf4jJclScope> </properties> </profile> + + <profile> + <id>disable-devMode-release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <devMode>false</devMode> + <jsMinimize>true</jsMinimize> + <jsCachePeriod>0</jsCachePeriod> + <jsPreProcessors> </jsPreProcessors> <!-- Vide pour ne pas inclure la propriété en release --> + <jsPostProcessors> </jsPostProcessors> <!-- Vide pour ne pas inclure la propriété en release --> + </properties> + </profile> + </profiles> </project> Modified: trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties 2014-07-24 10:20:05 UTC (rev 435) +++ trunk/faxtomail-ui-web/src/main/resources/nuiton-js.properties 2014-07-24 11:42:04 UTC (rev 436) @@ -23,13 +23,12 @@ ### # dev -cacheUpdatePeriod=0 -minimize=false -preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender -postProcessors=cssVariables - -# prod -#disableCache=false -#minimize=true -#preProcessors=cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr -#postProcessors=cssVariables,jsMin +debug=${devMode} +cacheUpdatePeriod=${jsCachePeriod} +minimizeEnabled=${jsMinimize} +# dev : preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender +# prod : preProcessors=cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr +${jsPreProcessors} +# dev : postProcessors=cssVariables +# prod : postProcessors=cssVariables,jsMin +${jsPostProcessors}