avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/altrmi base.xml build.xml default.properties
Date Sat, 28 Dec 2002 12:23:31 GMT
hammant     2002/12/28 04:23:30

  Modified:    altrmi   base.xml build.xml default.properties
  Log:
  Better 'available' usage to aid gump.
  
  Revision  Changes    Path
  1.9       +1 -1      jakarta-avalon-excalibur/altrmi/base.xml
  
  Index: base.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/base.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- base.xml	21 Dec 2002 20:32:36 -0000	1.8
  +++ base.xml	28 Dec 2002 12:23:30 -0000	1.9
  @@ -64,7 +64,7 @@
           <pathelement location="${build.home}/testclasses"/>            
         </classpath>
       </altrmiproxies>     
  -     
  +    
     </target>
   
   </project>
  
  
  
  1.56      +30 -19    jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- build.xml	27 Dec 2002 00:07:27 -0000	1.55
  +++ build.xml	28 Dec 2002 12:23:30 -0000	1.56
  @@ -9,8 +9,7 @@
       <property file="${basedir}/default.properties"/>
       <property file="${user.home}/.ant.properties"/>
       <property file="default.properties"/>
  -
  -
  +    
       <property name ="jetty.rel"    value="4.2.2"/>
   
       <!-- Classpath for product -->
  @@ -25,7 +24,6 @@
           <pathelement location="${qdox.jar}"/>
           <pathelement location="${jakarta-bcel.jar}"/>
           <pathelement path="${java.class.path}"/>
  -<!--        <pathelement path="lib/servlet.jar"/>-->
           <pathelement path="${cornerstone-api.jar}"/>
           <pathelement path="${phoenix-client.jar}"/>
           <pathelement path="${phoenix-metagenerate.jar}"/>
  @@ -66,6 +64,14 @@
       <target name="main" depends="compile, compile-test" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="prepare">
  +
  +        <available property="phoenix-client.present" classname="org.apache.avalon.phoenix.BlockEvent"

  +        classpathref="project.class.path"/>
  +        
  +        
  +    </target>
  +
       <target name="checkBCEL">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
               <property name="proj.jar.name" value="jakarta-bcel.jar"/>
  @@ -76,6 +82,7 @@
   
           </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"/>
  @@ -92,7 +99,7 @@
   
   
       <!-- Compiles the source code -->
  -    <target name="compile" depends="dependencies, warnJettyJars" description="Compiles
the source code">
  +    <target name="compile" depends="prepare, dependencies, warnJettyJars" description="Compiles
the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -106,6 +113,7 @@
               <classpath refid="project.class.path" />
               <include name="**/*.java"/>
               <exclude name="org/apache/excalibur/altrmi/server/impl/http/*.java" unless="jetty.present"/>
  +            <exclude name="org/apache/excalibur/altrmi/blocks/**" unless="phoenix-client.present"/>
           
           </javac>
   
           <rmic base="${build.classes}"
  @@ -166,7 +174,7 @@
   
       </target>
       
  -  <target name="metagenerate" description="Generates the XML descriptors">
  +  <target name="metagenerate" if="phoenix-client.present" description="Generates the
XML descriptors">
   
       <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
         <classpath refid="project.class.path" />
  @@ -180,10 +188,20 @@
   
     </target>    
   
  +  <target name="block-jar" if="phoenix-client.present">
  +
  +    <jar jarfile="${build.lib}/${blocks.jar.name}"
  +        basedir="${build.classes}"
  +        manifest="src/conf/MANIFEST-blocks.MF">
  +      <include name="org/apache/excalibur/altrmi/blocks/**"/>
  +    </jar>
  +
  +  </target>    
  +
       <!-- Creates all the .jar file -->
  -    <target name="jar" depends="compile, metagenerate" description="Generates the jar
files">
  +    <target name="jar" depends="compile, metagenerate, block-jar" description="Generates
the jar files">
   
  -        <mkdir dir="${build.lib}"/>
  +        <mkdir dir="${build.lib}"/>       
   
           <jar jarfile="${build.lib}/${common.jar.name}"
               basedir="${build.classes}"
  @@ -235,13 +253,6 @@
             <include name="org/apache/excalibur/altrmi/registry/**"/>
           </jar>
   
  -        <jar jarfile="${build.lib}/${blocks.jar.name}"
  -            basedir="${build.classes}"
  -            manifest="src/conf/MANIFEST-blocks.MF">
  -          <include name="org/apache/excalibur/altrmi/blocks/**"/>
  -        </jar>
  -
  -
       </target>
   
       <!-- Creates all the Javadocs -->
  @@ -265,10 +276,9 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile-test" description="Perform the unit tests"
unless="skip.tests">
  +    <target name="test" depends="compile-test" description="Perform the unit tests">
   
           <echo message="Performing Unit Tests" />
  -        <echo message="--${jakarta-commons-attributes.jar}" />
   
           <ant antfile="base.xml" target="generate"/>
   
  @@ -289,11 +299,11 @@
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
   
  -                    <include name="**/test/**/CustomHttpServletTestCase.class"/>
  -<!--
  +                    <include name="**/test/**/*TestCase.class"/>
   
  +<!--
   
  -                    <include name="**/test/**/*TestCase.class"/>
  +                    <include name="**/test/**/CustomHttpServletTestCase.class"/>
                       <include name="**/test/**/JettyServletTestCase.class"/>
   -->
   
  @@ -303,6 +313,7 @@
                   </fileset>
               </batchtest>
           </junit>
  +
   
           <!-- Dynamic Server Side classes -->
   
  
  
  
  1.16      +5 -5      jakarta-avalon-excalibur/altrmi/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/default.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- default.properties	27 Dec 2002 00:07:27 -0000	1.15
  +++ default.properties	28 Dec 2002 12:23:30 -0000	1.16
  @@ -28,11 +28,11 @@
   avalon-framework.home=${basedir}/../../jakarta-avalon
   avalon-framework.lib=${avalon-framework.home}/target/lib
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  -jakarta-bcel.jar=lib/bcel.jar
  -qdox.jar=lib/qdox-1.0.jar
  -cornerstone-api.jar=lib/cornerstone-api.jar
  -phoenix-client.jar=lib/phoenix-client.jar
  -phoenix-metagenerate.jar=lib/phoenix-metagenerate.jar
  +jakarta-bcel.jar=./lib/bcel.jar
  +qdox.jar=./lib/qdox-1.0.jar
  +cornerstone-api.jar=./lib/cornerstone-api.jar
  +phoenix-client.jar=./lib/phoenix-client.jar
  +phoenix-metagenerate.jar=./lib/phoenix-metagenerate.jar
   jakarta-commons-attributes.jar=./lib/commons-attributes-0.1.jar
   jakarta-commons-httpclient.jar=./lib/commons-httpclient.jar
   jakarta-commons-logging.jar=./lib/commons-logging.jar
  
  
  

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


Mime
View raw message