final static --> static final to follow JLS recomendations

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272092 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/java/org/apache/antlib/archive/BUnzip2.java

@@ -22,7 +22,7 @@ import org.apache.avalon.excalibur.bzip2.CBZip2InputStream;
 public class BUnzip2
     extends Unpack
 {
-    private final static String DEFAULT_EXTENSION = ".bz2";
+    private static final String DEFAULT_EXTENSION = ".bz2";
 
     protected String getDefaultExtension()
     {

proposal/myrmidon/src/java/org/apache/antlib/archive/BZip2.java

@@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException;
 public class BZip2
     extends Pack
 {
-    private final static byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'};
+    private static final byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'};
 
     protected OutputStream getPackingStream( OutputStream output )
         throws TaskException, IOException

proposal/myrmidon/src/java/org/apache/antlib/archive/GUnzip.java

@@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException;
 public class GUnzip
     extends Unpack
 {
-    private final static String DEFAULT_EXTENSION = ".gz";
+    private static final String DEFAULT_EXTENSION = ".gz";
 
     protected String getDefaultExtension()
     {

proposal/myrmidon/src/java/org/apache/antlib/build/BuildNumber.java

@@ -33,7 +33,7 @@ import org.apache.myrmidon.api.TaskException;
 public class BuildNumber
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( BuildNumber.class );
 
     /**

proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java

@@ -26,7 +26,7 @@ import org.apache.tools.todo.types.Commandline;
 public class Patch
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Patch.class );
 
     private File m_originalFile;

proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java

@@ -22,7 +22,7 @@ import org.apache.myrmidon.api.TaskException;
 public class SleepTask
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( SleepTask.class );
 
     private int m_seconds;

proposal/myrmidon/src/java/org/apache/antlib/core/AntCallTask.java

@@ -22,7 +22,7 @@ import org.apache.myrmidon.interfaces.model.Project;
  */
 public class AntCallTask extends AbstractAntTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AntCallTask.class );
 
     private String m_project;

proposal/myrmidon/src/java/org/apache/antlib/core/AntParam.java

@@ -21,7 +21,7 @@ import org.apache.myrmidon.api.TaskException;
  */
 public class AntParam
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AntParam.class );
 
     private String m_name;

proposal/myrmidon/src/java/org/apache/antlib/core/FileTokenSet.java

@@ -30,7 +30,7 @@ import org.apache.myrmidon.framework.filters.TokenSet;
 public class FileTokenSet
     implements TokenSet
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( FileTokenSet.class );
 
     private Map m_tokens = new HashMap();

proposal/myrmidon/src/java/org/apache/antlib/core/IfTask.java

@@ -28,7 +28,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition;
 public class IfTask
     extends AbstractContainerTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( IfTask.class );
 
     private Condition m_condition;

proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java

@@ -26,7 +26,7 @@ import org.apache.myrmidon.api.TaskException;
 public class LoadProperties
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( LoadProperties.class );
 
     private String m_prefix;

proposal/myrmidon/src/java/org/apache/antlib/core/Property.java

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.DataType;
 public class Property
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Property.class );
 
     private String m_name;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToEnumConverter
     implements Converter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToEnumConverter.class );
 
     public Object convert( final Class destination,

proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException;
 public class StringToFileConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToFileConverter.class );
 
     public StringToFileConverter()

proposal/myrmidon/src/java/org/apache/antlib/core/TryCatchTask.java

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.TaskList;
 public final class TryCatchTask
     extends AbstractContainerTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( TryCatchTask.class );
 
     private TaskList m_try;

proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java

@@ -29,7 +29,7 @@ import org.apache.myrmidon.api.TaskException;
 public class CVSPass
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( CVSPass.class );
 
     /**
@@ -50,7 +50,7 @@ public class CVSPass
     /**
      * Array contain char conversion data
      */
-    private final static char[] c_shifts = new char[]
+    private static final char[] c_shifts = new char[]
     {
         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
         16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,

proposal/myrmidon/src/java/org/apache/antlib/cvslib/ChangeLog.java

@@ -60,7 +60,7 @@ import org.apache.tools.todo.types.Commandline;
 public class ChangeLog
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( ChangeLog.class );
 
     /** User list */

proposal/myrmidon/src/java/org/apache/antlib/cvslib/CvsUser.java

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.ResourceManager;
  */
 public class CvsUser
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( CvsUser.class );
 
     private String m_userID;

proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java

@@ -100,17 +100,17 @@ public class CSharp
      * name of the executable. the .exe suffix is deliberately not included in
      * anticipation of the unix version
      */
-    private final static String EXE_NAME = "csc";
+    private static final String EXE_NAME = "csc";
 
     /**
      * what is the file extension we search on?
      */
-    private final static String FILE_EXT = "cs";
+    private static final String FILE_EXT = "cs";
 
     /**
      * derive the search pattern from the extension
      */
-    private final static String FILE_PATTERN = "**/*." + FILE_EXT;
+    private static final String FILE_PATTERN = "**/*." + FILE_EXT;
 
     /**
      * Fix C# reference inclusion. C# is really dumb in how it handles
@@ -125,7 +125,7 @@ public class CSharp
      * system <i>exactly</i> so may work on a unix box too.
      */
 
-    private final static String DEFAULT_REFERENCE_LIST =
+    private static final String DEFAULT_REFERENCE_LIST =
         "Accessibility.dll;" +
         "cscompmgd.dll;" +
         "CustomMarshalers.dll;" +

proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java

@@ -44,17 +44,17 @@ public class Ilasm
      * name of the executable. the .exe suffix is deliberately not included in
      * anticipation of the unix version
      */
-    private final static String EXE_NAME = "ilasm";
+    private static final String EXE_NAME = "ilasm";
 
     /**
      * what is the file extension we search on?
      */
-    private final static String FILE_EXT = "il";
+    private static final String FILE_EXT = "il";
 
     /**
      * and now derive the search pattern from the extension
      */
-    private final static String FILE_PATTERN = "**/*." + FILE_EXT;
+    private static final String FILE_PATTERN = "**/*." + FILE_EXT;
 
     /**
      * debug flag. Controls generation of debug information.

proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java

@@ -39,7 +39,7 @@ import org.apache.tools.todo.util.mappers.IdentityMapper;
 public class CopyTask
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( CopyTask.class );
 
     private File m_file;

proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java

@@ -31,7 +31,7 @@ import org.apache.tools.todo.types.ScannerUtil;
 public class Delete
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Delete.class );
 
     private final ArrayList filesets = new ArrayList();

proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException;
 public class Mkdir
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Mkdir.class );
 
     private File m_dir;

proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java

@@ -37,7 +37,7 @@ import org.apache.tools.todo.types.ScannerUtil;
 public class Touch
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Touch.class );
 
     private long m_millis = -1;

proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java

@@ -27,7 +27,7 @@ import org.apache.myrmidon.api.TaskException;
 public class LoadEnvironment
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( LoadEnvironment.class );
 
     private String m_prefix;

proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java

@@ -27,7 +27,7 @@ public class Facility
     extends AbstractContainerTask
     implements Configurable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Facility.class );
 
     private String m_namespace;

proposal/myrmidon/src/java/org/apache/antlib/runtime/Import.java

@@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
 public class Import
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Import.class );
 
     private File m_lib;

proposal/myrmidon/src/java/org/apache/antlib/runtime/TypeAvailableCondition.java

@@ -29,7 +29,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class TypeAvailableCondition
     implements Condition
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( TypeAvailableCondition.class );
 
     private String m_roleShorthand;

proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java

@@ -34,7 +34,7 @@ import org.apache.myrmidon.interfaces.workspace.Workspace;
 public class SoundTask
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( SoundTask.class );
 
     private BuildAlert m_success;

proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java

@@ -28,7 +28,7 @@ import org.apache.myrmidon.api.TaskException;
 public class CopyFilesTask
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( CopyFilesTask.class );
 
     private FileObject m_srcFile;

proposal/myrmidon/src/java/org/apache/antlib/vfile/DefaultFileSet.java

@@ -30,7 +30,7 @@ import org.apache.myrmidon.api.TaskException;
 public class DefaultFileSet
     implements FileSet
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultFileSet.class );
 
     private FileObject m_dir;

proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskContext;
 public class StringToFileObjectConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToFileObjectConverter.class );
 
     public StringToFileObjectConverter()

proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/AbstractNameFileSelector.java

@@ -27,7 +27,7 @@ import org.apache.oro.text.regex.Perl5Matcher;
 public abstract class AbstractNameFileSelector
     implements FileSelector
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( AbstractNameFileSelector.class );
 
     private Object m_type;

proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/FileTestCondition.java

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.conditions.Condition;
 public class FileTestCondition
     implements Condition
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( FileTestCondition.class );
 
     private FileObject m_file;

proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NameFileSelector.java

@@ -23,7 +23,7 @@ import org.apache.myrmidon.api.TaskException;
 public class NameFileSelector
     extends AbstractNameFileSelector
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( NameFileSelector.class );
 
     /**

proposal/myrmidon/src/java/org/apache/antlib/vfile/selectors/NotFileSelector.java

@@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException;
 public class NotFileSelector
     implements FileSelector
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( NotFileSelector.class );
 
     private FileSelector m_selector;

proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java

@@ -19,7 +19,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public abstract class AbstractConverter
     implements Converter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AbstractConverter.class );
 
     private final Class m_source;

proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java

@@ -35,7 +35,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public abstract class AbstractMasterConverter
     implements Converter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AbstractMasterConverter.class );
 
     /**

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToBooleanConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToBooleanConverter.class );
 
     public StringToBooleanConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToByteConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToByteConverter.class );
 
     public StringToByteConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToClassConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToClassConverter.class );
 
     public StringToClassConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDateConverter.java

@@ -27,7 +27,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToDateConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToDateConverter.class );
 
     public StringToDateConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToDoubleConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToDoubleConverter.class );
 
     public StringToDoubleConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToFloatConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToFloatConverter.class );
 
     public StringToFloatConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java

@@ -25,7 +25,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToIntegerConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToFloatConverter.class );
 
     public StringToIntegerConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToLongConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToLongConverter.class );
 
     public StringToLongConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java

@@ -24,7 +24,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToShortConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToShortConverter.class );
 
     public StringToShortConverter()

proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java

@@ -23,7 +23,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class StringToURLConverter
     extends AbstractConverter
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( StringToURLConverter.class );
 
     public StringToURLConverter()

proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java

@@ -22,50 +22,50 @@ import java.util.Set;
  */
 public class Os
 {
-    private final static String OS_NAME =
+    private static final String OS_NAME =
         System.getProperty( "os.name" ).toLowerCase( Locale.US );
-    private final static String OS_ARCH =
+    private static final String OS_ARCH =
         System.getProperty( "os.arch" ).toLowerCase( Locale.US );
-    private final static String OS_VERSION =
+    private static final String OS_VERSION =
         System.getProperty( "os.version" ).toLowerCase( Locale.US );
-    private final static String PATH_SEP =
+    private static final String PATH_SEP =
         System.getProperty( "path.separator" );
-    private final static OsFamily OS_FAMILY;
-    private final static OsFamily[] OS_ALL_FAMILIES;
+    private static final OsFamily OS_FAMILY;
+    private static final OsFamily[] OS_ALL_FAMILIES;
 
     /** All Windows based OSes. */
-    public final static OsFamily OS_FAMILY_WINDOWS = new OsFamily( "windows" );
+    public static final OsFamily OS_FAMILY_WINDOWS = new OsFamily( "windows" );
 
     /** All DOS based OSes. */
-    public final static OsFamily OS_FAMILY_DOS = new OsFamily( "dos" );
+    public static final OsFamily OS_FAMILY_DOS = new OsFamily( "dos" );
 
     /** All Windows NT based OSes. */
-    public final static OsFamily OS_FAMILY_WINNT =
+    public static final OsFamily OS_FAMILY_WINNT =
         new OsFamily( "nt", new OsFamily[]{OS_FAMILY_WINDOWS} );
 
     /** All Windows 9x based OSes. */
-    public final static OsFamily OS_FAMILY_WIN9X =
+    public static final OsFamily OS_FAMILY_WIN9X =
         new OsFamily( "win9x", new OsFamily[]{OS_FAMILY_WINDOWS, OS_FAMILY_DOS} );
 
     /** OS/2 */
-    public final static OsFamily OS_FAMILY_OS2 =
+    public static final OsFamily OS_FAMILY_OS2 =
         new OsFamily( "os/2", new OsFamily[]{OS_FAMILY_DOS} );
 
     /** Netware */
-    public final static OsFamily OS_FAMILY_NETWARE =
+    public static final OsFamily OS_FAMILY_NETWARE =
         new OsFamily( "netware" );
 
     /** All UNIX based OSes. */
-    public final static OsFamily OS_FAMILY_UNIX = new OsFamily( "unix" );
+    public static final OsFamily OS_FAMILY_UNIX = new OsFamily( "unix" );
 
     /** All Mac based OSes. */
-    public final static OsFamily OS_FAMILY_MAC = new OsFamily( "mac" );
+    public static final OsFamily OS_FAMILY_MAC = new OsFamily( "mac" );
 
     /** OSX */
-    public final static OsFamily OS_FAMILY_OSX =
+    public static final OsFamily OS_FAMILY_OSX =
         new OsFamily( "osx", new OsFamily[]{OS_FAMILY_UNIX, OS_FAMILY_MAC} );
 
-    private final static OsFamily[] ALL_FAMILIES = new OsFamily[]
+    private static final OsFamily[] ALL_FAMILIES = new OsFamily[]
     {
         OS_FAMILY_DOS,
         OS_FAMILY_MAC,

proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/Environment.java

@@ -30,12 +30,12 @@ import org.apache.avalon.excalibur.util.StringUtil;
  */
 final class Environment
 {
-    private final static String[] COMMAND_COM = new String[]{"command.com", "/c", "set"};
-    private final static String[] CMD_EXE = new String[]{"cmd", "/c", "set"};
+    private static final String[] COMMAND_COM = new String[]{"command.com", "/c", "set"};
+    private static final String[] CMD_EXE = new String[]{"cmd", "/c", "set"};
 
     // Alternatively one could use: /bin/sh -c env
-    private final static String[] ENV_CMD = new String[]{"/usr/bin/env"};
-    private final static String[] ENV_RAW = new String[]{"env"};
+    private static final String[] ENV_CMD = new String[]{"/usr/bin/env"};
+    private static final String[] ENV_RAW = new String[]{"env"};
 
     /**
      * This is a cached version of the native environment variables.

proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java

@@ -29,16 +29,16 @@ class ProcessMonitor
 {
     //Time to sleep in loop while processing output
     //of command and monitoring for timeout
-    private final static int SLEEP_TIME = 5;
+    private static final int SLEEP_TIME = 5;
 
     //State to indicate process is still running
-    private final static int STATE_RUNNING = 0;
+    private static final int STATE_RUNNING = 0;
 
     //State to indicate process shutdown by itself
-    private final static int STATE_STOPPED = 1;
+    private static final int STATE_STOPPED = 1;
 
     //State to indicate process was terminated due to timeout
-    private final static int STATE_TERMINATED = 2;
+    private static final int STATE_TERMINATED = 2;
 
     /**
      * The state of the process monitor and thus

proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java

@@ -28,10 +28,10 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class DefaultCommandLauncher
     implements CommandLauncher
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultCommandLauncher.class );
 
-    private final static Method c_execWithCWD;
+    private static final Method c_execWithCWD;
 
     static
     {

proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java

@@ -26,7 +26,7 @@ class ExecUtil
     /**
      * The file representing the current working directory.
      */
-    private final static File c_cwd;
+    private static final File c_cwd;
 
     static
     {

proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java

@@ -17,19 +17,19 @@ import org.apache.avalon.excalibur.i18n.Resources;
  */
 public final class FileType
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( FileType.class );
 
     /**
      * A folder, which can contain other files, but does not have any data
      * content.
      */
-    public final static FileType FOLDER = new FileType( REZ.getString( "folder.name" ) );
+    public static final FileType FOLDER = new FileType( REZ.getString( "folder.name" ) );
 
     /**
      * A regular file, which has data content, but cannot contain other files.
      */
-    public final static FileType FILE = new FileType( REZ.getString( "file.name" ) );
+    public static final FileType FILE = new FileType( REZ.getString( "file.name" ) );
 
     private String m_name;
 

proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java

@@ -20,14 +20,14 @@ public final class NameScope
      * as described by {@link #FILE_SYSTEM}.  However, an exception is
      * thrown if the resolved file is not a direct child of the base file.
      */
-    public final static NameScope CHILD = new NameScope( "child" );
+    public static final NameScope CHILD = new NameScope( "child" );
 
     /**
      * Resolve against the descendents of the base file.  The name is resolved
      * as described by {@link #FILE_SYSTEM}.  However, an exception is thrown
      * if the resolved file is not a descendent of the base file.
      */
-    public final static NameScope DESCENDENT = new NameScope( "descendent" );
+    public static final NameScope DESCENDENT = new NameScope( "descendent" );
 
     /**
      * Resolve against files in the same file system as the base file.
@@ -44,7 +44,7 @@ public final class NameScope
      * <p>A path is considered absolute if it starts with a separator character,
      * and relative if it does not.
      */
-    public final static NameScope FILE_SYSTEM = new NameScope( "filesystem" );
+    public static final NameScope FILE_SYSTEM = new NameScope( "filesystem" );
 
     private String m_name;
 

proposal/myrmidon/src/java/org/apache/aut/vfs/impl/DefaultFileSystemManager.java

@@ -28,7 +28,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class DefaultFileSystemManager
     implements FileSystemManager
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( DefaultFileSystemManager.class );
 
     /** The default provider. */

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileObject.java

@@ -31,10 +31,10 @@ import org.apache.avalon.excalibur.io.IOUtil;
 public abstract class AbstractFileObject
     implements FileObject
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AbstractFileObject.class );
 
-    private final static FileObject[] EMPTY_FILE_ARRAY = {};
+    private static final FileObject[] EMPTY_FILE_ARRAY = {};
 
     private FileName m_name;
     private AbstractFileSystem m_fs;

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/AbstractFileSystemProvider.java

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public abstract class AbstractFileSystemProvider
     implements FileSystemProvider
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AbstractFileSystemProvider.class );
 
     private FileSystemProviderContext m_context;

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/DefaultFileContent.java

@@ -26,12 +26,12 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class DefaultFileContent
     implements FileContent
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultFileContent.class );
 
-    private final static int STATE_NONE = 0;
-    private final static int STATE_READING = 1;
-    private final static int STATE_WRITING = 2;
+    private static final int STATE_NONE = 0;
+    private static final int STATE_READING = 1;
+    private static final int STATE_WRITING = 2;
 
     private AbstractFileObject m_file;
     private int _state = STATE_NONE;

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/UriParser.java

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  */
 public class UriParser
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( UriParser.class );
 
     /** The normalised separator to use. */

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileObject.java

@@ -25,10 +25,10 @@ import org.apache.avalon.excalibur.i18n.Resources;
 class FtpFileObject
     extends AbstractFileObject
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( FtpFileObject.class );
 
-    private final static FTPFile[] EMPTY_FTP_FILE_ARRAY = {};
+    private static final FTPFile[] EMPTY_FTP_FILE_ARRAY = {};
 
     private FtpFileSystem m_ftpFs;
 

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/ftp/FtpFileSystem.java

@@ -26,7 +26,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 class FtpFileSystem
     extends AbstractFileSystem
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( FtpFileSystem.class );
 
     private FTPClient m_client;

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/GenericFileNameParser.java

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 class GenericFileNameParser
     extends LocalFileNameParser
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( GenericFileNameParser.class );
 
     /**

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/LocalFile.java

@@ -30,7 +30,7 @@ final class LocalFile
     extends AbstractFileObject
     implements FileObject
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( LocalFile.class );
 
     private File m_file;

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/local/WindowsFileNameParser.java

@@ -20,7 +20,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 class WindowsFileNameParser
     extends LocalFileNameParser
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( WindowsFileNameParser.class );
 
     /**

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileNameParser.java

@@ -21,7 +21,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 public class SmbFileNameParser
     extends UriParser
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( SmbFileNameParser.class );
 
     /**

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/smb/SmbFileObject.java

@@ -29,7 +29,7 @@ public class SmbFileObject
     extends AbstractFileObject
     implements FileObject
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( SmbFileObject.class );
 
     private String m_fileName;

proposal/myrmidon/src/java/org/apache/aut/vfs/provider/zip/ZipFileSystem.java

@@ -28,7 +28,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  */
 public class ZipFileSystem extends AbstractFileSystem implements FileSystem
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( ZipFileSystem.class );
 
     private File m_file;

proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java

@@ -29,7 +29,7 @@ import org.apache.myrmidon.interfaces.aspect.AspectManager;
 public class DefaultAspectManager
     implements AspectManager, Initializable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultAspectManager.class );
 
     private HashMap m_aspectMap = new HashMap();

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java

@@ -35,7 +35,7 @@ public class ATIProjectBuilder
     extends DefaultProjectBuilder
     implements Parameterizable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( ATIProjectBuilder.class );
 
     private Parameters m_parameters;

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java

@@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.model.TypeLib;
 public class DefaultProject
     implements Project
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultProject.class );
 
     ///The imports

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java

@@ -42,15 +42,15 @@ public class DefaultProjectBuilder
     extends AbstractLogEnabled
     implements ProjectBuilder
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultProjectBuilder.class );
 
-    private final static Version VERSION = new Version( 2, 0, 0 );
+    private static final Version VERSION = new Version( 2, 0, 0 );
 
-    private final static int PROJECT_REFERENCES = 0;
-    private final static int LIBRARY_IMPORTS = 1;
-    private final static int IMPLICIT_TASKS = 2;
-    private final static int TARGETS = 3;
+    private static final int PROJECT_REFERENCES = 0;
+    private static final int LIBRARY_IMPORTS = 1;
+    private static final int IMPLICIT_TASKS = 2;
+    private static final int TARGETS = 3;
 
     // Use a name validator with the default rules.
     private DefaultNameValidator m_nameValidator = new DefaultNameValidator();

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java

@@ -32,10 +32,10 @@ import org.apache.myrmidon.interfaces.builder.ProjectException;
 public class TransformingProjectBuilder
     extends DefaultProjectBuilder
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( TransformingProjectBuilder.class );
 
-    private final static String STYLESHEET = "ant1convert.xsl";
+    private static final String STYLESHEET = "ant1convert.xsl";
     private Transformer m_transformer;
 
     protected Configuration parseProject( String systemID )

proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java

@@ -43,7 +43,7 @@ public class DefaultClassLoaderManager
     extends AbstractLogEnabled
     implements ClassLoaderManager, Serviceable, Initializable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultClassLoaderManager.class );
 
     /**

proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java

@@ -40,7 +40,7 @@ public class DefaultConfigurer
     extends AbstractLogEnabled
     implements Configurer, Serviceable, LogEnabled
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultConfigurer.class );
 
     ///Converter to use for converting between values

proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java

@@ -29,7 +29,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
 class DefaultObjectConfigurer
     implements ObjectConfigurer
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultObjectConfigurer.class );
 
     private final Class m_class;

proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java

@@ -23,7 +23,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
 class DefaultPropertyConfigurer
     implements PropertyConfigurer
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultPropertyConfigurer.class );
 
     private final int m_propertyIndex;

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java

@@ -42,7 +42,7 @@ public class DefaultDeployer
     extends AbstractLogEnabled
     implements Deployer, Serviceable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultDeployer.class );
 
     // The components used to deploy

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java

@@ -36,12 +36,12 @@ class Deployment
     extends AbstractLogEnabled
     implements TypeDeployer
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Deployment.class );
 
-    private final static String TYPE_DESCRIPTOR_NAME = "META-INF/ant-descriptor.xml";
-    private final static String ROLE_DESCRIPTOR_NAME = "META-INF/ant-roles.xml";
-    private final static String SERVICE_DESCRIPTOR_NAME = "META-INF/ant-services.xml";
+    private static final String TYPE_DESCRIPTOR_NAME = "META-INF/ant-descriptor.xml";
+    private static final String ROLE_DESCRIPTOR_NAME = "META-INF/ant-roles.xml";
+    private static final String SERVICE_DESCRIPTOR_NAME = "META-INF/ant-services.xml";
 
     private ClassLoader m_classLoader;
     private DefaultDeployer m_deployer;

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java

@@ -22,10 +22,10 @@ import org.apache.myrmidon.interfaces.deployer.DeploymentException;
 class RoleDescriptorBuilder
     implements DescriptorBuilder
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( RoleDescriptorBuilder.class );
 
-    private final static Version ROLE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 );
+    private static final Version ROLE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 );
 
     /**
      * Builds a descriptor from a set of configuration.

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java

@@ -22,10 +22,10 @@ import org.apache.myrmidon.interfaces.deployer.DeploymentException;
 class ServiceDescriptorBuilder
     implements DescriptorBuilder
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( ServiceDescriptorBuilder.class );
 
-    private final static Version SERVICE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 );
+    private static final Version SERVICE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 );
 
     /**
      * Builds a descriptor from a set of configuration.

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java

@@ -25,10 +25,10 @@ import org.apache.myrmidon.interfaces.deployer.TypeDefinition;
 class TypeDescriptorBuilder
     implements DescriptorBuilder
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( TypeDescriptorBuilder.class );
 
-    private final static Version TYPE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 );
+    private static final Version TYPE_DESCRIPTOR_VERSION = new Version( 1, 0, 0 );
 
     /**
      * Builds a descriptor from a set of configuration.

proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java

@@ -58,7 +58,7 @@ public class DefaultEmbeddor
     extends AbstractLogEnabled
     implements Embeddor, Parameterizable, Initializable, Startable, Disposable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultEmbeddor.class );
 
     /** Package containing the default component implementations. */

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java

