Author: abelevich
Date: 2009-02-05 10:19:28 -0500 (Thu, 05 Feb 2009)
New Revision: 12580
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/mojo/ResourceDependencyMojo.java
Log:
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-02-05
14:53:01 UTC (rev 12579)
+++
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/StyleAssembler.java 2009-02-05
15:19:28 UTC (rev 12580)
@@ -96,6 +96,7 @@
try {
if(builder.length() > 0 && velocityComponent != null) {
+
VelocityContext context = new VelocityContext();
context.put("content", builder);
VelocityEngine engine = velocityComponent.getEngine();
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-02-05
14:53:01 UTC (rev 12579)
+++
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-02-05
15:19:28 UTC (rev 12580)
@@ -362,8 +362,8 @@
handler.setStyleExcludes(styleExcludes);
handler.setComponentIncludes(componentIncludes);
handler.setComponentExcludes(componentExcludes);
+ handler.setNamespaceIncludes(namespaceIncludes);
handler.setNamespaceExcludes(namespaceExcludes);
- handler.setNamespaceIncludes(namespaceIncludes);
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
@@ -373,13 +373,16 @@
File file = new File(webSourceDir,processFile);
if(file.exists()) {
+
getLog().info("process file: " + file.getName());
try {
saxParser.parse(file, handler);
} catch (Exception e) {
getLog().error("Error process file: " + file.getAbsolutePath() +
"\n" + e.getMessage(), e);
}
+
}
+
}
return handler;
}
@@ -405,7 +408,8 @@
jarFileObjects = manager.resolveFile("jar://" + file.getAbsolutePath());
} catch (FileSystemException e) {
getLog().error("Error during processing file: " + file.getAbsolutePath()+
"\n" + e.getMessage(), e);
- }
+ }
+
}
return jarFileObjects;
@@ -472,11 +476,13 @@
if (formatted != null) {
File file = new File(formatted);
+
try {
url = file.toURI().toURL();
} catch (MalformedURLException e) {
getLog().error("Resource url " + file.getPath() + " is
invalid");
}
+
realm.addConstituent(url);
}
}
Show replies by date