avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader DefaultClassLoaderManager.java SarLoaderResolver.java
Date Fri, 11 Apr 2003 06:49:37 GMT
donaldp     2003/04/10 23:49:37

  Modified:    .        build.xml
               src/java/org/apache/avalon/phoenix/components/classloader
                        DefaultClassLoaderManager.java
                        SarLoaderResolver.java
  Removed:     lib/container excalibur-extension-1.0a.jar
                        excalibur-loader-1.0a.jar
  Log:
  Decouple from loader.
  
  Revision  Changes    Path
  1.241     +43 -1     avalon-phoenix/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/build.xml,v
  retrieving revision 1.240
  retrieving revision 1.241
  diff -u -r1.240 -r1.241
  --- build.xml	9 Apr 2003 23:30:39 -0000	1.240
  +++ build.xml	11 Apr 2003 06:49:37 -0000	1.241
  @@ -109,6 +109,10 @@
       <property name="configkit.jar" value="${repo.dir}/spice-configkit/spice-configkit-1.1.1/spice-configkit-1.1.1.jar"/>
       <fileset id="configkit.fileset" dir="${repo.dir}/spice-configkit/spice-configkit-1.1.1/lib"/>
   
  +    <!-- Invoke ant get-classman' to get these -->
  +    <property name="classman.jar" value="${repo.dir}/spice-classman/spice-classman-1.0/spice-classman-1.0.jar"/>
  +    <fileset id="classman.fileset" dir="${repo.dir}" includes="spice-classman/spice-classman-1.0/lib/*.jar"/>
  +
       <path id="project.class.path">
           <pathelement location="${xerces.jar}"/>
           <pathelement location="${framework.jar}"/>
  @@ -117,6 +121,7 @@
           <pathelement path="${log4j.jar}"/>
           <pathelement path="${cli.jar}"/>
           <pathelement path="${configkit.jar}"/>
  +        <pathelement path="${classman.jar}"/>
           <pathelement path="${mx4j.jar}"/>
           <pathelement path="${mx4j-tools.jar}"/>
           <pathelement path="${beanshell.jar}"/>
  @@ -132,6 +137,7 @@
               <include name="*.jar"/>
           </fileset>
           <pathelement path="${target.classes}"/>
  +        <fileset refid="classman.fileset"/>
       </path>
   
       <path id="test.class.path">
  @@ -464,6 +470,37 @@
           <untar src="${repo.dir}/spice-configkit/spice-configkit.tar" dest="${repo.dir}/spice-configkit"/>
       </target>
   
  +    <!-- =================================================================== -->
  +    <!-- ClassMan Tasks.                                                     -->
  +    <!-- =================================================================== -->
  +    <target name="check-classman-init" depends="init">
  +        <available property="classman.present" classname="org.realityforge.classman.metadata.ClassLoaderMetaData">
  +            <classpath refid="project.class.path"/>
  +        </available>
  +    </target>
  +
  +    <target name="check-classman" depends="check-classman-init" unless="classman.present">
  +        <echo>********************************</echo>
  +        <echo>* Please execute target        *</echo>
  +        <echo>* 'get-classman' in the main   *</echo>
  +        <echo>* build.xml build file         *</echo>
  +        <echo>* to download one and          *</echo>
  +        <echo>* a half Mb of Spice ClassMan  *</echo>
  +        <echo>********************************</echo>
  +        <fail message="Spice ClassMan needed. See above."/>
  +    </target>
  +
  +    <!-- Get the jars from the configkit project. -->
  +    <target name="get-classman" description="Get the Spice ClassMan distribution from
SourceForge.">
  +        <mkdir dir="${repo.dir}/spice-classman"/>
  +        <get src="http://osdn.dl.sourceforge.net/sourceforge/spice/spice-classman-1.0.tar.gz"
  +            dest="${repo.dir}/spice-classman/spice-classman.tar.gz"
  +            verbose="true"
  +            usetimestamp="true"/>
  +        <gunzip src="${repo.dir}/spice-classman/spice-classman.tar.gz" dest="${repo.dir}/spice-classman"/>
  +        <untar src="${repo.dir}/spice-classman/spice-classman.tar" dest="${repo.dir}/spice-classman"/>
  +    </target>
  +
       <!-- Main target -->
       <target name="main" depends="dist-lite"
           description="generates the Phoenix distribution without the javadocs"/>
  @@ -484,7 +521,7 @@
   
   
       <!-- Check requirements of environment -->
  -    <target name="check-environment" depends="check-mx4j, check-log4j, check-cli, check-configkit,
