proyal 2002/06/27 22:11:52
Modified: src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java DefaultKernel.java
Log:
DefaultKernel:
* Make ConfigurationValidator available to DefaultApplicationContext
DefaultApplicationContext:
* Implementation of new method to validate block
Revision Changes Path
1.17 +11 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultApplicationContext.java 20 May 2002 10:27:20 -0000 1.16
+++ DefaultApplicationContext.java 28 Jun 2002 05:11:52 -0000 1.17
@@ -17,6 +17,7 @@
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
import org.apache.avalon.phoenix.interfaces.SystemManager;
+import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
@@ -32,7 +33,7 @@
extends AbstractLogEnabled
implements ApplicationContext, Serviceable
{
- //Log HIerarchy for application
+ //Log Hierarchy for application
private final Hierarchy m_hierarchy;
///ClassLoader for application
@@ -44,6 +45,9 @@
//Repository of configuration data to access
private ConfigurationRepository m_repository;
+ //Validator to validate configuration against
+ private ConfigurationValidator m_validator;
+
///Place to expose Management beans
private SystemManager m_systemManager;
@@ -70,6 +74,7 @@
lookup( ConfigurationRepository.ROLE );
m_systemManager = (SystemManager)serviceManager.
lookup( SystemManager.ROLE );
+ m_validator = (ConfigurationValidator) serviceManager.lookup(
ConfigurationValidator.ROLE );
}
public SarMetaData getMetaData()
@@ -154,5 +159,10 @@
throws ConfigurationException
{
return m_repository.getConfiguration( m_metaData.getName(),
component );
+ }
+
+ public void validateConfiguration( String component ) throws
ConfigurationException
+ {
+ m_validator.isValid( m_metaData.getName(), component,
getConfiguration( component ) );
}
}
1.70 +6 -0
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- DefaultKernel.java 20 Jun 2002 11:39:31 -0000 1.69
+++ DefaultKernel.java 28 Jun 2002 05:11:52 -0000 1.70
@@ -29,6 +29,7 @@
import org.apache.avalon.phoenix.interfaces.Kernel;
import org.apache.avalon.phoenix.interfaces.KernelMBean;
import org.apache.avalon.phoenix.interfaces.SystemManager;
+import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.log.Hierarchy;
@@ -58,6 +59,9 @@
///Configuration Repository
private ConfigurationRepository m_repository;
+ //Configuration Validator
+ private ConfigurationValidator m_validator;
+
private HashMap m_entries = new HashMap();
public void service( final ServiceManager serviceManager )
@@ -66,6 +70,7 @@
m_systemManager = (SystemManager)serviceManager.lookup(
SystemManager.ROLE );
m_repository = (ConfigurationRepository)serviceManager.
lookup( ConfigurationRepository.ROLE );
+ m_validator = (ConfigurationValidator) serviceManager.lookup(
ConfigurationValidator.ROLE );
}
public void initialize()
@@ -242,6 +247,7 @@
final DefaultServiceManager componentManager = new
DefaultServiceManager();
componentManager.put( SystemManager.ROLE, m_systemManager );
componentManager.put( ConfigurationRepository.ROLE, m_repository );
+ componentManager.put( ConfigurationValidator.ROLE, m_validator );
componentManager.makeReadOnly();
return componentManager;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
