You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/02/08 00:32:04 UTC
cvs commit: avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl DefaultFactory.java
mcconnell 2004/02/07 15:32:04
Modified: merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
AbstractAppliance.java AbstractBlock.java
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
AbstractTestCase.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultFactory.java
Log:
Housekeeping.
Revision Changes Path
1.6 +2 -2 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java
Index: AbstractAppliance.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractAppliance.java 7 Feb 2004 22:46:42 -0000 1.5
+++ AbstractAppliance.java 7 Feb 2004 23:32:04 -0000 1.6
@@ -61,7 +61,7 @@
public AbstractAppliance( DeploymentModel model )
{
- if( null == m_model )
+ if( null == model )
{
throw new NullPointerException( "model" );
}
1.21 +5 -3 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractBlock.java 7 Feb 2004 06:06:30 -0000 1.20
+++ AbstractBlock.java 7 Feb 2004 23:32:04 -0000 1.21
@@ -100,8 +100,10 @@
private final DefaultState m_self = new DefaultState();
private final Engine m_engine;
- private final AccessControlContext m_accessControlContext;
- private final boolean m_secured;
+
+ private final AccessControlContext m_accessControlContext;
+
+ private final boolean m_secured;
//-------------------------------------------------------------------
// constructor
1.16 +2 -2 avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AbstractTestCase.java 7 Feb 2004 17:41:28 -0000 1.15
+++ AbstractTestCase.java 7 Feb 2004 23:32:04 -0000 1.16
@@ -119,7 +119,7 @@
m_system =
SystemContextBuilder.createSystemContext(
- context, base, local, ConsoleLogger.LEVEL_INFO, m_secured, timeout );
+ context, base, local, ConsoleLogger.LEVEL_DEBUG, m_secured, timeout );
m_logger = m_system.getLogger();
//
@@ -178,7 +178,7 @@
// and the root containment model
//
- getLogger().debug( "creating root block" );
+ getLogger().debug( "creating root block using model: " + m_model );
Block block = AbstractBlock.createRootBlock( m_model );
getLogger().debug( "block: " + block );
1.26 +0 -1 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DefaultFactory.java 7 Feb 2004 22:46:42 -0000 1.25
+++ DefaultFactory.java 7 Feb 2004 23:32:04 -0000 1.26
@@ -47,7 +47,6 @@
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ModelRepository;
import org.apache.avalon.composition.model.impl.DefaultSystemContext;
-import org.apache.avalon.composition.model.impl.DelegatingSystemContext;
import org.apache.avalon.composition.model.impl.DefaultContainmentContext;
import org.apache.avalon.composition.model.impl.DefaultContainmentModel;
import org.apache.avalon.composition.model.impl.DefaultClassLoaderModel;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org