- Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r1032 - in trunk/lutinpluginutil: . src/main/java/org/codelutin/util
by tchemit＠users.labs.libre-entreprise.org 16 Aug '08

16 Aug '08

Author: tchemit Date: 2008-08-16 16:50:37 +0000 (Sat, 16 Aug 2008) New Revision: 1032 Modified: trunk/lutinpluginutil/LICENSE.txt trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java Log: application du plugin maven-license-switcher en lgpl Modified: trunk/lutinpluginutil/LICENSE.txt =================================================================== --- trunk/lutinpluginutil/LICENSE.txt 2008-08-16 16:49:04 UTC (rev 1031) +++ trunk/lutinpluginutil/LICENSE.txt 2008-08-16 16:50:37 UTC (rev 1032) @@ -1,280 +1,166 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. + 0. Additional Definitions. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. - The precise terms and conditions for copying, distribution and -modification follow. + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + 1. Exception to Section 3 of the GNU GPL. - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. + 2. Conveying Modified Versions. - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + 3. Object Code Incorporating Material from Library Header Files. - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. + b) Accompany the object code with a copy of the GNU GPL and this license + document. -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. + 4. Combined Works. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) + d) Do one of the following: -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. + 5. Combined Libraries. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. + 6. Revised Versions of the GNU Lesser General Public License. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java 2008-08-16 16:49:04 UTC (rev 1031) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java 2008-08-16 16:50:37 UTC (rev 1032) @@ -1,16 +1,19 @@ /** - * *##% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * ##%* + * *##% Lutin plugin utilities library + * Copyright (C) 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see <http://www.gnu.org/licenses/>. ##%* */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java 2008-08-16 16:49:04 UTC (rev 1031) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java 2008-08-16 16:50:37 UTC (rev 1032) @@ -1,16 +1,19 @@ /** - * *##% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * ##%* + * *##% Lutin plugin utilities library + * Copyright (C) 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see <http://www.gnu.org/licenses/>. ##%* */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java 2008-08-16 16:49:04 UTC (rev 1031) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java 2008-08-16 16:50:37 UTC (rev 1032) @@ -1,17 +1,19 @@ /** - * *##% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * *##% Lutin plugin utilities library + * Copyright (C) 2008 CodeLutin * - * You should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * ##%* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see <http://www.gnu.org/licenses/>. ##%* */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java 2008-08-16 16:49:04 UTC (rev 1031) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java 2008-08-16 16:50:37 UTC (rev 1032) @@ -1,16 +1,19 @@ /** - * *##% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * ##%* + * *##% Lutin plugin utilities library + * Copyright (C) 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see <http://www.gnu.org/licenses/>. ##%* */ package org.codelutin.util;

1 0

16 Aug '08

