Skip to content

Commit 077f607

Browse files
committed
Suppress ant warning if missing extension lib dir
Many of the extensions do not include external dependencies, but for consistency in the build file all extensions attempt to copy libs if they exist. The copy tasks were already to configured to not fail if there was an error copying the files (because the source dir does not exist in this case.) This change also sets the quiet option so that a warning is not produced in the build output on a copy error. Signed-off-by: Tony Germano <[email protected]>
1 parent f5211eb commit 077f607

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

server/build.xml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<include name="*.xml" />
142142
</fileset>
143143
</copy>
144-
<copy todir="${connectors.dicom}/lib" failonerror="false">
144+
<copy todir="${connectors.dicom}/lib" failonerror="false" quiet="true">
145145
<fileset dir="${lib.extensions}/dimse" />
146146
</copy>
147147
<jar destfile="${connectors.dicom}/dicom-shared.jar" basedir="${classes}">
@@ -164,7 +164,7 @@
164164
<include name="*.xml" />
165165
</fileset>
166166
</copy>
167-
<copy todir="${connectors.doc}/lib" failonerror="false">
167+
<copy todir="${connectors.doc}/lib" failonerror="false" quiet="true">
168168
<fileset dir="${lib.extensions}/doc" />
169169
</copy>
170170
<jar destfile="${connectors.doc}/doc-shared.jar" basedir="${classes}">
@@ -190,7 +190,7 @@
190190
<include name="*.xml" />
191191
</fileset>
192192
</copy>
193-
<copy todir="${connectors.file}/lib" failonerror="false">
193+
<copy todir="${connectors.file}/lib" failonerror="false" quiet="true">
194194
<fileset dir="${lib.extensions}/file" />
195195
</copy>
196196
<jar destfile="${connectors.file}/file-shared.jar" basedir="${classes}">
@@ -228,7 +228,7 @@
228228
<include name="*.xml" />
229229
</fileset>
230230
</copy>
231-
<copy todir="${connectors.http}/lib" failonerror="false">
231+
<copy todir="${connectors.http}/lib" failonerror="false" quiet="true">
232232
<fileset dir="${lib.extensions}/http" />
233233
</copy>
234234
<jar destfile="${connectors.http}/http-shared.jar" basedir="${classes}">
@@ -256,7 +256,7 @@
256256
<include name="*.xml" />
257257
</fileset>
258258
</copy>
259-
<copy todir="${connectors.jdbc}/lib" failonerror="false">
259+
<copy todir="${connectors.jdbc}/lib" failonerror="false" quiet="true">
260260
<fileset dir="${lib.extensions}/jdbc" />
261261
</copy>
262262
<jar destfile="${connectors.jdbc}/jdbc-shared.jar" basedir="${classes}">
@@ -286,7 +286,7 @@
286286
<include name="*.xml" />
287287
</fileset>
288288
</copy>
289-
<copy todir="${connectors.jms}/lib" failonerror="false">
289+
<copy todir="${connectors.jms}/lib" failonerror="false" quiet="true">
290290
<fileset dir="${lib.extensions}/jms" />
291291
</copy>
292292
<jar destfile="${connectors.jms}/jms-shared.jar" basedir="${classes}">
@@ -312,7 +312,7 @@
312312
<include name="*.xml" />
313313
</fileset>
314314
</copy>
315-
<copy todir="${connectors.js}/lib" failonerror="false">
315+
<copy todir="${connectors.js}/lib" failonerror="false" quiet="true">
316316
<fileset dir="${lib.extensions}/js" />
317317
</copy>
318318
<jar destfile="${connectors.js}/js-shared.jar" basedir="${classes}">
@@ -334,7 +334,7 @@
334334
<include name="*.xml" />
335335
</fileset>
336336
</copy>
337-
<copy todir="${connectors.smtp}/lib" failonerror="false">
337+
<copy todir="${connectors.smtp}/lib" failonerror="false" quiet="true">
338338
<fileset dir="${lib.extensions}/smtp" />
339339
</copy>
340340
<jar destfile="${connectors.smtp}/smtp-shared.jar" basedir="${classes}">
@@ -358,7 +358,7 @@
358358
<include name="*.xml" />
359359
</fileset>
360360
</copy>
361-
<copy todir="${connectors.tcp}/lib" failonerror="false">
361+
<copy todir="${connectors.tcp}/lib" failonerror="false" quiet="true">
362362
<fileset dir="${lib.extensions}/tcp" />
363363
</copy>
364364
<jar destfile="${connectors.tcp}/tcp-shared.jar" basedir="${classes}">
@@ -382,7 +382,7 @@
382382
<include name="*.xml" />
383383
</fileset>
384384
</copy>
385-
<copy todir="${connectors.vm}/lib" failonerror="false">
385+
<copy todir="${connectors.vm}/lib" failonerror="false" quiet="true">
386386
<fileset dir="${lib.extensions}/vm" />
387387
</copy>
388388
<jar destfile="${connectors.vm}/vm-shared.jar" basedir="${classes}">
@@ -404,7 +404,7 @@
404404
<include name="*.xml" />
405405
</fileset>
406406
</copy>
407-
<copy todir="${connectors.ws}/lib" failonerror="false">
407+
<copy todir="${connectors.ws}/lib" failonerror="false" quiet="true">
408408
<fileset dir="${lib.extensions}/ws" />
409409
</copy>
410410
<jar destfile="${connectors.ws}/ws-shared.jar" basedir="${classes}">
@@ -443,7 +443,7 @@
443443
<include name="*.xml" />
444444
</fileset>
445445
</copy>
446-
<copy todir="${plugins.datatype-delimited}/lib" failonerror="false">
446+
<copy todir="${plugins.datatype-delimited}/lib" failonerror="false" quiet="true">
447447
<fileset dir="${lib.extensions}/datatypes/delimited" />
448448
</copy>
449449
<jar destfile="${plugins.datatype-delimited}/datatype-delimited-shared.jar" basedir="${classes}">
@@ -465,7 +465,7 @@
465465
<include name="*.xml" />
466466
</fileset>
467467
</copy>
468-
<copy todir="${plugins.datatype-dicom}/lib" failonerror="false">
468+
<copy todir="${plugins.datatype-dicom}/lib" failonerror="false" quiet="true">
469469
<fileset dir="${lib.extensions}/datatypes/dicom" />
470470
</copy>
471471
<jar destfile="${plugins.datatype-dicom}/datatype-dicom-shared.jar" basedir="${classes}">
@@ -484,7 +484,7 @@
484484
<include name="*.xml" />
485485
</fileset>
486486
</copy>
487-
<copy todir="${plugins.datatype-edi}/lib" failonerror="false">
487+
<copy todir="${plugins.datatype-edi}/lib" failonerror="false" quiet="true">
488488
<fileset dir="${lib.extensions}/datatypes/edi" />
489489
</copy>
490490
<!-- copy the xml files so they will be included in jar -->
@@ -506,7 +506,7 @@
506506
<include name="*.xml" />
507507
</fileset>
508508
</copy>
509-
<copy todir="${plugins.datatype-hl7v2}/lib" failonerror="false">
509+
<copy todir="${plugins.datatype-hl7v2}/lib" failonerror="false" quiet="true">
510510
<fileset dir="${lib.extensions}/datatypes/hl7v2" />
511511
</copy>
512512
<jar destfile="${plugins.datatype-hl7v2}/datatype-hl7v2-shared.jar" basedir="${classes}">
@@ -526,7 +526,7 @@
526526
<include name="*.xml" />
527527
</fileset>
528528
</copy>
529-
<copy todir="${plugins.datatype-hl7v3}/lib" failonerror="false">
529+
<copy todir="${plugins.datatype-hl7v3}/lib" failonerror="false" quiet="true">
530530
<fileset dir="${lib.extensions}/datatypes/hl7v3" />
531531
</copy>
532532
<jar destfile="${plugins.datatype-hl7v3}/datatype-hl7v3-shared.jar" basedir="${classes}">
@@ -544,7 +544,7 @@
544544
<include name="*.xml" />
545545
</fileset>
546546
</copy>
547-
<copy todir="${plugins.datatype-ncpdp}/lib" failonerror="false">
547+
<copy todir="${plugins.datatype-ncpdp}/lib" failonerror="false" quiet="true">
548548
<fileset dir="${lib.extensions}/datatypes/ncpdp" />
549549
</copy>
550550
<jar destfile="${plugins.datatype-ncpdp}/datatype-ncpdp-shared.jar" basedir="${classes}">
@@ -562,7 +562,7 @@
562562
<include name="*.xml" />
563563
</fileset>
564564
</copy>
565-
<copy todir="${plugins.datatype-xml}/lib" failonerror="false">
565+
<copy todir="${plugins.datatype-xml}/lib" failonerror="false" quiet="true">
566566
<fileset dir="${lib.extensions}/datatypes/xml" />
567567
</copy>
568568
<jar destfile="${plugins.datatype-xml}/datatype-xml-shared.jar" basedir="${classes}">
@@ -580,7 +580,7 @@
580580
<include name="*.xml" />
581581
</fileset>
582582
</copy>
583-
<copy todir="${plugins.datatype-raw}/lib" failonerror="false">
583+
<copy todir="${plugins.datatype-raw}/lib" failonerror="false" quiet="true">
584584
<fileset dir="${lib.extensions}/datatypes/raw" />
585585
</copy>
586586
<jar destfile="${plugins.datatype-raw}/datatype-raw-shared.jar" basedir="${classes}">
@@ -598,7 +598,7 @@
598598
<include name="*.xml" />
599599
</fileset>
600600
</copy>
601-
<copy todir="${plugins.datatype-json}/lib" failonerror="false">
601+
<copy todir="${plugins.datatype-json}/lib" failonerror="false" quiet="true">
602602
<fileset dir="${lib.extensions}/datatypes/json" />
603603
</copy>
604604
<jar destfile="${plugins.datatype-json}/datatype-json-shared.jar" basedir="${classes}">
@@ -616,7 +616,7 @@
616616
<include name="*.xml" />
617617
</fileset>
618618
</copy>
619-
<copy todir="${plugins.directoryresource}/lib" failonerror="false">
619+
<copy todir="${plugins.directoryresource}/lib" failonerror="false" quiet="true">
620620
<fileset dir="${lib.extensions}/directoryresource" />
621621
</copy>
622622
<jar destfile="${plugins.directoryresource}/directoryresource-shared.jar" basedir="${classes}">
@@ -636,7 +636,7 @@
636636
<include name="*.xml" />
637637
</fileset>
638638
</copy>
639-
<copy todir="${plugins.dashboardstatus}/lib" failonerror="false">
639+
<copy todir="${plugins.dashboardstatus}/lib" failonerror="false" quiet="true">
640640
<fileset dir="${lib.extensions}/dashboardstatus" />
641641
</copy>
642642
<jar destfile="${plugins.dashboardstatus}/dashboardstatus-shared.jar" basedir="${classes}">
@@ -656,7 +656,7 @@
656656
<include name="*.xml" />
657657
</fileset>
658658
</copy>
659-
<copy todir="${plugins.destinationsetfilter}/lib" failonerror="false">
659+
<copy todir="${plugins.destinationsetfilter}/lib" failonerror="false" quiet="true">
660660
<fileset dir="${lib.extensions}/destinationsetfilter" />
661661
</copy>
662662
<jar destfile="${plugins.destinationsetfilter}/destinationsetfilter-shared.jar" basedir="${classes}">
@@ -672,7 +672,7 @@
672672
<include name="*.xml" />
673673
</fileset>
674674
</copy>
675-
<copy todir="${plugins.dicomviewer}/lib" failonerror="false">
675+
<copy todir="${plugins.dicomviewer}/lib" failonerror="false" quiet="true">
676676
<fileset dir="${lib.extensions}/dicomviewer" />
677677
</copy>
678678

