donaldp     01/12/22 22:28:04

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/api
                        TaskContext.java
               proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec
                        DefaultExecManager.java
               
proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers
                        ExecUtil.java
  Log:
  Fix up license banner.
  
  Revision  Changes    Path
  1.11      +6 -6      
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/TaskContext.java
  
  Index: TaskContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/TaskContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TaskContext.java  2001/12/23 06:25:34     1.10
  +++ TaskContext.java  2001/12/23 06:28:04     1.11
  @@ -25,14 +25,14 @@
   {
       //these values are used when setting properties to indicate the scope at
       //which properties are set
  -    ScopeEnum       CURRENT            = new ScopeEnum( "Current" );
  -    ScopeEnum       PARENT             = new ScopeEnum( "Parent" );
  -    ScopeEnum       TOP_LEVEL          = new ScopeEnum( "TopLevel" );
  +    ScopeEnum CURRENT = new ScopeEnum( "Current" );
  +    ScopeEnum PARENT = new ScopeEnum( "Parent" );
  +    ScopeEnum TOP_LEVEL = new ScopeEnum( "TopLevel" );
   
       //these are the names of properties that every TaskContext must contain
  -    String          JAVA_VERSION       = "myrmidon.java.version";
  -    String          BASE_DIRECTORY     = "myrmidon.base.directory";
  -    String          NAME               = "myrmidon.task.name";
  +    String JAVA_VERSION = "myrmidon.java.version";
  +    String BASE_DIRECTORY = "myrmidon.base.directory";
  +    String NAME = "myrmidon.task.name";
   
       /**
        * Retrieve JavaVersion running under.
  
  
  
  1.2       +5 -2      
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/DefaultExecManager.java
  
  Index: DefaultExecManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/DefaultExecManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultExecManager.java   2001/12/23 06:22:23     1.1
  +++ DefaultExecManager.java   2001/12/23 06:28:04     1.2
  @@ -24,7 +24,7 @@
    * Used to run processes in the ant environment.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
  - * @version $Revision: 1.1 $ $Date: 2001/12/23 06:22:23 $
  + * @version $Revision: 1.2 $ $Date: 2001/12/23 06:28:04 $
    * @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
    * @see ExecManager
    * @see ExecMetaData
  @@ -72,7 +72,10 @@
           waitFor( process );
   
           //Now wait for monitor to finish aswell
  -        try { thread.join(); }
  +        try
  +        {
  +            thread.join();
  +        }
           catch( InterruptedException e )
           {
               //should never occur.
  
  
  
  1.4       +7 -3      
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java
  
  Index: ExecUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExecUtil.java     2001/12/23 02:54:35     1.3
  +++ ExecUtil.java     2001/12/23 06:28:04     1.4
  @@ -18,7 +18,7 @@
    * A set of utility functions useful when writing CommandLaunchers.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
  - * @version $Revision: 1.3 $ $Date: 2001/12/23 02:54:35 $
  + * @version $Revision: 1.4 $ $Date: 2001/12/23 06:28:04 $
    */
   class ExecUtil
   {
  @@ -80,8 +80,12 @@
       protected static String[] toNativeEnvironment( final Properties 
environment )
           throws ExecException
       {
  -        if( null == environment ) return null;
  -        else { return Environment.toNativeFormat( environment ); }
  +        if( null == environment )
  +            return null;
  +        else
  +        {
  +            return Environment.toNativeFormat( environment );
  +        }
       }
   
       /**
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to