Author: struberg Date: Wed Aug 29 18:48:09 2012 New Revision: 1378679 URL: http://svn.apache.org/viewvc?rev=1378679&view=rev Log: MSHARED-236 use m-shared-utils instead own classes
We just moved those utility classes over to maven-shared-utils and applied some bugfixes. Removed: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/DirectoryScanner.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/FileUtils.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/IOUtil.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/Os.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/SelectorUtils.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/StringUtils.java Modified: maven/shared/trunk/maven-verifier/pom.xml maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java Modified: maven/shared/trunk/maven-verifier/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/pom.xml?rev=1378679&r1=1378678&r2=1378679&view=diff ============================================================================== --- maven/shared/trunk/maven-verifier/pom.xml (original) +++ maven/shared/trunk/maven-verifier/pom.xml Wed Aug 29 18:48:09 2012 @@ -45,6 +45,12 @@ <dependencies> <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-utils</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1378679&r1=1378678&r2=1378679&view=diff ============================================================================== --- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original) +++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Wed Aug 29 18:48:09 2012 @@ -20,14 +20,14 @@ package org.apache.maven.it; */ import junit.framework.Assert; -import org.apache.maven.it.util.FileUtils; -import org.apache.maven.it.util.IOUtil; -import org.apache.maven.it.util.StringUtils; import org.apache.maven.it.util.cli.CommandLineException; import org.apache.maven.it.util.cli.CommandLineUtils; import org.apache.maven.it.util.cli.Commandline; import org.apache.maven.it.util.cli.StreamConsumer; import org.apache.maven.it.util.cli.WriterStreamConsumer; +import org.apache.maven.shared.utils.StringUtils; +import org.apache.maven.shared.utils.io.FileUtils; +import org.apache.maven.shared.utils.io.IOUtil; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java?rev=1378679&r1=1378678&r2=1378679&view=diff ============================================================================== --- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java (original) +++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/ResourceExtractor.java Wed Aug 29 18:48:09 2012 @@ -19,6 +19,9 @@ package org.apache.maven.it.util; * under the License. */ +import org.apache.maven.shared.utils.io.FileUtils; +import org.apache.maven.shared.utils.io.IOUtil; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -93,7 +96,7 @@ public class ResourceExtractor { } else { FileOutputStream fos = new FileOutputStream(destFile); try { - IOUtil.copy(z.getInputStream(ze), fos); + IOUtil.copy( z.getInputStream( ze ), fos ); } finally { IOUtil.close(fos); } Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java?rev=1378679&r1=1378678&r2=1378679&view=diff ============================================================================== --- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java (original) +++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/util/cli/StreamPumper.java Wed Aug 29 18:48:09 2012 @@ -78,7 +78,7 @@ package org.apache.maven.it.util.cli; * ==================================================================== */ -import org.apache.maven.it.util.IOUtil; +import org.apache.maven.shared.utils.io.IOUtil; import java.io.BufferedReader; import java.io.InputStream; @@ -160,7 +160,6 @@ public class StreamPumper { IOUtil.close( in ); - synchronized ( this ) { done = true;