@@ -683,7 +683,7 @@
683683
<include name="*.xml" />
684684
</fileset>
685685
</copy>
686-
<copy todir="${plugins.globalmapviewer}/lib" failonerror="false">
686+
<copy todir="${plugins.globalmapviewer}/lib" failonerror="false" quiet="true">
687687
<fileset dir="${lib.extensions}/globalmapviewer" />
688688
</copy>
689689
<jar destfile="${plugins.globalmapviewer}/globalmapviewer-shared.jar" basedir="${classes}">
@@ -701,7 +701,7 @@
701701
<include name="*.xml" />
702702
</fileset>
703703
</copy>
704-
<copy todir="${plugins.httpauth}/lib" failonerror="false">
704+
<copy todir="${plugins.httpauth}/lib" failonerror="false" quiet="true">
705705
<fileset dir="${lib.extensions}/httpauth" />
706706
</copy>
707707
<jar destfile="${plugins.httpauth}/httpauth-shared.jar" basedir="${classes}">
@@ -742,7 +742,7 @@
742742
<include name="*.xml" />
743743
</fileset>
744744
</copy>
745-
<copy todir="${plugins.imageviewer}/lib" failonerror="false">
745+
<copy todir="${plugins.imageviewer}/lib" failonerror="false" quiet="true">
746746
<fileset dir="${lib.extensions}/imageviewer" />
747747
</copy>
748748

