You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/01/10 07:46:10 UTC
svn commit: r733233 - in /maven/mercury/trunk/mercury-util: pom.xml
src/main/java/org/apache/maven/mercury/util/FileUtil.java
src/main/java/org/apache/maven/mercury/util/Util.java
Author: ogusakov
Date: Fri Jan 9 22:46:10 2009
New Revision: 733233
URL: http://svn.apache.org/viewvc?rev=733233&view=rev
Log:
[MNG-3962] added helper methods to utils
Modified:
maven/mercury/trunk/mercury-util/pom.xml
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/Util.java
Modified: maven/mercury/trunk/mercury-util/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/pom.xml?rev=733233&r1=733232&r2=733233&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/pom.xml (original)
+++ maven/mercury/trunk/mercury-util/pom.xml Fri Jan 9 22:46:10 2009
@@ -71,7 +71,6 @@
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<phase>package</phase>
Modified: maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=733233&r1=733232&r2=733233&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java Fri Jan 9 22:46:10 2009
@@ -996,15 +996,18 @@
BufferedOutputStream dest = null;
ZipEntry entry;
+
while ( ( entry = zis.getNextEntry() ) != null )
{
- File fo = new File( destDir, entry.getName() );
+ String entryName = entry.getName();
+
+ File fo = new File( destDir, entryName );
if( LOG.isDebugEnabled() )
LOG.debug( "Extracting: " + fo.getCanonicalPath() );
int count;
- byte data[] = new byte[DEFAULT_BUFFER_SIZE];
+ byte data[] = new byte[ DEFAULT_BUFFER_SIZE ];
// write the files to the disk
if ( entry.isDirectory() )
Modified: maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/Util.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/Util.java?rev=733233&r1=733232&r2=733233&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/Util.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/Util.java Fri Jan 9 22:46:10 2009
@@ -66,4 +66,10 @@
{
return isEmpty(s) ? dflt : s;
}
+
+ public static final void say( String msg, Monitor monitor )
+ {
+ if( monitor != null )
+ monitor.message( msg );
+ }
}