donaldp 02/03/29 04:56:05
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/framework
AbstractContainerTask.java AbstractFacadeTask.java
AbstractTypeDef.java Execute.java JavaVersion.java
LogLevel.java Pattern.java TypeInstanceTask.java
proposal/myrmidon/src/java/org/apache/myrmidon/frontends
AbstractLogger.java CLIMain.java EmbeddedAnt.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
AspectAwareExecutor.java DefaultExecutor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
ATIProjectBuilder.java DefaultProject.java
DefaultProjectBuilder.java
TransformingProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect
DefaultAspectManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader
DefaultClassLoaderManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurer.java DefaultObjectConfigurer.java
DefaultPropertyConfigurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java Deployment.java
RoleDescriptorBuilder.java
ServiceDescriptorBuilder.java
TypeDescriptorBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model
DefaultNameValidator.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/property
DefaultPropertyResolver.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/role
DefaultRoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultTaskContext.java DefaultWorkspace.java
TargetState.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type
DefaultTypeFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/type
DefaultTypeManager.java MultiSourceTypeFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories
ExecManagerFactory.java VfsManager.java
VfsManagerFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/java
ExecuteJava.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/service
InstantiatingServiceManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions
IsSetCondition.java IsTrueCondition.java
NotCondition.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service
MultiSourceServiceManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters
TokenLineFilter.java
Log:
final static --> static final to follow JLS recomendations
Revision Changes Path
1.24 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
Index: AbstractContainerTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractContainerTask.java 18 Mar 2002 09:15:10 -0000 1.23
+++ AbstractContainerTask.java 29 Mar 2002 12:56:02 -0000 1.24
@@ -29,12 +29,12 @@
* This is the class that Task writers should extend to provide custom tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.23 $ $Date: 2002/03/18 09:15:10 $
+ * @version $Revision: 1.24 $ $Date: 2002/03/29 12:56:02 $
*/
public abstract class AbstractContainerTask
extends AbstractTask
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( AbstractContainerTask.class );
///For converting own attributes
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java
Index: AbstractFacadeTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractFacadeTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractFacadeTask.java 13 Mar 2002 09:36:52 -0000 1.1
+++ AbstractFacadeTask.java 29 Mar 2002 12:56:02 -0000 1.2
@@ -20,13 +20,13 @@
* such as Javac, Jspc and so forth.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/13 09:36:52 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/29 12:56:02 $
*/
public abstract class AbstractFacadeTask
extends AbstractContainerTask
implements Configurable
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( AbstractFacadeTask.class );
/**
1.17 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
Index: AbstractTypeDef.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractTypeDef.java 7 Feb 2002 13:01:02 -0000 1.16
+++ AbstractTypeDef.java 29 Mar 2002 12:56:02 -0000 1.17
@@ -22,12 +22,12 @@
* TODO: Make this support classpath sub-element in future
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.16 $ $Date: 2002/02/07 13:01:02 $
+ * @version $Revision: 1.17 $ $Date: 2002/03/29 12:56:02 $
*/
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
1.11 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java
Index: Execute.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Execute.java 22 Mar 2002 07:18:09 -0000 1.10
+++ Execute.java 29 Mar 2002 12:56:02 -0000 1.11
@@ -29,11 +29,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
- * @version $Revision: 1.10 $ $Date: 2002/03/22 07:18:09 $
+ * @version $Revision: 1.11 $ $Date: 2002/03/29 12:56:02 $
*/
public class Execute
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources( Execute.class );
private Commandline m_command;
1.5 +7 -7
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java
Index: JavaVersion.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/JavaVersion.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaVersion.java 7 Feb 2002 13:01:02 -0000 1.4
+++ JavaVersion.java 29 Mar 2002 12:56:02 -0000 1.5
@@ -13,19 +13,19 @@
* Type safe wrapper class for Java Version enums.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/07 13:01:02 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/29 12:56:02 $
*/
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.
1.7 +7 -7
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java
Index: LogLevel.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/LogLevel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogLevel.java 22 Mar 2002 07:18:09 -0000 1.6
+++ LogLevel.java 29 Mar 2002 12:56:02 -0000 1.7
@@ -17,20 +17,20 @@
* for using enum to write to logger.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2002/03/22 07:18:09 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/29 12:56:02 $
*/
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.
1.23 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
Index: Pattern.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Pattern.java 28 Mar 2002 06:35:22 -0000 1.22
+++ Pattern.java 29 Mar 2002 12:56:02 -0000 1.23
@@ -19,13 +19,13 @@
* Basic data type for holding patterns.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.22 $ $Date: 2002/03/28 06:35:22 $
+ * @version $Revision: 1.23 $ $Date: 2002/03/29 12:56:02 $
* @ant.data-type name="pattern"
*/
public class Pattern
implements DataType
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( Pattern.class );
private String m_name;
1.16 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
Index: TypeInstanceTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TypeInstanceTask.java 15 Mar 2002 02:48:21 -0000 1.15
+++ TypeInstanceTask.java 29 Mar 2002 12:56:02 -0000 1.16
@@ -19,13 +19,13 @@
* This is the property "task" to declare a binding of a datatype to a name.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.15 $ $Date: 2002/03/15 02:48:21 $
+ * @version $Revision: 1.16 $ $Date: 2002/03/29 12:56:02 $
*/
public class TypeInstanceTask
extends AbstractContainerTask
implements Configurable
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( TypeInstanceTask.class );
private String m_id;
1.2 +6 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/AbstractLogger.java
Index: AbstractLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/AbstractLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractLogger.java 18 Mar 2002 11:49:46 -0000 1.1
+++ AbstractLogger.java 29 Mar 2002 12:56:03 -0000 1.2
@@ -13,16 +13,16 @@
* A partial logger implementation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/18 11:49:46 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/29 12:56:03 $
*/
public abstract class AbstractLogger
implements Logger
{
- public final static int LEVEL_DEBUG = 0;
- public final static int LEVEL_INFO = 1;
- public final static int LEVEL_WARN = 2;
- public final static int LEVEL_ERROR = 3;
- public final static int LEVEL_FATAL = 4;
+ public static final int LEVEL_DEBUG = 0;
+ public static final int LEVEL_INFO = 1;
+ public static final int LEVEL_WARN = 2;
+ public static final int LEVEL_ERROR = 3;
+ public static final int LEVEL_FATAL = 4;
/**
* Log a debug message.
1.36 +20 -20
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- CLIMain.java 27 Mar 2002 06:55:59 -0000 1.35
+++ CLIMain.java 29 Mar 2002 12:56:03 -0000 1.36
@@ -32,32 +32,32 @@
* to run project.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.35 $ $Date: 2002/03/27 06:55:59 $
+ * @version $Revision: 1.36 $ $Date: 2002/03/29 12:56:03 $
*/
public class CLIMain
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( CLIMain.class );
//defines for the Command Line options
- private final static int HELP_OPT = 'h';
- private final static int QUIET_OPT = 'q';
- private final static int VERBOSE_OPT = 'v';
- private final static int FILE_OPT = 'f';
- private final static int LOG_LEVEL_OPT = 'l';
- private final static int DEFINE_OPT = 'D';
- private final static int BUILDER_PARAM_OPT = 'B';
- private final static int NO_PREFIX_OPT = 'p';
- private final static int VERSION_OPT = 1;
- private final static int LISTENER_OPT = 2;
- private final static int TASKLIB_DIR_OPT = 5;
- private final static int INCREMENTAL_OPT = 6;
- private final static int HOME_DIR_OPT = 7;
- private final static int DRY_RUN_OPT = 8;
- private final static int DEBUG_OPT = 9;
+ private static final int HELP_OPT = 'h';
+ private static final int QUIET_OPT = 'q';
+ private static final int VERBOSE_OPT = 'v';
+ private static final int FILE_OPT = 'f';
+ private static final int LOG_LEVEL_OPT = 'l';
+ private static final int DEFINE_OPT = 'D';
+ private static final int BUILDER_PARAM_OPT = 'B';
+ private static final int NO_PREFIX_OPT = 'p';
+ private static final int VERSION_OPT = 1;
+ private static final int LISTENER_OPT = 2;
+ private static final int TASKLIB_DIR_OPT = 5;
+ private static final int INCREMENTAL_OPT = 6;
+ private static final int HOME_DIR_OPT = 7;
+ private static final int DRY_RUN_OPT = 8;
+ private static final int DEBUG_OPT = 9;
//incompatable options for info options
- private final static int[] INFO_OPT_INCOMPAT = new int[]
+ private static final int[] INFO_OPT_INCOMPAT = new int[]
{
HELP_OPT, QUIET_OPT, VERBOSE_OPT, FILE_OPT,
LOG_LEVEL_OPT, BUILDER_PARAM_OPT, NO_PREFIX_OPT,
@@ -66,13 +66,13 @@
};
//incompatable options for other logging options
- private final static int[] LOG_OPT_INCOMPAT = new int[]
+ private static final int[] LOG_OPT_INCOMPAT = new int[]
{
QUIET_OPT, VERBOSE_OPT, LOG_LEVEL_OPT, DEBUG_OPT
};
//incompatible options for listener options
- private final static int[] LISTENER_OPT_INCOMPAT = new int[]
+ private static final int[] LISTENER_OPT_INCOMPAT = new int[]
{
LISTENER_OPT, NO_PREFIX_OPT
};
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/EmbeddedAnt.java
Index: EmbeddedAnt.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/EmbeddedAnt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmbeddedAnt.java 26 Mar 2002 02:11:13 -0000 1.4
+++ EmbeddedAnt.java 29 Mar 2002 12:56:03 -0000 1.5
@@ -33,12 +33,12 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/03/26 02:11:13 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/29 12:56:03 $
*/
public class EmbeddedAnt
extends AbstractLogEnabled
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( EmbeddedAnt.class );
private static final String DEFAULT_EMBEDDOR_CLASS =
1.24 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
Index: AspectAwareExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AspectAwareExecutor.java 16 Mar 2002 04:08:06 -0000 1.23
+++ AspectAwareExecutor.java 29 Mar 2002 12:56:03 -0000 1.24
@@ -28,15 +28,15 @@
* the aspects helpers.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.23 $ $Date: 2002/03/16 04:08:06 $
+ * @version $Revision: 1.24 $ $Date: 2002/03/29 12:56:03 $
*/
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;
1.33 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
Index: DefaultExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DefaultExecutor.java 15 Mar 2002 02:48:20 -0000 1.32
+++ DefaultExecutor.java 29 Mar 2002 12:56:03 -0000 1.33
@@ -28,13 +28,13 @@
* The basic executor that just executes the tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.32 $ $Date: 2002/03/15 02:48:20 $
+ * @version $Revision: 1.33 $ $Date: 2002/03/29 12:56:03 $
*/
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;
1.13 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
Index: ATIProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ATIProjectBuilder.java 23 Mar 2002 04:01:24 -0000 1.12
+++ ATIProjectBuilder.java 29 Mar 2002 12:56:03 -0000 1.13
@@ -28,14 +28,14 @@
* Default implementation to construct project from a build file.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.12 $ $Date: 2002/03/23 04:01:24 $
+ * @version $Revision: 1.13 $ $Date: 2002/03/29 12:56:03 $
* @ant.type type="project-builder" name="ati"
*/
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;
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java
Index: DefaultProject.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultProject.java 13 Feb 2002 02:47:36 -0000 1.3
+++ DefaultProject.java 29 Mar 2002 12:56:03 -0000 1.4
@@ -20,12 +20,12 @@
* Default project implementation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.3 $ $Date: 2002/02/13 02:47:36 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/29 12:56:03 $
*/
public class DefaultProject
implements Project
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultProject.class );
///The imports
1.41 +7 -7
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- DefaultProjectBuilder.java 23 Mar 2002 04:01:24 -0000 1.40
+++ DefaultProjectBuilder.java 29 Mar 2002 12:56:03 -0000 1.41
@@ -34,7 +34,7 @@
* Default implementation to construct project from a build file.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.40 $ $Date: 2002/03/23 04:01:24 $
+ * @version $Revision: 1.41 $ $Date: 2002/03/29 12:56:03 $
*
* @ant.type type="project-builder" name="ant"
*/
@@ -42,15 +42,15 @@
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();
1.3 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java
Index: TransformingProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/TransformingProjectBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TransformingProjectBuilder.java 23 Mar 2002 04:01:24 -0000 1.2
+++ TransformingProjectBuilder.java 29 Mar 2002 12:56:03 -0000 1.3
@@ -25,17 +25,17 @@
* A Project Builder which performs an XSL transformation on a project.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/23 04:01:24 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/29 12:56:03 $
*
* @ant.type type="project-builder" name="xml"
*/
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 )
1.14 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
Index: DefaultAspectManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultAspectManager.java 16 Mar 2002 04:08:06 -0000 1.13
+++ DefaultAspectManager.java 29 Mar 2002 12:56:03 -0000 1.14
@@ -24,12 +24,12 @@
* Manage and propogate Aspects.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.13 $ $Date: 2002/03/16 04:08:06 $
+ * @version $Revision: 1.14 $ $Date: 2002/03/29 12:56:03 $
*/
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();
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultClassLoaderManager.java 28 Mar 2002 07:30:41 -0000 1.3
+++ DefaultClassLoaderManager.java 29 Mar 2002 12:56:03 -0000 1.4
@@ -43,7 +43,7 @@
extends AbstractLogEnabled
implements ClassLoaderManager, Serviceable, Initializable
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultClassLoaderManager.class
);
/**
1.43 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
Index: DefaultConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- DefaultConfigurer.java 23 Mar 2002 04:01:25 -0000 1.42
+++ DefaultConfigurer.java 29 Mar 2002 12:56:03 -0000 1.43
@@ -33,14 +33,14 @@
* Class used to configure tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.42 $ $Date: 2002/03/23 04:01:25 $
+ * @version $Revision: 1.43 $ $Date: 2002/03/29 12:56:03 $
* @ant.type type="configurer" name="default"
*/
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
1.20 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java
Index: DefaultObjectConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultObjectConfigurer.java 21 Mar 2002 06:33:17 -0000 1.19
+++ DefaultObjectConfigurer.java 29 Mar 2002 12:56:03 -0000 1.20
@@ -24,12 +24,12 @@
* of a class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.19 $ $Date: 2002/03/21 06:33:17 $
+ * @version $Revision: 1.20 $ $Date: 2002/03/29 12:56:03 $
*/
class DefaultObjectConfigurer
implements ObjectConfigurer
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultObjectConfigurer.class );
private final Class m_class;
1.9 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java
Index: DefaultPropertyConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultPropertyConfigurer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultPropertyConfigurer.java 5 Mar 2002 14:46:05 -0000 1.8
+++ DefaultPropertyConfigurer.java 29 Mar 2002 12:56:03 -0000 1.9
@@ -18,12 +18,12 @@
* create and set property values.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.8 $ $Date: 2002/03/05 14:46:05 $
+ * @version $Revision: 1.9 $ $Date: 2002/03/29 12:56:03 $
*/
class DefaultPropertyConfigurer
implements PropertyConfigurer
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultPropertyConfigurer.class
);
private final int m_propertyIndex;
1.35 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- DefaultDeployer.java 17 Mar 2002 08:10:19 -0000 1.34
+++ DefaultDeployer.java 29 Mar 2002 12:56:03 -0000 1.35
@@ -36,13 +36,13 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.34 $ $Date: 2002/03/17 08:10:19 $
+ * @version $Revision: 1.35 $ $Date: 2002/03/29 12:56:03 $
*/
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
1.25 +5 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
Index: Deployment.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Deployment.java 18 Mar 2002 11:49:46 -0000 1.24
+++ Deployment.java 29 Mar 2002 12:56:03 -0000 1.25
@@ -30,18 +30,18 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.24 $ $Date: 2002/03/18 11:49:46 $
+ * @version $Revision: 1.25 $ $Date: 2002/03/29 12:56:03 $
*/
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;
1.3 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java
Index: RoleDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleDescriptorBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RoleDescriptorBuilder.java 14 Feb 2002 10:53:54 -0000 1.2
+++ RoleDescriptorBuilder.java 29 Mar 2002 12:56:03 -0000 1.3
@@ -17,15 +17,15 @@
* Builds typelib role descriptors.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/14 10:53:54 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/29 12:56:03 $
*/
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.
1.4 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java
Index: ServiceDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/ServiceDescriptorBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceDescriptorBuilder.java 14 Feb 2002 10:53:54 -0000 1.3
+++ ServiceDescriptorBuilder.java 29 Mar 2002 12:56:03 -0000 1.4
@@ -17,15 +17,15 @@
* Builds typelib service descriptors.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:54 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/29 12:56:03 $
*/
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.
1.4 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java
Index: TypeDescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TypeDescriptorBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeDescriptorBuilder.java 16 Mar 2002 04:08:06 -0000 1.3
+++ TypeDescriptorBuilder.java 29 Mar 2002 12:56:03 -0000 1.4
@@ -20,15 +20,15 @@
* Builds typelib type descriptors.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/16 04:08:06 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/29 12:56:03 $
*/
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.
1.39 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- DefaultEmbeddor.java 23 Mar 2002 23:41:27 -0000 1.38
+++ DefaultEmbeddor.java 29 Mar 2002 12:56:04 -0000 1.39
@@ -52,13 +52,13 @@
* Instantiate this to embed inside other applications.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.38 $ $Date: 2002/03/23 23:41:27 $
+ * @version $Revision: 1.39 $ $Date: 2002/03/29 12:56:04 $
*/
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. */
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/DefaultNameValidator.java
Index: DefaultNameValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/DefaultNameValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultNameValidator.java 11 Mar 2002 06:07:24 -0000 1.1
+++ DefaultNameValidator.java 29 Mar 2002 12:56:04 -0000 1.2
@@ -15,12 +15,12 @@
* in ant projects.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/11 06:07:24 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/29 12:56:04 $
*/
public class DefaultNameValidator
implements NameValidator
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultNameValidator.class );
/**
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java
Index: DefaultPropertyResolver.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultPropertyResolver.java 24 Mar 2002 07:53:54 -0000 1.5
+++ DefaultPropertyResolver.java 29 Mar 2002 12:56:04 -0000 1.6
@@ -23,14 +23,14 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Darrell DeBoer</a>
- * @version $Revision: 1.5 $ $Date: 2002/03/24 07:53:54 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/29 12:56:04 $
*
* @ant.type type="property-resolver" name="default"
*/
public class DefaultPropertyResolver
implements PropertyResolver, Serviceable
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultPropertyResolver.class );
private Converter m_converter;
1.11 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
Index: DefaultRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultRoleManager.java 21 Feb 2002 12:52:07 -0000 1.10
+++ DefaultRoleManager.java 29 Mar 2002 12:56:04 -0000 1.11
@@ -18,12 +18,12 @@
* Interface to manage roles and mapping to names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.10 $ $Date: 2002/02/21 12:52:07 $
+ * @version CVS $Revision: 1.11 $ $Date: 2002/03/29 12:56:04 $
*/
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 */
1.33 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
Index: DefaultTaskContext.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DefaultTaskContext.java 28 Mar 2002 07:30:41 -0000 1.32
+++ DefaultTaskContext.java 29 Mar 2002 12:56:04 -0000 1.33
@@ -26,12 +26,12 @@
* Default implementation of TaskContext.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.32 $ $Date: 2002/03/28 07:30:41 $
+ * @version $Revision: 1.33 $ $Date: 2002/03/29 12:56:04 $
*/
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.
1.36 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
Index: DefaultWorkspace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DefaultWorkspace.java 23 Mar 2002 10:16:35 -0000 1.35
+++ DefaultWorkspace.java 29 Mar 2002 12:56:04 -0000 1.36
@@ -43,13 +43,13 @@
* This is the default implementation of Workspace.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.35 $ $Date: 2002/03/23 10:16:35 $
+ * @version $Revision: 1.36 $ $Date: 2002/03/29 12:56:04 $
*/
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;
1.2 +4 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java
Index: TargetState.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/TargetState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TargetState.java 13 Mar 2002 07:35:18 -0000 1.1
+++ TargetState.java 29 Mar 2002 12:56:04 -0000 1.2
@@ -12,7 +12,7 @@
* target.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/13 07:35:18 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/29 12:56:04 $
*/
final class TargetState
{
@@ -21,14 +21,14 @@
}
/** 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();
}
1.11 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java
Index: DefaultTypeFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultTypeFactory.java 14 Feb 2002 10:53:54 -0000 1.10
+++ DefaultTypeFactory.java 29 Mar 2002 12:56:04 -0000 1.11
@@ -15,12 +15,12 @@
* Create a type instance based on name.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version CVS $Revision: 1.10 $ $Date: 2002/02/14 10:53:54 $
+ * @version CVS $Revision: 1.11 $ $Date: 2002/03/29 12:56:04 $
*/
public class DefaultTypeFactory
implements TypeFactory
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( DefaultTypeFactory.class );
///A Map of shortnames to classnames
1.19 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
Index: DefaultTypeManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultTypeManager.java 16 Mar 2002 04:08:06 -0000 1.18
+++ DefaultTypeManager.java 29 Mar 2002 12:56:04 -0000 1.19
@@ -23,12 +23,12 @@
* The interface that is used to manage types.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.18 $ $Date: 2002/03/16 04:08:06 $
+ * @version $Revision: 1.19 $ $Date: 2002/03/29 12:56:04 $
*/
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.
1.15 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
Index: MultiSourceTypeFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MultiSourceTypeFactory.java 16 Mar 2002 04:08:06 -0000 1.14
+++ MultiSourceTypeFactory.java 29 Mar 2002 12:56:04 -0000 1.15
@@ -17,12 +17,12 @@
* This factory acts as a proxy to set of object factories.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.14 $ $Date: 2002/03/16 04:08:06 $
+ * @version $Revision: 1.15 $ $Date: 2002/03/29 12:56:04 $
*/
public class MultiSourceTypeFactory
implements TypeFactory
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( MultiSourceTypeFactory.class );
///Parent Selector
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/ExecManagerFactory.java
Index: ExecManagerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/ExecManagerFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExecManagerFactory.java 23 Mar 2002 10:16:35 -0000 1.2
+++ ExecManagerFactory.java 29 Mar 2002 12:56:04 -0000 1.3
@@ -22,12 +22,12 @@
* A Factory responsible for creating the ExecManager service.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/23 10:16:35 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/29 12:56:04 $
*/
public class ExecManagerFactory
implements ServiceFactory, Parameterizable
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( ExecManagerFactory.class );
private Parameters m_parameters;
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManager.java
Index: VfsManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VfsManager.java 15 Mar 2002 02:48:21 -0000 1.2
+++ VfsManager.java 29 Mar 2002 12:56:04 -0000 1.3
@@ -24,13 +24,13 @@
* The myrmidon FileSystemManager implementation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/15 02:48:21 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/29 12:56:04 $
*/
public class VfsManager
extends DefaultFileSystemManager
implements Serviceable, Initializable, Disposable
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources( VfsManager.class );
private TypeManager m_typeManager;
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManagerFactory.java
Index: VfsManagerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/factories/VfsManagerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VfsManagerFactory.java 20 Mar 2002 08:09:53 -0000 1.3
+++ VfsManagerFactory.java 29 Mar 2002 12:56:04 -0000 1.4
@@ -17,12 +17,12 @@
* A factory that creates the [EMAIL PROTECTED] FileSystemManager} service.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/20 08:09:53 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/29 12:56:04 $
*/
public class VfsManagerFactory
implements ServiceFactory
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources( VfsManagerFactory.class );
/**
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java
Index: ExecuteJava.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExecuteJava.java 27 Mar 2002 07:04:17 -0000 1.3
+++ ExecuteJava.java 29 Mar 2002 12:56:04 -0000 1.4
@@ -40,7 +40,7 @@
*/
public class ExecuteJava
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources( ExecuteJava.class );
private final Path m_classPath = new Path();
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java
Index: InstantiatingServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/service/InstantiatingServiceManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstantiatingServiceManager.java 15 Mar 2002 02:48:20 -0000 1.2
+++ InstantiatingServiceManager.java 29 Mar 2002 12:56:04 -0000 1.3
@@ -43,13 +43,13 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/15 02:48:20 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/29 12:56:04 $
*/
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. */
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java
Index: IsSetCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsSetCondition.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IsSetCondition.java 28 Mar 2002 06:35:22 -0000 1.6
+++ IsSetCondition.java 29 Mar 2002 12:56:04 -0000 1.7
@@ -18,14 +18,14 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.6 $ $Date: 2002/03/28 06:35:22 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/29 12:56:04 $
*
* @ant.type type="condition" name="is-set"
*/
public class IsSetCondition
implements Condition
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( IsSetCondition.class );
private String m_property;
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java
Index: IsTrueCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/IsTrueCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IsTrueCondition.java 28 Mar 2002 06:35:22 -0000 1.1
+++ IsTrueCondition.java 29 Mar 2002 12:56:04 -0000 1.2
@@ -21,14 +21,14 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/28 06:35:22 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/29 12:56:04 $
*
* @ant.type type="condition" name="is-true"
*/
public class IsTrueCondition
implements Condition
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( IsTrueCondition.class );
private String m_property;
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java
Index: NotCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/conditions/NotCondition.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NotCondition.java 28 Mar 2002 06:35:22 -0000 1.5
+++ NotCondition.java 29 Mar 2002 12:56:04 -0000 1.6
@@ -17,14 +17,14 @@
* it is false and vice versa.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*
* @ant.type type="condition" name="not"
*/
public class NotCondition
implements Condition
{
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( NotCondition.class );
private Condition m_condition;
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/MultiSourceServiceManager.java
Index: MultiSourceServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/MultiSourceServiceManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultiSourceServiceManager.java 24 Feb 2002 07:43:38 -0000 1.4
+++ MultiSourceServiceManager.java 29 Mar 2002 12:56:05 -0000 1.5
@@ -18,12 +18,12 @@
* [EMAIL PROTECTED] ServiceManager} objects.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/24 07:43:38 $
+ * @version $Revision: 1.5 $ $Date: 2002/03/29 12:56:05 $
*/
public class MultiSourceServiceManager
implements ServiceManager
{
- private final static Resources REZ
+ private static final Resources REZ
= ResourceManager.getPackageResources(
MultiSourceServiceManager.class );
/** The source service managers, in order. */
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java
Index: TokenLineFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/filters/TokenLineFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TokenLineFilter.java 23 Mar 2002 04:01:26 -0000 1.2
+++ TokenLineFilter.java 29 Mar 2002 12:56:05 -0000 1.3
@@ -24,12 +24,12 @@
/**
* The default token start string
*/
- private final static char[] DEFAULT_TOKEN_START = {'@'};
+ private static final char[] DEFAULT_TOKEN_START = {'@'};
/**
* The default token end string
*/
- private final static char[] DEFAULT_TOKEN_END = {'@'};
+ private static final char[] DEFAULT_TOKEN_END = {'@'};
/**
* List of ordered filters and filter files.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
