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

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. + * <p/> + * 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

[Lutinutil-commits] r1022 - in trunk/lutini18neditor: . src/main/java/org/codelutin/i18n/editor src/main/java/org/codelutin/i18n/editor/ui
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 13:21:23 +0000 (Fri, 15 Aug 2008) New Revision: 1022 Added: trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java Modified: trunk/lutini18neditor/pom.xml trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ManagerI18n.java trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ui/I18nPrincipalImpl.java Log: creation d'une classe Main + creation du jar executable. fix bug si pas de bundle trouve utilisation I18nBundleManager pour recuperer les bundles trouves possibilite d'ajouter un jar a traiter Modified: trunk/lutini18neditor/pom.xml =================================================================== --- trunk/lutini18neditor/pom.xml 2008-08-15 13:14:01 UTC (rev 1021) +++ trunk/lutini18neditor/pom.xml 2008-08-15 13:21:23 UTC (rev 1022) @@ -66,7 +66,7 @@  <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project} </maven.scm.url> - + <maven.jar.main.class>org.codelutin.i18n.editor.I18nEditor</maven.jar.main.class> </properties> <build> @@ -105,6 +105,26 @@ </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + <addClasspath>true</addClasspath> + <addExtensions/> + <classpathPrefix>./dependency/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> </build> Added: trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java =================================================================== --- trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java (rev 0) +++ trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/I18nEditor.java 2008-08-15 13:21:23 UTC (rev 1022) @@ -0,0 +1,51 @@ +/** + * # #% 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.i18n.editor; + +import org.codelutin.i18n.I18n; +import org.codelutin.i18n.editor.ui.I18nPrincipalImpl; +import org.codelutin.util.Resource; + +import java.io.File; +import java.io.IOException; +import java.net.URL; + +/** + * L'application. + * + * @author chemit + */ +public class I18nEditor { + + /** + * Lancement de l'interface + * + * @param args path to manage + * @throws java.io.IOException if any IO exception + */ + public static void main(String[] args) throws IOException { + + for (String arg : args) { + File file = new File(arg); + URL url = new URL(("" + file.toURI().toURL())); + //urls.add(url); + Resource.addClassLoader(I18nEditor.class.getClassLoader(), url); + } + + I18n.init(); // Par défaut pour tester + + new I18nPrincipalImpl().setVisible(true); + } +} Modified: trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ManagerI18n.java =================================================================== --- trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ManagerI18n.java 2008-08-15 13:14:01 UTC (rev 1021) +++ trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ManagerI18n.java 2008-08-15 13:21:23 UTC (rev 1022) @@ -18,8 +18,8 @@ package org.codelutin.i18n.editor; +import org.codelutin.i18n.I18n; import org.codelutin.i18n.I18nFileReader; -import org.codelutin.util.Resource; import java.io.FileWriter; import java.io.IOException; @@ -68,7 +68,11 @@ /** Ensemble des bundles modifiés ou créés par l'utilisateur */ protected Map<String, I18nFileReader> userBundles; - /** Singleton */ + /** + * Singleton + * + * @return the shared instance of manager + */ public static ManagerI18n getInstance() { if (manager == null) { try { @@ -80,14 +84,26 @@ return manager; } - /** Constucteur pour initialiser les bundles disponibles */ + /** + * Constucteur pour initialiser les bundles disponibles + * + * @throws java.io.IOException if any IO problems + */ protected ManagerI18n() throws IOException { bundles = new HashMap<String, I18nFileReader>(); userBundles = new HashMap<String, I18nFileReader>(); // Récupération des fichiers - List<URL> files = Resource.getURLs(".*i18n/.+\\.properties"); + URL[] files = I18n.getBundleManager().getUrls(); + if (files.length==0) { + //fixme : + PROJECT_NAME="unknown ?"; + return; + } + + //List<URL> files = Resource.getURLs(".*i18n/.+\\.properties"); + for (URL file : files) { String path = file.getPath(); I18nFileReader property = new I18nFileReader(); @@ -96,8 +112,10 @@ } // Détermination du nom du projet - List<URL> projects = Resource.getURLs(".*/i18n/.+\\.properties"); - String project = projects.get(0).getPath(); + //URL[] projects = files; + //List<URL> projects = Resource.getURLs(".*/i18n/.+\\.properties"); + //fixme : si pas de project, alors NullPointerException + String project = files[0].getPath(); Matcher matcher = PATTERN_FILE_NAME.matcher(project); matcher.matches(); Modified: trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ui/I18nPrincipalImpl.java =================================================================== --- trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ui/I18nPrincipalImpl.java 2008-08-15 13:14:01 UTC (rev 1021) +++ trunk/lutini18neditor/src/main/java/org/codelutin/i18n/editor/ui/I18nPrincipalImpl.java 2008-08-15 13:21:23 UTC (rev 1022) @@ -18,7 +18,6 @@ package org.codelutin.i18n.editor.ui; -import org.codelutin.i18n.I18n; import org.codelutin.i18n.editor.ManagerI18n; import org.codelutin.i18n.editor.model.PropertieNode; import org.codelutin.i18n.editor.model.PropertiesTreeModel; @@ -37,10 +36,8 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.io.FileNotFoundException; -import java.io.IOException; import java.io.Serializable; import java.util.List; @@ -89,22 +86,11 @@ // A chaque accès à l'arbre, réaffichage des valeurs des bundles pour // la clé sélectionnée - tree.addMouseListener(new MouseListener() { + tree.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { reloadValues(); } - - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { - } }); // Action de fermeture par le menu @@ -272,9 +258,4 @@ values.add(panel, new GBC(0, index).setFill(GBC.HORIZONTAL).setWeight(1, 1).setInsets(10)); } - /** Lancement de l'interface */ - public static void main(String[] args) throws FileNotFoundException, IOException { - I18n.init(); // Par défaut pour tester - new I18nPrincipalImpl().setVisible(true); - } }

1 0

[Lutinutil-commits] r1021 - in trunk/commandline/commandline-demo/src: main/resources/i18n main/uimodel/org/codelutin/commandline/demo/ui site/fr/rst/user
by tchemit＠users.labs.libre-entreprise.org 15 Aug '08

15 Aug '08

Author: tchemit Date: 2008-08-15 13:14:01 +0000 (Fri, 15 Aug 2008) New Revision: 1021 Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst Log: normalisation des noms de clefs i18n dans commandline-demo Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-08-14 17:43:59 UTC (rev 1020) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-08-15 13:14:01 UTC (rev 1021) @@ -19,6 +19,10 @@ commandlinedemo.config.remote.proxyLogin.description=remote proxy login ? commandlinedemo.config.remote.proxyPassword.description=remote proxy password ? commandlinedemo.config.remote.useProxy.description=falg to use or not remote proxy +commandlinedemo.mainui.menu.edit=Edit +commandlinedemo.mainui.menu.file=File +commandlinedemo.mainui.menu.help=Help +commandlinedemo.mainui.title=Commandline demo commandlinedemo.option.description.changeConfig=to change a property in configuration commandlinedemo.option.description.changeFileConfig=to change the configuration file to used commandlinedemo.option.description.editConfig=to edit the configuration via UI @@ -27,7 +31,3 @@ commandlinedemo.option.description.resetConfig=reset configuration commandlinedemo.option.description.showConfig=show configurations commandlinedemo.option.description.ui=flag to display or not UI -mainui.menu.edit=Edit -mainui.menu.file=File -mainui.menu.help=Help -mainui.title=Commandline demo Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-08-14 17:43:59 UTC (rev 1020) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-08-15 13:14:01 UTC (rev 1021) @@ -1,33 +1,33 @@ -commandlinedemo.config.main.configFileName.description=Le fichier de configuration utilis\u00A9 +commandlinedemo.config.main.configFileName.description=Le fichier de configuration utilis\u00E9 commandlinedemo.config.main.copyright.description=Le copyright de l'application commandlinedemo.config.main.debugMode.description=Flag pour activer ou non le mode debug -commandlinedemo.config.main.description=Cat\u00A9gorie principale de la configuration -commandlinedemo.config.main.encoding.description=L'encoding utilis\u00A9 par l'application -commandlinedemo.config.main.locale.description=La locale utilis\u00A9e par l'application +commandlinedemo.config.main.description=Cat\u00E9gorie principale de la configuration +commandlinedemo.config.main.encoding.description=L'encoding utilis\u00E9 par l'application +commandlinedemo.config.main.locale.description=La locale utilis\u00E9e par l'application commandlinedemo.config.main.organisationName.description=Le nom de l'organisation commandlinedemo.config.main.organisationURL.description=L'url du site de l'organisation commandlinedemo.config.main.projectName.description=Le nom du projet commandlinedemo.config.main.projectURL.description=l'url du site de l'application commandlinedemo.config.main.userFirstName.description=Le nom de famille de l'utilisateur -commandlinedemo.config.main.userLastName.description=Le pr\u00A9nom de l'utilisateur +commandlinedemo.config.main.userLastName.description=Le pr\u00E9nom de l'utilisateur commandlinedemo.config.main.userMail.description=Le courriel de l'utilisateur commandlinedemo.config.main.version.description=La version de l'aplication commandlinedemo.config.remote.URI.description=remote uri ? -commandlinedemo.config.remote.description=Cat\u00A9gorie remote de la configuration +commandlinedemo.config.remote.description=Cat\u00E9gorie remote de la configuration commandlinedemo.config.remote.login.description=Login en remote ? commandlinedemo.config.remote.password.description=Password en remote ? commandlinedemo.config.remote.proxyLogin.description=Login proxy ? commandlinedemo.config.remote.proxyPassword.description=Password proxy ? commandlinedemo.config.remote.useProxy.description=flag pour utiliser le mode proxy ? -commandlinedemo.option.description.changeConfig=permet de changer une propri\u00A9t\u00A9 de la configuration +commandlinedemo.mainui.menu.edit=Edit +commandlinedemo.mainui.menu.file=Fichier +commandlinedemo.mainui.menu.help=Aide +commandlinedemo.mainui.title=Commandline D\u00E9mo +commandlinedemo.option.description.changeConfig=permet de changer une propri\u00E9t\u00E9 de la configuration commandlinedemo.option.description.changeFileConfig=permet de changer de fichier de configuration -commandlinedemo.option.description.editConfig=permet d'\u00A9diter la configuration +commandlinedemo.option.description.editConfig=permet d'\u00E9diter la configuration commandlinedemo.option.description.help=Affichage de l'aide commandlinedemo.option.description.helpConfig=Affichage de l'aide sur la configuration -commandlinedemo.option.description.resetConfig=R\u00A9initialiser la configuration +commandlinedemo.option.description.resetConfig=R\u00E9initialiser la configuration commandlinedemo.option.description.showConfig=Afficher la configuration commandlinedemo.option.description.ui=Flag pour indiquer l'utilisation ou non de l'ui -mainui.menu.edit=Edit -mainui.menu.file=Fichier -mainui.menu.help=Aide -mainui.title=Commandline D\u00E9mo Modified: trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx =================================================================== --- trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2008-08-14 17:43:59 UTC (rev 1020) +++ trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2008-08-15 13:14:01 UTC (rev 1021) @@ -1,12 +1,12 @@ -<JFrame title="mainui.title" width="1024" height="768" defaultCloseOperation="do_nothing_on_close"> +<JFrame title="commandlinedemo.mainui.title" width="1024" height="768" defaultCloseOperation="do_nothing_on_close"> <JMenuBar> - <JMenu text="mainui.menu.file"> + <JMenu text="commandlinedemo.mainui.menu.file"> <JMenuItem id="quit"/> </JMenu> - <JMenu text="mainui.menu.edit"> + <JMenu text="commandlinedemo.mainui.menu.edit"> <JMenuItem id="config"/> </JMenu> - <JMenu text="mainui.menu.help" mnemonic="{'H'}"> + <JMenu text="commandlinedemo.mainui.menu.help" mnemonic="{'H'}"> <JMenuItem id="help"/> <JMenuItem id="site"/> <JMenuItem id="about"/> Modified: trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst =================================================================== --- trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-08-14 17:43:59 UTC (rev 1020) +++ trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-08-15 13:14:01 UTC (rev 1021) @@ -10,7 +10,7 @@ #. --edit-config - permet d'©diter la configuration + permet d'éditer la configuration #. --config-file <configFile:FILE> @@ -18,7 +18,7 @@ #. [--config]* <key:STRING> <value:STRING> [main|remote] - permet de changer une propri©t© de la configuration + permet de changer une propriété de la configuration #. --help|-h @@ -30,7 +30,7 @@ #. --reset-config - R©initialiser la configuration + Réinitialiser la configuration #. --ui <flag:BOOLEAN> @@ -39,11 +39,11 @@ Les configurations de **CommandLineDemo** ----------------------------------------- -Cat©gorie principale de la configuration (main) +Catégorie principale de la configuration (main) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. configFileName (File) <defaultValue:.commandlineDemo-1> - Le fichier de configuration utilis© + Le fichier de configuration utilisé #. copyright (String) <defaultValue:Copyright Codelutin 2008> @@ -55,11 +55,11 @@ #. encoding (String) <defaultValue:UTF-8> - L'encoding utilis© par l'application + L'encoding utilisé par l'application #. locale (Locale) <defaultValue:en_GB> - La locale utilis©e par l'application + La locale utilisée par l'application #. organisationName (String) <defaultValue:Codelutin> @@ -83,7 +83,7 @@ #. userLastName (String) - Le pr©nom de l'utilisateur + Le prénom de l'utilisateur #. userMail (String) @@ -94,7 +94,7 @@ La version de l'aplication -Cat©gorie remote de la configuration (remote) +Catégorie remote de la configuration (remote) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. URI (URI) <defaultValue:jnp://localhost:1099>

1 0

[Lutinutil-commits] r1020 - in trunk: lutini18neditor maven-i18n-plugin
by tchemit＠users.labs.libre-entreprise.org 14 Aug '08

14 Aug '08

Author: tchemit Date: 2008-08-14 17:43:59 +0000 (Thu, 14 Aug 2008) New Revision: 1020 Modified: trunk/lutini18neditor/pom.xml trunk/maven-i18n-plugin/pom.xml Log: utilisation org.codelutin:lutinproject:2.4 Modified: trunk/lutini18neditor/pom.xml =================================================================== --- trunk/lutini18neditor/pom.xml 2008-08-13 10:54:48 UTC (rev 1019) +++ trunk/lutini18neditor/pom.xml 2008-08-14 17:43:59 UTC (rev 1020) @@ -6,95 +6,91 @@  <modelVersion>4.0.0</modelVersion> -  +  +  +  <parent> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.3</version> + <version>2.4</version> </parent> -  <groupId>lutinlib</groupId> <artifactId>lutini18neditor</artifactId> - <name>Lutin I18n Editor</name> -  - <packaging>jar</packaging> + <dependencies> -  - <version>0.3-SNAPSHOT</version> +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>0.30-SNAPSHOT</version> + <scope>compile</scope> + </dependency> -  +  + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>jaxx-swing</artifactId> + <scope>compile</scope> + <version>0.4</version> + </dependency> + + </dependencies> + +  +  +  + + <name>Lutin I18n Editor</name> + <version>0.3-SNAPSHOT</version> <description>Editeur de fichier i18n</description> <inceptionYear>2008</inceptionYear> -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=12</url> - </issueManagement> +  + <url>${labs.project.url}</url> - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> - </site> - </distributionManagement> +  +  +  + <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> + <build> <plugins> <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>0.3</version> -  + <version>0.4</version> <executions> <execution> - <phase>process-sources</phase> <goals> <goal>generate</goal> </goals> </execution> </executions> - <dependencies> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing</artifactId> - <scope>compile</scope> - <version>0.3</version> - </dependency> - </dependencies> </plugin> + <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${maven.compile.encoding}</encoding> - </configuration> - </plugin> - <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>0.4</version> - <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> - <src>${maven.src.dir}/main/resources/i18n</src> - <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> - <keysModifier>false</keysModifier> - <keepBackup>false</keepBackup> - </configuration> <executions> <execution> - <phase>generate-resources</phase> <goals> -  <goal>parserJava</goal> <goal>gen</goal> </goals> @@ -109,86 +105,15 @@ </executions> </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> +  +  +  -  - <dependencies> + <scm> + <url>${maven.scm.url}</url> + </scm> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>0.30-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing</artifactId> - <scope>compile</scope> - <version>0.3</version> - </dependency> - - </dependencies> - - <profiles> - <profile> - <id>project</id> - - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <properties> -  - <maven.test.skip>true</maven.test.skip> - -  - <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> - -  - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - <maven.compile.encoding>UTF-8</maven.compile.encoding> - - </properties> - </profile> - </profiles> </project> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2008-08-13 10:54:48 UTC (rev 1019) +++ trunk/maven-i18n-plugin/pom.xml 2008-08-14 17:43:59 UTC (rev 1020) @@ -66,7 +66,7 @@ <inceptionYear>2007</inceptionYear>  - <url>http://${labs.host}/projects/${labs.project}</url> + <url>${labs.project.url}</url>   @@ -105,6 +105,10 @@ </properties> +  +  +  + <scm> <url>${maven.scm.url}</url> </scm> @@ -118,5 +122,5 @@ </plugin> </plugins> </reporting> - + </project>

1 0

[Lutinutil-commits] r1019 - in trunk/maven-i18n-plugin: . src/main/java/org/codelutin/i18n/plugin/core src/main/java/org/codelutin/i18n/plugin/extension src/site src/site/apt src/site/xdoc/fr/rst
by tchemit＠users.labs.libre-entreprise.org 13 Aug '08

13 Aug '08

Author: tchemit Date: 2008-08-13 10:54:48 +0000 (Wed, 13 Aug 2008) New Revision: 1019 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/core/AbstractI18nPlugin.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.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 trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserXml.java trunk/maven-i18n-plugin/src/site/apt/index.apt trunk/maven-i18n-plugin/src/site/apt/usage.apt trunk/maven-i18n-plugin/src/site/site.xml trunk/maven-i18n-plugin/src/site/xdoc/fr/rst/Todo.rst Log: report du plugin (car c un plugin) suppression des attributs javadoc description car cela ne fonctionne pas. Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/pom.xml 2008-08-13 10:54:48 UTC (rev 1019) @@ -109,4 +109,14 @@ <url>${maven.scm.url}</url> </scm> + <reporting> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> + </reporting> + </project> 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-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-13 10:54:48 UTC (rev 1019) @@ -60,13 +60,13 @@ protected abstract File getDefaultBasedir(); /** - * @description treate default entry + * treate default entry * @parameter expression="${i18n.treateDefault}" default-value="true" */ protected boolean treateDefaultEntry; /** - * @description Source entries (src+includes+excludes) . + * Source entries (src+includes+excludes) . * @parameter expression="${i18n.entries}" */ protected SourceEntry[] entries; Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java 2008-08-13 10:54:48 UTC (rev 1019) @@ -40,77 +40,71 @@ public abstract class AbstractI18nPlugin extends AbstractMojo { /** - * @description Langues des bundles generes. + * Langues des bundles generes. * @parameter expression="${i18n.bundles}" default-value="" * @required */ protected String[] bundles; /** - * @description Repertoire sources des fichiers i18n. + * Repertoire sources des fichiers i18n. * @parameter expression="${i18n.src}" default-value="${basedir}/src/resources/i18n" * @required */ protected File src; /** - * @description Met les fichiers generes dans le repertoire des sources i18n. + * Met les fichiers generes dans le repertoire des sources i18n. * @parameter expression="${i18n.genSrc}" default-value="true" */ protected boolean genSrc; /** - * @description Répertoire des fichiers generes i18n. + * Repertoire des fichiers generes i18n. * @parameter expression="${i18n.out}" default-value="${basedir}/target/gen/i18n" * @required */ protected File out; /** - * @description Active la modification de cle + * Active la modification de cle * @parameter expression="${i18n.keysModifier}" default-value="false" */ protected boolean keysModifier; /** - * @description verbose + * verbose flag * @parameter expression="${i18n.verbose}" default-value="false" */ protected boolean verbose; /** - * @description Nom du projet. + * Nom du projet. * @parameter expression="${i18n.artifactId}" default-value="${project.artifactId}" * @readonly */ protected String artifactId; /** - * @description conserve les anciens fichiers de traduction avec un suffix ~ + * conserve les anciens fichiers de traduction avec un suffix ~ * @parameter expression="${i18n.keepBackup}" default-value="true" */ protected boolean keepBackup; /** - * @description ne conserve que les clef scannees (et donc traite tous les fichiers) + * ne conserve que les clef scannees (et donc traite tous les fichiers) * @parameter expression="${i18n.strictMode}" default-value="false" */ protected boolean strictMode; /** - * @description ne conserve que les clef scannees (et donc traite tous les fichiers) + * encoding a utiliser pour charger et sauver les bundles * @parameter expression="${i18n.encoding}" default-value="${maven.compile.encoding}" * @required */ protected String encoding; /** - * Log - * Do not use a instance of, use a lazy instancier - */ - //protected Log log = getLog(); - - /** * Répertoire de stockage des fichiers i18n pour la recuperation des fichiers * de traduction entre librairie */ @@ -177,6 +171,4 @@ return s; } - /** Taille du buffer pour les lectures/écritures */ - protected static final int BUFFER_SIZE = 8 * 1024; } Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java 2008-08-13 10:54:48 UTC (rev 1019) @@ -25,7 +25,7 @@ import java.util.regex.Pattern; /** - * Un paseur java pour scanner les annotations ActionConfig + * Un parseur java pour scanner les annotations ActionConfig * * @author chemit * @goal parserJavaActionConfig Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java 2008-08-13 10:54:48 UTC (rev 1019) @@ -15,7 +15,7 @@ package org.codelutin.i18n.plugin.extension; /** - * Un paseur java pour scanner les annotations TabContentConfig. + * Un parseur java pour scanner les annotations TabContentConfig. * * @author chemit * @goal parserJavaTabConfig 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-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-13 10:54:48 UTC (rev 1019) @@ -31,13 +31,13 @@ public class ParserJaxx extends ParserXml { /** - * @description Source entries (src+includes+excludes) . + * Source entries (src+includes+excludes) . * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/*.jaxx" */ protected String defaultIncludes; /** - * @description Règles xml. + * Regles xml. * @parameter expression="${i18n.rulesJaxx}" default-value="jaxx.rules" */ protected String rulesJaxx; 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-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-13 10:54:48 UTC (rev 1019) @@ -22,7 +22,7 @@ import java.io.File; /** - * Récupération des chaines à traduire depuis les fichiers xml Swixat. + * Recuperation des chaines à traduire depuis les fichiers xml Swixat. * * @author julien * @goal parserSwixat @@ -31,19 +31,19 @@ public class ParserSwixat extends ParserXml { /** - * @description Source entries (src+includes) . + * Source entries (src+includes) . * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/*.xml" */ protected String defaultIncludes; /** - * @description Source entries (src+excludes) . + * Source entries (src+excludes) . * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/context.xml" */ protected String defaultExcludes; /** - * @description R�gles xml. + * Regles xml. * @parameter expression="${i18n.rulesSwixat}" default-value="swixat.rules" */ protected String rulesSwixat; Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserXml.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserXml.java 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserXml.java 2008-08-13 10:54:48 UTC (rev 1019) @@ -48,7 +48,7 @@ protected static final int BUFFER_SIZE = 8 * 1024; /** - * @description default src for an entry. + * default src for an entry. * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/uimodel" * @required */ Modified: trunk/maven-i18n-plugin/src/site/apt/index.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/apt/index.apt 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/site/apt/index.apt 2008-08-13 10:54:48 UTC (rev 1019) @@ -6,9 +6,9 @@ August 2008 ------ -Maven 2 I18n Plugin +Maven I18n Plugin - The Maven 2 I18n Plugin is used to compute i18n bundles for a given maven module. + The Maven I18n Plugin is used to compute i18n bundles for a given maven module. * Goals Overview Modified: trunk/maven-i18n-plugin/src/site/apt/usage.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/apt/usage.apt 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/site/apt/usage.apt 2008-08-13 10:54:48 UTC (rev 1019) @@ -22,6 +22,6 @@ +-----+ -* The <<<i18n:get>>> Mojo +* The <<<get>>> Mojo To be done. Modified: trunk/maven-i18n-plugin/src/site/site.xml =================================================================== --- trunk/maven-i18n-plugin/src/site/site.xml 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/site/site.xml 2008-08-13 10:54:48 UTC (rev 1019) @@ -36,7 +36,8 @@ <item name="FAQ" href="faq.html"/> </menu> <menu name="Examples"> - <item name="Simplest example Configuring Describe Mojo" href="/examples/describe-configuration.html"/> + <item name="To be done" /> +  </menu> <menu name="Téléchargement"> Modified: trunk/maven-i18n-plugin/src/site/xdoc/fr/rst/Todo.rst =================================================================== --- trunk/maven-i18n-plugin/src/site/xdoc/fr/rst/Todo.rst 2008-08-13 10:50:21 UTC (rev 1018) +++ trunk/maven-i18n-plugin/src/site/xdoc/fr/rst/Todo.rst 2008-08-13 10:54:48 UTC (rev 1019) @@ -1,80 +1,4 @@ -Un nouveau parser d'argument -============================ +TODO +==== -L'idée est d'avoir une description simple des arguments et de leur type et -que soit généré une classe à partir de cette description. Dans le -programme il suffirat de demander à la classe généré les inforamtions. - -Les options sont chargées par leur valeur par defaut, puis sont surchargées -par les valeurs des fichiers de configurations, puis surchargé -par les valeurs des variables d'environnement, et enfin surchargé par les -valeurs de la ligne de commande. - -Les fichiers de configuraiton sont lu dans l'ordre suivant: /etc/ + chemin -indiqué, puis $HOME/. + chemin indiqué. - -si le chemin indiqué est titi/toto.conf et que l'on est sur un système Linux -les fichiers de configuration seront: /etc/titi/toto.conf et -~/.titi/toto.conf - -exemple de description ----------------------- - -Par exemple on pourrait avoir le fichier Toto.java.conf dans les sources du -projet qui fournirait le fichier Toto.java:: - - configfile: titi/toto.conf - - outFile: le fichier de sortie - short: o - long: outfile - default: - - type: File - environment: toto - - number: Le nombre de fichier à produire - required: 1 - short: n - default: 1 - long: number - condition: 0<Number && Number<10 - type: int - -La description commence l'option non obligatoire *configfile* qui donne le -nom du fichier de configuration à utiliser pour l'application. Puis on -trouve les options. Une option commence par un nom, puis sa description -ensuite l'option peut avoir plusieurs options: - -- short: l'option courte sur la ligne de commande. Si absente pas d'option - courte -- long: l'option longue sur la ligne de commande, si pas d'option, on - reprend le nom de l'option -- type: le type de l'option (int, Float, String, char, File, ...) -- default: la valeur par default, si elle n'est pas specifier sur la ligne - de commande, ni dans les variables d'environnement ni dans le fichier de - configuration. Pour une option de type File si default faut -, alors - le fichier est la sortie standard. -- condition: la condition que doit respecter l'option pour être valide - la condition est une expression java contenant le nom de l'option comme - valeur de variable. -- environment: le nom de la variable d'environnement qu'il faut utiliser - si l'option n'est pas retrouve sur la ligne de commande. Si cette option - n'est pas indiqué alors, la variable d'environnement recherchée est le nom - du fichier de description suivi d'un point, suivi du nom de l'option. - par exemple toto.outfile - - -L'objet résultat sera Toto placé dans le fichier Toto.java. L'extension -java.conf est obligatoire pour détecter un fichier de configuration à -parser. Cet objet aurai les méthodes getOutputFile():File et getNumber():int - -Librairies utilisé ------------------- - -Sans doute utilisé, le parser redwood pour le fichier de configuration -http://www.isellrenohomes.com/parser/. Il lit directement des EBNF. - -projet de parsage d'argument ----------------------------- - -http://www.martiansoftware.com/jsap/ +Any idea ?

1 0

[Lutinutil-commits] r1018 - in trunk/lutinutil: . src/site
by tchemit＠users.labs.libre-entreprise.org 13 Aug '08

13 Aug '08

Author: tchemit Date: 2008-08-13 10:50:21 +0000 (Wed, 13 Aug 2008) New Revision: 1018 Modified: trunk/lutinutil/pom.xml trunk/lutinutil/src/site/site.xml Log: improve site (due to improve in lutinproject) Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-08-13 09:58:55 UTC (rev 1017) +++ trunk/lutinutil/pom.xml 2008-08-13 10:50:21 UTC (rev 1018) @@ -71,8 +71,8 @@   -  +  <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> </properties> @@ -90,7 +90,6 @@ <artifactId>maven-i18n-plugin</artifactId> <executions> <execution> - <phase>process-resources</phase> <goals> <goal>parserJava</goal> <goal>gen</goal> @@ -103,24 +102,8 @@ <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <configuration> -  -  -  - </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <configuration> -  -  -  - </configuration> - - </plugin> - </plugins> </build> Modified: trunk/lutinutil/src/site/site.xml =================================================================== --- trunk/lutinutil/src/site/site.xml 2008-08-13 09:58:55 UTC (rev 1017) +++ trunk/lutinutil/src/site/site.xml 2008-08-13 10:50:21 UTC (rev 1018) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="LutinUtil"> +<project name="${project.name}"> <skin> <groupId>lutinlib</groupId> @@ -8,7 +8,7 @@ </skin> <bannerLeft> - <name>Lutin Util</name> + <name>${project.name}</name> </bannerLeft> <bannerRight> @@ -30,7 +30,7 @@ </links> <menu name="Utilisateur"> - <item name="Accueil" href="abstract.html"/> + <item name="Accueil" href="index.html"/> <item name="Documentation" href="/LutinUtil.html"/> </menu> @@ -43,7 +43,7 @@ <menu name="Développeur"> <item name="A faire" href="Todo.html"/> - <item name="CommandLineArgumentApplication" href="/CommandLineArgumentApplication.html"/> +  </menu> <menu ref="reports"/>

1 0

[Lutinutil-commits] r1017 - trunk/maven-i18n-plugin
by tchemit＠users.labs.libre-entreprise.org 13 Aug '08

13 Aug '08

Author: tchemit Date: 2008-08-13 09:58:55 +0000 (Wed, 13 Aug 2008) New Revision: 1017 Modified: trunk/maven-i18n-plugin/pom.xml Log: l'url et maven.scm.url doit etre surchargee car le projet du labs est diff?\195?\169rent Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2008-08-13 09:47:37 UTC (rev 1016) +++ trunk/maven-i18n-plugin/pom.xml 2008-08-13 09:58:55 UTC (rev 1017) @@ -65,6 +65,9 @@ </description> <inceptionYear>2007</inceptionYear> +  + <url>http://${labs.host}/projects/${labs.project}</url> +    @@ -93,10 +96,10 @@  <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>

1 0