7:23 p.m.
Author: abelevich
Date: 2009-02-02 13:23:21 -0500 (Mon, 02 Feb 2009)
New Revision: 12529
Modified:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java
Log:
fix user resources lookup
Modified:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java
===================================================================
---
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java 2009-02-02
16:47:55 UTC (rev 12528)
+++
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ComponentsHandler.java 2009-02-02
18:23:21 UTC (rev 12529)
@@ -41,7 +41,8 @@
private Set <String> scripts = new LinkedHashSet<String>();
private Set <String> styles = new LinkedHashSet<String>();
-
+
+
@Override
public void endElement(String uri, String localName, String name) throws SAXException {
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-02
16:47:55 UTC (rev 12528)
+++
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java 2009-02-02
18:23:21 UTC (rev 12529)
@@ -45,6 +45,7 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -113,7 +114,7 @@
/**
* outputScriptDirectory
- * @parameter expression = "${basedir}/src/main/webapp"
+ * @parameter expression = "${basedir}/src/main/webapp/WEB-INF/classes"
*/
private File outputScriptDirectory ;
@@ -126,7 +127,7 @@
/**
* outputStyleDirectory
- * @parameter expression = "${basedir}/src/main/webapp"
+ * @parameter expression = "${basedir}/src/main/webapp/WEB-INF/classes"
*/
private File outputStyleDirectory;
@@ -318,20 +319,46 @@
}
- // add project classes, scripts etc ...
- List compileClasspathElements = project.getCompileClasspathElements();
- for (Object path: compileClasspathElements) {
- try {
- URL url = new File((String)path).toURI().toURL();
- childRealm.addConstituent(url);
- }catch (MalformedURLException e) {
- getLog().error("Artifact url " + path + " is invalid");
- }
-
- }
-
+ // add project classes, scripts, styles etc ...
+ List<Resource> compileClasspathElements = project.getCompileClasspathElements();
+ addResources(childRealm, compileClasspathElements);
+
+ List<Resource> scripts = project.getScriptSourceRoots();
+ addResources(realm, scripts);
+
+ List<Resource> resources = project.getResources();
+ addResources(realm, resources);
+
//make the child realm the ContextClassLoader
classLoader = childRealm.getClassLoader();
return classLoader;
}
+
+ private ClassRealm addResources(ClassRealm realm, List<Resource> resources) {
+ if(realm != null && resources != null) {
+ for(Object path: resources) {
+ URL url = null;
+
+ String formatted = null;
+
+ if (path instanceof String) {
+ formatted = (String)path;
+
+ } else if(path instanceof Resource) {
+ formatted = ((Resource)path).getDirectory();
+ }
+
+ 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);
+ }
+ }
+ }
+ return realm;
+ }
}