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/09/25 13:34:08 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader SarPolicyVerifier.java DefaultClassLoaderManager.java
donaldp 2002/09/25 04:34:08
Modified: lib/container excalibur-loader-1.0a.jar
src/java/org/apache/avalon/phoenix/components/classloader
DefaultClassLoaderManager.java
Added: src/java/org/apache/avalon/phoenix/components/classloader
SarPolicyVerifier.java
Log:
Integrate with latest policy package utilities.
Revision Changes Path
1.3 +330 -241 jakarta-avalon-phoenix/lib/container/excalibur-loader-1.0a.jar
<<Binary file>>
1.42 +12 -9 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
Index: DefaultClassLoaderManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- DefaultClassLoaderManager.java 22 Sep 2002 08:52:13 -0000 1.41
+++ DefaultClassLoaderManager.java 25 Sep 2002 11:34:08 -0000 1.42
@@ -86,14 +86,14 @@
public void contextualize( Context context )
throws ContextException
{
- m_commonClassLoader = (ClassLoader)context.get( "common.classloader" );
+ m_commonClassLoader = (ClassLoader) context.get( "common.classloader" );
}
public void service( final ServiceManager serviceManager )
throws ServiceException
{
final ExtensionManager packageRepository =
- (ExtensionManager)serviceManager.lookup( ExtensionManager.ROLE );
+ (ExtensionManager) serviceManager.lookup( ExtensionManager.ROLE );
m_packageManager = new PackageManager( packageRepository );
}
@@ -191,7 +191,7 @@
final int size = unsatisfied.size();
for( int i = 0; i < size; i++ )
{
- final Extension extension = (Extension)unsatisfied.get( i );
+ final Extension extension = (Extension) unsatisfied.get( i );
final Object[] params = new Object[]
{
extension.getExtensionName(),
@@ -212,7 +212,7 @@
}
final OptionalPackage[] packages =
- (OptionalPackage[])dependencies.toArray( new OptionalPackage[ 0 ] );
+ (OptionalPackage[]) dependencies.toArray( new OptionalPackage[ 0 ] );
return OptionalPackage.toFiles( packages );
}
@@ -230,7 +230,7 @@
try
{
final URL url = new URL( "jar:" + element + "!/" );
- final JarURLConnection connection = (JarURLConnection)url.openConnection();
+ final JarURLConnection connection = (JarURLConnection) url.openConnection();
final Manifest manifest = connection.getManifest();
if( null != manifest )
{
@@ -246,7 +246,7 @@
}
}
- return (Manifest[])manifests.toArray( new Manifest[ 0 ] );
+ return (Manifest[]) manifests.toArray( new Manifest[ 0 ] );
}
/**
@@ -262,17 +262,20 @@
throws ConfigurationException
{
final SarPolicyResolver resolver =
- new SarPolicyResolver(baseDirectory, workDirectory );
+ new SarPolicyResolver( baseDirectory, workDirectory );
setupLogger( resolver );
final PolicyBuilder builder = new PolicyBuilder();
final PolicyReader reader = new PolicyReader();
+ final SarPolicyVerifier verifier = new SarPolicyVerifier();
+ setupLogger( verifier );
final Element element = ConfigurationUtil.toElement( configuration );
element.setAttribute( "version", "1.0" );
try
{
- final PolicyMetaData policyMetaData = reader.readPolicy( element );
- return builder.buildPolicy( policyMetaData, resolver );
+ final PolicyMetaData policy = reader.readPolicy( element );
+ verifier.verifyPolicy( policy );
+ return builder.buildPolicy( policy, resolver );
}
catch( final Exception e )
{
1.1 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarPolicyVerifier.java
Index: SarPolicyVerifier.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.phoenix.components.classloader;
import org.apache.excalibur.policy.verifier.PolicyVerifier;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
/**
* A simple adapter for verifier to support logging to
* Phoenixs subsystem.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/09/25 11:34:08 $
*/
class SarPolicyVerifier
extends PolicyVerifier
implements LogEnabled
{
private Logger m_logger;
public void enableLogging( final Logger logger )
{
m_logger = logger;
}
protected void info( final String message )
{
m_logger.info( message );
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>