[richfaces-svn-commits] JBoss Rich Faces SVN: r12269 - in trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd: mojo and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Jan 14 07:12:24 EST 2009
Author: abelevich
Date: 2009-01-14 07:12:24 -0500 (Wed, 14 Jan 2009)
New Revision: 12269
Removed:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/ComponentFilter.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentFilter.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichWebSourceWalker.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/XhtmlFileNameFilter.java
Modified:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentsScanner.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java
Log:
Deleted: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/ComponentFilter.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/ComponentFilter.java 2009-01-14 02:14:47 UTC (rev 12268)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/ComponentFilter.java 2009-01-14 12:12:24 UTC (rev 12269)
@@ -1,16 +0,0 @@
-package org.richfaces.cdk.rd;
-
-public interface ComponentFilter {
-
- public static String A4J_NEW = "http://richfaces.org/a4j";
-
- public static String A4J_OD = "";
-
- public static String RICH_NEW = "http://richfaces.org/rich";
-
- public static String RICH_OLD = "";
-
-
- public boolean accept(String name);
-
-}
Deleted: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentFilter.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentFilter.java 2009-01-14 02:14:47 UTC (rev 12268)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentFilter.java 2009-01-14 12:12:24 UTC (rev 12269)
@@ -1,9 +0,0 @@
-package org.richfaces.cdk.rd;
-
-public class RichComponentFilter implements ComponentFilter{
-
- public boolean accept(String name) {
- return true;
- }
-
-}
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentsScanner.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentsScanner.java 2009-01-14 02:14:47 UTC (rev 12268)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichComponentsScanner.java 2009-01-14 12:12:24 UTC (rev 12269)
@@ -1,15 +1,10 @@
package org.richfaces.cdk.rd;
import java.io.File;
-import java.util.HashSet;
import java.util.Set;
import javax.xml.parsers.SAXParser;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
/**
* @author Anton Belevich
*
@@ -18,24 +13,14 @@
private SAXParser parser;
- private Set <String> components = new HashSet<String>();
+ private RichComponentsHandler handler;
-
- DefaultHandler defaultHandler = new DefaultHandler () {
- @Override
- public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException {
- components.add(name);
- }
- };
-
- public RichComponentsScanner(SAXParser parser) {
+ public RichComponentsScanner(SAXParser parser, RichComponentsHandler handler) {
this.parser = parser;
+ this.handler = handler;
}
- public Set<String> getResult() {
- return components;
- }
-
+
public SAXParser getParser() {
return parser;
}
@@ -45,6 +30,12 @@
}
public void doScan(File file) throws Exception {
- parser.parse(file, defaultHandler);
+// TODO: check file, handler
+ parser.parse(file, handler);
}
+
+ public Set <String> getResult() {
+ return handler.getComponents();
+ }
+
}
Deleted: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichWebSourceWalker.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichWebSourceWalker.java 2009-01-14 02:14:47 UTC (rev 12268)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/RichWebSourceWalker.java 2009-01-14 12:12:24 UTC (rev 12269)
@@ -1,52 +0,0 @@
-package org.richfaces.cdk.rd;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-
-/**
- * @author Anton Belevich
- *
- */
-public class RichWebSourceWalker {
-
-
- private FilenameFilter filter;
-
- private ComponentsScanner scanner;
-
- public RichWebSourceWalker(ComponentsScanner scanner) {
- this(scanner, new FilenameFilter () {
- public boolean accept(File dir, String name) {
- return true;
- }
- }) ;
- }
-
- public RichWebSourceWalker(ComponentsScanner scanner, FilenameFilter filter) {
- this.filter = filter;
- this.scanner = scanner;
- }
-
- public void walk(File file) throws Exception{
- if(file.isDirectory()) {
- String[] children = file.list();
- for (String child : children) {
- walk((new File(file, child)));
- }
- } else {
- if(filter.accept(file, file.getName())) {
- System.out.println("Process File: " + file.getName());
- scanner.doScan(file);
- }
- }
- }
-
- public FilenameFilter getFilter() {
- return filter;
- }
-
- public void setFilter(FilenameFilter filter) {
- this.filter = filter;
- }
-}
Deleted: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/XhtmlFileNameFilter.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/XhtmlFileNameFilter.java 2009-01-14 02:14:47 UTC (rev 12268)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/XhtmlFileNameFilter.java 2009-01-14 12:12:24 UTC (rev 12269)
@@ -1,21 +0,0 @@
-/**
- *
- */
-package org.richfaces.cdk.rd;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-/**
- * @author Anton Belevich
- *
- */
-public class XhtmlFileNameFilter implements FilenameFilter {
-
- public String XHTML_PAGE = ".xhtml";
-
- public boolean accept(File dir, String name) {
- return name.endsWith(XHTML_PAGE) ? true : false;
- }
-
-}
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java 2009-01-14 02:14:47 UTC (rev 12268)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java 2009-01-14 12:12:24 UTC (rev 12269)
@@ -22,6 +22,7 @@
package org.richfaces.cdk.rd.mojo;
import java.io.File;
+import java.util.List;
import java.util.Set;
import javax.xml.parsers.SAXParser;
@@ -30,10 +31,12 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.DirectoryScanner;
import org.richfaces.cdk.rd.ComponentsScanner;
-import org.richfaces.cdk.rd.RichWebSourceWalker;
+import org.richfaces.cdk.rd.RichComponentsHandler;
import org.richfaces.cdk.rd.RichComponentsScanner;
-import org.richfaces.cdk.rd.XhtmlFileNameFilter;
+import org.richfaces.cdk.rd.filter.ComponentFilter;
+import org.richfaces.cdk.rd.filter.RichComponentFilter;
/**
* @author Anton Belevich
@@ -70,6 +73,13 @@
private File webSourceDirectory;
/**
+ * namespaces
+ * @parameter
+ *
+ */
+ private List namespaces;
+
+ /**
* loadOrder
* @parameter;
*/
@@ -77,22 +87,54 @@
public void execute() throws MojoExecutionException {
try {
- SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
- SAXParser saxParser = saxParserFactory.newSAXParser();
-
- ComponentsScanner scanner = new RichComponentsScanner(saxParser);
-
- RichWebSourceWalker walker = new RichWebSourceWalker(scanner, new XhtmlFileNameFilter());
- walker.walk(webSourceDirectory);
-
- Set <String>result = scanner.getResult();
- for(String component: result) {
- System.out.println(component);
+ Set <String> result = findComponents(webSourceDirectory);
+ for (String component: result) {
+ System.out.println("find: " + component);
}
+ mergeScripts(result);
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage(),e);
}
}
+
+ public Set <String> findComponents (File webSourceDir) throws Exception{
+
+ DirectoryScanner scanner = new DirectoryScanner();
+ scanner.setBasedir(webSourceDir);
+ scanner.setIncludes(new String []{"**/*.xhtml"});
+ scanner.addDefaultExcludes();
+ scanner.scan();
+
+ String [] collectedFiles = scanner.getIncludedFiles();
+
+ SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+ saxParserFactory.setNamespaceAware(true);
+ SAXParser saxParser = saxParserFactory.newSAXParser();
+
+ ComponentFilter filter = new RichComponentFilter();
+ filter.addNamespaces(namespaces);
+
+ RichComponentsHandler handler = new RichComponentsHandler();
+ handler.setFilter(filter);
+
+ ComponentsScanner richScanner = new RichComponentsScanner(saxParser,handler);
+
+ for(String processFile : collectedFiles) {
+ File file = new File(webSourceDir,processFile);
+ if(file.exists()) {
+ getLog().info("process file: " + file.getName());
+ richScanner.doScan(file);
+ }
+ }
+
+ return richScanner.getResult();
+
+ }
+
+ public void mergeScripts(Set <String> components) throws Exception{
+
+
+ }
}
More information about the richfaces-svn-commits
mailing list