@@ -33,10 +33,10 @@ import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
 public class AspectAwareExecutor
     extends DefaultExecutor
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AspectAwareExecutor.class );
 
-    private final static Configuration[] EMPTY_ELEMENTS = new Configuration[ 0 ];
+    private static final Configuration[] EMPTY_ELEMENTS = new Configuration[ 0 ];
 
     private AspectManager m_aspectManager;
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java

@@ -34,7 +34,7 @@ public class DefaultExecutor
     extends AbstractLogEnabled
     implements Executor, Serviceable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultExecutor.class );
 
     private Configurer m_configurer;

proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java

@@ -30,7 +30,7 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver;
 public class DefaultPropertyResolver
     implements PropertyResolver, Serviceable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultPropertyResolver.class );
 
     private Converter m_converter;

proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java

@@ -23,7 +23,7 @@ import org.apache.myrmidon.interfaces.role.RoleManager;
 public class DefaultRoleManager
     implements RoleManager
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultRoleManager.class );
 
     /** Parent <code>RoleManager</code> for nested resolution */

proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java

@@ -49,7 +49,7 @@ public class InstantiatingServiceManager
     extends AbstractLogEnabled
     implements ServiceManager, Parameterizable, Serviceable, Disposable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( InstantiatingServiceManager.class );
 
     /** Map from service class -> service object. */

proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java

@@ -28,7 +28,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager;
 public class DefaultTypeManager
     implements TypeManager, Serviceable
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( DefaultTypeManager.class );
 
     ///Parent type manager to inherit values from.

proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java

@@ -22,7 +22,7 @@ import org.apache.myrmidon.interfaces.type.TypeFactory;
 public class MultiSourceTypeFactory
     implements TypeFactory
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( MultiSourceTypeFactory.class );
 
     ///Parent Selector

proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java

@@ -31,7 +31,7 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver;
 public class DefaultTaskContext
     implements TaskContext
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultTaskContext.class );
 
     // Property name validator allows digits, but no internal whitespace.

proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java

@@ -49,7 +49,7 @@ public class DefaultWorkspace
     extends AbstractLogEnabled
     implements Workspace, Serviceable, Parameterizable, Initializable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultWorkspace.class );
 
     private Executor m_executor;

proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java

@@ -21,14 +21,14 @@ final class TargetState
     }
 
     /** Target has not been started. */
-    public final static TargetState NOT_STARTED = new TargetState();
+    public static final TargetState NOT_STARTED = new TargetState();
 
     /**
      * Target has been started, and the dependencies of the target are being
      * traversed.
      */
-    public final static TargetState TRAVERSING = new TargetState();
+    public static final TargetState TRAVERSING = new TargetState();
 
     /** Target has been completed. */
