Author: abelevich Date: 2009-01-22 10:32:51 -0500 (Thu, 22 Jan 2009) New Revision: 12375 Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/Components.java trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java Log: Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/Components.java =================================================================== --- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/Components.java 2009-01-22 15:23:51 UTC (rev 12374) +++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/Components.java 2009-01-22 15:32:51 UTC (rev 12375) @@ -29,8 +29,6 @@ return this.components; } - - @Override public int hashCode() { final int prime = 31; Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java =================================================================== --- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java 2009-01-22 15:23:51 UTC (rev 12374) +++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java 2009-01-22 15:32:51 UTC (rev 12375) @@ -93,7 +93,6 @@ return assemblyFile; } - public void setAssemblyFile(File assemblyFile) { this.assemblyFile = assemblyFile; } @@ -102,37 +101,30 @@ return resources; } - public void setResources(Collection<String> resources) { this.resources = resources; } - public List<String> getIncludesBefore() { return includesBefore; } - public void setIncludesBefore(List<String> includesBefore) { this.includesBefore = includesBefore; } - public List<String> getIncludesAfter() { return includesAfter; } - public void setIncludesAfter(List<String> includesAfter) { this.includesAfter = includesAfter; } - public ResourceAssembler getAssembler() { return assembler; } - public void setAssembler(ResourceAssembler assembler) { this.assembler = assembler; } Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java =================================================================== --- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java 2009-01-22 15:23:51 UTC (rev 12374) +++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java 2009-01-22 15:32:51 UTC (rev 12375) @@ -38,13 +38,10 @@ Log log = new SystemStreamLog(); - private StringBuilder builder; + private StringBuilder builder = new StringBuilder(); public void assembly(URL resource) { log.info("process resource : " + resource.getFile()); - if (builder == null) { - builder = new StringBuilder(); - } try { builder.append(IOUtil.toString(resource.openStream())); } catch (IOException e) { Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java =================================================================== --- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java 2009-01-22 15:23:51 UTC (rev 12374) +++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java 2009-01-22 15:32:51 UTC (rev 12375) @@ -31,29 +31,31 @@ private StringBuilder builder = new StringBuilder(); + public void assembly(URL resource) { String file = resource.getFile(); log.info("process resource: " + file); - try { InputStream resourceInputStream = resource.openStream(); - if(file.endsWith(".xcss")) { - XMLBody xmlBody = new XMLBody(); - try { - xmlBody.loadXML(resourceInputStream,true); - builder.append(xmlBody.getContent()); - } catch (ParsingException e) { - log.error("Error processing xcss: " + e.getMessage(), e); - } finally { - resourceInputStream.close(); + try { + if(file.endsWith(".xcss")) { + XMLBody xmlBody = new XMLBody(); + try { + xmlBody.loadXML(resourceInputStream,true); + builder.append(xmlBody.getContent()); + } catch (ParsingException e) { + log.error("Error processing xcss: " + e.getMessage(), e); + } + } else { + builder.append(IOUtil.toString(resourceInputStream)); } - } else { - builder.append(IOUtil.toString(resourceInputStream)); + } finally { + resourceInputStream.close(); } } catch (IOException e) { - log.error("Error load xcss file " + resource.getFile() + " : " + e.getMessage(), e); + log.error("Error process css file " + file + " : " + e.getMessage(), e); } } Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java =================================================================== --- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-01-22 15:23:51 UTC (rev 12374) +++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-01-22 15:32:51 UTC (rev 12375) @@ -12,7 +12,6 @@ import javax.xml.parsers.SAXParserFactory; import org.ajax4jsf.builder.mojo.Library; -import org.ajax4jsf.builder.xml.XMLBodyMerge; import org.apache.commons.digester.Digester; import org.apache.commons.vfs.FileObject; import org.apache.commons.vfs.FileSystemException; @@ -138,13 +137,13 @@ * beforeIncludes * @parameter */ - private List beforeStylesIncludes; + private List beforeStyleIncludes; /** * afterIncludes * @parameter */ - private List afterStylesIncludes; + private List afterStyleIncludes; /** * @@ -185,11 +184,10 @@ Set <String> styles = handler.getStyles(); if(!styles.isEmpty()) { - XMLBodyMerge xmlBodyMerge = new XMLBodyMerge(null); File assemblyFile = new File(outputStyleDirectory, stylePackName + ".xcss"); StyleAssembler styleAssembler = new StyleAssembler(); styleAssembler.setVelocityComponent(velocity); - mergeResources(assemblyFile, styleAssembler, beforeStylesIncludes, afterStylesIncludes, styles); + mergeResources(assemblyFile, styleAssembler, beforeStyleIncludes, afterStyleIncludes, styles); } } Thread.currentThread().setContextClassLoader(oldClassLoader);