proyal 2002/08/02 06:55:01
Modified: src/java/org/apache/avalon/phoenix/components/configuration
FileSystemPersistentConfigurationRepository.java
Log:
No longer create context with phoenix.home as it
is in the context we can get
Revision Changes Path
1.9 +8 -20
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
Index: FileSystemPersistentConfigurationRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileSystemPersistentConfigurationRepository.java 26 Jul 2002 20:09:17 -0000
1.8
+++ FileSystemPersistentConfigurationRepository.java 2 Aug 2002 13:55:01 -0000
1.9
@@ -23,11 +23,9 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepositoryMBean;
import org.apache.excalibur.configuration.ConfigurationUtil;
@@ -56,7 +54,7 @@
* @see org.apache.excalibur.configuration.merged.ConfigurationSplitter
*/
public class FileSystemPersistentConfigurationRepository extends AbstractLogEnabled
- implements ConfigurationRepository, Parameterizable, Configurable,
Initializable,
+ implements ConfigurationRepository, Contextualizable, Configurable,
Initializable,
ConfigurationRepositoryMBean
{
private static final Resources REZ =
@@ -69,22 +67,14 @@
private final DefaultConfigurationRepository
m_mergedConfigurations = new DefaultConfigurationRepository();
- private String m_phoenixHome;
+ private Context m_context;
private File m_storageDirectory;
- public void parameterize( final Parameters parameters ) throws
ParameterException
+ public void contextualize( Context context )
+ throws ContextException
{
- this.m_phoenixHome = parameters.getParameter( "phoenix.home", ".." );
- }
-
- private Context createConfigurationContext()
- {
- final DefaultContext ctx = new DefaultContext();
-
- ctx.put( "phoenix.home", this.m_phoenixHome );
-
- return ctx;
+ m_context = context;
}
public void configure( final Configuration configuration ) throws
ConfigurationException
@@ -113,9 +103,7 @@
try
{
- final Object opath = PropertyUtil.resolveProperty( path,
-
createConfigurationContext(),
- false );
+ final Object opath = PropertyUtil.resolveProperty( path, m_context,
false );
if( opath instanceof String )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
