You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/07/27 03:45:53 UTC

cvs commit: jakarta-slide build.xml

remm        01/07/26 18:45:53

  Modified:    .        build.xml
  Log:
  - The JNDI wrapper depends on Catalina classes (which in turn need JNDI
    to build).
    Problem reported by Valeriy Podkolzin <vpodkolzin at atg.com>
  
  Revision  Changes    Path
  1.99      +3 -2      jakarta-slide/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/build.xml,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- build.xml	2001/06/25 18:38:15	1.98
  +++ build.xml	2001/07/27 01:45:53	1.99
  @@ -823,7 +823,7 @@
         <classpath refid="wrappers.classpath"/>
         <exclude name="**/catalina/**" unless="catalina.present" />
         <exclude name="**/log4j/**" unless="log4j.present" />
  -      <exclude name="**/jndi/**" unless="jndi.present" />
  +      <exclude name="**/jndi/**" unless="catalina.present" />
       </javac>
   
     </target>
  @@ -833,7 +833,7 @@
     <!-- Build JNDI related components                                       -->
     <!-- This target requires the JNDI libraries                             -->
     <!-- =================================================================== -->
  -  <target name="jndi-wrapper" depends="wrappers" if="jndi.present">
  +  <target name="jndi-wrapper" depends="wrappers" if="catalina.present">
   
       <jar jarfile="${slide.dist}/slide/wrappers/jndiwrapper.jar"
        basedir="${slide.build}/classes"
  @@ -841,6 +841,7 @@
        includes="LICENSE,README,CHANGELOG,**/wrappers/jndi/**" />
   
     </target>
  +
   
     <!-- =================================================================== -->
     <!-- Build Catalina related components                                   -->