mcconnell 02/05/11 17:25:17
Modified: merlin/src/java/org/apache/excalibur/merlin
ServiceFactory.java UnitInfo.java
Log:
minor code cleanup
Revision Changes Path
1.2 +2 -2
jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ServiceFactory.java
Index: ServiceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ServiceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceFactory.java 10 May 2002 17:53:09 -0000 1.1
+++ ServiceFactory.java 12 May 2002 00:25:17 -0000 1.2
@@ -180,8 +180,8 @@
{
for( int i=0; i<dependencies.length; i++ )
{
- DependencyInfo info = dependencies[i];
- providers.put( info.getRole(), getProvider( unit, info, base
) );
+ DependencyInfo dependency = dependencies[i];
+ providers.put( dependency.getRole(), getProvider( unit,
dependency, base ) );
}
return providers;
}
1.2 +4 -8
jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/UnitInfo.java
Index: UnitInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/UnitInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnitInfo.java 10 May 2002 17:53:09 -0000 1.1
+++ UnitInfo.java 12 May 2002 00:25:17 -0000 1.2
@@ -272,8 +272,8 @@
public UnitInfo( String path, Configuration config, File root )
throws Exception
{
- this( loadClass( path ), loadConfiguration(
- path + ".xinfo" ), config, root );
+ this( loadClass( path ), loadConfiguration( path + ".xinfo" ),
+ config, root );
}
/**
@@ -315,10 +315,6 @@
return null;
}
-
-
-
-
/**
* Returns a <code>TRUE</code> if the supplied <code>ServiceInfo</code>
can be
* provided by the implementation.
@@ -439,9 +435,9 @@
catch( Throwable e )
{
final String error =
- "Unexpected exception while attempting to load .xinfo from
path: ";
+ "Unexpected exception while attempting to load configuration
from path: ";
throw new ConfigurationException( error + path, e );
- }
+ }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
