[richfaces-svn-commits] JBoss Rich Faces SVN: r4867 - in branches/3.1.x: framework/impl and 1 other directories.

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

Author: alexsmirnov
Date: 2007-12-14 14:06:11 -0500 (Fri, 14 Dec 2007)
New Revision: 4867

Modified:
   branches/3.1.x/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java
   branches/3.1.x/framework/impl/pom.xml
   branches/3.1.x/ui/assembly/pom.xml
Log:
fix http://jira.jboss.com/jira/browse/RF-1647 .

Modified: branches/3.1.x/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java
===================================================================
--- branches/3.1.x/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java	2007-12-14 19:02:51 UTC (rev 4866)
+++ branches/3.1.x/cdk/maven-javascript-plugin/src/main/java/net/sf/alchim/mojo/yuicompressor/YuiCompressorMojo.java	2007-12-14 19:06:11 UTC (rev 4867)
@@ -182,6 +182,8 @@
                 compressor.compress(out, linebreakpos);
             }
             getLog().debug("end compression");
+            // Close output file before rename.
+            IOUtil.close(out);out=null;
             FileUtils.forceDelete(outFile);
             FileUtils.rename(outFileTmp, outFile);
         } finally {

Modified: branches/3.1.x/framework/impl/pom.xml
===================================================================
--- branches/3.1.x/framework/impl/pom.xml	2007-12-14 19:02:51 UTC (rev 4866)
+++ branches/3.1.x/framework/impl/pom.xml	2007-12-14 19:06:11 UTC (rev 4867)
@@ -83,7 +83,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!--plugin>
+			<plugin>
 				<groupId>org.richfaces.cdk</groupId>
 				<artifactId>maven-javascript-plugin</artifactId>
 				<version>${project.version}</version>
@@ -127,6 +127,9 @@
 											**/scriptaculous/*.js
 										</exclude>
 										<exclude>
+											**/extend/*.js
+										</exclude>
+										<exclude>
 											**/jquery.jcarousel-min.js
 										</exclude>
 										<exclude>
@@ -151,7 +154,7 @@
 
 					</execution>
 				</executions>
-			</plugin-->
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>

Modified: branches/3.1.x/ui/assembly/pom.xml
===================================================================
--- branches/3.1.x/ui/assembly/pom.xml	2007-12-14 19:02:51 UTC (rev 4866)
+++ branches/3.1.x/ui/assembly/pom.xml	2007-12-14 19:06:11 UTC (rev 4867)
@@ -225,7 +225,7 @@
 					</outputDirectory>
 				</configuration>
 			</plugin>
-			<!--plugin>
+			<plugin>
 				<groupId>org.richfaces.cdk</groupId>
 				<artifactId>maven-javascript-plugin</artifactId>
 				<version>${project.version}</version>
@@ -292,7 +292,7 @@
 						<include>**/*.js</include>
 					</includes>
 				</configuration>
-			</plugin-->
+			</plugin>
 
 		</plugins>
 	</build>