Author: tchemit Date: 2008-08-16 16:49:04 +0000 (Sat, 16 Aug 2008) New Revision: 1031 Added: trunk/maven-license-switcher-plugin/ trunk/maven-license-switcher-plugin/pom.xml trunk/maven-license-switcher-plugin/src/ trunk/maven-license-switcher-plugin/src/main/ trunk/maven-license-switcher-plugin/src/main/java/ trunk/maven-license-switcher-plugin/src/main/java/org/ trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/ trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/ trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseFilter.java trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseProcessor.java trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseType.java trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/SwitchLicenseMojo.java trunk/maven-license-switcher-plugin/src/main/resources/ trunk/maven-license-switcher-plugin/src/main/resources/lgpl/ trunk/maven-license-switcher-plugin/src/main/resources/lgpl/header.txt trunk/maven-license-switcher-plugin/src/main/resources/lgpl/license.txt trunk/maven-license-switcher-plugin/src/site/ trunk/maven-license-switcher-plugin/src/site/apt/ trunk/maven-license-switcher-plugin/src/site/apt/index.apt trunk/maven-license-switcher-plugin/src/site/apt/usage.apt trunk/maven-license-switcher-plugin/src/site/fml/ trunk/maven-license-switcher-plugin/src/site/fml/faq.fml trunk/maven-license-switcher-plugin/src/site/site.xml trunk/maven-license-switcher-plugin/src/site/xdoc/ trunk/maven-license-switcher-plugin/src/site/xdoc/fr/ trunk/maven-license-switcher-plugin/src/site/xdoc/fr/rst/ trunk/maven-license-switcher-plugin/src/site/xdoc/fr/rst/Todo.rst Log: nouveau plugin maven pour switcher la license d'un projet maven Property changes on: trunk/maven-license-switcher-plugin ___________________________________________________________________ Name: svn:ignore + target Added: trunk/maven-license-switcher-plugin/pom.xml =================================================================== --- trunk/maven-license-switcher-plugin/pom.xml (rev 0) +++ trunk/maven-license-switcher-plugin/pom.xml 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>2.4</version> + </parent> + + <groupId>org.codelutin.plugin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + + <dependencies> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutinprocessor</artifactId> + <version>0.13-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.1</version> + <scope>compile</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Plugin maven pour switcher les licenses</name> + <version>0.1</version> + <description>Plugin pour switcher de license dans un module maven 2</description> + <inceptionYear>2008</inceptionYear> + +  + <url>${labs.project.url}</url> + +  +  +  + + <packaging>maven-plugin</packaging> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + </plugin> + + </plugins> + </build> + + <properties> + +  + <labs.id>12</labs.id> + +  + <labs.project>lutinutil</labs.project> + +  + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project} + </maven.scm.url> + + </properties> + +  +  +  + + <scm> + <url>${maven.scm.url}</url> + </scm> + + <reporting> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> + </reporting> + +</project> Added: trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseFilter.java =================================================================== --- trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseFilter.java (rev 0) +++ trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseFilter.java 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,76 @@ +/** + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##%* + */ +package org.codelutin.license; + +import org.codelutin.processor.filters.DefaultFilter; + +/** + * Un filtre pour remplacer la license d'un fichier source java. + * + * fixme : il faut ne pas autoriser le process de fichier java qui ne sont pas valide selon le header - footer... + * + * @author chemit + */ +public class LicenseFilter extends DefaultFilter { + + protected String header = "*##%"; + protected String footer = "##%*"; + /** + * la licence a insere dans le header du fichier source. Ce header est formatte en commentaire (chaque ligne + * commence par un ' * ', sauf pour la premiere et derniere ligne). + */ + protected String licenseHeader; + + /** flag pour indiquer si la licence a ete trouvee entre le header et le footer */ + protected boolean touched; + + public LicenseFilter(String licenseHeader) { + this.licenseHeader = " " + licenseHeader + " "; + } + + protected String performInFilter(String ch) { + if (wasTouched()) { + // on autorise pas deux process de la licence dans un fichier java + throw new IllegalStateException("has find more one time the license processor tags"); + } + touched = true; + return header + licenseHeader + footer; + } + + protected String performOutFilter(String ch) { + return ch; + } + + protected String getHeader() { + return header; + } + + protected String getFooter() { + return footer; + } + + @Override + public String flush() { + return super.flush(); + } + + public boolean wasTouched() { + return touched; + } + + public void reset() { + touched = false; + } +} Added: trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseProcessor.java =================================================================== --- trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseProcessor.java (rev 0) +++ trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseProcessor.java 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,39 @@ +/** + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##%* + */ +package org.codelutin.license; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; + +/** @author chemit */ +public class LicenseProcessor extends org.codelutin.processor.Processor { + + protected LicenseFilter licenseFilter; + + public LicenseProcessor(String header) { + licenseFilter = new LicenseFilter(header); + setInputFilter(licenseFilter); + } + + public LicenseFilter getLicenceFilter() { + return licenseFilter; + } + + public void process(File filein, File fileout) throws IOException { + process(new FileReader(filein), new FileWriter(fileout)); + } +} Added: trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseType.java =================================================================== --- trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseType.java (rev 0) +++ trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/LicenseType.java 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,54 @@ +/** + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##%* + */ +package org.codelutin.license; + +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.UnsupportedEncodingException; + +/** + * Une enumeration pour definir le type d'une licence a utiliser. + * + * Chaque licence doit definir 2 fichiers textes (licence.txt et header.txt) dans le repertoire <code>name().toLowerCase()</code> + * du classpath. + * + * La methode {@link #getLicenceFileReader(String)} permet de recuperer le contenu de la licence. + * + * La methode {@link #getLicenceHeaderReader(String)} permet de recuperer le contenu de l'en-tete de la licence a appliquer. + * + * @author chemit + */ +public enum LicenseType { + GPL, + LGPL; + + public Reader getLicenceFileReader(String encoding) throws UnsupportedEncodingException { + InputStream resource = getClass().getResourceAsStream(File.separator + name().toLowerCase() + File.separator + "license.txt"); + if (resource == null) { + throw new IllegalStateException("could not find license for " + this); + } + return new InputStreamReader(resource, encoding); + } + + public Reader getLicenceHeaderReader(String encoding) throws UnsupportedEncodingException { + InputStream resource = getClass().getResourceAsStream(File.separator + name().toLowerCase() + File.separator + "header.txt"); + if (resource == null) { + throw new IllegalStateException("could not find license header for " + this); + } + return new InputStreamReader(resource, encoding); + } +} Added: trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/SwitchLicenseMojo.java =================================================================== --- trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/SwitchLicenseMojo.java (rev 0) +++ trunk/maven-license-switcher-plugin/src/main/java/org/codelutin/license/SwitchLicenseMojo.java 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,274 @@ +/** + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##%* + */ +package org.codelutin.license; + +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.util.DirectoryScanner; +import org.codelutin.util.FileUtil; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.util.Calendar; +import java.util.Date; + +/** + * Le goal pour switcher les licenses de tous les sources java d'un module maven et de positionner le fichier LICENSE.txt + * + * @author chemit + * @goal switch + * @phase process-sources + */ +public class SwitchLicenseMojo extends AbstractMojo { + + /** + * Dependance du projet. + * + * @parameter default-value="${project}" + * @readonly + */ + protected MavenProject project; + + /** + * l'annee de creation du module (sera place dans le header) + * + * @parameter default-value="${project.inceptionYear}" + * @required + */ + protected String inceptionYear; + + /** + * le nom de l'organisation ( sera place dans le header) + * + * @parameter default-value="${project.organization.name}" + * @required + * @readonly + */ + protected String organizationName; + + /** + * le nom du projet ( sera place dans le header) + * + * @parameter default-value="${project.name}" + * @required + * @readonly + */ + protected String projectName; + + + /** + * encoding a utiliser pour lire et ecrire les fichiers. + * + * @parameter expression="${licence-switcher.encoding}" default-value="${maven.compile.encoding}" + * @required + */ + protected String encoding; + + /** + * Repertoire des fichiers sources a traiter. + * + * @parameter expression="${license-switcher.src}" default-value="${basedir}/src/main/java" + * @required + * @readonly + */ + protected File src; + + /** + * Fichier de la licence du module. + * + * @parameter expression="${license-switcher.licenceFile}" default-value="${basedir}/LICENSE.txt" + * @required + * @readonly + */ + protected File licenseFile; + + /** + * Le type de license a appliquer. + * + * @parameter expression="${license-switcher.licenseType}" default-value="LGPL" + * @required + */ + protected String licenseType; + + /** + * un flag pour conserver un backup des fichiers modifies + * + * @parameter expression="${license-switcher.keepBackup}" default-value="false" + */ + protected boolean keepBackup; + + /** + * un flag pour avoir les traces + * + * @parameter expression="${license-switcher.verbose}" default-value="false" + */ + protected boolean verbose; + + + /** le header a ajouter dans chaque fichier java */ + protected String licenseHeaderContent; + + /** le texte de la licence a placer dans le fichier ${basedir}/LICENSE.txt */ + protected String licenseFileContent; + + /** la liste des chemin relatifs des sources java a traiter a partir de {@link #src} */ + protected String[] javaFilesToTreate; + + protected long timestamp; + + public void execute() throws MojoExecutionException, MojoFailureException { + try { + init(); + } catch (IOException e) { + throw new MojoExecutionException("could not init goal for reason : " + e.getMessage(), e); + } + + // write project license + writeLicense(); + + if (javaFilesToTreate.length == 0) { + getLog().warn("no java source files to treate."); + return; + } + + // create a licence processor with given header + LicenseProcessor p = new LicenseProcessor(licenseHeaderContent); + + for (String javaRelativePath : javaFilesToTreate) { + + File sourceFile = new File(src, javaRelativePath); + + try { + processJavaSource(p, sourceFile); + } catch (Exception e) { + throw new MojoExecutionException("could not treate java source file " + sourceFile + " for reason : " + e.getMessage(), e); + } + } + } + + protected void writeLicense() throws MojoExecutionException { + if (licenseFile.exists() && keepBackup) { + if (verbose) { + getLog().info("backup " + licenseFile); + } + // copy it to backup file + File backup = new File(licenseFile.getAbsolutePath() + "~"); + licenseFile.renameTo(backup); + } + try { + FileUtil.writeString(licenseFile, licenseFileContent, encoding); + } catch (IOException e) { + throw new MojoExecutionException("could not write license file " + licenseFile + " for reason : " + e.getMessage(), e); + } + } + + /** + * @param p license processor + * @param sourceFile the java source file where to switch (or add the licence) + * @throws java.io.IOException if IO pb + */ + protected void processJavaSource(LicenseProcessor p, File sourceFile) throws Exception { + if (verbose) { + getLog().info("treate file " + sourceFile); + } + + File processFile = new File(sourceFile.getAbsolutePath() + "_" + timestamp); + + try { + p.process(sourceFile, processFile); + + if (!p.getLicenceFilter().wasTouched()) { + addLicenseToJavaSourceFile(sourceFile, processFile); + } + + if (keepBackup) { + File backupFile = new File(sourceFile.getAbsolutePath() + "~"); + if (verbose) { + getLog().debug("backup original file " + sourceFile); + } + sourceFile.renameTo(backupFile); + } + processFile.renameTo(sourceFile); + + } catch (Exception e) { + getLog().error("could not process file " + sourceFile + " for reason " + e.getMessage(), e); + processFile.delete(); + throw e; + } finally { + p.getLicenceFilter().reset(); + } + } + + protected void addLicenseToJavaSourceFile(File sourceFile, File processFile) throws IOException { + getLog().warn("no license was found on file " + sourceFile + ", adding one"); + String content = FileUtil.readAsString(sourceFile, encoding); + content = "/**\n * *##% " + licenseHeaderContent + " ##%*\n */\n" + content; + FileUtil.writeString(processFile, content, encoding); + } + + protected void init() throws IOException { + + timestamp = System.nanoTime(); + + LicenseType type = LicenseType.valueOf(licenseType); + + // obtain content of license file + licenseFileContent = FileUtil.readAsString(type.getLicenceFileReader(encoding)); + + // obtain content of license header + String tmpHeader = FileUtil.readAsString(type.getLicenceHeaderReader(encoding)); + + // defined inceptionYear (if year is older than now suffix with a - thisYear) + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + String thisYear = cal.get(Calendar.YEAR) + ""; + if (!thisYear.equals(inceptionYear)) { + inceptionYear = inceptionYear + " - " + thisYear; + } + + // format header with projet informations + tmpHeader = String.format(tmpHeader, projectName, inceptionYear, organizationName); + + // add " * " before each line + BufferedReader reader = new BufferedReader(new java.io.StringReader(tmpHeader)); + StringBuilder sb = new StringBuilder(); + + String line = reader.readLine(); + sb.append(line).append('\n'); + while ((line = reader.readLine()) != null) { + sb.append(" * ").append(line).append("\n"); + } + tmpHeader = sb.toString(); + licenseHeaderContent = tmpHeader.substring(0, tmpHeader.length() - 1); + + if (verbose) { + getLog().info("header to write on java source files \n" + licenseHeaderContent); + } + + // init directory scanner + DirectoryScanner ds = new DirectoryScanner(); + ds.setBasedir(src); + ds.setIncludes(new String[]{"**\\/*.java"}); + + // scan + ds.scan(); + + // get files + javaFilesToTreate = ds.getIncludedFiles(); + } +} Added: trunk/maven-license-switcher-plugin/src/main/resources/lgpl/header.txt =================================================================== --- trunk/maven-license-switcher-plugin/src/main/resources/lgpl/header.txt (rev 0) +++ trunk/maven-license-switcher-plugin/src/main/resources/lgpl/header.txt 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,15 @@ +%1$s +Copyright (C) %2$s %3$s + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Lesser Public License for more details. + +You should have received a copy of the GNU General Lesser Public +License along with this program. If not, see <http://www.gnu.org/licenses/>. Added: trunk/maven-license-switcher-plugin/src/main/resources/lgpl/license.txt =================================================================== --- trunk/maven-license-switcher-plugin/src/main/resources/lgpl/license.txt (rev 0) +++ trunk/maven-license-switcher-plugin/src/main/resources/lgpl/license.txt 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/maven-license-switcher-plugin/src/site/apt/index.apt =================================================================== --- trunk/maven-license-switcher-plugin/src/site/apt/index.apt (rev 0) +++ trunk/maven-license-switcher-plugin/src/site/apt/index.apt 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,28 @@ + ------ + Introduction + ------ + Tony Chemit + ------ + August 2008 + ------ + +Maven licence-switcher Plugin + + The Maven Licence Switcher Plugin is used to switch the licence on java sources of a maven module. + +* Goals Overview + + The plugin has the following goals: + + * {{{switch-mojo.html}llicence-switcher:switch}} parse Java sources and switch licence header. + + + * {{{help-mojo.html}licence-switcher:help}} display help. + +* Usage + + Instructions on how to use the Plugin can be found {{{usage.html}here}}. + +* Examples + + to be done. Added: trunk/maven-license-switcher-plugin/src/site/apt/usage.apt =================================================================== --- trunk/maven-license-switcher-plugin/src/site/apt/usage.apt (rev 0) +++ trunk/maven-license-switcher-plugin/src/site/apt/usage.apt 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,22 @@ + ------ + Usage + ------ + Tony Chemit + ------ + August 2008 + ------ + +Usage + + Below are the different goals and configurations of the plugin. + +* The <<<switch>>> Mojo + + The <<<switch>>> mojo is used to switch licence header on each java source files and add a LICENCE.txt file on the + basedir of the project. + ++-----+ +mvn switch-licence:switch ++-----+ + +To be done. Added: trunk/maven-license-switcher-plugin/src/site/fml/faq.fml =================================================================== --- trunk/maven-license-switcher-plugin/src/site/fml/faq.fml (rev 0) +++ trunk/maven-license-switcher-plugin/src/site/fml/faq.fml 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,33 @@ +<?xml version="1.0"?> + + + +<faqs id="FAQ" title="Frequently Asked Questions"> + <part id="General"> + <faq id="Test question?"> + <question>test question?</question> + <answer> + + The first answer :) + + </answer> + </faq> + </part> +</faqs> \ No newline at end of file Added: trunk/maven-license-switcher-plugin/src/site/site.xml =================================================================== --- trunk/maven-license-switcher-plugin/src/site/site.xml (rev 0) +++ trunk/maven-license-switcher-plugin/src/site/site.xml 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <skin> + <groupId>lutinlib</groupId> + <artifactId>lutin-site-skin</artifactId> + <version>0.1</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu name="Utilisateur"> + <item name="Introduction" href="index.html"/> + <item name="Goals" href="plugin-info.html"/> + <item name="Usage" href="usage.html"/> + <item name="FAQ" href="faq.html"/> + </menu> + <menu name="Examples"> + <item name="To be done"/> +  + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/lutinplugin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/lutinplugin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Added: trunk/maven-license-switcher-plugin/src/site/xdoc/fr/rst/Todo.rst =================================================================== --- trunk/maven-license-switcher-plugin/src/site/xdoc/fr/rst/Todo.rst (rev 0) +++ trunk/maven-license-switcher-plugin/src/site/xdoc/fr/rst/Todo.rst 2008-08-16 16:49:04 UTC (rev 1031) @@ -0,0 +1,4 @@ +TODO +==== + +Any idea ?

1 0

[Lutinutil-commits] r1030 - in trunk/lutinpluginutil/src: main/java/org/codelutin/util test/java/org/codelutin/util
by tchemit＠users.labs.libre-entreprise.org 16 Aug '08

16 Aug '08

Author: tchemit Date: 2008-08-16 12:39:44 +0000 (Sat, 16 Aug 2008) New Revision: 1030 Added: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java Log: ajout de FileUtil preparation pour les changements de licence Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java 2008-08-16 10:04:38 UTC (rev 1029) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java 2008-08-16 12:39:44 UTC (rev 1030) @@ -1,5 +1,5 @@ /** - * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * ##% + * ##%* */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java 2008-08-16 10:04:38 UTC (rev 1029) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java 2008-08-16 12:39:44 UTC (rev 1030) @@ -1,5 +1,5 @@ /** - * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * ##% + * ##%* */ package org.codelutin.util; Added: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java (rev 0) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUtil.java 2008-08-16 12:39:44 UTC (rev 1030) @@ -0,0 +1,102 @@ +/** + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * ##%* + */ +package org.codelutin.util; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.nio.channels.FileChannel; + +/** @author chemit */ +public class FileUtil { + + /** + * Permet de copier le fichier source vers le fichier cible. + * + * @param source le fichier source + * @param target le fichier cible + * @throws java.io.IOException Erreur de copie + */ + public static void copy(File source, File target) throws IOException { + target.getParentFile().mkdirs(); + FileChannel sourceChannel = new FileInputStream(source).getChannel(); + FileChannel targetChannel = new FileOutputStream(target).getChannel(); + sourceChannel.transferTo(0, sourceChannel.size(), targetChannel); + // or + // targetChannel.transferFrom(sourceChannel, 0, sourceChannel.size()); + sourceChannel.close(); + targetChannel.close(); + } + + /** + * Permet de lire un fichier et de retourner sont contenu sous forme d'une + * chaine de carateres + * + * @param file le fichier a lire + * @param encoding encoding to read file + * @return the content of the file + * @throws IOException if IO pb + */ + static public String readAsString(File file, String encoding) throws IOException { + FileInputStream inf = new FileInputStream(file); + BufferedReader in = new BufferedReader(new InputStreamReader(inf, encoding)); + final String result = readAsString(in); + in.close(); + return result; + } + + /** + * Permet de lire un fichier et de retourner sont contenu sous forme d'une + * chaine de carateres + * + * @param file le reader a lire + * @return the content of the file + * @throws IOException if IO pb + */ + static public String readAsString(java.io.Reader file) throws IOException { + StringBuffer result = new StringBuffer(); + char[] cbuf = new char[2000]; + BufferedReader in = new BufferedReader(file); + int nb = in.read(cbuf); + while (nb != -1) { + result.append(cbuf, 0, nb); + nb = in.read(cbuf); + } + in.close(); + return result.toString(); + } + + /** + * Sauvegarde un contenu dans un fichier. + * + * @param file le fichier a ecrire + * @param content le contenu du fichier + * @param encoding l'encoding d'ecriture + * @throws IOException if IO pb + */ + static public void writeString(File file, String content, String encoding) throws IOException { + file.getParentFile().mkdirs(); + BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), encoding)); + out.write(content); + out.close(); + } + +} Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java 2008-08-16 10:04:38 UTC (rev 1029) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java 2008-08-16 12:39:44 UTC (rev 1030) @@ -1,5 +1,5 @@ /** - * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * ##% + * ##%* */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java 2008-08-16 10:04:38 UTC (rev 1029) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java 2008-08-16 12:39:44 UTC (rev 1030) @@ -1,5 +1,5 @@ /** - * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * ##% + * ##%* */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java 2008-08-16 10:04:38 UTC (rev 1029) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java 2008-08-16 12:39:44 UTC (rev 1030) @@ -1,5 +1,5 @@ /** - * ##% Copyright (C) 2008 Code Lutin, Tony Chemit + * *##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * ##% + * ##%* */ package org.codelutin.util;

1 0

[Lutinutil-commits] r1029 - in trunk: commandline/commandline-core/src/main/java/org/codelutin/option commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions commandline/maven-plug
by tchemit＠users.labs.libre-entreprise.org 16 Aug '08

16 Aug '08

Author: tchemit Date: 2008-08-16 10:04:38 +0000 (Sat, 16 Aug 2008) New Revision: 1029 Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKey.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKeyImpl.java trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/AboutAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/HelpAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/SiteAction.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoaderEntry.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/LoaderEntry.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java trunk/lutinutil/src/main/java/org/codelutin/i18n/I18nLoader.java trunk/lutinutil/src/main/java/org/codelutin/util/config/Config.java trunk/lutinutil/src/main/java/org/codelutin/util/config/IdentityConfig.java trunk/lutinutil/src/main/java/org/codelutin/util/config/Property.java trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleConfig.java trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleIdentityConfig.java trunk/lutinutil/src/test/java/org/codelutin/i18n/bundle/I18nBunsleScopeTest.java trunk/lutinutil/src/test/java/org/codelutin/util/LocaleConverterTest.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/PluginHelper.java Log: preparation du changement de licences (remplacement # #% par ##%) Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/Context.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKey.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKey.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKey.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKeyImpl.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKeyImpl.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextKeyImpl.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option; Modified: trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java =================================================================== --- trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-core/src/main/java/org/codelutin/option/ContextProvider.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.commandline.demo; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoMain.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.commandline.demo; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.commandline.demo.ui; Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.commandline.demo.ui.actions; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/AboutAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/AboutAction.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/AboutAction.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,11 +10,10 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; -import static org.codelutin.i18n.I18n._; import org.codelutin.option.ui.ConfigUI; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/HelpAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/HelpAction.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/HelpAction.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/SiteAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/SiteAction.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/SiteAction.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.ui.actions; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/AbsractDefinitionContext.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoader.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoaderEntry.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoaderEntry.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigLoaderEntry.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoader.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/ConfigPropertyLoaderEntry.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/Loader.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/LoaderEntry.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/LoaderEntry.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/LoaderEntry.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoader.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/loader/OptionLoaderEntry.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def.loader; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.generate; Modified: trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java =================================================================== --- trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/commandline/maven-plugin/src/test/java/org/codelutin/option/def/PropertiesLoaderTest.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.option.def; Modified: trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java =================================================================== --- trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.i18n.editor; Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util; Modified: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util; Modified: trunk/lutinutil/src/main/java/org/codelutin/i18n/I18nLoader.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/i18n/I18nLoader.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/main/java/org/codelutin/i18n/I18nLoader.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.i18n; Modified: trunk/lutinutil/src/main/java/org/codelutin/util/config/Config.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/config/Config.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/main/java/org/codelutin/util/config/Config.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util.config; Modified: trunk/lutinutil/src/main/java/org/codelutin/util/config/IdentityConfig.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/config/IdentityConfig.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/main/java/org/codelutin/util/config/IdentityConfig.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util.config; Modified: trunk/lutinutil/src/main/java/org/codelutin/util/config/Property.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/config/Property.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/main/java/org/codelutin/util/config/Property.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util.config; Modified: trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleConfig.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleConfig.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleConfig.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util.config; Modified: trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleIdentityConfig.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleIdentityConfig.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/main/java/org/codelutin/util/config/SimpleIdentityConfig.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util.config; Modified: trunk/lutinutil/src/test/java/org/codelutin/i18n/bundle/I18nBunsleScopeTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/i18n/bundle/I18nBunsleScopeTest.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/test/java/org/codelutin/i18n/bundle/I18nBunsleScopeTest.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.i18n.bundle; Modified: trunk/lutinutil/src/test/java/org/codelutin/util/LocaleConverterTest.java =================================================================== --- trunk/lutinutil/src/test/java/org/codelutin/util/LocaleConverterTest.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/lutinutil/src/test/java/org/codelutin/util/LocaleConverterTest.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.util; Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/PluginHelper.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/PluginHelper.java 2008-08-15 19:27:37 UTC (rev 1028) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/PluginHelper.java 2008-08-16 10:04:38 UTC (rev 1029) @@ -1,5 +1,5 @@ /** - * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * ##% Copyright (C) 2008 Code Lutin, Tony Chemit * This program is free software; you * can redistribute it and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; either version 2 @@ -10,7 +10,7 @@ * should have received a copy of the GNU General Public License along with this * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place * - Suite 330, Boston, MA 02111-1307, USA. - * # #% + * ##% */ package org.codelutin.i18n.plugin;

1 0

[Lutinutil-commits] r1028 - trunk/lutinutil/src/main/java/org/codelutin/util
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 19:27:37 +0000 (Fri, 15 Aug 2008) New Revision: 1028 Modified: trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java Log: javadoc Modified: trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-08-15 19:13:47 UTC (rev 1027) +++ trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-08-15 19:27:37 UTC (rev 1028) @@ -97,8 +97,8 @@ * <li> {@link #saveForUser} sauvegarde les donnees dans $HOME * </ul> * - * Lors de l'utilisation de la methode {@link saveForSystem} ou - * {@link saveForUser} seul les options lu dans un fichier ou modifier par + * Lors de l'utilisation de la methode {@link #saveForSystem()} ou + * {@link #saveForUser()} seul les options lu dans un fichier ou modifier par * programmation ({@link #setOption} seront sauvegardees. Par exemple les * options passees sur la ligne de commande ne seront pas sauvees. * @@ -361,8 +361,8 @@ * Used to put default configuration option in config option. Those options * are used as fallback value. * - * @param key - * @param value + * @param key default property key + * @param value default property value */ protected void setDefaultOption(String key, String value) { defaults.setProperty(key, value); @@ -371,10 +371,10 @@ /** * Save configuration, in specified file * - * @param logOnError if true not throw exception but log error - * @param file file where config will be writen - * @param forceAll if true save all config option - * (with defaults, classpath, env, command line) + * @param file file where config will be writen + * @param forceAll if true save all config option + * (with defaults, classpath, env, command line) + * @throws java.io.IOException if IO pb */ public void save(File file, boolean forceAll) throws IOException { Properties prop = new Properties(); @@ -477,9 +477,9 @@ /** * Add alias for action. This method put just -- front the actionMethod and - * call {@link addAlias} + * call {@link #addAlias(String, String[])} * - * @param alias + * @param alias the alias to add for the given method action * @param actionMethod must be fully qualified method path: package.Class.method */ public void addActionAlias(String alias, String actionMethod) { @@ -488,7 +488,7 @@ /** * Set name of file where options are read (in /etc, $HOME, $CURDIR) - * This set used {@link setDefaultOption} + * This set used {@link #setDefaultOption(String, String)} * * @param name file name */ @@ -505,8 +505,8 @@ /** * Set option value * - * @param key - * @param value + * @param key property key + * @param value property value */ public void setOption(String key, String value) { options.setProperty(key, value); @@ -515,7 +515,7 @@ /** * get option value as string * - * @param key + * @param key the option's key * @return String representation value */ public String getOption(String key) { @@ -527,7 +527,7 @@ * get option value as typed value * * @param clazz type of object wanted as return type - * @param key + * @param key the option's key * @return typed value */ public <T> T getOption(Class<T> clazz, String key) { @@ -554,7 +554,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public File getOptionAsFile(String key) { @@ -566,7 +566,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public URL getOptionAsURL(String key) { @@ -577,7 +577,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public Class getOptionAsClass(String key) { @@ -588,7 +588,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public Date getOptionAsDate(String key) { @@ -599,7 +599,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public Time getOptionAsTime(String key) { @@ -610,7 +610,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public Timestamp getOptionAsTimestamp(String key) { @@ -621,7 +621,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public int getOptionAsInt(String key) { @@ -632,7 +632,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public double getOptionAsDouble(String key) { @@ -643,7 +643,7 @@ /** * get option value as typed value * - * @param key + * @param key the option's key * @return typed value */ public boolean getOptionAsBoolean(String key) { @@ -677,7 +677,7 @@ * * @param m the method to call * @param args iterator with many argument (equals or more than necessary - * @throws java.lang.Exception if call failed + * @return the arguments found for the given method */ protected String[] getParams(Method m, ListIterator<String> args) { List<String> result = new ArrayList<String>(); @@ -708,8 +708,8 @@ * Create action from string, string must be [package.][class][#][method] * if package, class or method missing, default is used * - * @param name - * @param params + * @param name name of the action + * @param args * @return */ protected Action createAction(String name, ListIterator<String> args) throws ArgumentsParserException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {

1 0

[Lutinutil-commits] r1027 - in trunk/maven-i18n-plugin: . src/main/java/org/codelutin/i18n/plugin/core src/main/java/org/codelutin/i18n/plugin/extension
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 19:13:47 +0000 (Fri, 15 Aug 2008) New Revision: 1027 Modified: trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java Log: utilisation de org.codelutin:lutinpluginutil:0.1 et des FileUpdater Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2008-08-15 16:59:21 UTC (rev 1026) +++ trunk/maven-i18n-plugin/pom.xml 2008-08-15 19:13:47 UTC (rev 1027) @@ -52,6 +52,14 @@ <version>3.1</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.1</version> + <scope>compile</scope> + </dependency> + </dependencies>  Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-15 16:59:21 UTC (rev 1026) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-15 19:13:47 UTC (rev 1027) @@ -22,6 +22,7 @@ import org.apache.maven.plugin.MojoFailureException; import org.codelutin.i18n.plugin.PluginHelper; import org.codelutin.i18n.plugin.ui.KeysModifier; +import org.codelutin.util.FileUpdater; import java.io.BufferedOutputStream; import java.io.File; @@ -61,12 +62,14 @@ /** * treate default entry + * * @parameter expression="${i18n.treateDefault}" default-value="true" */ protected boolean treateDefaultEntry; /** * Source entries (src+includes+excludes) . + * * @parameter expression="${i18n.entries}" */ protected SourceEntry[] entries; @@ -84,6 +87,8 @@ protected SourceEntry currentEntry; + protected FileUpdater updater; + public void init() { t0 = System.nanoTime(); result = new Properties(); @@ -98,14 +103,18 @@ } /** - * Test if a file is up to date and do not treate. + * Test if a file is up to date and not to be treated. + * + * This method is called on a file only in not {@link #strictMode}. + * + * If {@link #updater} is null, then it considers that file as always to be treated. * - * @param basedir the basdir of sourceentry - * @param file1 the file path relative to basedir - * @param file the file to treate @return <code>true</code> if file is uptodate, says needs no treatment. + * @param file the file path to test * @return <code>true</code> if file is up to date and do not need to be parsed */ - protected abstract boolean isFileUptodate(File basedir, File file1, String file); + protected final boolean isFileUptodate(File file) { + return updater != null && updater.isFileUpToDate(file); + } /* * (non-Javadoc) @@ -218,8 +227,8 @@ } touchFile = false; int size = result.size(); - if (strictMode || !isFileUptodate(basedir, file, file1)) { - // on parse toujours en mode strict ou que le fichier n'est pas à jour + if (strictMode || !isFileUptodate(file)) { + // on parse toujours en mode strict ou quand le fichier n'est pas à jour getLog().info("parseFile " + file); parseFile(file); } Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-08-15 16:59:21 UTC (rev 1026) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-08-15 19:13:47 UTC (rev 1027) @@ -24,9 +24,11 @@ import org.codelutin.i18n.plugin.core.ParserEvent; import org.codelutin.i18n.plugin.core.ParserException; import org.codelutin.processor.filters.I18nFilter; +import org.codelutin.util.FileUpdaterHelper; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.io.InputStreamReader; import java.io.LineNumberReader; @@ -41,18 +43,21 @@ /** * Source entries (src+includes+excludes) . + * * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/*.java" */ protected String defaultIncludes; /** * default src for an entry. + * * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/java" */ protected File defaultBasedir; /** * Dependance du projet. + * * @parameter default-value="${project}" * @readonly */ @@ -60,6 +65,7 @@ /** * Repertoire sources des fichiers i18n. + * * @parameter expression="${i18n.cp}" default-value="${basedir}/target/classes" * @required */ @@ -103,12 +109,10 @@ filter = new I18nFilter(); } - @Override - protected boolean isFileUptodate(File basedir, File file1, String file) { - String clazzFile = file.substring(0, file.length() - 4) + "class"; - File clazz = new File(cp + File.separator + clazzFile); - - return clazz.exists() && file1.lastModified() < clazz.lastModified(); + protected void parseEntry(File basedir, String[] files) throws IOException { + // prepare new file updater + updater = FileUpdaterHelper.newJavaFileUpdater(basedir, cp); + super.parseEntry(basedir, files); } @Override Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-15 16:59:21 UTC (rev 1026) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-15 19:13:47 UTC (rev 1027) @@ -19,7 +19,10 @@ package org.codelutin.i18n.plugin.extension; +import org.codelutin.util.FileUpdaterHelper; + import java.io.File; +import java.io.IOException; /** * Récupération des chaine à traduire depuis les fichiers xml Jaxx. @@ -32,12 +35,21 @@ /** * Source entries (src+includes+excludes) . + * * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/*.jaxx" */ protected String defaultIncludes; /** + * Where jaxx files should have been generated. + * + * @parameter expression="${i18n.defaultGenerateBasedir}" default-value="${basedir}/target/generated-sources/java" + */ + protected File defaultGenerateBasedir; + + /** * Regles xml. + * * @parameter expression="${i18n.rulesJaxx}" default-value="jaxx.rules" */ protected String rulesJaxx; @@ -52,9 +64,10 @@ return new String[]{}; } - @Override - protected boolean isFileUptodate(File basedir, File file1, String file) { - return false; + protected void parseEntry(File basedir, String[] files) throws IOException { + // prepare new file updater + updater = FileUpdaterHelper.newJavaFileUpdater(basedir, defaultGenerateBasedir); + super.parseEntry(basedir, files); } @Override Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-15 16:59:21 UTC (rev 1026) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-15 19:13:47 UTC (rev 1027) @@ -19,8 +19,6 @@ package org.codelutin.i18n.plugin.extension; -import java.io.File; - /** * Recuperation des chaines à traduire depuis les fichiers xml Swixat. * @@ -32,18 +30,21 @@ /** * Source entries (src+includes) . + * * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/*.xml" */ protected String defaultIncludes; /** * Source entries (src+excludes) . + * * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/context.xml" */ protected String defaultExcludes; /** * Regles xml. + * * @parameter expression="${i18n.rulesSwixat}" default-value="swixat.rules" */ protected String rulesSwixat; @@ -59,12 +60,6 @@ } @Override - protected boolean isFileUptodate(File basedir, File file1, String file) { - return false; - } - - - @Override protected String getKeyModifierStart() { return "=\\s*[\"\']"; }

1 0

15 Aug '08

Author: tchemit Date: 2008-08-15 16:59:21 +0000 (Fri, 15 Aug 2008) New Revision: 1026 Added: trunk/lutinpluginutil/ trunk/lutinpluginutil/LICENSE.txt trunk/lutinpluginutil/changelog trunk/lutinpluginutil/pom.xml trunk/lutinpluginutil/src/ trunk/lutinpluginutil/src/main/ trunk/lutinpluginutil/src/main/java/ trunk/lutinpluginutil/src/main/java/org/ trunk/lutinpluginutil/src/main/java/org/codelutin/ trunk/lutinpluginutil/src/main/java/org/codelutin/util/ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java trunk/lutinpluginutil/src/main/java/org/codelutin/util/package.html trunk/lutinpluginutil/src/main/resources/ trunk/lutinpluginutil/src/site/ trunk/lutinpluginutil/src/site/site.xml trunk/lutinpluginutil/src/site/xdoc/ trunk/lutinpluginutil/src/site/xdoc/fr/ trunk/lutinpluginutil/src/site/xdoc/fr/rst/ trunk/lutinpluginutil/src/site/xdoc/fr/rst/Todo.rst trunk/lutinpluginutil/src/site/xdoc/fr/rst/index.rst trunk/lutinpluginutil/src/test/ trunk/lutinpluginutil/src/test/java/ trunk/lutinpluginutil/src/test/java/org/ trunk/lutinpluginutil/src/test/java/org/codelutin/ trunk/lutinpluginutil/src/test/java/org/codelutin/util/ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaFileUpdaterTest.java trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxFileUpdaterTest.java trunk/lutinpluginutil/src/test/resources/ trunk/lutinpluginutil/src/test/resources/log4j.properties trunk/lutinpluginutil/src/test/resources/org/ trunk/lutinpluginutil/src/test/resources/org/codelutin/ trunk/lutinpluginutil/src/test/resources/org/codelutin/util/ trunk/lutinpluginutil/src/test/resources/org/codelutin/util/JaxxDummy.jaxx Log: creation de org.codelutin:lutinpluginutil:0.1 avec les classes utilitaires des plugins maven. Property changes on: trunk/lutinpluginutil ___________________________________________________________________ Name: svn:ignore + target Added: trunk/lutinpluginutil/LICENSE.txt =================================================================== --- trunk/lutinpluginutil/LICENSE.txt (rev 0) +++ trunk/lutinpluginutil/LICENSE.txt 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,280 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS Added: trunk/lutinpluginutil/changelog =================================================================== --- trunk/lutinpluginutil/changelog (rev 0) +++ trunk/lutinpluginutil/changelog 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,2 @@ +ver-0-1 chemit 2008???? + * initial version with only FileUpdater \ No newline at end of file Added: trunk/lutinpluginutil/pom.xml =================================================================== --- trunk/lutinpluginutil/pom.xml (rev 0) +++ trunk/lutinpluginutil/pom.xml 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>2.4</version> + </parent> + + <artifactId>lutinpluginutil</artifactId> + + <dependencies> + + </dependencies> + + +  +  +  + + <name>Lutin plugin utilities library</name> + <version>0.1</version> + <description>Library of usefull class to be used in any maven plugin.</description> + <inceptionYear>2008</inceptionYear> + <url>${labs.project.url}</url> + +  +  +  + + <packaging>jar</packaging> + + <properties> + +  + <labs.id>12</labs.id> + +  + <labs.project>lutinutil</labs.project> + +  + <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project} + </maven.scm.url> + + </properties> + + <scm> + <url>${maven.scm.url}</url> + </scm> + + <build> + + <plugins> + +  + <plugin> + <groupId>lutinplugin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + </plugin> + + </plugins> + </build> + +</project> Added: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java (rev 0) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdater.java 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,34 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util; + +import java.io.File; + +/** + * Contract to be realized to test if a file is up to date. + * + * use {@link #isFileUpToDate(java.io.File)} to determine if a file is up to date. + * + * @author chemit + */ +public interface FileUpdater { + + /** + * @param f file to test + * @return <code>true</code> if file is up to date, <code>false</code> otherwise + */ + boolean isFileUpToDate(File f); + +} Added: trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java (rev 0) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/FileUpdaterHelper.java 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,66 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util; + +import java.io.File; + +/** @author chemit */ +public class FileUpdaterHelper { + + static public FileUpdater newJavaFileUpdater(File src, File dst) { + return new JavaFileUpdater(src, dst); + } + + static public FileUpdater newJaxxFileUpdater(File src, File dst) { + return new JaxxFileUpdater(src, dst); + } + + /** + * To test if a java source file is newser than his compiled class + * + * @author chemit + */ + public static class JavaFileUpdater extends MirroredFileUpdater { + + protected JavaFileUpdater(File sourceDirectory, File destinationDirectory) { + super(sourceDirectory, destinationDirectory); + } + + public File getMirrorFile(File f) { + String file = f.getAbsolutePath().substring(prefixSourceDirecotory); + String mirrorRelativePath = file.substring(0, file.length() - 4) + "class"; + return new File(destinationDirectory + File.separator + mirrorRelativePath); + } + } + + /** + * To test if a jaxx source file is newser than his generated java source file + * + * @author chemit + */ + public static class JaxxFileUpdater extends MirroredFileUpdater { + + protected JaxxFileUpdater(File sourceDirectory, File destinationDirectory) { + super(sourceDirectory, destinationDirectory); + } + + public File getMirrorFile(File f) { + String file = f.getAbsolutePath().substring(prefixSourceDirecotory); + String mirrorRelativePath = file.substring(0, file.length() - 4) + "java"; + return new File(destinationDirectory + File.separator + mirrorRelativePath); + } + + } +} Added: trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java (rev 0) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/MirroredFileUpdater.java 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,69 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +/** + * Simple base implementation of a {@link FileUpdater} for an updater with a sourcedir and a destinationdir. + * + * @author chemit + */ +public abstract class MirroredFileUpdater implements FileUpdater { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(MirroredFileUpdater.class); + + /** source basedir */ + protected File sourceDirectory; + + /** length of source basedir absolute path */ + protected int prefixSourceDirecotory; + + /** destination basedir */ + protected File destinationDirectory; + + protected MirroredFileUpdater(File sourceDirectory, File destinationDirectory) { + this.sourceDirectory = sourceDirectory; + this.destinationDirectory = destinationDirectory; + this.prefixSourceDirecotory = sourceDirectory.getAbsolutePath().length(); + if (log.isDebugEnabled()) { + log.debug(this); + } + } + + public File getSourceDirectory() { + return sourceDirectory; + } + + public File getDestinationDirectory() { + return destinationDirectory; + } + + public abstract File getMirrorFile(File f); + + public boolean isFileUpToDate(File f) { + File mirror = getMirrorFile(f); + return mirror.exists() && f.lastModified() < mirror.lastModified(); + } + + @Override + public String toString() { + return super.toString() + "<srcdir:" + sourceDirectory + ", destdir:" + destinationDirectory + ">"; + } +} Added: trunk/lutinpluginutil/src/main/java/org/codelutin/util/package.html =================================================================== --- trunk/lutinpluginutil/src/main/java/org/codelutin/util/package.html (rev 0) +++ trunk/lutinpluginutil/src/main/java/org/codelutin/util/package.html 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Lutin plugin util</h1> +Ensemble de classe Java permettant de simplifier le developpement de plugins maven en +factorisant des besoins que l'on retrouve dans tous les developpements. +</body> +</html> \ No newline at end of file Added: trunk/lutinpluginutil/src/site/site.xml =================================================================== --- trunk/lutinpluginutil/src/site/site.xml (rev 0) +++ trunk/lutinpluginutil/src/site/site.xml 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <skin> + <groupId>lutinlib</groupId> + <artifactId>lutin-site-skin</artifactId> + <version>0.1</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Added: trunk/lutinpluginutil/src/site/xdoc/fr/rst/Todo.rst =================================================================== --- trunk/lutinpluginutil/src/site/xdoc/fr/rst/Todo.rst (rev 0) +++ trunk/lutinpluginutil/src/site/xdoc/fr/rst/Todo.rst 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,2 @@ +TODO +==== Added: trunk/lutinpluginutil/src/site/xdoc/fr/rst/index.rst =================================================================== --- trunk/lutinpluginutil/src/site/xdoc/fr/rst/index.rst (rev 0) +++ trunk/lutinpluginutil/src/site/xdoc/fr/rst/index.rst 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,20 @@ +LutinPluginUtil +=============== + +.. contents:: + + +Présentation +------------ + +Ensemble de classe Java permettant de simplifier le développement de plugin +maven en factorisant des besoins que l'on retrouve dans tous les développements... + +FileUpdater +----------- + +Mecanisme permettant de savoir si un fichier est a jour (utile pour les plugins de generation). + + +**Veuillez consulter la JavaDoc pour de plus ample details sur les differentes +librairies.** Added: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java (rev 0) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaDummy.java 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,22 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util; + +/** @author chemit */ +public class JavaDummy { + /** + * A dummy file to test {@link org.codelutin.util.FileUpdaterHelper.JavaFileUpdater} in {@link JavaFileUpdaterTest} + */ +} \ No newline at end of file Added: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaFileUpdaterTest.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaFileUpdaterTest.java (rev 0) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JavaFileUpdaterTest.java 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +package org.codelutin.util; + +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.util.FileUpdaterHelper.JavaFileUpdater; + +import java.io.File; + +/** + * Test of a {@link JavaFileUpdater} on the test sourcepath and test-classpath + * + * @author chemit + */ +public class JavaFileUpdaterTest extends TestCase { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(FileUpdaterHelper.class); + + + static final char SEP = File.separatorChar; + + static MirroredFileUpdater fileUpdater; + + static File sourceFile; + static File mirrorFile; + + public void testInitUpdater() throws Exception { + + String basedir = System.getProperty("basedir"); + if (basedir == null) { + log.warn("basedir not found, test is not executed from maven..."); + basedir = new File(new File("").getAbsolutePath()).getAbsolutePath(); + } + + log.info("basedir = " + basedir); + + File src = new File(basedir, "src" + SEP + "test" + SEP + "java"); + File dir = new File(basedir, "target" + SEP + "test-classes"); + fileUpdater = (MirroredFileUpdater) FileUpdaterHelper.newJavaFileUpdater(src, dir); + log.info(fileUpdater); + + // test source dir exists + File sourceDirectory = fileUpdater.getSourceDirectory(); + assertTrue("sourcedir is null", sourceDirectory != null); + assertTrue("sourcedir does not exists " + sourceDirectory, sourceDirectory.exists()); + + // test destination dir exists + File destinationDirectory = fileUpdater.getDestinationDirectory(); + assertTrue("destinationDirectory is null", destinationDirectory != null); + assertTrue("destinationDirectory does not exists " + destinationDirectory, destinationDirectory.exists()); + + sourceFile = new File(fileUpdater.getSourceDirectory(), "org" + SEP + "codelutin" + SEP + "util" + SEP + JavaDummy.class.getSimpleName() + ".java"); + + } + + public void testSourceFileIsUptoDate() throws Exception { + + assertTrue("fileUpdater was not init", fileUpdater != null); + assertTrue("sourceFile was not init ", sourceFile != null); + assertTrue("could not find source of this test " + sourceFile, sourceFile.exists()); + + // java file is up to date since it was compiled to launch this test + assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + + mirrorFile = fileUpdater.getMirrorFile(sourceFile); + } + + + public void testSourceFileDoesNotHaveMirrorFile() throws Exception { + + assertTrue("fileUpdater was not init", fileUpdater != null); + assertTrue("sourceFile was not init ", sourceFile != null); + assertTrue("could not find source of this test " + sourceFile, sourceFile.exists()); + assertTrue("mirrorFile was not init ", mirrorFile != null); + assertTrue("could not find mirrorFile " + mirrorFile, mirrorFile.exists()); + + // now rename mirror Class, so source file is no more up to date + File mirrorClassRenamed = new File(fileUpdater.getMirrorFile(sourceFile).getAbsolutePath() + "2"); + mirrorFile.renameTo(mirrorClassRenamed); + + // java file is no more up to date + assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + + // renmae mirror Class to his original name + mirrorClassRenamed.renameTo(mirrorFile); + + // java file is now up to date (rename method does not affect lasmodified property on a file) + assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + } + + public void testSourceFileIsNewerThanMirrorFile() throws Exception { + + assertTrue("fileUpdater was not init", fileUpdater != null); + assertTrue("sourceFile was not init ", sourceFile != null); + assertTrue("could not find source of this test " + sourceFile, sourceFile.exists()); + assertTrue("mirrorFile was not init ", mirrorFile != null); + assertTrue("could not find mirrorFile " + mirrorFile, mirrorFile.exists()); + + long sourceTime = sourceFile.lastModified(); + long mirrorTime = mirrorFile.lastModified(); + + // make source file newer than mirror file + sourceFile.setLastModified(mirrorTime + 10); + + // java file is no more up to date + assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + + // put back old time to source file + sourceFile.setLastModified(sourceTime); + + // java file is now up to date (rename method does not affect lasmodified property on a file) + assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + } + +} Added: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java (rev 0) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxDummy.java 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,22 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.util; + +/** @author chemit */ +public class JaxxDummy { + /** + * A dummy file to test {@link org.codelutin.util.FileUpdaterHelper.JaxxFileUpdater} in {@link JaxxFileUpdaterTest} + */ +} Added: trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxFileUpdaterTest.java =================================================================== --- trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxFileUpdaterTest.java (rev 0) +++ trunk/lutinpluginutil/src/test/java/org/codelutin/util/JaxxFileUpdaterTest.java 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +package org.codelutin.util; + +import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +/** + * Test of a {@link org.codelutin.util.FileUpdaterHelper.JaxxFileUpdater} on the test sourcepath + * + * @author chemit + */ +public class JaxxFileUpdaterTest extends TestCase { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(FileUpdaterHelper.class); + + + static final char SEP = File.separatorChar; + + static MirroredFileUpdater fileUpdater; + + static File sourceFile; + static File mirrorFile; + + public void testInitUpdater() throws Exception { + + String basedir = System.getProperty("basedir"); + if (basedir == null) { + log.warn("basedir not found, test is not executed from maven..."); + basedir = new File(new File("").getAbsolutePath()).getAbsolutePath(); + } + + log.info("basedir = " + basedir); + + File src = new File(basedir, "src" + SEP + "test" + SEP + "resources"); + File dir = new File(basedir, "src" + SEP + "test" + SEP + "java"); + fileUpdater = (MirroredFileUpdater) FileUpdaterHelper.newJaxxFileUpdater(src, dir); + log.info(fileUpdater); + + // test source dir exists + File sourceDirectory = fileUpdater.getSourceDirectory(); + assertTrue("sourcedir is null", sourceDirectory != null); + assertTrue("sourcedir does not exists " + sourceDirectory, sourceDirectory.exists()); + + // test destination dir exists + File destinationDirectory = fileUpdater.getDestinationDirectory(); + assertTrue("destinationDirectory is null", destinationDirectory != null); + assertTrue("destinationDirectory does not exists " + destinationDirectory, destinationDirectory.exists()); + + sourceFile = new File(fileUpdater.getSourceDirectory(), "org" + SEP + "codelutin" + SEP + "util" + SEP + JaxxDummy.class.getSimpleName() + ".jaxx"); + + } + + public void testSourceFileIsUptoDate() throws Exception { + + assertTrue("fileUpdater was not init", fileUpdater != null); + + assertTrue("sourceFile was not init ", sourceFile != null); + assertTrue("could not find source of this test " + sourceFile, sourceFile.exists()); + + mirrorFile = fileUpdater.getMirrorFile(sourceFile); + + // we do not know if jaxx file is newer than the dummy java source ? + + sourceFile.setLastModified(mirrorFile.lastModified() - 10); + + // java file is up to date since it was compiled to launch this test + assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + + + } + + + public void testSourceFileDoesNotHaveMirrorFile() throws Exception { + + assertTrue("fileUpdater was not init", fileUpdater != null); + + assertTrue("sourceFile was not init ", sourceFile != null); + assertTrue("could not find source of this test " + sourceFile, sourceFile.exists()); + + assertTrue("mirrorFile was not init ", mirrorFile != null); + assertTrue("could not find mirrorFile " + mirrorFile, mirrorFile.exists()); + + // now rename mirror Class, so source file is no more up to date + File mirrorClassRenamed = new File(fileUpdater.getMirrorFile(sourceFile).getAbsolutePath() + "2"); + mirrorFile.renameTo(mirrorClassRenamed); + + // java file is no more up to date + assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + + // renmae mirror Class to his original name + mirrorClassRenamed.renameTo(mirrorFile); + + // java file is now up to date (rename method does not affect lasmodified property on a file) + assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + } + + public void testSourceFileIsNewerThanMirrorFile() throws Exception { + + assertTrue("fileUpdater was not init", fileUpdater != null); + + assertTrue("sourceFile was not init ", sourceFile != null); + assertTrue("could not find source of this test " + sourceFile, sourceFile.exists()); + + assertTrue("mirrorFile was not init ", mirrorFile != null); + assertTrue("could not find mirrorFile " + mirrorFile, mirrorFile.exists()); + + long sourceTime = sourceFile.lastModified(); + long mirrorTime = mirrorFile.lastModified(); + + // make source file newer than mirror file + sourceFile.setLastModified(mirrorTime + 10); + + // java file is no more up to date + assertFalse(sourceFile + " should not be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + + // put back old time to source file + sourceFile.setLastModified(sourceTime); + + // java file is now up to date (rename method does not affect lasmodified property on a file) + assertTrue(sourceFile + " should be uptodate", fileUpdater.isFileUpToDate(sourceFile)); + } + +} \ No newline at end of file Added: trunk/lutinpluginutil/src/test/resources/log4j.properties =================================================================== --- trunk/lutinpluginutil/src/test/resources/log4j.properties (rev 0) +++ trunk/lutinpluginutil/src/test/resources/log4j.properties 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,10 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.codelutin.util=DEBUG + Added: trunk/lutinpluginutil/src/test/resources/org/codelutin/util/JaxxDummy.jaxx =================================================================== --- trunk/lutinpluginutil/src/test/resources/org/codelutin/util/JaxxDummy.jaxx (rev 0) +++ trunk/lutinpluginutil/src/test/resources/org/codelutin/util/JaxxDummy.jaxx 2008-08-15 16:59:21 UTC (rev 1026) @@ -0,0 +1,3 @@ +<Object> + Dummy file to test org.codelutin.util.FileUpdaterHelper.JaxxFileUpdater +</Object> \ No newline at end of file

1 0

[Lutinutil-commits] r1025 - trunk/lutini18neditor
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 13:24:10 +0000 (Fri, 15 Aug 2008) New Revision: 1025 Removed: trunk/lutini18neditor/.cvsignore Log: no .cvsignore in svn Deleted: trunk/lutini18neditor/.cvsignore =================================================================== --- trunk/lutini18neditor/.cvsignore 2008-08-15 13:23:55 UTC (rev 1024) +++ trunk/lutini18neditor/.cvsignore 2008-08-15 13:24:10 UTC (rev 1025) @@ -1,3 +0,0 @@ -target -.project -.classpath

1 0

[Lutinutil-commits] r1024 - trunk/lutinutil
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 13:23:55 +0000 (Fri, 15 Aug 2008) New Revision: 1024 Modified: trunk/lutinutil/pom.xml Log: permettre d'ajouter une url a nimporte quel classloader meilleur log dans I18nBundleEntry possibilite de recuperer les urls scannees par I18nBundleManager pom ameliore (suite a modifs dans lutinproject) Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-08-15 13:23:40 UTC (rev 1023) +++ trunk/lutinutil/pom.xml 2008-08-15 13:23:55 UTC (rev 1024) @@ -57,7 +57,8 @@ <version>0.30-SNAPSHOT</version> <description>Library of usefull class to be used in any project.</description> <inceptionYear>2004</inceptionYear> - + <url>${labs.project.url}</url> +    @@ -69,8 +70,8 @@  <labs.id>12</labs.id> -  -  +  + <labs.project>${pom.artifactId}</labs.project>  <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>

1 0

[Lutinutil-commits] r1023 - in trunk/lutinutil/src/main/java/org/codelutin: i18n/bundle util
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 13:23:40 +0000 (Fri, 15 Aug 2008) New Revision: 1023 Modified: trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java trunk/lutinutil/src/main/java/org/codelutin/util/Resource.java Log: permettre d'ajouter une url a nimporte quel classloader meilleur log dans I18nBundleEntry possibilite de recuperer les urls scannees par I18nBundleManager pom ameliore (suite a modifs dans lutinproject) Modified: trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java 2008-08-15 13:21:23 UTC (rev 1022) +++ trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleEntry.java 2008-08-15 13:23:40 UTC (rev 1023) @@ -121,22 +121,32 @@ */ public void load(Language language, Properties resource) throws IOException { InputStream inputStream = null; + StringBuilder sb = new StringBuilder(); try { I18nFileReader fileReader = new I18nFileReader(); inputStream = getPath().openStream(); String encoding = language.getEncoding(); + if (I18nBundle.log.isDebugEnabled()) { + sb.append(getPath()).append("\n"); + } fileReader.load(inputStream, encoding); + if (I18nBundle.log.isDebugEnabled()) { - for (Entry<Object, Object> entry : resource.entrySet()) { - I18nBundle.log.debug(encoding + " : " + entry); + for (Entry<Object, Object> entry : fileReader.entrySet()) { + sb.append(encoding).append(" : ").append(entry).append("\n"); } } resource.putAll(fileReader); + if (I18nBundle.log.isDebugEnabled()) { + sb.append("nbSentences : ").append(fileReader.size()).append("\n"); + sb.append("====================================="); + } fileReader.clear(); + + } finally { if (I18nBundle.log.isDebugEnabled()) { - I18nBundle.log.debug(getPath()); + I18nBundle.log.debug(sb.toString()); } - } finally { if (inputStream != null) { inputStream.close(); } Modified: trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java 2008-08-15 13:21:23 UTC (rev 1022) +++ trunk/lutinutil/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java 2008-08-15 13:23:40 UTC (rev 1023) @@ -158,6 +158,10 @@ return result.toArray(new I18nBundleEntry[result.size()]); } + public URL[] getUrls() { + return urls; + } + public void load(Language language, Properties resource) throws IOException { long t0 = System.nanoTime(); I18nBundleEntry[] entries = getBundleEntries(language.getLocale()); Modified: trunk/lutinutil/src/main/java/org/codelutin/util/Resource.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/Resource.java 2008-08-15 13:21:23 UTC (rev 1022) +++ trunk/lutinutil/src/main/java/org/codelutin/util/Resource.java 2008-08-15 13:23:40 UTC (rev 1023) @@ -75,15 +75,25 @@ * @param url l'url a ajouter */ static public void addDefaultClassLoader(URL url) { + ClassLoader classLoader = ClassLoader.getSystemClassLoader(); + addClassLoader(classLoader,url); + } + + /** + * Permet d'ajouter dans un classloader une nouvelle URL dans + * lequel il faut rechercher les fichiers. + * + * @param classLoader le classloader a modifier + * @param url l'url a ajouter + */ + static public void addClassLoader(ClassLoader classLoader ,URL url) { try { - ClassLoader classLoader = ClassLoader.getSystemClassLoader(); - Method method = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class}); method.setAccessible(true); method.invoke(classLoader, url); } catch (Exception eee) { - throw new RuntimeException("Can't add url in default classloader", + throw new RuntimeException("Can't add url in classloader "+classLoader, eee); } }

1 0