From: Kai Moritz Date: Tue, 3 Dec 2013 19:52:09 +0000 (+0100) Subject: wro4j für die Zusammenführung und Umwandlung der LESS-Dateien eingeführt X-Git-Tag: thymeroot-2.0.0~177 X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=aa23c197b723965e54f06bc5746cd7729dd29dd6;p=website wro4j für die Zusammenführung und Umwandlung der LESS-Dateien eingeführt --- diff --git a/pom.xml b/pom.xml index aae2e137..4f823317 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ 1.5.8 3.2.4.RELEASE 3.0.1 + 1.7.2 @@ -136,26 +137,30 @@ - org.lesscss - lesscss-maven-plugin - 1.3.3 + ro.isdc.wro4j + wro4j-maven-plugin + ${wro4j.version} + + ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory + ${project.build.directory}/${project.build.finalName}/css/ + ${project.build.directory}/${project.build.finalName}/js/ + + prepare-package - compile + run - - ${project.basedir}/src/main/webapp/less - ${project.build.directory}/${project.build.finalName}/css - true - maven-war-plugin - less/** + + WEB-INF/wro.*, + less/** + @@ -174,6 +179,101 @@ org.eclipse.jetty jetty-maven-plugin + + + ${project.basedir}/src/test/resources/jetty-web.xml + + + + + ro.isdc.wro4j + wro4j-core + ${wro4j.version} + + + ro.isdc.wro4j + wro4j-extensions + ${wro4j.version} + + + javax.servlet + servlet-api + + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + + + org.springframework + spring-web + + + com.google.code.gson + gson + + + com.google.javascript + closure-compiler + + + com.github.lltyk + dojo-shrinksafe + + + org.jruby + jruby-core + + + org.jruby + jruby-stdlib + + + me.n4u.sass + sass-gems + + + nz.co.edmi + bourbon-gem-jar + + + org.codehaus.gmaven.runtime + gmaven-runtime-1.7 + + + org.webjars + jshint + + + org.webjars + emberjs + + + org.webjars + handlebars + + + org.webjars + coffee-script + + + org.webjars + jslint + + + org.webjars + json2 + + + org.webjars + jquery + + + + org.codehaus.mojo diff --git a/src/main/webapp/WEB-INF/wro.properties b/src/main/webapp/WEB-INF/wro.properties new file mode 100644 index 00000000..597e4537 --- /dev/null +++ b/src/main/webapp/WEB-INF/wro.properties @@ -0,0 +1,4 @@ +managerFactoryClassName=ro.isdc.wro.manager.factory.ConfigurableWroManagerFactory +preProcessors=cssUrlRewriting,lessCssImport +postProcessors=less4j +disableCache=true diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml new file mode 100644 index 00000000..73ce6ea0 --- /dev/null +++ b/src/main/webapp/WEB-INF/wro.xml @@ -0,0 +1,16 @@ + + + + /less/base/browserreset.less + /less/base/fonts.less + /less/base/util.less + /less/base/typo.less + /less/base/layout.less + /less/base/head.less + /less/base/navigation.less + /less/base/content.less + /less/base/marginal.less + /less/base/footer.less + + + diff --git a/src/main/webapp/less/base.less b/src/main/webapp/less/base.less deleted file mode 100644 index 1bbbe451..00000000 --- a/src/main/webapp/less/base.less +++ /dev/null @@ -1,23 +0,0 @@ -@charset "UTF-8"; - -/** - * Diese Datei wird nur verwendet, wenn die Webanwendung via - * "mvn jetty:run" gestartet wird (z.B. über das Shell-Skript run.sh). - * Ansonsten werden die CSS-Dateien beim ausführen des Befehls "mvn package" - * minifiziert und in der Datei /css/base.css zusammengefasst. - * - * Damit alles (auf dem Produktivserver _und_ in der Test-Umgebung) wie - * erwartet funktioniert, müssen neue CSS-Schnipsel hier und in der POM - * im Modul web eingetragen werden! - */ - -@import 'base/browserreset'; -@import 'base/fonts'; -@import 'base/typo'; -@import 'base/util'; -@import 'base/head'; -@import 'base/navigation'; -@import 'base/layout'; -@import 'base/content'; -@import 'base/marginal'; -@import 'base/footer'; diff --git a/src/test/resources/jetty-web.xml b/src/test/resources/jetty-web.xml new file mode 100644 index 00000000..089e3c9d --- /dev/null +++ b/src/test/resources/jetty-web.xml @@ -0,0 +1,17 @@ + + + + + wro + ro.isdc.wro.http.WroFilter + + + + wro + *.css + + +