donaldp 2002/09/09 04:30:19
Modified: src/java/org/apache/avalon/phoenix/components/deployer Tag:
RELEASE_402-branch DefaultDeployer.java
src/java/org/apache/avalon/phoenix/tools/verifier Tag:
RELEASE_402-branch SarVerifier.java
Added: src/java/org/apache/avalon/phoenix/tools/verifier Tag:
RELEASE_402-branch VerifyException.java
Log:
Decouple phoenix-client from containerkit.
Revision Changes Path
No revision
No revision
1.54.2.1 +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.54
retrieving revision 1.54.2.1
diff -u -r1.54 -r1.54.2.1
--- DefaultDeployer.java 6 Sep 2002 09:42:35 -0000 1.54
+++ DefaultDeployer.java 9 Sep 2002 11:30:19 -0000 1.54.2.1
@@ -49,7 +49,7 @@
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.excalibur.containerkit.verifier.VerifyException;
+import org.apache.avalon.phoenix.tools.verifier.VerifyException;
/**
* Deploy .sar files into a kernel using this class.
No revision
No revision
1.28.2.1 +1 -31
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.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- SarVerifier.java 6 Sep 2002 11:17:45 -0000 1.28
+++ SarVerifier.java 9 Sep 2002 11:30:19 -0000 1.28.2.1
@@ -30,8 +30,6 @@
import org.apache.avalon.phoenix.metainfo.BlockInfo;
import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
-import org.apache.excalibur.containerkit.verifier.ComponentVerifier;
-import org.apache.excalibur.containerkit.verifier.VerifyException;
/**
* This Class verifies that Sars are valid. It performs a number
@@ -380,8 +378,6 @@
block.getBlockInfo().getServices(),
classLoader );
- verifyAvalonComponent( name, clazz, interfaces );
-
for( int i = 0; i < interfaces.length; i++ )
{
if( !interfaces[ i ].isAssignableFrom( clazz ) )
@@ -402,32 +398,6 @@
classname );
getLogger().error( message );
System.err.println( message );
- }
-
- }
-
- /**
- * Verify specified object satisifies the rules of being abn Avalon component.
- *
- * @param name the components name
- * @param clazz the implementation class
- * @param interfaces the service classes
- */
- private void verifyAvalonComponent( final String name, Class clazz, final
Class[] interfaces )
- {
- try
- {
- final ComponentVerifier verifier = new ComponentVerifier();
- setupLogger( verifier );
- verifier.
- verifyComponent( name, clazz, interfaces );
- }
- catch( VerifyException ve )
- {
- //ignore as the above will print out
- //error. However the verifier is too
- //strict and we need to be more lax for backwards
- //compatability
}
}
No revision
No revision
1.5.2.1 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/Attic/VerifyException.java
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
