tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina build.xml
Date Fri, 24 Jun 2005 11:54:21 GMT
pero        2005/06/24 04:54:21

  Modified:    catalina build.xml
  Log:
  Add new jmx remote ant support
  new catalina-ant-jmx.jar build
  
  Revision  Changes    Path
  1.81      +19 -3     jakarta-tomcat-catalina/catalina/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- build.xml	18 Jan 2005 00:52:39 -0000	1.80
  +++ build.xml	24 Jun 2005 11:54:21 -0000	1.81
  @@ -542,7 +542,7 @@
   
       <!-- Executable Commands -->
       <copy todir="${catalina.build}/bin">
  -      <fileset dir="src/bin" excludes="*-using-launcher.*,launcher.properties,catalina.xml"
/>
  +      <fileset dir="src/bin" excludes="*-using-launcher.*,launcher.properties,catalina.xml,*-tasks.xml"
/>
       </copy>
       <fixcrlf srcdir="${catalina.build}/bin" includes="*.sh" eol="lf"/>
       <fixcrlf srcdir="${catalina.build}/bin" includes="*.bat" eol="crlf"/>
  @@ -640,6 +640,9 @@
   
     </target>
   
  +	
  +
  +	
     <target name="build-catalina-optional" unless="build.tomcat.base">
       <!-- Compile internal server components -->
       <javac srcdir="src/share" destdir="${classes.dir}"
  @@ -1018,7 +1021,7 @@
       <jar jarfile="${catalina.deploy}/server/lib/catalina-ant.jar">
         <fileset dir="${classes.dir}">
           
  -      	<include name="org/apache/catalina/ant/**" />
  +      	<include name="org/apache/catalina/ant/*" />
           <include name="org/apache/catalina/util/Base64.class" />
   
         	<!-- Javadoc and i18n exclusions -->
  @@ -1028,7 +1031,20 @@
         </fileset>
       </jar>
   
  -    <!-- Naming - Factory JAR File -->
  +  	<!-- Catalina JMX Accessor Ant Tasks JAR File -->
  +    <jar jarfile="${catalina.deploy}/server/lib/catalina-ant-jmx.jar">
  +      <fileset dir="${classes.dir}">
  +        
  +      	<include name="org/apache/catalina/ant/jmx/*" />
  +
  +      	<!-- Javadoc and i18n exclusions -->
  +        <exclude name="**/package.html" />
  +        <exclude name="**/LocalStrings_*" />
  +      	
  +      </fileset>
  +    </jar>
  +
  +  	<!-- Naming - Factory JAR File -->
       <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar" index="true">
         <fileset dir="${classes.dir}">
           <include name="org/apache/naming/**" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message