-    public final static TargetState FINISHED = new TargetState();
+    public static final TargetState FINISHED = new TargetState();
 }

proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java

@@ -34,7 +34,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager;
 public abstract class AbstractContainerTask
     extends AbstractTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AbstractContainerTask.class );
 
     ///For converting own attributes

proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java

@@ -26,7 +26,7 @@ public abstract class AbstractFacadeTask
     extends AbstractContainerTask
     implements Configurable
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AbstractFacadeTask.class );
 
     /**

proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java

@@ -27,7 +27,7 @@ import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
 public abstract class AbstractTypeDef
     extends AbstractContainerTask
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( AbstractTypeDef.class );
 
     // TODO - replace lib with class-path

proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java

@@ -33,7 +33,7 @@ import org.apache.tools.todo.util.FileUtils;
  */
 public class Execute
 {
-    private final static Resources REZ
+    private static final Resources REZ
         = ResourceManager.getPackageResources( Execute.class );
 
     private Commandline m_command;

proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java

@@ -19,13 +19,13 @@ public final class JavaVersion
     extends ValuedEnum
 {
     //standard enums for version of JVM
-    public final static JavaVersion JAVA1_0 = new JavaVersion( "Java 1.0", 100 );
-    public final static JavaVersion JAVA1_1 = new JavaVersion( "Java 1.1", 110 );
-    public final static JavaVersion JAVA1_2 = new JavaVersion( "Java 1.2", 120 );
-    public final static JavaVersion JAVA1_3 = new JavaVersion( "Java 1.3", 130 );
-    public final static JavaVersion JAVA1_4 = new JavaVersion( "Java 1.4", 140 );
+    public static final JavaVersion JAVA1_0 = new JavaVersion( "Java 1.0", 100 );
+    public static final JavaVersion JAVA1_1 = new JavaVersion( "Java 1.1", 110 );
+    public static final JavaVersion JAVA1_2 = new JavaVersion( "Java 1.2", 120 );
+    public static final JavaVersion JAVA1_3 = new JavaVersion( "Java 1.3", 130 );
+    public static final JavaVersion JAVA1_4 = new JavaVersion( "Java 1.4", 140 );
 
-    private final static JavaVersion CURRENT = determineCurrentJavaVersion();
+    private static final JavaVersion CURRENT = determineCurrentJavaVersion();
 
     /**
      * Method to retrieve the current JVM version.

proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java

@@ -23,14 +23,14 @@ public final class LogLevel
     extends Enum
 {
     //Map for all the levels
-    private final static HashMap c_levels = new HashMap();
+    private static final HashMap c_levels = new HashMap();
 
     //standard enums for version of JVM
-    public final static LogLevel ERROR = new LogLevel( "error" );
-    public final static LogLevel WARN = new LogLevel( "warn" );
-    public final static LogLevel INFO = new LogLevel( "info" );
-    public final static LogLevel VERBOSE = new LogLevel( "verbose" );
-    public final static LogLevel DEBUG = new LogLevel( "debug" );
+    public static final LogLevel ERROR = new LogLevel( "error" );
+    public static final LogLevel WARN = new LogLevel( "warn" );
+    public static final LogLevel INFO = new LogLevel( "info" );
+    public static final LogLevel VERBOSE = new LogLevel( "verbose" );
+    public static final LogLevel DEBUG = new LogLevel( "debug" );
 
     /**
      * Retrieve the log level for the specified name.

proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java

@@ -25,7 +25,7 @@ import org.apache.myrmidon.framework.conditions.NotCondition;
 public class Pattern
     implements DataType
 {
-    private final static Resources REZ =
+    private static final Resources REZ =
         ResourceManager.getPackageResources( Pattern.class );
 
     private String m_name;