Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@jakarta.apache.org Received: (qmail 55800 invoked by uid 500); 10 Oct 2001 22:00:25 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk Reply-To: ant-dev@jakarta.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 55791 invoked from network); 10 Oct 2001 22:00:24 -0000 Date: 10 Oct 2001 20:13:42 -0000 Message-ID: <20011010201342.17016.qmail@mailweb21.rediffmail.com> MIME-Version: 1.0 From: "Magesh Umasankar" Reply-To: "Magesh Umasankar" To: Subject: [PATCH] Single File Filesets can be used with toFile attr. for copy and move tasks. Content-type: multipart/mixed; boundary="Next_1002744822---0-203.199.83.145-17013" X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N This is a multipart mime message --Next_1002744822---0-203.199.83.145-17013 Content-type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Let me direct your attention to this thread on ant-user.=0D=0A=0D=0Ahttp://= marc.theaimsgroup.com/?t=3D100258096800004&w=3D2&r=3D1=0D=0A=0D=0ASpecifica= lly to Pete's comment...=0D=0A=3D=3D=3D=3D=3D=0D=0AOr perhaps more simply= =0D=0A=0D=0A =0D=0A =0D=0A =0D=0A =0D=0A =0D=0A=3D=3D=3D=3D=3D=0D=0A=0D=0AIn the above case, Pete = has suggested the user use=0D=0AFileset to resolve pattern mappings issue i= nstead of=0D=0Agoing for regexps. The only problem the use of this=0D=0Aap= proach is that if jndi*.jar results in multiple files=0D=0Ain the fileset, = we won't know how to move them all to=0D=0Aa single file.=0D=0A=0D=0AHoweve= r, if the pattern jndi*.jar in my/jndi/dir =0D=0Areturns only one file, a v= alid copy/move should be=0D=0Aperformed (logical user expectation).=0D=0A= =0D=0ABut, as it is now, the Copy and Move tasks will not=0D=0Alet the user= use toFile and FileSets even if there is=0D=0Ano (src)file attribute speci= fied and the fileset=0D=0Acontains just one file.=0D=0A=0D=0AHere is a patc= h that looks into the fileset before=0D=0Adismissing it outright. Once thi= s patch is in place=0D=0APete's suggestion in the user group will work so l= ong=0D=0Aas the pattern doesn't result in multiple files.=0D=0A=0D=0AThanks= ,=0D=0AMagesh=0D=0A =0A --Next_1002744822---0-203.199.83.145-17013 Content-type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: base64 Content-Disposition: attach; filename="patchfile.txt" SW5kZXg6IGNvcHkuaHRtbA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9ob21lL2N2c3B1 YmxpYy9qYWthcnRhLWFudC9kb2NzL21hbnVhbC9Db3JlVGFza3MvY29weS5odG1sLHYNCnJl dHJpZXZpbmcgcmV2aXNpb24gMS4yDQpkaWZmIC13IC11IC1yMS4yIGNvcHkuaHRtbA0KLS0t IGNvcHkuaHRtbCAgIDIwMDEvMDIvMTMgMTI6MzE6NTAgICAgIDEuMg0KKysrIGNvcHkuaHRt bCAgIDIwMDEvMTAvMTAgMTk6NTU6MjkNCkBAIC0zOSw3ICszOSw5IEBADQogICAgIDx0ZCB2 YWxpZ249InRvcCI+VGhlIGZpbGUgdG8gY29weSB0by48L3RkPg0KICAgICA8dGQgdmFsaWdu PSJ0b3AiIGFsaWduPSJjZW50ZXIiIHJvd3NwYW49IjIiPldpdGggdGhlIDx2YXI+ZmlsZTwv dmFyPiBhdHRyaWJ1dGUsIA0KICAgICBlaXRoZXIgPHZhcj50b2ZpbGU8L3Zhcj4gb3IgPHZh cj50b2RpcjwvdmFyPiBjYW4gYmUgdXNlZC4gIFdpdGggbmVzdGVkIGZpbGVzZXRzLCANCi0g ICAgb25seSA8dmFyPnRvZGlyPC92YXI+IGlzIGFsbG93ZWQuPC90ZD4NCisgICAgaWYgdGhl IGZpbGVzZXQgc2l6ZSBpcyBncmVhdGVyIHRoYW4gMSBvciBpZiB0aGUgb25seSBlbnRyeSBp biB0aGUgZmlsZXNldCBpcyBhDQorICAgIGRpcmVjdG9yeSBvciBpZiB0aGUgZmlsZSBhdHRy aWJ1dGUgaXMgYWxyZWFkeSBzcGVjaWZpZWQsIG9ubHkNCisgICAgPHZhcj50b2RpcjwvdmFy PiBpcyBhbGxvd2VkPC90ZD4NCiAgIDwvdHI+DQogICA8dHI+DQogICAgIDx0ZCB2YWxpZ249 InRvcCI+dG9kaXI8L3RkPg0KDQoNCg0KDQpJbmRleDogQ29weS5qYXZhDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09DQpSQ1MgZmlsZTogL2hvbWUvY3ZzcHVibGljL2pha2FydGEtYW50L3NyYy9tYWluL29y Zy9hcGFjaGUvdG9vbHMvYW50L3Rhc2tkZWZzL0NvcHkuamF2YSx2DQpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuMjANCmRpZmYgLXcgLXUgLXIxLjIwIENvcHkuamF2YQ0KLS0tIENvcHkuamF2 YSAgIDIwMDEvMDgvMTggMTQ6NTk6MzkgICAgIDEuMjANCisrKyBDb3B5LmphdmEgICAyMDAx LzEwLzEwIDE5OjU4OjM0DQpAQCAtNzQsNiArNzQsNyBAQA0KICAqIEBhdXRob3IgR2xlbm4g TWNBbGxpc3RlciA8YSBocmVmPSJtYWlsdG86Z2xlbm5tQGNhLmlibS5jb20iPmdsZW5ubUBj YS5pYm0uY29tPC9hPg0KICAqIEBhdXRob3IgPGEgaHJlZj0ibWFpbHRvOnN0ZWZhbi5ib2Rl d2lnQGVwb3N0LmRlIj5TdGVmYW4gQm9kZXdpZzwvYT4NCiAgKiBAYXV0aG9yIDxBIGhyZWY9 Imdob2xhbUB4dHJhLmNvLm56Ij5NaWNoYWVsIE1jQ2FsbHVtPC9BPg0KKyAqIEBhdXRob3Ig PGEgaHJlZj0ibWFpbHRvOnVtYWdlc2hAcmVkaWZmbWFpbC5jb20iPk1hZ2VzaCBVbWFzYW5r YXI8L2E+DQogICovDQogcHVibGljIGNsYXNzIENvcHkgZXh0ZW5kcyBUYXNrIHsNCiAgICAg cHJvdGVjdGVkIEZpbGUgZmlsZSA9IG51bGw7ICAgICAvLyB0aGUgc291cmNlIGZpbGUgDQpA QCAtMjg3LDcgKzI4OCwyNyBAQA0KICAgICAgICAgfQ0KICAgICAgICAgICAgDQogICAgICAg ICBpZiAoZGVzdEZpbGUgIT0gbnVsbCAmJiBmaWxlc2V0cy5zaXplKCkgPiAwKSB7DQotICAg ICAgICAgICAgdGhyb3cgbmV3IEJ1aWxkRXhjZXB0aW9uKCJDYW5ub3QgY29uY2F0ZW5hdGUg bXVsdHBsZSBmaWxlcyBpbnRvIGEgc2luZ2xlIGZpbGUuIik7DQorICAgICAgICAgICAgaWYg KGZpbGVzZXRzLnNpemUoKSA+IDEpIHsNCisgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEJ1 aWxkRXhjZXB0aW9uKA0KKyAgICAgICAgICAgICAgICAgICAgIkNhbm5vdCBjb25jYXRlbmF0 ZSBtdWx0aXBsZSBmaWxlcyBpbnRvIGEgc2luZ2xlIGZpbGUuIik7DQorICAgICAgICAgICAg fSBlbHNlIHsNCisgICAgICAgICAgICAgICAgRmlsZVNldCBmcyA9IChGaWxlU2V0KSBmaWxl c2V0cy5lbGVtZW50QXQoMCk7DQorICAgICAgICAgICAgICAgIERpcmVjdG9yeVNjYW5uZXIg ZHMgPSBmcy5nZXREaXJlY3RvcnlTY2FubmVyKHByb2plY3QpOw0KKyAgICAgICAgICAgICAg ICBTdHJpbmdbXSBzcmNGaWxlcyA9IGRzLmdldEluY2x1ZGVkRmlsZXMoKTsNCisNCisgICAg ICAgICAgICAgICAgaWYgKHNyY0ZpbGVzLmxlbmd0aCA+IDApIHsNCisgICAgICAgICAgICAg ICAgICAgIGlmIChmaWxlID09IG51bGwpIHsNCisgICAgICAgICAgICAgICAgICAgICAgICBm aWxlID0gbmV3IEZpbGUoc3JjRmlsZXNbMF0pOw0KKyAgICAgICAgICAgICAgICAgICAgICAg IGZpbGVzZXRzLnJlbW92ZUVsZW1lbnRBdCgwKTsNCisgICAgICAgICAgICAgICAgICAgIH0g ZWxzZSB7DQorICAgICAgICAgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEJ1aWxkRXhjZXB0 aW9uKA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ2Fubm90IGNvbmNhdGVuYXRl IG11bHRpcGxlIGZpbGVzIGludG8gYSBzaW5nbGUgZmlsZS4iKTsNCisgICAgICAgICAgICAg ICAgICAgIH0NCisgICAgICAgICAgICAgICAgfSBlbHNlIHsNCisgICAgICAgICAgICAgICAg ICAgIHRocm93IG5ldyBCdWlsZEV4Y2VwdGlvbigNCisgICAgICAgICAgICAgICAgICAgICAg ICAiQ2Fubm90IHBlcmZvcm0gb3BlcmF0aW9uIGZyb20gZGlyZWN0b3J5IHRvIGZpbGUuIik7 DQorICAgICAgICAgICAgICAgIH0NCisgICAgICAgICAgICB9DQogICAgICAgICB9DQogDQog ICAgICAgICBpZiAoZGVzdEZpbGUgIT0gbnVsbCkgew0K --Next_1002744822---0-203.199.83.145-17013--