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/07 18:46:24 UTC
cvs commit: avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl ComponentModelContextHelper.java DefaultContainmentModel.java
mcconnell 2004/02/07 09:46:24
Modified: merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
ComponentModelContextHelper.java
DefaultContainmentModel.java
Log:
Update imports.
Revision Changes Path
1.3 +2 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/ComponentModelContextHelper.java
Index: ComponentModelContextHelper.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/ComponentModelContextHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentModelContextHelper.java 7 Feb 2004 17:44:13 -0000 1.2
+++ ComponentModelContextHelper.java 7 Feb 2004 17:46:24 -0000 1.3
@@ -66,7 +66,7 @@
//-------------------------------------------------------------------
private static final Resources REZ =
- ResourceManager.getPackageResources( ComponentContextHelper.class );
+ ResourceManager.getPackageResources( ComponentModelContextHelper.class );
//-------------------------------------------------------------------
// immutable state
1.27 +3 -1 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultContainmentModel.java 7 Feb 2004 17:41:28 -0000 1.26
+++ DefaultContainmentModel.java 7 Feb 2004 17:46:24 -0000 1.27
@@ -48,6 +48,7 @@
import org.apache.avalon.composition.model.ClassLoaderContext;
import org.apache.avalon.composition.model.ClassLoaderModel;
import org.apache.avalon.composition.model.ContainmentModel;
+import org.apache.avalon.composition.model.ComponentContext;
import org.apache.avalon.composition.model.ContainmentContext;
import org.apache.avalon.composition.model.ContextModel;
import org.apache.avalon.composition.model.DependencyModel;
@@ -55,6 +56,7 @@
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ModelException;
+import org.apache.avalon.composition.model.ModelFactory;
import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.ModelRepository;
import org.apache.avalon.composition.model.ModelSelector;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org