[richfaces-svn-commits] JBoss Rich Faces SVN: r14053 - in trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd: handler and 1 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu May 7 07:11:43 EDT 2009
Author: abelevich
Date: 2009-05-07 07:11:43 -0400 (Thu, 07 May 2009)
New Revision: 14053
Modified:
trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java
trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java
trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java
trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java
trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java
Log:
https://jira.jboss.org/jira/browse/RF-7052
Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java
===================================================================
--- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java 2009-05-07 11:09:28 UTC (rev 14052)
+++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ResourcesGenerator.java 2009-05-07 11:11:43 UTC (rev 14053)
@@ -28,7 +28,6 @@
import java.util.List;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.logging.SystemStreamLog;
/**
* @author Anton Belevich
@@ -38,7 +37,7 @@
private File assemblyFile;
- private Log log = new SystemStreamLog();
+ private Log log;
private Collection<String> resources;
@@ -48,6 +47,9 @@
private ResourceAssembler assembler;
+ public ResourcesGenerator(Log log) {
+ this.log = log;
+ }
public void doAssembly() {
if(resources != null) {
@@ -69,6 +71,7 @@
for (String resourceName: resources) {
URL resource = getResourceURL(resourceName);
+ log.info("concatenate resource: " + resource);
if(resource != null) {
if (assembler != null) {
assembler.assembly(resource);
@@ -107,9 +110,10 @@
}
try {
- assemblyFile.createNewFile();
+ assemblyFile.createNewFile();
+
} catch (IOException e) {
- log.error("Error create assembly File: " + assemblyFile.getAbsolutePath(),e);
+ log.error("Error create assembly File: " + assemblyFile.getPath(),e);
}
assembler.writeToFile(assemblyFile);
Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java
===================================================================
--- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java 2009-05-07 11:09:28 UTC (rev 14052)
+++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java 2009-05-07 11:11:43 UTC (rev 14053)
@@ -27,7 +27,6 @@
import java.net.URL;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.logging.SystemStreamLog;
import org.codehaus.plexus.util.IOUtil;
/**
@@ -36,14 +35,18 @@
*/
public class ScriptAssembler implements ResourceAssembler {
- protected Log log = new SystemStreamLog();
+ protected Log log;
+
private StringBuilder builder = new StringBuilder();
+ public ScriptAssembler(Log log) {
+ this.log = log;
+ }
+
public void assembly(URL resource) {
- log.info("process resource : " + resource.getFile());
-
+
try {
builder.append(IOUtil.toString(resource.openStream()));
builder.append("\n");
@@ -60,6 +63,7 @@
FileWriter fileWriter = new FileWriter(file);
try {
+ log.info("write result to the: " + file.getPath());
IOUtil.copy(builder.toString(), fileWriter);
} finally {
fileWriter.close();
Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java
===================================================================
--- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java 2009-05-07 11:09:28 UTC (rev 14052)
+++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java 2009-05-07 11:11:43 UTC (rev 14053)
@@ -44,18 +44,24 @@
public class StyleAssembler implements ResourceAssembler {
- protected Log log = new SystemStreamLog();
+ protected Log log = new SystemStreamLog();
private VelocityComponent velocityComponent;
private StringBuilder builder = new StringBuilder();
+ public StyleAssembler(Log log) {
+ this.log = log;
+ }
public void assembly(URL resource) {
String file = resource.getFile();
- log.info("process resource: " + file);
+ if(log.isDebugEnabled()) {
+ log.debug("process resource: " + file);
+ }
+
try {
InputStream resourceInputStream = resource.openStream();
@@ -101,7 +107,7 @@
context.put("content", builder);
VelocityEngine engine = velocityComponent.getEngine();
FileWriter fileWriter = new FileWriter(file);
-
+ log.info("write result to the: " + file.getPath());
try {
Template velocityTemplate = engine.getTemplate("templates12/xcss.vm");
velocityTemplate.merge(context, fileWriter);
Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java
===================================================================
--- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java 2009-05-07 11:09:28 UTC (rev 14052)
+++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java 2009-05-07 11:11:43 UTC (rev 14053)
@@ -25,6 +25,8 @@
import java.util.Map;
import java.util.Set;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.logging.SystemStreamLog;
import org.codehaus.plexus.util.SelectorUtils;
import org.richfaces.cdk.rd.Component;
import org.richfaces.cdk.rd.Components;
@@ -39,6 +41,8 @@
private String [] INCLUDE_ALL_PATTERN = {"**"};
+ protected Log log;
+
private Map <String,Components> components;
private Set <String> scripts = new LinkedHashSet<String>();
@@ -61,7 +65,9 @@
private String [] componentExcludes;
-
+ public ComponentsHandler(Log log) {
+ this.log = log;
+ }
@Override
public void endElement(String uri, String localName, String name) throws SAXException {
@@ -69,17 +75,27 @@
if(namespaceIncludes == null) {
namespaceIncludes = INCLUDE_ALL_PATTERN;
+
+ if(log.isDebugEnabled()) {
+ log.debug("use default include patterns for namespaces");
+ }
}
if(doMatch(namespaceIncludes, uri, true)){
-
+
if(!doMatch(namespaceExcludes, uri, true)) {
Components library = components.get(uri);
List <Component> components = library.getComponents();
if (componentIncludes == null) {
+
componentIncludes = INCLUDE_ALL_PATTERN;
+
+ if(log.isDebugEnabled()) {
+ log.debug("use default include patterns for components");
+ }
+
}
for(Component component : components ){
@@ -90,6 +106,9 @@
if(doMatch(componentIncludes, componentName,false)) {
if(!doMatch(componentExcludes, componentName,false)) {
+
+ log.info("process component: " + componentName);
+
collectScripts(component);
collectStyles(component);
}
@@ -100,10 +119,12 @@
}
+ } else if(log.isDebugEnabled()) {
+ log.debug("components from namespace " + uri + " are in excluded list");
}
-
+ } else if(log.isDebugEnabled()) {
+ log.debug("components from namespace " + uri + " aren't in include list");
}
-
}
}
@@ -113,12 +134,17 @@
styleIncludes = INCLUDE_ALL_PATTERN;
}
+ if(log.isDebugEnabled()) {
+ log.debug("start collect styles from component: " + component.getComponentName() );
+ }
+
for(String style : component.getStyles()) {
if(doMatch(styleIncludes, style, true)) {
if(!doMatch(styleExcludes, style, true)) {
this.styles.add(style);
+ log.info("style " + style + " is collected");
}
}
@@ -153,12 +179,17 @@
scriptIncludes = INCLUDE_ALL_PATTERN;
}
+ if(log.isDebugEnabled()) {
+ log.debug("start collect scripts from component: " + component.getComponentName() );
+ }
+
for(String script : component.getScripts()) {
if(doMatch(scriptIncludes, script, true)) {
if(!doMatch(scriptExcludes, script, true)) {
this.scripts.add(script);
+ log.info("script " + script + " is collected");
}
}
Modified: trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java
===================================================================
--- trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-07 11:09:28 UTC (rev 14052)
+++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-05-07 11:11:43 UTC (rev 14053)
@@ -269,7 +269,7 @@
scriptFile.mkdirs();
}
- ScriptAssembler scriptAssembler = new ScriptAssembler();
+ ScriptAssembler scriptAssembler = new ScriptAssembler(getLog());
getLog().info("Start merge scripts to the: " + scriptFile.getPath());
@@ -285,7 +285,7 @@
if(!styleFile.exists()) {
styleFile.mkdirs();
}
- StyleAssembler styleAssembler = new StyleAssembler();
+ StyleAssembler styleAssembler = new StyleAssembler(getLog());
styleAssembler.setVelocityComponent(velocity);
getLog().info("Start merge styles to the: " + styleFile.getPath());
@@ -308,7 +308,7 @@
}
public void mergeResources(File assembly, ResourceAssembler assembler, List <String> beforeIncludes, List <String> afterIncludes, Collection<String> resources) {
- ResourcesGenerator styleGenerator = new ResourcesGenerator();
+ ResourcesGenerator styleGenerator = new ResourcesGenerator(getLog());
styleGenerator.setAssembler(assembler);
styleGenerator.setIncludesAfter(afterIncludes);
styleGenerator.setIncludesBefore(beforeIncludes);
@@ -351,7 +351,7 @@
String [] collectedFiles = scanner.getIncludedFiles();
- ComponentsHandler handler = new ComponentsHandler();
+ ComponentsHandler handler = new ComponentsHandler(getLog());
handler.setComponents(components);
handler.setScriptIncludes(scriptIncludes);
handler.setScriptExcludes(scriptExcludes);
@@ -371,11 +371,11 @@
File file = new File(webSourceDir,processFile);
if(file.exists()) {
- getLog().info("process file: " + file.getName());
+ getLog().info("start process file: " + file.getPath());
try {
saxParser.parse(file, handler);
} catch (Exception e) {
- getLog().error("Error process file: " + file.getAbsolutePath() + "\n" + e.getMessage(), e);
+ getLog().error("Error process file: " + file.getPath() + "\n" + e.getMessage(), e);
}
}
@@ -391,20 +391,22 @@
try {
resolver.resolve(artifact, Collections.EMPTY_LIST, localRepository);
- getLog().info("artifact " + artifact.getFile().getAbsolutePath() + " is resolved");
+ if(getLog().isDebugEnabled()) {
+ getLog().debug("artifact " + artifact.getFile().getPath() + " is resolved");
+ }
} catch (ArtifactResolutionException e) {
- getLog().error("Error with resolve artifact " + artifact.getFile().getAbsolutePath() + "\n" + e.getMessage(), e);
+ getLog().error("Error with resolve artifact " + artifact.getFile().getPath() + "\n" + e.getMessage(), e);
} catch (ArtifactNotFoundException e) {
- getLog().error("Not found artifact " + artifact.getFile().getAbsolutePath() + "\n" + e.getMessage(), e);
+ getLog().error("Not found artifact " + artifact.getFile().getPath() + "\n" + e.getMessage(), e);
}
File file = artifact.getFile();
try {
FileSystemManager manager = VFS.getManager();
- jarFileObjects = manager.resolveFile("jar:///" + file.getAbsolutePath());
+ jarFileObjects = manager.resolveFile("jar:///" + file.getPath());
} catch (FileSystemException e) {
- getLog().error("Error during processing file: " + file.getAbsolutePath()+ "\n" + e.getMessage(), e);
+ getLog().error("Error during processing file: " + file.getPath()+ "\n" + e.getMessage(), e);
}
}
More information about the richfaces-svn-commits
mailing list