@@ -753,7 +753,7 @@
753753
<include name="*.xml" />
754754
</fileset>
755755
</copy>
756-
<copy todir="${plugins.javascriptrule}/lib" failonerror="false">
756+
<copy todir="${plugins.javascriptrule}/lib" failonerror="false" quiet="true">
757757
<fileset dir="${lib.extensions}/javascriptrule" />
758758
</copy>
759759
<jar destfile="${plugins.javascriptrule}/javascriptrule-shared.jar" basedir="${classes}">
@@ -767,7 +767,7 @@
767767
<include name="*.xml" />
768768
</fileset>
769769
</copy>
770-
<copy todir="${plugins.javascriptstep}/lib" failonerror="false">
770+
<copy todir="${plugins.javascriptstep}/lib" failonerror="false" quiet="true">
771771
<fileset dir="${lib.extensions}/javascriptstep" />
772772
</copy>
773773
<jar destfile="${plugins.javascriptstep}/javascriptstep-shared.jar" basedir="${classes}">
@@ -781,7 +781,7 @@
781781
<include name="*.xml" />
782782
</fileset>
783783
</copy>
784-
<copy todir="${plugins.mapper}/lib" failonerror="false">
784+
<copy todir="${plugins.mapper}/lib" failonerror="false" quiet="true">
785785
<fileset dir="${lib.extensions}/mapper" />
786786
</copy>
787787
<jar destfile="${plugins.mapper}/mapper-shared.jar" basedir="${classes}">
@@ -796,7 +796,7 @@
796796
<include name="*.xml" />
797797
</fileset>
798798
</copy>
799-
<copy todir="${plugins.messagebuilder}/lib" failonerror="false">
799+
<copy todir="${plugins.messagebuilder}/lib" failonerror="false" quiet="true">
800800
<fileset dir="${lib.extensions}/messagebuilder" />
801801
</copy>
802802
<jar destfile="${plugins.messagebuilder}/messagebuilder-shared.jar" basedir="${classes}">
@@ -810,7 +810,7 @@
810810
<include name="*.xml" />
811811
</fileset>
812812
</copy>
813-
<copy todir="${plugins.datapruner}/lib" failonerror="false">
813+
<copy todir="${plugins.datapruner}/lib" failonerror="false" quiet="true">
814814
<fileset dir="${lib.extensions}/datapruner" />
815815
</copy>
816816
<jar destfile="${plugins.datapruner}/datapruner-shared.jar" basedir="${classes}">
@@ -828,7 +828,7 @@
828828
<include name="*.xml" />
829829
</fileset>
830830
</copy>
831-
<copy todir="${plugins.mllpmode}/lib" failonerror="false">
831+
<copy todir="${plugins.mllpmode}/lib" failonerror="false" quiet="true">
832832
<fileset dir="${lib.extensions}/mllpmode" />
833833
</copy>
834834
<jar destfile="${plugins.mllpmode}/mllpmode-shared.jar" basedir="${classes}">
@@ -846,7 +846,7 @@
846846
<include name="*.xml" />
847847
</fileset>
848848
</copy>
849-
<copy todir="${plugins.pdfviewer}/lib" failonerror="false">
849+
<copy todir="${plugins.pdfviewer}/lib" failonerror="false" quiet="true">
850850
<fileset dir="${lib.extensions}/pdfviewer" />
851851
</copy>
852852

