Author: krosenvold Date: Mon Feb 25 21:05:20 2013 New Revision: 1449899 URL: http://svn.apache.org/r1449899 Log: o Removed exceptions that were used by pre-1.5 logic that used forks
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1449899&r1=1449898&r2=1449899&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java Mon Feb 25 21:05:20 2013 @@ -19,9 +19,10 @@ package org.apache.maven.shared.utils.cl * under the License. */ -import java.io.IOException; +import org.apache.maven.shared.utils.Os; +import org.apache.maven.shared.utils.StringUtils; + import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -40,6 +41,7 @@ public abstract class CommandLineUtils { + @SuppressWarnings( "UnusedDeclaration" ) public static class StringStreamConsumer implements StreamConsumer { @@ -77,12 +79,14 @@ public abstract class CommandLineUtils } + @SuppressWarnings( "UnusedDeclaration" ) public static int executeCommandLine( Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr ) throws CommandLineException { return executeCommandLine( cl, null, systemOut, systemErr, 0 ); } + @SuppressWarnings( "UnusedDeclaration" ) public static int executeCommandLine( Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr, int timeoutInSeconds ) throws CommandLineException @@ -90,6 +94,7 @@ public abstract class CommandLineUtils return executeCommandLine( cl, null, systemOut, systemErr, timeoutInSeconds ); } + @SuppressWarnings( "UnusedDeclaration" ) public static int executeCommandLine( Commandline cl, InputStream systemIn, StreamConsumer systemOut, StreamConsumer systemErr ) throws CommandLineException @@ -284,12 +289,10 @@ public abstract class CommandLineUtils * with case-insensitive environment variables like Windows, all variable names will be normalized to upper case. * * @return The shell environment variables, can be empty but never <code>null</code>. - * @throws IOException If the environment variables could not be queried from the shell. * @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result * <b>since 2.0.2 System#getenv() will be used if available in the current running jvm.</b> */ public static Properties getSystemEnvVars() - throws IOException { return getSystemEnvVars( !Os.isFamily( Os.FAMILY_WINDOWS ) ); } @@ -300,33 +303,13 @@ public abstract class CommandLineUtils * * @param caseSensitive Whether environment variable keys should be treated case-sensitively. * @return Properties object of (possibly modified) envar keys mapped to their values. - * @throws IOException . * @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result * <b>since 2.0.2 System#getenv() will be used if available in the current running jvm.</b> */ public static Properties getSystemEnvVars( boolean caseSensitive ) - throws IOException { - - // check if it's 1.5+ run - - try - { - Map<String, String> envs = System.getenv(); - return ensureCaseSensitivity( envs, caseSensitive ); - } - catch ( IllegalAccessException e ) - { - throw new IOException( e.getMessage() ); - } - catch ( IllegalArgumentException e ) - { - throw new IOException( e.getMessage() ); - } - catch ( InvocationTargetException e ) - { - throw new IOException( e.getMessage() ); - } + Map<String, String> envs = System.getenv(); + return ensureCaseSensitivity( envs, caseSensitive ); } private static boolean isAlive( Process p ) @@ -457,7 +440,6 @@ public abstract class CommandLineUtils } static Properties ensureCaseSensitivity( Map<String, String> envs, boolean preserveKeyCase ) - throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { Properties envVars = new Properties(); for ( Map.Entry<String, String> entry : envs.entrySet() ) Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java?rev=1449899&r1=1449898&r2=1449899&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java (original) +++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java Mon Feb 25 21:05:20 2013 @@ -71,7 +71,7 @@ public class Commandline //protected Vector envVars = new Vector(); // synchronized added to preserve synchronize of Vector class - private final Map<String,String> envVars = Collections.synchronizedMap( new LinkedHashMap<String,String>() ); + private final Map<String, String> envVars = Collections.synchronizedMap( new LinkedHashMap<String, String>() ); private Shell shell; @@ -88,7 +88,7 @@ public class Commandline * Create a new command line object. * Shell is autodetected from operating system * - * @param toProcess The command to process + * @param toProcess The command to process */ public Commandline( String toProcess ) { @@ -217,7 +217,6 @@ public class Commandline * Add system environment variables */ public void addSystemEnvironment() - throws Exception { Properties systemEnvVars = CommandLineUtils.getSystemEnvVars(); @@ -235,16 +234,8 @@ public class Commandline * Return the list of environment variables */ public String[] getEnvironmentVariables() - throws CommandLineException { - try - { - addSystemEnvironment(); - } - catch ( Exception e ) - { - throw new CommandLineException( "Error setting up environmental variables", e ); - } + addSystemEnvironment(); String[] environmentVars = new String[envVars.size()]; int i = 0; for ( String name : envVars.keySet() ) @@ -394,7 +385,6 @@ public class Commandline * Allows to set the shell to be used in this command line. * * @param shell the shell - * */ void setShell( Shell shell ) { @@ -403,8 +393,6 @@ public class Commandline /** * Get the shell to be used in this command line. - * - * */ public Shell getShell() { Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java?rev=1449899&r1=1449898&r2=1449899&view=diff ============================================================================== --- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java (original) +++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/cli/CommandLineUtilsTest.java Mon Feb 25 21:05:20 2013 @@ -38,7 +38,6 @@ public class CommandLineUtilsTest * Tests that case-insensitive environment variables are normalized to upper case. */ public void testGetSystemEnvVarsCaseInsensitive() - throws Exception { Properties vars = CommandLineUtils.getSystemEnvVars( false ); for ( Object o : vars.keySet() )