donaldp 2002/09/09 04:35:53
Modified: containerkit/src/java/org/apache/excalibur/containerkit/verifier
AssemblyVerifier.java MetaDataVerifier.java
Resources.properties
Removed: containerkit/src/java/org/apache/excalibur/containerkit/verifier
ComponentVerifier.java VerifyException.java
Log:
Move verifier into info package
Revision Changes Path
1.37 +13 -12
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java
Index: AssemblyVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- AssemblyVerifier.java 8 Sep 2002 04:55:16 -0000 1.36
+++ AssemblyVerifier.java 9 Sep 2002 11:35:53 -0000 1.37
@@ -17,6 +17,7 @@
import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.info.DependencyDescriptor;
import org.apache.avalon.framework.info.ServiceDescriptor;
+import org.apache.avalon.framework.tools.verifier.VerifyException;
/**
* This Class verifies that Sars are valid. It performs a number
@@ -39,7 +40,7 @@
* <li>Verify that the Class objects for Component implement the
* service interfaces.</li>
* <li>Verify that the Class is a valid Avalon Component as per the
- * rules in {@link ComponentVerifier} object.</li>
+ * rules in {@link
org.apache.avalon.framework.tools.verifier.ComponentVerifier} object.</li>
* </ul>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
@@ -57,7 +58,7 @@
* regulations of assembly.
*
* @param components the Components that make up assembly
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
public void verifyAssembly( final ComponentProfile[] components )
throws VerifyException
@@ -89,7 +90,7 @@
* Verfiy that all Components have the needed dependencies specified correctly.
*
* @param components the ComponentEntry objects for the components
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
public void verifyValidDependencies( final ComponentProfile[] components )
throws VerifyException
@@ -104,7 +105,7 @@
* Verfiy that there are no circular references between Components.
*
* @param components the ComponentEntry objects for the components
- * @throws VerifyException if an circular dependency error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
circular dependency error occurs
*/
protected void verifyNoCircularDependencies( final ComponentProfile[]
components )
throws VerifyException
@@ -126,7 +127,7 @@
* @param component ???
* @param components the ComponentEntry objects for the components
* @param stack the ???
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
protected void verifyNoCircularDependencies( final ComponentProfile component,
final ComponentProfile[]
components,
@@ -221,7 +222,7 @@
* Verfiy that the inter-Component dependencies are valid.
*
* @param components the ComponentProfile objects for the components
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
protected void verifyDependencyReferences( final ComponentProfile[] components )
throws VerifyException
@@ -237,7 +238,7 @@
*
* @param component the ComponentProfile object for the component
* @param others the ComponentProfile objects for the other components
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
protected void verifyDependencyReferences( final ComponentProfile component,
final ComponentProfile[] others )
@@ -306,7 +307,7 @@
* Verify that the names of the specified Components are valid.
*
* @param components the Components Profile
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
protected void verifyValidNames( final ComponentProfile[] components )
throws VerifyException
@@ -352,7 +353,7 @@
* It is not valid for the same name to be used in multiple components.
*
* @param components the Components
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
protected void checkNamesUnique( final ComponentProfile[] components )
throws VerifyException
@@ -371,7 +372,7 @@
* @param components the array of components to check
* @param name the name of component
* @param index the index of component in array (so we can skip it)
- * @throws VerifyException if names are not unique
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if names
are not unique
*/
private void verifyUniqueName( final ComponentProfile[] components,
final String name,
@@ -398,7 +399,7 @@
* in ComponentInfo.
*
* @param component the ComponentProfile describing the component
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
protected void verifyDependenciesMap( final ComponentProfile component )
throws VerifyException
1.17 +10 -8
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/MetaDataVerifier.java
Index: MetaDataVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/MetaDataVerifier.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MetaDataVerifier.java 8 Sep 2002 04:45:52 -0000 1.16
+++ MetaDataVerifier.java 9 Sep 2002 11:35:53 -0000 1.17
@@ -17,6 +17,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.tools.verifier.VerifyException;
+import org.apache.avalon.framework.tools.verifier.ComponentVerifier;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.registry.ComponentProfile;
@@ -30,7 +32,7 @@
* <li>Verify that the Class objects for Component implement the
* service interfaces.</li>
* <li>Verify that the Class is a valid Avalon Component as per the
- * rules in {@link ComponentVerifier} object.</li>
+ * rules in {@link
org.apache.avalon.framework.tools.verifier.ComponentVerifier} object.</li>
* <li>Verify that the Class is Composable/Serviceable if and only if
* dependencies are declared.</li>
* <li>Verify that the Class is Contextualizable if and context
@@ -83,7 +85,7 @@
*
* @param component the {@link ComponentProfile} object for the components
* @param classLoader the ClassLoader to load component from
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
public void verifyType( final ComponentProfile component,
final ClassLoader classLoader )
@@ -98,7 +100,7 @@
* advertised interfaces. And confrorm to expectations of {@link
ComponentProfile}.
*
* @param component the {@link ComponentProfile} object for the components
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
public void verifyType( final ComponentProfile component,
final Class clazz )
@@ -123,7 +125,7 @@
*
* @param component the {@link ComponentProfile}
* @param clazz the class implementing component
- * @throws VerifyException if fails verification check
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if fails
verification check
*/
protected void verifyContextPresence( final ComponentProfile component,
final ComponentInfo info,
@@ -156,7 +158,7 @@
*
* @param component the {@link ComponentProfile}
* @param clazz the class implementing component
- * @throws VerifyException if fails verification check
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if fails
verification check
*/
protected void verifyDependencyPresence( final ComponentProfile component,
final Class clazz )
@@ -189,7 +191,7 @@
* @param services the services the component offers
* @param classLoader the classLoader
* @return an array of Classes for all the services
- * @throws VerifyException if an error occurs
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if an
error occurs
*/
protected Class[] getServiceClasses( final String name,
final ServiceDescriptor[] services,
@@ -224,7 +226,7 @@
* @param classLoader the ClassLoader to use
* @param component the meta data associate with component
* @return the Class object
- * @throws VerifyException if unable to aquire class object
+ * @throws org.apache.avalon.framework.tools.verifier.VerifyException if unable
to aquire class object
*/
private Class getClass( final ClassLoader classLoader,
final ComponentProfile component )
1.10 +0 -14
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/Resources.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Resources.properties 18 Jun 2002 07:38:47 -0000 1.9
+++ Resources.properties 9 Sep 2002 11:35:53 -0000 1.10
@@ -1,17 +1,3 @@
-#From Verifier class
-verifier.non-public-ctor.error=The implementation class {1} for component named
"{0}" does not have a public no-arg constructor.
-verifier.missing-noargs-ctor.error=The implementation class {1} for component named
"{0}" does not have a no-arg constructor.
-verifier.abstract-class.error=The implementation class {1} for component named
"{0}" is abstract.
-verifier.nonpublic-class.error=The implementation class {1} for component named
"{0}" is not public.
-verifier.primitive-class.error=The implementation class {1} for component named
"{0}" is primitive.
-verifier.interface-class.error=The implementation class {1} for component named
"{0}" is an interface.
-verifier.array-class.error=The implementation class {1} for component named "{0}"
is an array class.
-verifier.non-interface-service.error=The service class {1} for component named
"{0}" is not an interface.
-verifier.non-public-service.error=The service class {1} for component named "{0}"
is not public.
-verifier.incompat-serviceable.error=The implementation class {1} for component
named "{0}" is both Serviceable and Composable (incompatible lifecycle interfaces).
-verifier.incompat-config.error=The implementation class {1} for component named
"{0}" is both Configurable and Parameterizable (incompatible lifecycle interfaces).
-verifier.noimpl-service.error=The implementation class {1} for component named
"{0}" does not implement the service interface {2} which it declares it supports.
-
#Assembly Verifier
assembly.valid-names.notice=Verifying that the names specified for Component are
valid.
assembly.unique-names.notice=Verifying that the names specified for the Components
are unique.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
