mcconnell 2003/07/15 09:50:48
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
DefaultProfileRepository.java
merlin/composition/src/java/org/apache/avalon/composition/model/impl
Scanner.java
merlin/composition/src/test/conf context.xml
Log:
Correct updates re. moved meta.info.verifier
Revision Changes Path
1.3 +2 -2
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultProfileRepository.java
Index: DefaultProfileRepository.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultProfileRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultProfileRepository.java 15 Jun 2003 18:22:30 -0000 1.2
+++ DefaultProfileRepository.java 15 Jul 2003 16:50:47 -0000 1.3
@@ -67,10 +67,10 @@
import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
+import org.apache.avalon.meta.info.verifier.VerifyException;
import org.apache.avalon.meta.model.Profile;
import org.apache.avalon.meta.model.builder.ProfileBuilder;
import org.apache.avalon.meta.model.verifier.ProfileVerifier;
-import org.apache.avalon.meta.verifier.VerifyException;
import org.apache.excalibur.configuration.ConfigurationUtil;
/**
1.9 +3 -3
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Scanner.java
Index: Scanner.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/Scanner.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Scanner.java 14 Jul 2003 22:03:43 -0000 1.8
+++ Scanner.java 15 Jul 2003 16:50:47 -0000 1.9
@@ -83,7 +83,7 @@
import org.apache.avalon.meta.info.Type;
import org.apache.avalon.meta.info.builder.TypeBuilder;
import org.apache.avalon.meta.info.builder.ServiceBuilder;
-import org.apache.avalon.meta.verifier.ComponentVerifier;
+import org.apache.avalon.meta.info.verifier.TypeVerifier;
/**
* A repository for services, types and profiles.
@@ -436,7 +436,7 @@
final String name = type.getInfo().getName();
final Class[] classes = getServiceClasses( type );
final Class[] extensions = getExtensionClasses( type );
- final ComponentVerifier verifier = new ComponentVerifier();
+ final TypeVerifier verifier = new TypeVerifier();
verifier.verifyComponent( name, clazz, classes );
}
1.3 +2 -0 avalon-sandbox/merlin/composition/src/test/conf/context.xml
Index: context.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/test/conf/context.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- context.xml 14 Jul 2003 22:03:43 -0000 1.2
+++ context.xml 15 Jul 2003 16:50:47 -0000 1.3
@@ -4,10 +4,12 @@
<classloader>
<classpath>
+ <!--
<repository>
<resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
<resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
</repository>
+ -->
<fileset dir="ext">
<include>test-a.jar</include>
</fileset>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
