maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
Date Sat, 14 Aug 2004 20:46:24 GMT
brett       2004/08/14 13:46:24

  Modified:    .        m2-bootstrap-all.sh mboot.jar
               maven-mboot2/src/main/java MBoot.java
  Log:
  have system properties override maven.properties
  
  Revision  Changes    Path
  1.2       +4 -2      maven-components/m2-bootstrap-all.sh
  
  Index: m2-bootstrap-all.sh
  ===================================================================
  RCS file: /home/cvs/maven-components/m2-bootstrap-all.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- m2-bootstrap-all.sh	27 Jul 2004 17:37:07 -0000	1.1
  +++ m2-bootstrap-all.sh	14 Aug 2004 20:46:24 -0000	1.2
  @@ -3,6 +3,8 @@
   # Check to make sure  JAVA_HOME is set
   [ -z $JAVA_HOME ] && echo && echo 'You must set $JAVA_HOME to use mboot!'
&& echo && exit 1
   
  +ARGS="$@"
  +
   # Build and install mboot
   (
     echo "-----------------------------------------------------------------------"
  @@ -20,7 +22,7 @@
     echo " Building maven2 components ... "
     echo "-----------------------------------------------------------------------"  
   
  -  $JAVA_HOME/bin/java -jar mboot.jar
  +  $JAVA_HOME/bin/java $ARGS -jar mboot.jar
     ret=$?; if [ $ret != 0 ]; then exit $ret; fi
   )
   ret=$?; if [ $ret != 0 ]; then exit $ret; fi
  @@ -30,7 +32,7 @@
     echo
     echo "Running maven-core integration tests ..."
     echo 
  -  ./maven-core-it.sh 
  +  ./maven-core-it.sh $ARGS
     ret=$?; if [ $ret != 0 ]; then exit $ret; fi
   )
   ret=$?; if [ $ret != 0 ]; then exit $ret; fi
  
  
  
  1.15      +111 -240  maven-components/mboot.jar
  
  	<<Binary file>>
  
  
  1.15      +5 -0      maven-components/maven-mboot2/src/main/java/MBoot.java
  
  Index: MBoot.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MBoot.java	14 Aug 2004 06:59:14 -0000	1.14
  +++ MBoot.java	14 Aug 2004 20:46:24 -0000	1.15
  @@ -160,10 +160,15 @@
   
           properties = loadProperties( mavenPropertiesFile );
   
  +        // Make the system properties override maven.properties
  +        properties.putAll( System.getProperties() );
  +
           for ( Iterator i = properties.keySet().iterator(); i.hasNext(); )
           {
               String key = (String) i.next();
   
  +            // TODO: the namespace should be "properties" itself to support variables within
the same file,
  +            //       however, StringUtils would need to support recursive replacement
               properties.setProperty( key, StringUtils.interpolate( properties.getProperty(
key ), System.getProperties() ) );
           }
   
  
  
  

Mime
View raw message