hammant     2003/02/08 09:24:31

  Modified:    .        build.xml
               src/java/org/apache/avalon/phoenix/components/kernel/beanshell
                        BeanShellKernelProxy.java
  Log:
  beanshell moved to kernel-impl classloader
  
  Revision  Changes    Path
  1.199     +2 -2      avalon-phoenix/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/build.xml,v
  retrieving revision 1.198
  retrieving revision 1.199
  diff -u -r1.198 -r1.199
  --- build.xml 6 Feb 2003 13:40:52 -0000       1.198
  +++ build.xml 8 Feb 2003 17:24:31 -0000       1.199
  @@ -448,8 +448,8 @@
   
       <!-- Copy BeanShell jars -->
       <target name="dist-beanshell" description="Copies Beanshell jars" 
if="beanshell.jars">
  -        <copy file="${build.lib}/phoenix-bsh-commands.jar" 
todir="${bin.dist.lib}"/>
  -        <copy todir="${bin.dist.lib}/">
  +        <copy file="${build.lib}/phoenix-bsh-commands.jar" 
todir="${bin.dist.container.lib}"/>
  +        <copy todir="${bin.dist.container.lib}/">
               <fileset dir="${lib.dir}">
                   <include name="bsh-*"/>
               </fileset>
  
  
  
  1.9       +10 -10    
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
  
  Index: BeanShellKernelProxy.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BeanShellKernelProxy.java 25 Jan 2003 15:47:17 -0000      1.8
  +++ BeanShellKernelProxy.java 8 Feb 2003 17:24:31 -0000       1.9
  @@ -7,13 +7,13 @@
    */
   package org.apache.avalon.phoenix.components.kernel.beanshell;
   
  -import java.io.File;
  -import java.util.Map;
  -import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.logger.Logger;
  +import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
   import org.apache.avalon.phoenix.interfaces.Application;
   import org.apache.avalon.phoenix.interfaces.Kernel;
  -import org.apache.avalon.phoenix.metadata.SarMetaData;
  +
  +import java.io.File;
  +import java.util.Map;
   
   public class BeanShellKernelProxy
       implements Kernel
  @@ -28,12 +28,12 @@
           m_kernel = kernel;
       }
   
  -    public void addApplication( final PartitionMetaData metaData,
  -                                final File workDirectory,
  -                                final ClassLoader classLoader,
  -                                final Logger logger,
  -                                final Map classloaders )
  -        throws Exception
  +    public void addApplication(PartitionProfile profile,
  +                               File homeDirectory, File workDirectory,
  +                               ClassLoader classLoader,
  +                               Logger logger,
  +                               Map classloaders)
  +            throws Exception
       {
           throw new UnsupportedOperationException( "This is not supported for 
non-kernel visitors" );
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to