[richfaces-svn-commits] JBoss Rich Faces SVN: r14028 - trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2009-05-06 07:43:25 -0400 (Wed, 06 May 2009)
New Revision: 14028

Modified:
   trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java
Log:
fix generated resource output

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-06 08:43:34 UTC (rev 14027)
+++ trunk/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/ResourceDependencyMojo.java	2009-05-06 11:43:25 UTC (rev 14028)
@@ -22,7 +22,6 @@
 
 import java.io.File;
 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
@@ -69,8 +68,8 @@
 /**
  * @author Anton Belevich
  * @goal assembly-resources
- * @phase process-resources	
-	
+ * @phase generate-resources
+ *	
  */
 public  class ResourceDependencyMojo extends AbstractMojo {
 
@@ -122,28 +121,34 @@
 	private File webSourceDirectory;
 	
 	/**
-	 *  outputScriptDirectory 
-	 *  @parameter expression = "${basedir}/src/main/webapp/WEB-INF/classes" 
+	 *  outputScriptDirectory
+	 *  @parameter expression="${project.build.directory}/generated-resources/script"
 	 */
 	private File outputScriptDirectory ;
 	
 	/**
-	 * scriptFileName
+	 * scriptFilePath
 	 * @parameter expression="custom-dependencies"
 	 */
-	private String scriptFileName;
+	private String scriptFilePath;
 	
 	/**
 	 *  outputStyleDirectory 
-	 *  @parameter expression = "${basedir}/src/main/webapp/WEB-INF/classes"  
+	 *  @parameter expression="${project.build.directory}/generated-resources/styles"
 	 */
 	private File outputStyleDirectory;
 	
 	/**
-	 * styleFileName
+	 * outputResourceDirectory
+	 * @parameter expression="${project.build.directory}/generated-resources
+	 * 
+	 */
+	private File outputResourceDirectory;
+	/**
+	 * styleFilePath
 	 * @parameter  expression="custom-dependencies"
 	 */
-	private String styleFileName;
+	private String styleFilePath;
 			
 	/**
 	 * beforeScriptIncludes
@@ -269,43 +274,45 @@
 							
 				Set <String> scripts = handler.getScripts();
 				
-				File scriptFile = new File(outputScriptDirectory, scriptFileName + ".js");
-								
+				scriptFilePath = scriptFilePath.endsWith(".js") ? scriptFilePath : scriptFilePath + ".js";  
+				File scriptFile = new File(outputResourceDirectory, scriptFilePath);
+				if(!scriptFile.exists()) {
+					scriptFile.mkdirs();
+				}	
+				
+				ScriptAssembler scriptAssembler = new ScriptAssembler();
+				
+				getLog().info("Start merge scripts to the: " + scriptFile.getPath());
+				
 				if(!scripts.isEmpty()) {
-			
-					if(!outputScriptDirectory.exists()) {
-						outputScriptDirectory.mkdirs();
-					}
-
-					ScriptAssembler scriptAssembler = new ScriptAssembler();
-					mergeResources(scriptFile, scriptAssembler, beforeScriptIncludes, afterScriptIncludes, scripts);
-					
-				} else if(scriptFile.exists()) {
-					scriptFile.delete();
-				}
-				
+					mergeResources(scriptFile,scriptAssembler, beforeScriptIncludes, afterScriptIncludes, scripts);
+				}	
+		
 				Set <String> styles = handler.getStyles();
 				
-				File styleFile = new File(outputStyleDirectory, styleFileName + ".xcss");
+				styleFilePath = styleFilePath.endsWith(".xcss") ? styleFilePath : styleFilePath + ".xcss";  
 				
+				File styleFile = new File(outputResourceDirectory, styleFilePath);
+				if(!styleFile.exists()) {
+					styleFile.mkdirs();
+				}				
+				StyleAssembler styleAssembler = new StyleAssembler();
+				styleAssembler.setVelocityComponent(velocity);
+				getLog().info("Start merge styles to the: " + styleFile.getPath());
+				
 				if(!styles.isEmpty()) {
-				
-					if(!outputStyleDirectory.exists()) {
-						outputStyleDirectory.mkdirs();
-					}
-		
-					StyleAssembler styleAssembler = new StyleAssembler();
-					styleAssembler.setVelocityComponent(velocity);
-					mergeResources(styleFile, styleAssembler, beforeStyleIncludes, afterStyleIncludes, styles);
-				
-				} else if(styleFile.exists()) {
-					styleFile.delete();
-				}
+					mergeResources(styleFile,styleAssembler, beforeStyleIncludes, afterStyleIncludes, styles);
+				}	
+			
+				Resource resource = new Resource();
+				resource.setDirectory(outputResourceDirectory.getPath());
+				project.addResource(resource);
 			}
 			
 			Thread.currentThread().setContextClassLoader(oldClassLoader);
 
 		} catch (Exception e) {
+			getLog().error("Error generate resource", e);
 			throw new MojoExecutionException(e.getMessage(),e);
 		} 	
 		
@@ -406,7 +413,7 @@
 
 			try {
 				FileSystemManager manager = VFS.getManager();
-				jarFileObjects = manager.resolveFile("jar:" + file.getAbsolutePath());
+				jarFileObjects = manager.resolveFile("jar:///" + file.getAbsolutePath());
 			} catch (FileSystemException e)  {
 				getLog().error("Error during processing file: " + file.getAbsolutePath()+ "\n" + e.getMessage(), e);
 			}