You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by vi...@apache.org on 2002/05/14 23:35:58 UTC

cvs commit: jakarta-avalon-excalibur/altrmi build.xml callback.xml default.properties

vinayc      02/05/14 14:35:58

  Modified:    altrmi   build.xml callback.xml default.properties
  Log:
  BCEL Proxy Generator added
  
  Revision  Changes    Path
  1.21      +13 -1     jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml	28 Apr 2002 12:51:30 -0000	1.20
  +++ build.xml	14 May 2002 21:35:57 -0000	1.21
  @@ -15,6 +15,7 @@
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
           <pathelement path="${java.class.path}"/>
  +		<pathelement location="${jakarta-bcel.jar}"/>
       </path>
   
       <path id="tools.class.path">
  @@ -33,10 +34,21 @@
   
       <target name="main" depends="compile, compile-test" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  +	
  +	<target name="checkBCEL">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  +            <property name="name" value="jakarta-bcel.jar"/>
  +            <property name="class" value="org.apache.bcel.generic.ClassGen"/>
  +            <property name="classpath" value="${cp}"/>
  +            <property name="remedy" value="Download BCEL from http://jakarta.apache.org/builds/jakarta-bcel/release/v5.0rc1/ and copy bcel.jar ${nl}
  +           |   to ${ant.home}/lib"/>
   
  +        </ant>
  +    </target>
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +		<ant antfile="${basedir}/build.xml" target="checkBCEL"/>
       </target>
   
       <target name="dependencies-test" depends="dist-jar, dependencies"
  @@ -192,7 +204,7 @@
   
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
  -                    <include name="**/test/*TestCase.class"/>
  +                    <include name="**/test/**/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
               </batchtest>
  
  
  
  1.5       +18 -8     jakarta-avalon-excalibur/altrmi/callback.xml
  
  Index: callback.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/callback.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- callback.xml	20 Apr 2002 13:24:27 -0000	1.4
  +++ callback.xml	14 May 2002 21:35:57 -0000	1.5
  @@ -4,8 +4,12 @@
   <!-- ========== Initialize Properties ===================================== -->
   
   
  -  <property file="ant.properties"/>                <!-- Component local   -->
  -  <property file="${user.home}/ant.properties"/>   <!-- User local        -->
  +    <property file="${user.home}/build.properties"/>
  +    <property file="${basedir}/../ant.properties"/>
  +    <property file="${basedir}/ant.properties"/>
  +    <property file="${user.home}/.ant.properties"/>
  +    <property file="${basedir}/../default.properties"/>
  +    <property file="${basedir}/default.properties"/>
    
   
   <!-- ========== Component Declarations ==================================== -->
  @@ -19,7 +23,8 @@
     <!-- Construct compile classpath -->
     <path id="compile.classpath">
       <pathelement location="${build.home}/classes"/>
  -  </path>
  +	<pathelement location="${jakarta-bcel.jar}"/>
  + </path>
     
     <!-- For running of tests -->
     <path id="test.classpath">
  @@ -27,16 +32,19 @@
       <pathelement location="${build.home}/testclasses"/>        
       <pathelement location="${build.home}/genclasses"/>
       <pathelement location="${avalon-framework.jar}"/>
  +	
     </path>      
   
     <taskdef name="altrmiproxies" classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
       <classpath refid="compile.classpath" />
     </taskdef>
     
  -
  + <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
  +		<ant antfile="${basedir}/build.xml" target="checkBCEL"/>
  +  </target>
   <!-- ========== Executable Targets ======================================== -->
   
  -  <target name="prepare"
  +  <target name="prepare"  depends="dependencies"  
      description="Prepare build directory">
       <mkdir dir="${build.home}"/>
       <mkdir dir="${build.home}/genclasses"/>  
  @@ -53,19 +61,21 @@
        
       <altrmiproxies genname="CallbackTest" srcgendir="${build.home}/genjava" 
           classgendir="${build.home}/genclasses" verbose="true"
  -        interfaces="org.apache.excalibur.altrmi.test.callback.CallBackTest">
  +        interfaces="org.apache.excalibur.altrmi.test.callback.CallBackTest" generatorClass="org.apache.excalibur.altrmi.generator.BCELProxyGeneratorImpl">
         <classpath>
           <pathelement location="${build.home}/classes"/>
  -        <pathelement location="${build.home}/testclasses"/>            
  +        <pathelement location="${build.home}/testclasses"/>   
  +		<pathelement location="${jakarta-bcel.jar}"/>
         </classpath>
       </altrmiproxies>    
       
       <altrmiproxies genname="CallBackTestListenerImpl" srcgendir="${build.home}/genjava" 
           classgendir="${build.home}/genclasses" verbose="true" 
  -        interfaces="org.apache.excalibur.altrmi.test.callback.CallBackTestListener">
  +        interfaces="org.apache.excalibur.altrmi.test.callback.CallBackTestListener" generatorClass="org.apache.excalibur.altrmi.generator.BCELProxyGeneratorImpl">
         <classpath>
           <pathelement location="${build.home}/classes"/>
           <pathelement location="${build.home}/testclasses"/>            
  +		<pathelement location="${jakarta-bcel.jar}"/>
         </classpath>
       </altrmiproxies>     
       
  
  
  
  1.6       +1 -1      jakarta-avalon-excalibur/altrmi/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	28 Apr 2002 12:51:30 -0000	1.5
  +++ default.properties	14 May 2002 21:35:57 -0000	1.6
  @@ -26,7 +26,7 @@
   avalon-framework.home=${basedir}/../../jakarta-avalon
   avalon-framework.lib=${avalon-framework.home}/build/lib
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  -
  +jakarta-bcel.jar=./lib/bcel.jar
   # --------------------------------------------------
   
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>