Author: bpoussin Date: 2013-01-22 14:44:59 +0100 (Tue, 22 Jan 2013) New Revision: 21 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/21 Log: ajout du WroManagerFactory a utiliser pour le plugin maven Added: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java Modified: trunk/nuiton-js-jqgrid/ trunk/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml trunk/nuiton-js-wro/pom.xml trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java trunk/pom.xml Property changes on: trunk/nuiton-js-jqgrid ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml =================================================================== --- trunk/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml 2013-01-19 11:25:15 UTC (rev 20) +++ trunk/nuiton-js-jquery/src/main/resources/META-INF/nuiton-js/wro-jquery.xml 2013-01-22 13:44:59 UTC (rev 21) @@ -1,5 +1,5 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='jquery'> - <js>classpath:nuiton-js-jquery/**.js</js> + <js>classpath:nuiton-js-jquery/*.js</js> </group> </groups> Modified: trunk/nuiton-js-wro/pom.xml =================================================================== (Binary files differ) Property changes on: trunk/nuiton-js-wro/pom.xml ___________________________________________________________________ Deleted: svn:mime-type - application/xml Added: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java (rev 0) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java 2013-01-22 13:44:59 UTC (rev 21) @@ -0,0 +1,65 @@ +package org.nuiton.js.wro; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import ro.isdc.wro.manager.factory.standalone.StandaloneContext; +import ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory; +import ro.isdc.wro.model.factory.WroModelFactory; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class NuitonJsMavenWroManagerFactory extends ConfigurableWroManagerFactory { + protected StandaloneContext standaloneContext; + protected File configProperties; + + + @Override + public void initialize(final StandaloneContext standaloneContext) { + super.initialize(standaloneContext); + this.standaloneContext = standaloneContext; + } + + @Override + protected WroModelFactory newModelFactory() { + return new NuitonJsXmlModelFactory() { + @Override + protected InputStream getModelResourceAsStream() throws IOException { + InputStream stream = new BufferedInputStream( + new FileInputStream(standaloneContext.getWroFile())); + return stream; + } + }; + } + + @Override + protected Properties createProperties() { + Properties result = new NuitonJsWroConfigurationFactory(){ + @Override + protected String getUserConfigPath() { + return configProperties.getAbsolutePath(); + } + @Override + protected InputStream loadAsStream(String file) throws Exception { + return new BufferedInputStream(new FileInputStream(file)); + } + }.initProperties(); + return result; + } + + @Override + public void setExtraConfigFile(final File extraProperties) { + super.setExtraConfigFile(extraProperties); + this.configProperties = extraProperties; + } + +} Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java 2013-01-19 11:25:15 UTC (rev 20) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java 2013-01-22 13:44:59 UTC (rev 21) @@ -1,5 +1,6 @@ package org.nuiton.js.wro; +import java.io.IOException; import java.io.InputStream; import java.util.Properties; import javax.servlet.FilterConfig; @@ -18,7 +19,7 @@ * dans la config: * <li> managerFactoryClassName=org.nuiton.js.wro.NuitonJsWroManagerFactory * <li> debug=true - * <li> preProcessors=fallbackCssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMin + * <li> preProcessors=fallbackCssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr * <li> postProcessors=cssVariables,jsMin * <li> uriLocators=servletContext,uri,classpath * @@ -72,7 +73,7 @@ String file = getUserConfigPath(); try { LOG.debug("loading config resource from: {}", file); - propertyStream = getServletContext().getResourceAsStream(file); + propertyStream = loadAsStream(file); Validate.notNull(propertyStream); Properties props = new Properties(); props.load(propertyStream); @@ -86,6 +87,11 @@ return result; } + protected InputStream loadAsStream(String file) throws Exception { + InputStream result = getServletContext().getResourceAsStream(file); + return result; + } + protected ServletContext getServletContext() { ServletContext result; if (filterConfig != null) { Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java 2013-01-19 11:25:15 UTC (rev 20) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsXmlModelFactory.java 2013-01-22 13:44:59 UTC (rev 21) @@ -48,7 +48,7 @@ } } - // on continue avec le fichier par defaut /WEB-INF/wro.properties + // on continue avec le fichier par defaut /WEB-INF/wro.xml try { // on ne reutilise pas create du super car la methode commence // par un new model :(. Or on veut conserve les imports qui viennent Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-19 11:25:15 UTC (rev 20) +++ trunk/pom.xml 2013-01-22 13:44:59 UTC (rev 21) @@ -51,6 +51,12 @@ </dependency> <dependency> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-maven-plugin</artifactId> + <version>${wroVersion}</version> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>${servletApiVersion}</version> @@ -111,7 +117,7 @@ <properties> - <wroVersion>1.5.0</wroVersion> + <wroVersion>1.6.2</wroVersion> <slf4jVersion>1.7.2</slf4jVersion> <servletApiVersion>2.5</servletApiVersion>