← Back to branch summary

~ubuntu-branches/ubuntu/natty/tomcat6/natty-proposed

« back to all changes in this revision

Viewing changes to build.xml

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-05-21 13:51:15 UTC
  • mfrom: (2.2.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100521135115-qfwnf24lzvi3644v
Tags: 6.0.26-2
http://bugs.debian.org/581018
https://launchpad.net/bugs/557300
https://launchpad.net/bugs/569118
* debian/tomcat6.{postinst,prerm}: Respect TOMCAT6_USER and TOMCAT6_GROUP
  as defined in /etc/default/tomcat6 when setting directory permissions and
  authbind configuration (Closes: #581018, LP: #557300)
* debian/tomcat6.postinst: Use group "tomcat6" instead of "adm" for
  permissions in /var/lib/tomcat6, so that group "adm" doesn't get write
  permissions over /var/lib/tomcat6/webapps (LP: #569118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
build.xml
58
58
  <property name="tomcat.build"          value="${basedir}/output/build"/>
59
59
  <property name="tomcat.classes"        value="${basedir}/output/classes"/>
60
60
  <property name="tomcat.dist"           value="${basedir}/output/dist"/>
61
 
  <property name="tomcat.tmp"            value="${basedir}/output/tmp"/>
 
61
  <property name="tomcat.manifests"      value="${basedir}/output/manifests"/>
62
62
  <property name="test.failonerror"      value="true"/>
63
63
  <property name="test.runner"           value="junit.textui.TestRunner"/>
64
64
 
70
70
  <!-- Exact spec versions (for the manifests) -->
71
71
  <property name="servlet.revision" value="MR2" />
72
72
  <property name="jsp.revision" value="FR" />
 
73
  <property name="el.revision" value="FR" />
73
74
 
74
75
  <!-- JAR artifacts -->
75
76
  <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
258
259
  <macrodef name="jarIt" description="utility macro for standard JAR packaging">
259
260
    <attribute name="jarfile" description="the name of the JAR file to create"/>
260
261
    <attribute name="filesId" description="the patternset id of the files to use"/>
261
 
    <attribute name="manifest" description="the manifest file use"/>
262
 
    <attribute name="notice" description="the LICENSE file to use"/>
263
 
    <attribute name="license" description="the NOTICE file to use"/>
 
262
    <attribute name="manifest" description="the manifest file use"
 
263
               default="${tomcat.manifests}/default.manifest" />
 
264
    <attribute name="notice" description="the LICENSE file to use"
 
265
               default="${tomcat.manifests}/default.notice" />
 
266
    <attribute name="license" description="the NOTICE file to use"
 
267
               default="${tomcat.manifests}/default.license" />
264
268
    <sequential>
265
269
      <jar  jarfile="@{jarfile}" manifest="@{manifest}">
266
270
        <fileset dir="${tomcat.classes}">
281
285
    <filter token="target.jdk" value="${compile.target}"/>
282
286
    <filter token="servlet.revision" value="${servlet.revision}"/>
283
287
    <filter token="jsp.revision" value="${jsp.revision}"/>
 
288
    <filter token="el.revision" value="${el.revision}"/>
284
289
 
285
 
    <mkdir dir="${tomcat.tmp}" />
286
 
    <copy todir="${tomcat.tmp}" overwrite="yes" filtering="yes"
 
290
    <mkdir dir="${tomcat.manifests}" />
 
291
    <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
287
292
      encoding="ISO-8859-1">
288
293
      <filterset refid="version.filters"/>
289
 
      <fileset dir="res/META-INF" includes="*.manifest" />
 
294
      <fileset dir="${tomcat.home}/res/META-INF" >
 
295
        <include name="*.manifest" />
 
296
        <include name="*.license" />
 
297
        <include name="*.notice" />
 
298
      </fileset>
290
299
    </copy>
291
300
 
292
301
  </target>
294
303
  <target name="package" depends="build-manifests" >
295
304
    <!-- Common Annotations 1.0 JAR File -->
296
305
    <jarIt jarfile="${annotations-api.jar}" filesId="files.annotations-api"
297
 
      manifest="${tomcat.tmp}/default.manifest"
298
 
      notice="res/META-INF/default.notice"
299
 
      license="res/META-INF/default.license" />
 
306
      manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
300
307
 
301
308
    <!-- Servlet 2.5 Implementation JAR File -->
302
309
    <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
303
 
      manifest="${tomcat.tmp}/servlet-api.jar.manifest"
304
 
      notice="res/META-INF/default.notice"
305
 
      license="res/META-INF/default.license" />
 
310
      manifest="${tomcat.manifests}/servlet-api.jar.manifest" />
306
311
 
307
312
    <!-- JSP 2.1 Implementation JAR File -->
308
313
    <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
309
 
      manifest="${tomcat.tmp}/jsp-api.jar.manifest"
310
 
      notice="res/META-INF/default.notice"
311
 
      license="res/META-INF/default.license" />
 
314
      manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
312
315
 
313
316
 
314
317
    <!-- JSP 2.1 EL Implementation JAR File -->
315
318
    <jarIt jarfile="${el-api.jar}" filesId="files.el-api"
316
 
      manifest="${tomcat.tmp}/default.manifest"
317
 
      notice="res/META-INF/default.notice"
318
 
      license="res/META-INF/default.license" />
 
319
      manifest="${tomcat.manifests}/el-api.jar.manifest" />
319
320
 
320
321
    <!-- Bootstrap JAR File -->
321
322
    <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
322
 
      manifest="${tomcat.tmp}/bootstrap.jar.manifest"
323
 
      notice="res/META-INF/default.notice"
324
 
      license="res/META-INF/default.license" />
 
323
      manifest="${tomcat.manifests}/bootstrap.jar.manifest" />
325
324
 
326
325
    <!-- Tomcat-juli JAR File -->
327
 
    <jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli"
328
 
      manifest="${tomcat.tmp}/default.manifest"
329
 
      notice="res/META-INF/default.notice"
330
 
      license="res/META-INF/default.license" />
 
326
    <jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli" />
331
327
 
332
328
    <!-- Catalina Main JAR File -->
333
 
    <jarIt jarfile="${catalina.jar}" filesId="files.catalina"
334
 
      manifest="${tomcat.tmp}/default.manifest"
335
 
      notice="res/META-INF/default.notice"
336
 
      license="res/META-INF/default.license" />
 
329
    <jarIt jarfile="${catalina.jar}" filesId="files.catalina" />
337
330
 
338
331
    <!-- Catalina GroupCom/Tribes JAR File -->
339
 
    <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"
340
 
      manifest="${tomcat.tmp}/default.manifest"
341
 
      notice="res/META-INF/default.notice"
342
 
      license="res/META-INF/default.license" />
 
332
    <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes" />
343
333
 
344
334
    <!-- Catalina Cluster/HA JAR File -->
345
 
    <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"
346
 
      manifest="${tomcat.tmp}/default.manifest"
347
 
      notice="res/META-INF/default.notice"
348
 
      license="res/META-INF/default.license" />
 
335
    <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha" />
349
336
 
350
337
    <!-- Catalina Ant Tasks JAR File -->
351
 
    <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant"
352
 
      manifest="${tomcat.tmp}/default.manifest"
353
 
      notice="res/META-INF/default.notice"
354
 
      license="res/META-INF/default.license" />
 
338
    <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant" />
355
339
 
356
340
    <!-- Protocol handlers - Coyote -->
357
 
    <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote"
358
 
      manifest="${tomcat.tmp}/default.manifest"
359
 
      notice="res/META-INF/default.notice"
360
 
      license="res/META-INF/default.license" />
 
341
    <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote" />
361
342
 
362
343
    <!-- Jasper Implementation JAR File -->
363
 
    <jarIt jarfile="${jasper.jar}" filesId="files.jasper"
364
 
      manifest="${tomcat.tmp}/default.manifest"
365
 
      notice="res/META-INF/default.notice"
366
 
      license="res/META-INF/default.license" />
 
344
    <jarIt jarfile="${jasper.jar}" filesId="files.jasper" />
367
345
 
368
346
    <!-- Jasper EL Implementation JAR File -->
369
 
    <jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el"
370
 
      manifest="${tomcat.tmp}/default.manifest"
371
 
      notice="res/META-INF/default.notice"
372
 
      license="res/META-INF/default.license" />
 
347
    <jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el" />
373
348
 
374
349
    <!-- i18n JARs -->
375
350
    <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
376
 
      manifest="${tomcat.tmp}/default.manifest" >
 
351
      manifest="${tomcat.manifests}/default.manifest" >
377
352
      <fileset dir="${tomcat.classes}">
378
353
        <include name="**/LocalStrings_es.properties" />
379
354
      </fileset>
380
 
      <zipfileset file="res/META-INF/default.notice"
 
355
      <zipfileset file="${tomcat.manifests}/default.notice"
381
356
        fullpath="META-INF/NOTICE" />
382
 
      <zipfileset file="res/META-INF/default.license"
 
357
      <zipfileset file="${tomcat.manifests}/default.license"
383
358
        fullpath="META-INF/LICENSE" />
384
359
    </jar>
385
360
    <jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
386
 
      manifest="${tomcat.tmp}/default.manifest" >
 
361
      manifest="${tomcat.manifests}/default.manifest" >
387
362
      <fileset dir="${tomcat.classes}">
388
363
        <include name="**/LocalStrings_fr.properties" />
389
364
      </fileset>
390
 
      <zipfileset file="res/META-INF/default.notice"
 
365
      <zipfileset file="${tomcat.manifests}/default.notice"
391
366
        fullpath="META-INF/NOTICE" />
392
 
      <zipfileset file="res/META-INF/default.license"
 
367
      <zipfileset file="${tomcat.manifests}/default.license"
393
368
        fullpath="META-INF/LICENSE" />
394
369
    </jar>
395
370
    <jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
396
 
      manifest="${tomcat.tmp}/default.manifest" >
 
371
      manifest="${tomcat.manifests}/default.manifest" >
397
372
      <fileset dir="${tomcat.classes}">
398
373
        <include name="**/LocalStrings_ja.properties" />
399
374
      </fileset>
400
 
      <zipfileset file="res/META-INF/default.notice"
 
375
      <zipfileset file="${tomcat.manifests}/default.notice"
401
376
        fullpath="META-INF/NOTICE" />
402
 
      <zipfileset file="res/META-INF/default.license"
 
377
      <zipfileset file="${tomcat.manifests}/default.license"
403
378
        fullpath="META-INF/LICENSE" />
404
379
    </jar>
405
380
 
672
647
  <target name="clean">
673
648
    <delete dir="${tomcat.classes}" />
674
649
    <delete dir="${tomcat.build}" />
675
 
    <delete dir="${tomcat.tmp}" />
 
650
    <delete dir="${tomcat.manifests}" />
676
651
  </target>
677
652
 
678
653
  <!-- Download and dependency building -->
785
760
 
786
761
  </target>
787
762
 
788
 
  <target name="build-tomcat-dbcp" unless="jdk16.present">
 
763
  <target name="build-tomcat-dbcp" unless="jdk16.present"
 
764
          depends="build-manifests">
789
765
    <copy todir="${tomcat-dbcp.home}">
790
766
      <fileset dir="${commons-pool.home}">
791
767
        <include name="**/*.java" />
825
801
    </javac>
826
802
    <jar jarfile="${tomcat-dbcp.jar}"
827
803
         index="true"
828
 
         manifest="${tomcat.tmp}/default.manifest">
 
804
         manifest="${tomcat.manifests}/default.manifest">
829
805
      <fileset dir="${tomcat-dbcp.home}/classes">
830
806
        <include name="**/*.class" />
831
807
        <include name="**/*.properties" />
832
808
      </fileset>
833
 
      <zipfileset file="${tomcat.home}/res/META-INF/default.notice"
 
809
      <zipfileset file="${tomcat.manifests}/default.notice"
834
810
        fullpath="META-INF/NOTICE" />
835
 
      <zipfileset file="${tomcat.home}/res/META-INF/default.license"
 
811
      <zipfileset file="${tomcat.manifests}/default.license"
836
812
        fullpath="META-INF/LICENSE" />
837
813
    </jar>
838
814
  </target>
839
815
 
840
 
  <target name="build-jasper-jdt">
 
816
  <target name="build-jasper-jdt" depends="build-manifests">
841
817
    <unjar src="${jdt.jar}" dest="${jasper-jdt.home}" />
842
818
    <jar destfile="${jasper-jdt.jar}" index="true"
843
 
         manifest="${tomcat.tmp}/default.manifest">
 
819
         manifest="${tomcat.manifests}/default.manifest">
844
820
      <fileset dir="${jasper-jdt.home}">
845
821
        <include name="org/eclipse/jdt/core/compiler/**"/>
846
822
        <include name="org/eclipse/jdt/internal/compiler/**"/>
847
823
        <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
848
824
      </fileset>
849
 
      <zipfileset file="${tomcat.home}/res/META-INF/jasper-jdt.jar.notice"
 
825
      <zipfileset file="${tomcat.manifests}/jasper-jdt.jar.notice"
850
826
        fullpath="META-INF/NOTICE" />
851
 
      <zipfileset file="${tomcat.home}/res/META-INF/jasper-jdt.jar.license"
 
827
      <zipfileset file="${tomcat.manifests}/jasper-jdt.jar.license"
852
828
        fullpath="META-INF/LICENSE" />
853
829
    </jar>
854
830
  </target>