Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 72569 invoked from network); 2 Dec 2005 23:32:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Dec 2005 23:32:03 -0000 Received: (qmail 76461 invoked by uid 500); 2 Dec 2005 23:30:21 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 70086 invoked by uid 500); 2 Dec 2005 23:29:47 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-commits@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 54435 invoked by uid 99); 2 Dec 2005 23:27:28 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2005 15:27:27 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 02 Dec 2005 14:36:56 -0800 Received: (qmail 53945 invoked by uid 65534); 2 Dec 2005 20:21:04 -0000 Message-ID: <20051202202104.53943.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r351829 - in /maven/scm/trunk/maven-scm-plugin: pom.xml src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java Date: Fri, 02 Dec 2005 20:21:02 -0000 To: scm-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Fri Dec 2 12:20:57 2005 New Revision: 351829 URL: http://svn.apache.org/viewcvs?rev=351829&view=rev Log: Don't use plexus-1.0.5 for backward compatibility Modified: maven/scm/trunk/maven-scm-plugin/pom.xml maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java Modified: maven/scm/trunk/maven-scm-plugin/pom.xml URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=351829&r1=351828&r2=351829&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/pom.xml (original) +++ maven/scm/trunk/maven-scm-plugin/pom.xml Fri Dec 2 12:20:57 2005 @@ -56,10 +56,5 @@ maven-scm-provider-svn 1.0-beta-2-SNAPSHOT - - org.codehaus.plexus - plexus-utils - 1.0.5-SNAPSHOT - Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java?rev=351829&r1=351828&r2=351829&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java Fri Dec 2 12:20:57 2005 @@ -24,6 +24,10 @@ import org.codehaus.plexus.util.cli.DefaultConsumer; import org.codehaus.plexus.util.cli.StreamConsumer; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.Iterator; +import java.util.Properties; /** * @goal bootstrap @@ -61,7 +65,7 @@ try { - cl.addSystemEnvironment(); + addSystemEnvironment( cl ); } catch( Exception e ) { @@ -100,5 +104,68 @@ throw new MojoExecutionException( "Can't run goal " + goals, e ); } } - + + /** + * Add system environment variables + * Moved to plexus-utils 1.0.5 + */ + private void addSystemEnvironment( Commandline cl ) + throws Exception + { + Properties envVars = getSystemEnvVars(); + + for ( Iterator i = envVars.keySet().iterator(); i.hasNext(); ) + { + String key = (String) i.next(); + + cl.addEnvironment( key, envVars.getProperty( key ) ); + } + } + + private Properties getSystemEnvVars() + throws Exception + { + Process p = null; + + Properties envVars = new Properties(); + + Runtime r = Runtime.getRuntime(); + + String os = System.getProperty( "os.name" ).toLowerCase(); + + //If this is windows set the shell to command.com or cmd.exe with correct arguments. + if ( os.indexOf( "windows" ) != -1 ) + { + if (os.indexOf("95") != -1 || os.indexOf("98") != -1 || os.indexOf("Me") != -1) + { + p = r.exec( "command.com /c set" ); + } + else + { + p = r.exec( "cmd.exe /c set" ); + } + } + else + { + p = r.exec( "env" ); + } + + BufferedReader br = new BufferedReader( new InputStreamReader( p.getInputStream() ) ); + + String line; + + while( ( line = br.readLine() ) != null ) + { + int idx = line.indexOf( '=' ); + + String key = line.substring( 0, idx ); + + String value = line.substring( idx + 1 ); + + envVars.setProperty( key, value ); + // System.out.println( key + " = " + value ); + } + + return envVars; + } }