Author: alexsmirnov
Date: 2009-12-10 20:42:53 -0500 (Thu, 10 Dec 2009)
New Revision: 16107
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
Log:
refactor model
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-12-10
16:48:10 UTC (rev 16106)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-12-11
01:42:53 UTC (rev 16107)
@@ -31,6 +31,7 @@
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.DirectoryScanner;
import org.richfaces.builder.maven.MavenLogger;
+import org.richfaces.cdk.CdkClassLoader;
import org.richfaces.cdk.CdkContextBase;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWorker;
@@ -226,14 +227,14 @@
if (null != workers) {
for (Entry<String, String> workerEntry : workers.entrySet()) {
try {
- Class<? extends CdkWorker> workerClass =
- Class.forName(workerEntry.getKey()).asSubclass(CdkWorker.class);
+ Class<CdkWorker> workerClass =
+ (Class<CdkWorker>)
Class.forName(workerEntry.getKey()).asSubclass(CdkWorker.class);
Class<? extends CdkWorker> workerImplementationClass =
Class.forName(workerEntry.getValue()).asSubclass(CdkWorker.class);
CdkWorker workerInstance = workerImplementationClass.newInstance();
workerInstance.init(context);
- context.addWorker(workerClass, workerInstance);
+ context.setWorker(workerClass, workerInstance);
if (NamingConventions.class.equals(workerClass)) {
namingConventionsConfigured = true;
@@ -264,7 +265,7 @@
throw new MojoFailureException("Naming conventions initialization
error", e);
}
- context.addWorker(NamingConventions.class, facesConventions);
+ context.setWorker(NamingConventions.class, facesConventions);
}
// Set default model validator if it was not configured.
@@ -277,7 +278,7 @@
throw new MojoFailureException("RichFaces Validator initialization
error", e);
}
- context.addWorker(ModelValidator.class, validatorImpl);
+ context.setWorker(ModelValidator.class, validatorImpl);
}
if (null != options) {
@@ -290,10 +291,8 @@
// Build JSF library.
LibraryBuilder builder = LibraryBuilder.createInstance(context);
- ComponentLibrary model = builder.buildModel();
+ builder.build();
- builder.generate(model);
-
// Tell project about generated files.
project.addCompileSourceRoot(outputJavaDirectory.getAbsolutePath());
@@ -393,23 +392,21 @@
return doScan(facesConfigs);
}
- protected ClassLoader createProjectClassLoader(MavenProject project) {
- ClassLoader classLoader = null;
+ protected CdkClassLoader createProjectClassLoader(MavenProject project) {
+ CdkClassLoader classLoader = null;
try {
String outputDirectory = project.getBuild().getOutputDirectory();
- URL[] urls = new URL[classpathElements.size() + 1];
- int i = 0;
+ List<File> urls = new ArrayList<File>(classpathElements.size() +
1);
+ urls.add(new File(outputDirectory));
- urls[i++] = new File(outputDirectory).toURI().toURL();
-
for (Iterator<String> iter = classpathElements.iterator();
iter.hasNext();) {
String element = iter.next();
- urls[i++] = new File(element).toURI().toURL();
+ urls.add(new File(element));
}
- classLoader = new URLClassLoader(urls);
+ classLoader = new CdkClassLoader(urls);
} catch (MalformedURLException e) {
getLog().error("Bad URL in classpath", e);
}
Show replies by date