check-wrapper">
  +    <target name="check-environment" depends="check-mx4j, check-log4j, check-cli, check-configkit,
check-classman, check-wrapper">
           <available property="xerces.present" type="file" file="${xerces.jar}"/>
           <available property="servlet.present" classname="javax.servlet.Servlet">
               <classpath refid="project.class.path"/>
  @@ -787,6 +824,11 @@
           <copy file="${target.lib}/phoenix-tools.jar" todir="${bin.dist.tools.lib}/"/>
           <copy file="${target.lib}/phoenix-loader.jar" todir="${bin.dist.bin}/"/>
           <copy file="${target.lib}/phoenix-engine.jar" todir="${bin.dist.container.lib}"/>
  +
  +        <copy file="${classman.jar}" todir="${bin.dist.container.lib}"/>
  +        <copy todir="${bin.dist.container.lib}">
  +            <fileset refid="classman.fileset"/>
  +        </copy>
   
           <copy file="${logkit.jar}" todir="${bin.dist.lib}"/>
           <copy file="${log4j.jar}" todir="${bin.dist.lib}"/>
  
  
  
  1.54      +9 -9      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java
  
  Index: DefaultClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/DefaultClassLoaderManager.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- DefaultClassLoaderManager.java	22 Mar 2003 12:07:08 -0000	1.53
  +++ DefaultClassLoaderManager.java	11 Apr 2003 06:49:37 -0000	1.54
  @@ -72,17 +72,17 @@
   import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
   import org.apache.avalon.phoenix.interfaces.ClassLoaderSet;
  -import org.apache.excalibur.loader.builder.LoaderBuilder;
  -import org.apache.excalibur.loader.builder.LoaderResolver;
  -import org.apache.excalibur.loader.metadata.ClassLoaderMetaData;
  -import org.apache.excalibur.loader.metadata.ClassLoaderSetMetaData;
  -import org.apache.excalibur.loader.metadata.FileSetMetaData;
  -import org.apache.excalibur.loader.metadata.JoinMetaData;
  -import org.apache.excalibur.loader.reader.ClassLoaderSetReader;
  -import org.apache.excalibur.loader.verifier.ClassLoaderVerifier;
   import org.apache.excalibur.policy.builder.PolicyBuilder;
   import org.apache.excalibur.policy.metadata.PolicyMetaData;
   import org.apache.excalibur.policy.reader.PolicyReader;
  +import org.realityforge.classman.builder.LoaderBuilder;
  +import org.realityforge.classman.builder.LoaderResolver;
  +import org.realityforge.classman.metadata.ClassLoaderMetaData;
  +import org.realityforge.classman.metadata.ClassLoaderSetMetaData;
  +import org.realityforge.classman.metadata.FileSetMetaData;
  +import org.realityforge.classman.metadata.JoinMetaData;
  +import org.realityforge.classman.reader.ClassLoaderSetReader;
  +import org.realityforge.classman.verifier.ClassLoaderVerifier;
   import org.w3c.dom.Element;
   
   /**
  @@ -163,7 +163,7 @@
       }
   
       /**
  -     * @avalon.dependency interface="ExtensionManager"
  +     * @phoenix.dependency interface="ExtensionManager"
        */
       public void service( final ServiceManager serviceManager )
           throws ServiceException
  
  
  
  1.6       +2 -2      avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarLoaderResolver.java
  
  Index: SarLoaderResolver.java
  ===================================================================
  RCS file: /home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/classloader/SarLoaderResolver.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SarLoaderResolver.java	22 Mar 2003 12:07:08 -0000	1.5
  +++ SarLoaderResolver.java	11 Apr 2003 06:49:37 -0000	1.6
  @@ -61,7 +61,7 @@
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.phoenix.components.util.ResourceUtil;
  -import org.apache.excalibur.loader.builder.DefaultLoaderResolver;
  +import org.realityforge.classman.builder.DefaultLoaderResolver;
   
   /**
    * a LoaderResolver that knows about Phoenixs environment,
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message