You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/06/04 06:36:13 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier Resources.properties SarVerifier.java Verifier.java VerifyException.java
donaldp 2002/06/03 21:36:13
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockAccessor.java DefaultApplication.java
ListenerAccessor.java
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java
src/java/org/apache/avalon/phoenix/tools/verifier
Resources.properties SarVerifier.java
Removed: src/java/org/apache/avalon/phoenix/components/lifecycle/metainfo
ComponentDescriptor.java ComponentInfo.java
DependencyDescriptor.java ServiceDescriptor.java
src/java/org/apache/avalon/phoenix/components/lifecycle
LifecycleException.java LifecycleHelper.java
ResourceAccessor.java Resources.properties
src/java/org/apache/avalon/phoenix/tools/verifier
Verifier.java VerifyException.java
Log:
Update main tree to use the generic versions of component bits
Revision Changes Path
1.5 +2 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockAccessor.java
Index: BlockAccessor.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockAccessor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BlockAccessor.java 19 May 2002 03:58:30 -0000 1.4
+++ BlockAccessor.java 4 Jun 2002 04:36:13 -0000 1.5
@@ -21,7 +21,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.phoenix.components.lifecycle.ResourceAccessor;
+import org.apache.avalon.phoenix.components.container.lifecycle.ResourceAccessor;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
@@ -32,7 +32,7 @@
* Block or Listener.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.4 $ $Date: 2002/05/19 03:58:30 $
+ * @version $Revision: 1.5 $ $Date: 2002/06/04 04:36:13 $
*/
class BlockAccessor
extends AbstractLogEnabled
1.25 +2 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultApplication.java 20 May 2002 12:01:33 -0000 1.24
+++ DefaultApplication.java 4 Jun 2002 04:36:13 -0000 1.25
@@ -19,8 +19,8 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.ApplicationListener;
import org.apache.avalon.phoenix.BlockListener;
-import org.apache.avalon.phoenix.components.lifecycle.LifecycleException;
-import org.apache.avalon.phoenix.components.lifecycle.LifecycleHelper;
+import org.apache.avalon.phoenix.components.container.lifecycle.LifecycleException;
+import org.apache.avalon.phoenix.components.container.lifecycle.LifecycleHelper;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ApplicationException;
1.7 +2 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerAccessor.java
Index: ListenerAccessor.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerAccessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListenerAccessor.java 20 May 2002 10:15:34 -0000 1.6
+++ ListenerAccessor.java 4 Jun 2002 04:36:13 -0000 1.7
@@ -18,7 +18,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.phoenix.components.lifecycle.ResourceAccessor;
+import org.apache.avalon.phoenix.components.container.lifecycle.ResourceAccessor;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
@@ -27,7 +27,7 @@
* Block or Listener.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2002/05/20 10:15:34 $
+ * @version $Revision: 1.7 $ $Date: 2002/06/04 04:36:13 $
*/
class ListenerAccessor
extends AbstractLogEnabled
1.37 +1 -1 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- DefaultDeployer.java 29 May 2002 10:29:32 -0000 1.36
+++ DefaultDeployer.java 4 Jun 2002 04:36:13 -0000 1.37
@@ -30,6 +30,7 @@
import org.apache.avalon.phoenix.components.deployer.installer.Installation;
import org.apache.avalon.phoenix.components.deployer.installer.Installer;
import org.apache.avalon.phoenix.components.deployer.installer.InstallationException;
+import org.apache.avalon.phoenix.components.container.verifier.VerifyException;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
@@ -45,7 +46,6 @@
import org.apache.avalon.phoenix.tools.assembler.AssemblyException;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
import org.apache.avalon.phoenix.tools.verifier.SarVerifier;
-import org.apache.avalon.phoenix.tools.verifier.VerifyException;
import org.apache.log.Hierarchy;
/**
1.11 +0 -13 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Resources.properties
Index: Resources.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Resources.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Resources.properties 19 May 2002 05:24:58 -0000 1.10
+++ Resources.properties 4 Jun 2002 04:36:13 -0000 1.11
@@ -25,16 +25,3 @@
verifier.service-isa-lifecycle.error=The Block named "{0}" (implementation class "{1}"), implements a service "{2}" which extends a Lifecycle interface "{3}". This violates the expected usage patterns.
verifier.implements-block.error=The Block named "{0}" (implementation class "{1}"), implements Block interface. The Block interface has been deprecated and should no longer be used.
-
-#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).
\ No newline at end of file
1.18 +10 -2 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
Index: SarVerifier.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SarVerifier.java 20 May 2002 11:39:02 -0000 1.17
+++ SarVerifier.java 4 Jun 2002 04:36:13 -0000 1.18
@@ -23,6 +23,8 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockListener;
+import org.apache.avalon.phoenix.components.container.verifier.Verifier;
+import org.apache.avalon.phoenix.components.container.verifier.VerifyException;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
@@ -57,7 +59,7 @@
* </ul>
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.17 $ $Date: 2002/05/20 11:39:02 $
+ * @version $Revision: 1.18 $ $Date: 2002/06/04 04:36:13 $
*/
public class SarVerifier
extends AbstractLogEnabled
@@ -231,9 +233,15 @@
return sb.toString();
}
+ /**
+ * Get array of dependencies for specified Block from specified Block array.
+ *
+ * @param block the block to get dependencies of
+ * @param blocks the total set of blocks in application
+ * @return the dependencies of block
+ */
private BlockMetaData[] getDependencies( final BlockMetaData block,
final BlockMetaData[] blocks )
- throws VerifyException
{
final ArrayList dependencies = new ArrayList();
final DependencyMetaData[] deps = block.getDependencies();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>