@@ -857,7 +857,7 @@
857857
<include name="*.xml" />
858858
</fileset>
859859
</copy>
860-
<copy todir="${plugins.textviewer}/lib" failonerror="false">
860+
<copy todir="${plugins.textviewer}/lib" failonerror="false" quiet="true">
861861
<fileset dir="${lib.extensions}/textviewer" />
862862
</copy>
863863

@@ -868,7 +868,7 @@
868868
<include name="*.xml" />
869869
</fileset>
870870
</copy>
871-
<copy todir="${plugins.rulebuilder}/lib" failonerror="false">
871+
<copy todir="${plugins.rulebuilder}/lib" failonerror="false" quiet="true">
872872
<fileset dir="${lib.extensions}/rulebuilder" />
873873
</copy>
874874
<jar destfile="${plugins.rulebuilder}/rulebuilder-shared.jar" basedir="${classes}">
@@ -883,7 +883,7 @@
883883
<include name="*.xml" />
884884
</fileset>
885885
</copy>
886-
<copy todir="${plugins.serverlog}/lib" failonerror="false">
886+
<copy todir="${plugins.serverlog}/lib" failonerror="false" quiet="true">
887887
<fileset dir="${lib.extensions}/serverlog" />
888888
</copy>
889889
<jar destfile="${plugins.serverlog}/serverlog-shared.jar" basedir="${classes}">
@@ -903,7 +903,7 @@
903903
<include name="*.xml" />
904904
</fileset>
905905
</copy>
906-
<copy todir="${plugins.scriptfilerule}/lib" failonerror="false">
906+
<copy todir="${plugins.scriptfilerule}/lib" failonerror="false" quiet="true">
907907
<fileset dir="${lib.extensions}/scriptfilerule" />
908908
</copy>
909909
<jar destfile="${plugins.scriptfilerule}/scriptfilerule-shared.jar" basedir="${classes}">
@@ -917,7 +917,7 @@
917917
<include name="*.xml" />
918918
</fileset>
919919
</copy>
920-
<copy todir="${plugins.scriptfilestep}/lib" failonerror="false">
920+
<copy todir="${plugins.scriptfilestep}/lib" failonerror="false" quiet="true">
921921
<fileset dir="${lib.extensions}/scriptfilestep" />
922922
</copy>
923923
<jar destfile="${plugins.scriptfilestep}/scriptfilestep-shared.jar" basedir="${classes}">
@@ -931,7 +931,7 @@
931931
<include name="*.xml" />
932932
</fileset>
933933
</copy>
934-
<copy todir="${plugins.xsltstep}/lib" failonerror="false">
934+
<copy todir="${plugins.xsltstep}/lib" failonerror="false" quiet="true">
935935
<fileset dir="${lib.extensions}/xsltstep" />
936936
</copy>
937937
<jar destfile="${plugins.xsltstep}/xsltstep-shared.jar" basedir="${classes}">

0 commit comments

Comments
 (0)