mcconnell 2003/01/18 12:56:21
Modified: assembly/src/java/org/apache/avalon/assembly/lifecycle
DefaultDeploymentService.java
assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration
ConfigurationService.java
DefaultConfigurationService.java
Removed: assembly/src/java/org/apache/avalon/assembly/lifecycle/parameters
DefaultParameterizationService.java
ParameterizationService.java package.html
Log:
Parameterization and Configuration merged under a single Avalon 4 Configuration
strategy implementation.
Revision Changes Path
1.16 +0 -30
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/DefaultDeploymentService.java
Index: DefaultDeploymentService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/DefaultDeploymentService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultDeploymentService.java 18 Jan 2003 20:45:58 -0000 1.15
+++ DefaultDeploymentService.java 18 Jan 2003 20:56:21 -0000 1.16
@@ -69,8 +69,6 @@
import org.apache.avalon.assembly.lifecycle.logging.DefaultLoggingService;
import org.apache.avalon.assembly.lifecycle.configuration.ConfigurationService;
import
org.apache.avalon.assembly.lifecycle.configuration.DefaultConfigurationService;
-import org.apache.avalon.assembly.lifecycle.parameters.ParameterizationService;
-import
org.apache.avalon.assembly.lifecycle.parameters.DefaultParameterizationService;
import org.apache.avalon.assembly.lifecycle.context.ContextualizationService;
import org.apache.avalon.assembly.lifecycle.context.DefaultContextualizationService;
import org.apache.avalon.assembly.lifecycle.composition.CompositionService;
@@ -103,7 +101,6 @@
private LoggingService m_logging;
private ConfigurationService m_configuration;
private ContextualizationService m_contextualization;
- private ParameterizationService m_parameters;
private CompositionService m_composition;
private InitializationService m_initialization;
private DisposalService m_disposal;
@@ -161,16 +158,6 @@
m_configuration = makeConfigurationService();
}
- key = "urn:assembly:lifecycle.parameters";
- if( m_context.hasEntry( key ) )
- {
- m_parameters = (ParameterizationService) m_context.get( key );
- }
- else
- {
- m_parameters = makeParameterizationService();
- }
-
key = "urn:assembly:lifecycle.context";
if( m_context.hasEntry( key ) )
{
@@ -271,7 +258,6 @@
m_contextualization.contextualize( appliance, instance );
m_composition.service( appliance, instance );
m_configuration.configure( appliance, instance );
- m_parameters.parameterize( appliance, instance );
m_initialization.initialize( appliance, instance );
return instance;
}
@@ -363,22 +349,6 @@
{
final String error =
"Internal error while attempting to build the bootstrap configuration
service.";
- throw new DeploymentException( error, e );
- }
- }
-
- private ParameterizationService makeParameterizationService() throws
DeploymentException
- {
- try
- {
- DefaultParameterizationService service = new
DefaultParameterizationService();
- service.enableLogging( getLogger().getChildLogger( "params" ) );
- return service;
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build the bootstrap
parameterization service.";
throw new DeploymentException( error, e );
}
}
1.2 +2 -2
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/ConfigurationService.java
Index: ConfigurationService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/ConfigurationService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationService.java 29 Nov 2002 13:04:55 -0000 1.1
+++ ConfigurationService.java 18 Jan 2003 20:56:21 -0000 1.2
@@ -70,5 +70,5 @@
* @param object the object to configure
*/
void configure( Appliance appliance, Object object )
- throws ConfigurationException;
+ throws Exception;
}
1.5 +24 -5
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/DefaultConfigurationService.java
Index: DefaultConfigurationService.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration/DefaultConfigurationService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultConfigurationService.java 27 Dec 2002 16:15:03 -0000 1.4
+++ DefaultConfigurationService.java 18 Jan 2003 20:56:21 -0000 1.5
@@ -50,12 +50,15 @@
package org.apache.avalon.assembly.lifecycle.configuration;
+import org.apache.avalon.assembly.appliance.Appliance;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.assembly.appliance.Appliance;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.ParameterException;
/**
* The default configuration service provides support for the configuration of a
@@ -68,13 +71,13 @@
public class DefaultConfigurationService extends AbstractLogEnabled implements
ConfigurationService
{
/**
- * Configure a supplied object in accordance with the profile
- * directives assiacted with the supplied appliance.
+ * Configure and or Parameterise a supplied object in accordance with the
+ * supplied appliance criteria.
* @param appliance the appliace
* @param object the object to configure
*/
public void configure( Appliance appliance, Object object )
- throws ConfigurationException
+ throws Exception
{
if( appliance == null )
{
@@ -99,5 +102,21 @@
}
((Configurable)object).configure( config );
}
+
+ if( object instanceof Parameterizable )
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ final String message = appliance.toString();
+ getLogger().debug( message );
+ }
+ Parameters params = appliance.getParameters();
+ if( params == null )
+ {
+ params = Parameters.EMPTY_PARAMETERS;
+ }
+ ((Parameterizable)object).parameterize( params );
+ }
+
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
