mcconnell 02/05/14 00:27:52
Modified: merlin/src/conf MANIFEST.MF
merlin/src/java/org/apache/excalibur/merlin ServiceInfo.java
Log:
updated to handle optional version attribute in .xinfo
Revision Changes Path
1.2 +1 -1 jakarta-avalon-excalibur/merlin/src/conf/MANIFEST.MF
Index: MANIFEST.MF
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/src/conf/MANIFEST.MF,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MANIFEST.MF 10 May 2002 17:52:48 -0000 1.1
+++ MANIFEST.MF 14 May 2002 07:27:52 -0000 1.2
@@ -4,7 +4,7 @@
Implementation-Vendor: Apache Software Foundation
Implementation-Version: @package-version@
Main-Class: org.apache.excalibur.merlin.ServiceLoader
-Class-Path: excalibur-configuration-1.0.jar excalibur-context-1.0.jar
+Class-Path: excalibur-configuration.jar excalibur-context.jar
Name: org/apache/excalibur/merlin/ServiceLoader.class
Avalon-Block: true
1.3 +1 -1
jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ServiceInfo.java
Index: ServiceInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ServiceInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServiceInfo.java 12 May 2002 13:41:28 -0000 1.2
+++ ServiceInfo.java 14 May 2002 07:27:52 -0000 1.3
@@ -29,7 +29,7 @@
final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
m_interface = loader.loadClass( config.getAttribute( "name" ) );
- m_version = Version.getVersion( config.getAttribute( "version" ) );
+ m_version = Version.getVersion( config.getAttribute( "version",
"1.0" ) );
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
