proyal 2002/07/12 13:12:27
Modified: merlin/src/java/org/apache/excalibur/merlin
ServiceFactory.java UnitInfo.java
Log:
* Use new org.apache.avalon.framework.configuration.ConfigurationUtil class
Revision Changes Path
1.8 +1 -1
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServiceFactory.java 13 Jun 2002 17:24:51 -0000 1.7
+++ ServiceFactory.java 12 Jul 2002 20:12:26 -0000 1.8
@@ -32,7 +32,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.configuration.CascadingConfiguration;
-import org.apache.excalibur.configuration.ConfigurationUtil;
+import org.apache.avalon.framework.configuration.ConfigurationUtil;
/**
* The <code>ServiceFactory</code> class provides support for the
1.10 +2 -2
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UnitInfo.java 16 Jun 2002 13:49:13 -0000 1.9
+++ UnitInfo.java 12 Jul 2002 20:12:27 -0000 1.10
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.configuration.CascadingConfiguration;
-import org.apache.excalibur.configuration.ConfigurationUtil;
+import org.apache.avalon.framework.configuration.ConfigurationUtil;
import org.apache.excalibur.configuration.ContextFactory;
/**
@@ -214,7 +214,7 @@
Configuration contextConfig = xinfo.getChild( "context", false );
// get any context declarations from the component profile
- Configuration componentConfig = ConfigurationUtil.matchFirstOccurance(
+ Configuration componentConfig = ConfigurationUtil.matchFirstOccurance(
conf, "component", "class", block.getName() );
Configuration profileContextConfig = componentConfig.getChild( "context",
false );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
