do'h, didn't noticed; they should have their value correctly set by now
thx for looking into it, juan pablo On Mon, Mar 3, 2014 at 8:01 PM, Dirk Frederickx <[email protected]>wrote: > Juan, > > Quick check : > The haddock.css is now generated in the templates/default directory. This > should be the templates/haddock directory. > > > Note how these lines were different in the original jspwiki-war/pom.xml. > > <cssDestinationFolder>${project.build.directory}/generated-sources/wro/ > templates/default/</cssDestinationFolder> > > <cssDestinationFolder>${project.build.directory}/generated-sources/wro/ > templates/haddock/</cssDestinationFolder> > > > Can they just be put back into the original pom.xml ? > > > dirk > > > > On Mon, Mar 3, 2014 at 7:36 PM, <[email protected]> wrote: > > > Author: juanpablo > > Date: Mon Mar 3 18:36:01 2014 > > New Revision: 1573667 > > > > URL: http://svn.apache.org/r1573667 > > Log: > > wro4j minimization can be avoided via -Dminimize=false > > > > Modified: > > jspwiki/trunk/jspwiki-war/pom.xml > > jspwiki/trunk/pom.xml > > > > Modified: jspwiki/trunk/jspwiki-war/pom.xml > > URL: > > > http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1573667&r1=1573666&r2=1573667&view=diff > > > > > ============================================================================== > > --- jspwiki/trunk/jspwiki-war/pom.xml (original) > > +++ jspwiki/trunk/jspwiki-war/pom.xml Mon Mar 3 18:36:01 2014 > > @@ -255,13 +255,7 @@ > > <jsDestinationFolder>d:/static/js/</jsDestinationFolder> > > <ignoreMissingResources>false</ignoreMissingResources> > > --> > > - <minimize>true</minimize> > > - > > > > <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory> > > - > > > > <jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder> > > - > > > > <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/</cssDestinationFolder> > > - <contextFolder>${basedir}/src/main/</contextFolder> > > <wroFile>src/main/config/wro/wro.xml</wroFile> > > - > > <extraConfigFile>src/main/config/wro/wro.properties</extraConfigFile> > > </configuration> > > </execution> > > > > @@ -273,13 +267,7 @@ > > <goal>run</goal> > > </goals> > > <configuration> > > - <minimize>true</minimize> > > - > > > > <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory> > > - > > > > <jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder> > > - > > > > <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/haddock/</cssDestinationFolder> > > - <contextFolder>${basedir}/src/main/</contextFolder> > > <wroFile>src/main/config/wro/wro-haddock.xml</wroFile> > > - > > <extraConfigFile>src/main/config/wro/wro.properties</extraConfigFile> > > </configuration> > > </execution> > > </executions> > > > > Modified: jspwiki/trunk/pom.xml > > URL: > > > http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1573667&r1=1573666&r2=1573667&view=diff > > > > > ============================================================================== > > --- jspwiki/trunk/pom.xml (original) > > +++ jspwiki/trunk/pom.xml Mon Mar 3 18:36:01 2014 > > @@ -40,6 +40,7 @@ > > > > > <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> > > <jdk.version>1.6</jdk.version> > > <lucene.version>4.6.0</lucene.version> > > + <minimize>true</minimize> <!-- wro4j compression --> > > </properties> > > > > <prerequisites> > > @@ -471,6 +472,14 @@ > > <groupId>ro.isdc.wro4j</groupId> > > <artifactId>wro4j-maven-plugin</artifactId> > > <version>1.7.3</version> > > + <configuration> > > + <contextFolder>${project.basedir}/src/main/</contextFolder> > > + > > > > <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/</cssDestinationFolder> > > + > > <extraConfigFile>src/main/config/wro/wro.properties</extraConfigFile> > > + <minimize>${minimize}</minimize> > > + > > > > <jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder> > > + > > > > <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory> > > + </configuration> > > </plugin> > > > > <!-- yuicompressor => replaced by wro4j > > > > > > >
