[Jtimer-commits] [jtimer] 01/01: fixes #1128: Migrates to git (for jtimer 2.0)

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 1e9445e864801bacf170f9f7aa50b84fb0c7feb7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 27 21:40:21 2014 +0100 fixes #1128: Migrates to git (for jtimer 2.0) --- .gitignore | 17 + LICENSE.txt | 674 +++++++++++++++++++++ pom.xml | 380 +++++++----- src/license/THIRD-PARTY.properties | 27 + src/main/config/wro.properties | 21 + src/main/config/wro.xml | 21 + .../org/chorem/jtimer/config/JtimerConfig.java | 22 + .../chorem/jtimer/config/JtimerConfigOption.java | 22 + .../org/chorem/jtimer/entities/TimerAlarm.java | 22 + .../java/org/chorem/jtimer/entities/TimerTask.java | 5 +- .../java/org/chorem/jtimer/entities/TimerTime.java | 22 + .../java/org/chorem/jtimer/entities/TodoList.java | 22 + .../java/org/chorem/jtimer/io/DataHandler.java | 22 + .../org/chorem/jtimer/io/GTimerDataLoader.java | 22 + .../chorem/jtimer/io/resources/DailySortedMap.java | 22 + .../chorem/jtimer/io/resources/GTimerTimeUtil.java | 22 + .../chorem/jtimer/io/resources/OldTimerAlert.java | 22 + .../jtimer/io/resources/OldTimerProject.java | 22 + .../chorem/jtimer/io/resources/OldTimerTask.java | 22 + .../java/org/chorem/jtimer/storage/Storage.java | 22 + .../chorem/jtimer/storage/StorageException.java | 22 + .../java/org/chorem/jtimer/utils/ReportTask.java | 22 + .../java/org/chorem/jtimer/war/JettyRunner.java | 22 + .../org/chorem/jtimer/web/AbstractResource.java | 22 + .../java/org/chorem/jtimer/web/AlarmResource.java | 22 + .../java/org/chorem/jtimer/web/AlarmsResource.java | 22 + .../jtimer/web/ApplicationServletFilter.java | 22 + .../java/org/chorem/jtimer/web/ImportResource.java | 22 + .../java/org/chorem/jtimer/web/ReportResource.java | 22 + .../org/chorem/jtimer/web/RestApplication.java | 22 + .../java/org/chorem/jtimer/web/TaskResource.java | 22 + .../java/org/chorem/jtimer/web/TasksResource.java | 22 + .../org/chorem/jtimer/web/TiersServerResource.java | 22 + .../java/org/chorem/jtimer/web/TimeResource.java | 22 + .../java/org/chorem/jtimer/web/TimesResource.java | 22 + .../jtimer/web/websocket/WebsocketHandler.java | 22 + src/main/resources/jtimer-default.properties | 21 + src/main/webapp/WEB-INF/web.xml | 21 + src/main/webapp/css/app.css | 21 + src/main/webapp/index.html | 21 + src/main/webapp/js/app.js | 21 + src/main/webapp/js/controllers.js | 21 + src/main/webapp/js/entities.js | 21 + src/main/webapp/js/filters.js | 21 + src/main/webapp/js/service.js | 21 + src/main/webapp/partials/about.html | 21 + src/main/webapp/partials/alertModal.html | 21 + src/main/webapp/partials/contact.html | 21 + src/main/webapp/partials/dialogModal.html | 21 + src/main/webapp/partials/optionModal.html | 21 + src/main/webapp/partials/reportModal.html | 21 + src/main/webapp/partials/reportNestedTask.html | 21 + src/main/webapp/partials/settings.html | 21 + src/main/webapp/partials/task.html | 21 + src/main/webapp/partials/tasks.html | 21 + src/main/webapp/partials/timesModal.html | 21 + .../resources/images/jtimer-logo-orange-little.jpg | Bin 0 -> 12194 bytes src/site/site.xml | 69 +++ 58 files changed, 2113 insertions(+), 159 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c1ebcb1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +.idea +*.ipr +*.iws +*.iml +*.log +*~ +/*/*~ +atlassian-ide-plugin.xml +target/* +*/target/* +*/*.ipr +*/*.iws +*/*.iml +*/.idea +src/main/webapp/css/jtimer.css +src/main/webapp/js/jtimer.js + diff --git a/LICENSE.txt b/LICENSE.txt index e69de29..94a9ed0 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU 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. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/pom.xml b/pom.xml index 2fa6d36..a867eaa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ <?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/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <artifactId>chorempom</artifactId> + <version>1.5</version> </parent> <groupId>org.chorem</groupId> @@ -16,9 +16,8 @@ <name>jTimer</name> <description>jTimer - Time tracking tool.</description> - <url>http://maven-site.chorem.org/jtimer</url> + <url>http://jtimer.chorem.org</url> <inceptionYear>2007</inceptionYear> - <licenses> <license> <name>General Public License (GPL)</name> @@ -27,152 +26,87 @@ </license> </licenses> + <scm> + <connection>scm:git:http://git.chorem.org/jtimer.git</connection> + <developerConnection> + scm:git:https://git.chorem.org/jtimer.git + </developerConnection> + <url>https://gitweb.chorem.org/jtimer.git</url> + </scm> + <distributionManagement> + <site> + <id>${site.server}</id> + <url>${site.url}</url> + </site> + </distributionManagement> + <properties> - <platform>chorem.org</platform> + + <projectId>jtimer</projectId> + <license.licenseName>gpl_v3</license.licenseName> <javaVersion>1.7</javaVersion> <restletVersion>2.2.1</restletVersion> <gsonVersion>2.2.4</gsonVersion> <h2Version>1.4.178</h2Version> <jettyVersion>9.2.1.v20140609</jettyVersion> - </properties> - <build> - <plugins> - <plugin> - <groupId>ro.isdc.wro4j</groupId> - <artifactId>wro4j-maven-plugin</artifactId> - <version>1.7.5</version> - <dependencies> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angularjs</artifactId> - <version>1.3.0-beta.7-1</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular-ui-bootstrap</artifactId> - <version>0.11.0-2</version> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>1.11.1-1</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - <version>3.1.1-1</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-moment</artifactId> - <version>2.6.0-1</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-font-awesome</artifactId> - <version>4.0.3-1</version> - </dependency> - <dependency> - <groupId>ro.isdc.wro4j</groupId> - <artifactId>wro4j-extensions</artifactId> - <version>1.7.5</version> - </dependency> - </dependencies> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - - <configuration> - <targetGroups>jtimer</targetGroups> - <contextFolder>${basedir}/src/main/webapp/web/</contextFolder> - <!-- hack during devel, otherwize tomcat don't find generated file - (perhaps it's not the good place ?) - <cssDestinationFolder>${basedir}/target/${projectId}-${project.version}/css</cssDestinationFolder> - <jsDestinationFolder>${basedir}/target/${projectId}-${project.version}/js</jsDestinationFolder> --> - <cssDestinationFolder>${basedir}/src/main/webapp/css</cssDestinationFolder> - <jsDestinationFolder>${basedir}/src/main/webapp/js</jsDestinationFolder> - <!-- end devel hack --> - <wroManagerFactory>org.nuiton.js.wro.NuitonJsMavenWroManagerFactory</wroManagerFactory> - <wroFile>${basedir}/src/main/config/wro.xml</wroFile> - <extraConfigFile>${basedir}/src/main/config/wro.properties</extraConfigFile> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jettyVersion}</version> - <configuration> - <httpConnector> - <port>8081</port> - </httpConnector> - </configuration> + <!-- Java version --> + <javaVersion>1.7</javaVersion> + <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> + <maven.compiler.source>${javaVersion}</maven.compiler.source> + <!--TODO remove this when idea won't ask to change jdk level at each pom modification--> + <maven.compiler.target>${javaVersion}</maven.compiler.target> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>generate-runnable-war</id> - <goals> - <goal>war</goal> - </goals> - <configuration> - <warName>${project.build.finalName}-standalone</warName> - <archive> - <manifest> - <mainClass>org.chorem.jtimer.war.JettyRunner</mainClass> - </manifest> - </archive> - <webResources> - <resource> - <directory>${project.build.directory}/classes</directory> - <targetPath>WEB-INF/..</targetPath> - <includes> - <include>**/war/*</include> - </includes> - <filtering>false</filtering> - </resource> - </webResources> - <overlays> - <overlay> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!--Multilanguage maven-site --> + <locales>fr</locales> + + <!-- files to deploy to redmine --> + <redmine.releaseFiles> + target/${project.artifactId}-${project.version}-war + </redmine.releaseFiles> + + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + + </properties> + + <repositories> + <repository> + <id>jtimer-group</id> + <url>http://maven.nuiton.org/nexus/content/groups/jtimer</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>jtimer-group</id> + <url>http://maven.nuiton.org/nexus/content/groups/jtimer</url> + </pluginRepository> + </pluginRepositories> <dependencies> - <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> - <version>0.8.15</version> - </dependency> - <dependency> + <dependency> + <groupId>com.github.spullara.mustache.java</groupId> + <artifactId>compiler</artifactId> + <version>0.8.15</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> </dependency> <dependency> <groupId>com.h2database</groupId> @@ -193,6 +127,7 @@ <groupId>org.restlet.jee</groupId> <artifactId>org.restlet.ext.servlet</artifactId> <version>${restletVersion}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -200,28 +135,163 @@ <version>${jettyVersion}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-2</version> - </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.3.5</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.2</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>3.0-alpha-2</version> + </dependency> </dependencies> - <repositories> - <repository> - <id>jtimer-group</id> - <url>http://maven.nuiton.org/nexus/content/groups/jtimer</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>jtimer-group</id> - <url>http://maven.nuiton.org/nexus/content/groups/jtimer</url> - </pluginRepository> - </pluginRepositories> + <build> + <plugins> + <plugin> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-maven-plugin</artifactId> + <version>1.7.5</version> + <dependencies> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-wro</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-angularjs</artifactId> + <version>1.3.0-beta.7-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-angular-ui-bootstrap</artifactId> + <version>0.11.0-2</version> + </dependency> + + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery</artifactId> + <version>1.11.1-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-bootstrap</artifactId> + <version>3.1.1-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-moment</artifactId> + <version>2.6.0-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-font-awesome</artifactId> + <version>4.0.3-1</version> + </dependency> + <dependency> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-extensions</artifactId> + <version>1.7.5</version> + </dependency> + </dependencies> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + + <configuration> + <targetGroups>jtimer</targetGroups> + <contextFolder>${basedir}/src/main/webapp/web/</contextFolder> + <!-- hack during devel, otherwize tomcat don't find generated file + (perhaps it's not the good place ?) + <cssDestinationFolder>${basedir}/target/${projectId}-${project.version}/css</cssDestinationFolder> + <jsDestinationFolder>${basedir}/target/${projectId}-${project.version}/js</jsDestinationFolder> --> + <cssDestinationFolder>${basedir}/src/main/webapp/css</cssDestinationFolder> + <jsDestinationFolder>${basedir}/src/main/webapp/js</jsDestinationFolder> + <!-- end devel hack --> + <wroManagerFactory>org.nuiton.js.wro.NuitonJsMavenWroManagerFactory</wroManagerFactory> + <wroFile>${basedir}/src/main/config/wro.xml</wroFile> + <extraConfigFile>${basedir}/src/main/config/wro.properties</extraConfigFile> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jettyVersion}</version> + <configuration> + <httpConnector> + <port>8081</port> + </httpConnector> + </configuration> + + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>generate-runnable-war</id> + <goals> + <goal>war</goal> + </goals> + <configuration> + <warName>${project.build.finalName}-standalone</warName> + <archive> + <manifest> + <mainClass>org.chorem.jtimer.war.JettyRunner</mainClass> + </manifest> + </archive> + <webResources> + <resource> + <directory>${project.build.directory}/classes</directory> + <targetPath>WEB-INF/..</targetPath> + <includes> + <include>**/war/*</include> + </includes> + <filtering>false</filtering> + </resource> + </webResources> + <overlays> + <overlay> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + + <profile> + <id>release-quality-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <!-- We use some none central dependencies --> + <helper.skipCheckAutocontainer>true</helper.skipCheckAutocontainer> + </properties> + + </profile> + + </profiles> </project> diff --git a/src/license/THIRD-PARTY.properties b/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..b32f561 --- /dev/null +++ b/src/license/THIRD-PARTY.properties @@ -0,0 +1,27 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 license +# - Apache License 2.0 +# - Apache Software License - Version 2.0 +# - BSD License +# - CDDL + GPLv2 with classpath exception +# - CDDL 1.0 license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - EPL 1.0 license +# - Eclipse Public License - Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 2.1 license +# - LGPL 3.0 license +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Oct 27 21:30:50 CET 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 diff --git a/src/main/config/wro.properties b/src/main/config/wro.properties index c02c3c6..6b73c99 100644 --- a/src/main/config/wro.properties +++ b/src/main/config/wro.properties @@ -1,3 +1,24 @@ +### +# #%L +# jTimer +# %% +# Copyright (C) 2007 - 2014 CodeLutin +# %% +# 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 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 Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### preProcessors=cssVariables,forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender postProcessors= #cssMinJawr,jsMin diff --git a/src/main/config/wro.xml b/src/main/config/wro.xml index a72d61f..5d7ae00 100644 --- a/src/main/config/wro.xml +++ b/src/main/config/wro.xml @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <groups xmlns="http://www.isdc.ro/wro"> <group name='jtimer'> <group-ref>jquery</group-ref> diff --git a/src/main/java/org/chorem/jtimer/config/JtimerConfig.java b/src/main/java/org/chorem/jtimer/config/JtimerConfig.java index b7c23f3..e612dfc 100644 --- a/src/main/java/org/chorem/jtimer/config/JtimerConfig.java +++ b/src/main/java/org/chorem/jtimer/config/JtimerConfig.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.config; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Properties; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/org/chorem/jtimer/config/JtimerConfigOption.java b/src/main/java/org/chorem/jtimer/config/JtimerConfigOption.java index e44ac36..8fe2ea5 100644 --- a/src/main/java/org/chorem/jtimer/config/JtimerConfigOption.java +++ b/src/main/java/org/chorem/jtimer/config/JtimerConfigOption.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.config; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.nuiton.config.ConfigOptionDef; /** diff --git a/src/main/java/org/chorem/jtimer/entities/TimerAlarm.java b/src/main/java/org/chorem/jtimer/entities/TimerAlarm.java index 7b97742..98dd041 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerAlarm.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerAlarm.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.entities; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; import java.util.UUID; diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTask.java b/src/main/java/org/chorem/jtimer/entities/TimerTask.java index 39cd78c..c2b9a9f 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTask.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTask.java @@ -1,9 +1,6 @@ /* * #%L * jTimer - * - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2013 CodeLutin, Chatellier Eric * %% @@ -326,4 +323,4 @@ public class TimerTask implements Serializable { } -} \ No newline at end of file +} diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTime.java b/src/main/java/org/chorem/jtimer/entities/TimerTime.java index ac7a526..839d837 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTime.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTime.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.entities; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; import java.util.Date; import java.util.UUID; diff --git a/src/main/java/org/chorem/jtimer/entities/TodoList.java b/src/main/java/org/chorem/jtimer/entities/TodoList.java index 1b9ccb0..c2de9e8 100644 --- a/src/main/java/org/chorem/jtimer/entities/TodoList.java +++ b/src/main/java/org/chorem/jtimer/entities/TodoList.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.entities; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.tuple.Pair; import java.util.Queue; diff --git a/src/main/java/org/chorem/jtimer/io/DataHandler.java b/src/main/java/org/chorem/jtimer/io/DataHandler.java index a7d4ec8..b10787e 100644 --- a/src/main/java/org/chorem/jtimer/io/DataHandler.java +++ b/src/main/java/org/chorem/jtimer/io/DataHandler.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.io; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.entities.TimerAlarm; diff --git a/src/main/java/org/chorem/jtimer/io/GTimerDataLoader.java b/src/main/java/org/chorem/jtimer/io/GTimerDataLoader.java index 84c648f..1605b5a 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerDataLoader.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerDataLoader.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.io; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; diff --git a/src/main/java/org/chorem/jtimer/io/resources/DailySortedMap.java b/src/main/java/org/chorem/jtimer/io/resources/DailySortedMap.java index e9ba7dc..3413ccc 100644 --- a/src/main/java/org/chorem/jtimer/io/resources/DailySortedMap.java +++ b/src/main/java/org/chorem/jtimer/io/resources/DailySortedMap.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.io.resources; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Calendar; import java.util.Comparator; import java.util.Date; diff --git a/src/main/java/org/chorem/jtimer/io/resources/GTimerTimeUtil.java b/src/main/java/org/chorem/jtimer/io/resources/GTimerTimeUtil.java index e641ec2..ab4f50b 100644 --- a/src/main/java/org/chorem/jtimer/io/resources/GTimerTimeUtil.java +++ b/src/main/java/org/chorem/jtimer/io/resources/GTimerTimeUtil.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.io.resources; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/chorem/jtimer/io/resources/OldTimerAlert.java b/src/main/java/org/chorem/jtimer/io/resources/OldTimerAlert.java index 405f848..8d5f08c 100644 --- a/src/main/java/org/chorem/jtimer/io/resources/OldTimerAlert.java +++ b/src/main/java/org/chorem/jtimer/io/resources/OldTimerAlert.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.io.resources; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; /** diff --git a/src/main/java/org/chorem/jtimer/io/resources/OldTimerProject.java b/src/main/java/org/chorem/jtimer/io/resources/OldTimerProject.java index 0cfc73d..3250800 100644 --- a/src/main/java/org/chorem/jtimer/io/resources/OldTimerProject.java +++ b/src/main/java/org/chorem/jtimer/io/resources/OldTimerProject.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.io.resources; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + /** * Represent a project. * diff --git a/src/main/java/org/chorem/jtimer/io/resources/OldTimerTask.java b/src/main/java/org/chorem/jtimer/io/resources/OldTimerTask.java index 2ee3cc7..0190a87 100644 --- a/src/main/java/org/chorem/jtimer/io/resources/OldTimerTask.java +++ b/src/main/java/org/chorem/jtimer/io/resources/OldTimerTask.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.io.resources; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/org/chorem/jtimer/storage/Storage.java b/src/main/java/org/chorem/jtimer/storage/Storage.java index 7b75f34..07ffecf 100644 --- a/src/main/java/org/chorem/jtimer/storage/Storage.java +++ b/src/main/java/org/chorem/jtimer/storage/Storage.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.storage; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/chorem/jtimer/storage/StorageException.java b/src/main/java/org/chorem/jtimer/storage/StorageException.java index d38cc6e..bf80a7b 100644 --- a/src/main/java/org/chorem/jtimer/storage/StorageException.java +++ b/src/main/java/org/chorem/jtimer/storage/StorageException.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.storage; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + public class StorageException extends RuntimeException { /** serialVersionUID. */ diff --git a/src/main/java/org/chorem/jtimer/utils/ReportTask.java b/src/main/java/org/chorem/jtimer/utils/ReportTask.java index 0474ecd..52412e2 100644 --- a/src/main/java/org/chorem/jtimer/utils/ReportTask.java +++ b/src/main/java/org/chorem/jtimer/utils/ReportTask.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.utils; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.gson.annotations.Expose; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/chorem/jtimer/war/JettyRunner.java b/src/main/java/org/chorem/jtimer/war/JettyRunner.java index 01af0d0..0c39cda 100644 --- a/src/main/java/org/chorem/jtimer/war/JettyRunner.java +++ b/src/main/java/org/chorem/jtimer/war/JettyRunner.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.war; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.File; import java.io.IOException; import java.net.JarURLConnection; diff --git a/src/main/java/org/chorem/jtimer/web/AbstractResource.java b/src/main/java/org/chorem/jtimer/web/AbstractResource.java index b3e8bb1..31c6d37 100644 --- a/src/main/java/org/chorem/jtimer/web/AbstractResource.java +++ b/src/main/java/org/chorem/jtimer/web/AbstractResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.gson.GsonBuilder; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/src/main/java/org/chorem/jtimer/web/AlarmResource.java b/src/main/java/org/chorem/jtimer/web/AlarmResource.java index 8996b00..4fd9b10 100644 --- a/src/main/java/org/chorem/jtimer/web/AlarmResource.java +++ b/src/main/java/org/chorem/jtimer/web/AlarmResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.IOException; import java.util.Date; import java.util.List; diff --git a/src/main/java/org/chorem/jtimer/web/AlarmsResource.java b/src/main/java/org/chorem/jtimer/web/AlarmsResource.java index 21b5cbe..bbc436c 100644 --- a/src/main/java/org/chorem/jtimer/web/AlarmsResource.java +++ b/src/main/java/org/chorem/jtimer/web/AlarmsResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.ArrayList; import com.google.gson.Gson; diff --git a/src/main/java/org/chorem/jtimer/web/ApplicationServletFilter.java b/src/main/java/org/chorem/jtimer/web/ApplicationServletFilter.java index 8ee5282..0e011f8 100644 --- a/src/main/java/org/chorem/jtimer/web/ApplicationServletFilter.java +++ b/src/main/java/org/chorem/jtimer/web/ApplicationServletFilter.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/src/main/java/org/chorem/jtimer/web/ImportResource.java b/src/main/java/org/chorem/jtimer/web/ImportResource.java index e6f89e7..5b52c9b 100644 --- a/src/main/java/org/chorem/jtimer/web/ImportResource.java +++ b/src/main/java/org/chorem/jtimer/web/ImportResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/chorem/jtimer/web/ReportResource.java b/src/main/java/org/chorem/jtimer/web/ReportResource.java index 80f8683..357bf14 100644 --- a/src/main/java/org/chorem/jtimer/web/ReportResource.java +++ b/src/main/java/org/chorem/jtimer/web/ReportResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/org/chorem/jtimer/web/RestApplication.java b/src/main/java/org/chorem/jtimer/web/RestApplication.java index dc78c42..8456b4c 100644 --- a/src/main/java/org/chorem/jtimer/web/RestApplication.java +++ b/src/main/java/org/chorem/jtimer/web/RestApplication.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; import java.util.Iterator; import java.util.Timer; diff --git a/src/main/java/org/chorem/jtimer/web/TaskResource.java b/src/main/java/org/chorem/jtimer/web/TaskResource.java index 5664561..e431e54 100644 --- a/src/main/java/org/chorem/jtimer/web/TaskResource.java +++ b/src/main/java/org/chorem/jtimer/web/TaskResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Date; import com.google.gson.Gson; diff --git a/src/main/java/org/chorem/jtimer/web/TasksResource.java b/src/main/java/org/chorem/jtimer/web/TasksResource.java index af3c47f..efd8d22 100644 --- a/src/main/java/org/chorem/jtimer/web/TasksResource.java +++ b/src/main/java/org/chorem/jtimer/web/TasksResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/org/chorem/jtimer/web/TiersServerResource.java b/src/main/java/org/chorem/jtimer/web/TiersServerResource.java index f5a598b..c34e15e 100644 --- a/src/main/java/org/chorem/jtimer/web/TiersServerResource.java +++ b/src/main/java/org/chorem/jtimer/web/TiersServerResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/org/chorem/jtimer/web/TimeResource.java b/src/main/java/org/chorem/jtimer/web/TimeResource.java index bcf7d90..f354d0d 100644 --- a/src/main/java/org/chorem/jtimer/web/TimeResource.java +++ b/src/main/java/org/chorem/jtimer/web/TimeResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.IOException; import java.util.Date; import java.util.List; diff --git a/src/main/java/org/chorem/jtimer/web/TimesResource.java b/src/main/java/org/chorem/jtimer/web/TimesResource.java index 32714db..5ddd6de 100644 --- a/src/main/java/org/chorem/jtimer/web/TimesResource.java +++ b/src/main/java/org/chorem/jtimer/web/TimesResource.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.ArrayList; import com.google.gson.Gson; diff --git a/src/main/java/org/chorem/jtimer/web/websocket/WebsocketHandler.java b/src/main/java/org/chorem/jtimer/web/websocket/WebsocketHandler.java index 094dc22..771e086 100644 --- a/src/main/java/org/chorem/jtimer/web/websocket/WebsocketHandler.java +++ b/src/main/java/org/chorem/jtimer/web/websocket/WebsocketHandler.java @@ -1,5 +1,27 @@ package org.chorem.jtimer.web.websocket; +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jetty.websocket.api.Session; diff --git a/src/main/resources/jtimer-default.properties b/src/main/resources/jtimer-default.properties index cba829e..631f7db 100644 --- a/src/main/resources/jtimer-default.properties +++ b/src/main/resources/jtimer-default.properties @@ -1,4 +1,25 @@ ### +# #%L +# jTimer +# %% +# Copyright (C) 2007 - 2014 CodeLutin +# %% +# 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 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 Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +### # jTimer default properties ### # jTimer storage path diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index a1b89f1..6b29728 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0"> diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css index 8539421..a3952ea 100644 --- a/src/main/webapp/css/app.css +++ b/src/main/webapp/css/app.css @@ -1,3 +1,24 @@ +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ body{ margin:0; diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index d4a2c8e..9af0f51 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <!DOCTYPE html> <html lang="en" ng-app="webtimer" zmanifest="webtimer.appcache"> <head> diff --git a/src/main/webapp/js/app.js b/src/main/webapp/js/app.js index d3f6d1d..96de400 100644 --- a/src/main/webapp/js/app.js +++ b/src/main/webapp/js/app.js @@ -1,3 +1,24 @@ +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Cette directive permet de parcourir un Arbre, pour chaque noeud de l'arbre * un l'element DOM est duplique. diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index 6ed5059..9474776 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -1,3 +1,24 @@ +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ function TasksCtrl($scope, $interval, $timeout, $q, settings, serverTaskAccess, serverTimeAccess, serverAlarmAccess, serverReportAccess, $localStorage, $window, $document, $modal, wtWebsocket, jTimerWebsocket) { // {Boolean} vrai si on est online diff --git a/src/main/webapp/js/entities.js b/src/main/webapp/js/entities.js index 670667f..212cc70 100644 --- a/src/main/webapp/js/entities.js +++ b/src/main/webapp/js/entities.js @@ -1,3 +1,24 @@ +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Genere un UUID * @returns {String} diff --git a/src/main/webapp/js/filters.js b/src/main/webapp/js/filters.js index 5d2ea5f..b3c5282 100644 --- a/src/main/webapp/js/filters.js +++ b/src/main/webapp/js/filters.js @@ -1,3 +1,24 @@ +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ var wtFilter = function(input) { var date = moment(input).utc(); return date.diff(moment(0), 'hours') + ":" +date.format("mm:ss"); diff --git a/src/main/webapp/js/service.js b/src/main/webapp/js/service.js index 96a091a..be1dca2 100644 --- a/src/main/webapp/js/service.js +++ b/src/main/webapp/js/service.js @@ -1,3 +1,24 @@ +/* + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2014 CodeLutin + * %% + * 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 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 Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Service qui permet un échange restfull des taches */ diff --git a/src/main/webapp/partials/about.html b/src/main/webapp/partials/about.html index 65fe26d..8415cb8 100644 --- a/src/main/webapp/partials/about.html +++ b/src/main/webapp/partials/about.html @@ -1 +1,22 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> WebTimer 1.0 diff --git a/src/main/webapp/partials/alertModal.html b/src/main/webapp/partials/alertModal.html index 647fd10..b99316d 100644 --- a/src/main/webapp/partials/alertModal.html +++ b/src/main/webapp/partials/alertModal.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <table class='table'> <thead> diff --git a/src/main/webapp/partials/contact.html b/src/main/webapp/partials/contact.html index 928ed1b..5d64385 100644 --- a/src/main/webapp/partials/contact.html +++ b/src/main/webapp/partials/contact.html @@ -1 +1,22 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> jtimer-users@listes.chorem.org \ No newline at end of file diff --git a/src/main/webapp/partials/dialogModal.html b/src/main/webapp/partials/dialogModal.html index dd54c78..7e6857a 100644 --- a/src/main/webapp/partials/dialogModal.html +++ b/src/main/webapp/partials/dialogModal.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <h4>Supress options : </h4> <hr/> diff --git a/src/main/webapp/partials/optionModal.html b/src/main/webapp/partials/optionModal.html index 5eebcd3..8279fe3 100644 --- a/src/main/webapp/partials/optionModal.html +++ b/src/main/webapp/partials/optionModal.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <tabset justified="true"> <!--tasks--> <tab heading="Task"> diff --git a/src/main/webapp/partials/reportModal.html b/src/main/webapp/partials/reportModal.html index eff23d4..00c4c04 100644 --- a/src/main/webapp/partials/reportModal.html +++ b/src/main/webapp/partials/reportModal.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div> <h3>Report :</h3> </div> diff --git a/src/main/webapp/partials/reportNestedTask.html b/src/main/webapp/partials/reportNestedTask.html index 7b149cf..31129bc 100644 --- a/src/main/webapp/partials/reportNestedTask.html +++ b/src/main/webapp/partials/reportNestedTask.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div style="display : block" > <div style="min-width : 100px; max-width : 110px; display : inline-block;">-{{subtask.name}}</div> diff --git a/src/main/webapp/partials/settings.html b/src/main/webapp/partials/settings.html index 3cc015f..777db6e 100644 --- a/src/main/webapp/partials/settings.html +++ b/src/main/webapp/partials/settings.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div id="header"> <a href='#/tasks' class='glyphicon glyphicon-arrow-left'>Home</a> </div> diff --git a/src/main/webapp/partials/task.html b/src/main/webapp/partials/task.html index ff2e0ed..f7b9bc8 100644 --- a/src/main/webapp/partials/task.html +++ b/src/main/webapp/partials/task.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div id="modalheader"> <div class="left"> <h4>Task : {{task.name}}</h4> diff --git a/src/main/webapp/partials/tasks.html b/src/main/webapp/partials/tasks.html index 100f23b..790a5bc 100644 --- a/src/main/webapp/partials/tasks.html +++ b/src/main/webapp/partials/tasks.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div id="header"> <!--Header partie gauche --> <span class='left form-inline'> diff --git a/src/main/webapp/partials/timesModal.html b/src/main/webapp/partials/timesModal.html index d4a02dd..ef4f2bf 100644 --- a/src/main/webapp/partials/timesModal.html +++ b/src/main/webapp/partials/timesModal.html @@ -1,3 +1,24 @@ +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2014 CodeLutin + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <div id="modalheader"> <!--<div ng-controller="DatePickerCtrl" style="display:inline-block; min-height:290px;" ng-show="!dateChosen"> <datepicker ng-model="dateobj.date" ng-change="changeDayDate()" min-date="minDate" max-date="dateMaxPicker" show-weeks="true" class="well well-sm"></datepicker> diff --git a/src/site/resources/images/jtimer-logo-orange-little.jpg b/src/site/resources/images/jtimer-logo-orange-little.jpg new file mode 100644 index 0000000..a120df7 Binary files /dev/null and b/src/site/resources/images/jtimer-logo-orange-little.jpg differ diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..8825f12 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2012 CodeLutin, Chatellier Eric + %% + 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 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <custom> + <fluidoSkin> + <topBarIcon> + <name>jTimer</name> + <href>index.html</href> + </topBarIcon> + </fluidoSkin> + </custom> + + <bannerLeft> + <src>images/jtimer-logo-orange-little.jpg</src> + <href>/index.html</href> + <alt>jTimer logo</alt> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + </poweredBy> + + <body> + + <links> + <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="chorem.org" href="https://forge.chorem.org"/> + <item name="CodeLutin" href="https://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu ref="reports"/> + + </body> +</project> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.