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 2003/12/05 01:40:08 UTC
cvs commit: avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl DefaultContainmentModel.java
mcconnell 2003/12/04 16:40:08
Modified: merlin/composition/api/src/java/org/apache/avalon/composition/model
ContainmentModel.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultContainmentModel.java
Log:
Add operations supporting assignment of target directive overrides.
Revision Changes Path
1.6 +16 -1 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
Index: ContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContainmentModel.java 22 Nov 2003 12:52:55 -0000 1.5
+++ ContainmentModel.java 5 Dec 2003 00:40:08 -0000 1.6
@@ -55,6 +55,7 @@
import org.apache.avalon.composition.data.Profile;
import org.apache.avalon.composition.data.ServiceDirective;
import org.apache.avalon.composition.data.CategoriesDirective;
+import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
@@ -168,5 +169,19 @@
* @return the export directives
*/
ServiceDirective getExportDirective( Class clazz );
+
+ /**
+ * Apply a set of override targets resolvable from a supplied url.
+ * @param url a url resolvable to a TargetDirective[]
+ * @exception ModelException if an error occurs
+ */
+ void applyTargets( URL config )
+ throws ModelException;
+
+ /**
+ * Apply a set of override targets.
+ * @param targets a set of target directives
+ */
+ void applyTargets( TargetDirective[]targets );
}
1.9 +12 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultContainmentModel.java 4 Dec 2003 00:23:21 -0000 1.8
+++ DefaultContainmentModel.java 5 Dec 2003 00:40:08 -0000 1.9
@@ -1046,7 +1046,12 @@
}
}
- private void applyTargets( URL config )
+ /**
+ * Apply a set of override targets resolvable from a supplied url.
+ * @param url a url resolvable to a TargetDirective[]
+ * @exception ModelException if an error occurs
+ */
+ public void applyTargets( URL config )
throws ModelException
{
if( config != null )
@@ -1056,7 +1061,11 @@
}
}
- private void applyTargets( TargetDirective[]targets )
+ /**
+ * Apply a set of override targets.
+ * @param targets a set of target directives
+ */
+ public void applyTargets( TargetDirective[]targets )
{
for( int i=0; i<targets.length; i++ )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org