From 6dc7723c738c8307369f2fcfd8feb0fd2ea703c1 Mon Sep 17 00:00:00 2001 From: yvesf Date: Thu, 24 Feb 2011 22:45:14 +0100 Subject: file-copy from previous development-repository --- src/main/java/agpl-3.0.txt | 661 +++++++++++++++++++++ .../java/de/dhbw/horb/calendar/ICSServlet.java | 39 ++ .../horb/calendar/dualis/DualisConnection.java | 173 ++++++ .../dhbw/horb/calendar/dualis/DualisException.java | 33 + .../de/dhbw/horb/calendar/ics/AbstractICSType.java | 43 ++ .../java/de/dhbw/horb/calendar/ics/VCalendar.java | 51 ++ .../java/de/dhbw/horb/calendar/ics/VEvent.java | 79 +++ .../java/de/dhbw/horb/calendar/ui/LoginWorker.java | 90 +++ .../de/dhbw/horb/calendar/ui/MyApplication.java | 161 +++++ .../horb/calendar/ui/StundenplanComponent.java | 102 ++++ .../horb/calendar/util/AuthenticatedServlet.java | 84 +++ src/main/webapp/WEB-INF/web.xml | 34 ++ src/main/webapp/index.jsp | 8 + src/site/resources/images/dhbwcalendar-google1.jpg | Bin 0 -> 28604 bytes src/site/resources/images/dhbwcalendar-google2.jpg | Bin 0 -> 53155 bytes .../resources/images/dhbwcalendar-lightning.jpg | Bin 0 -> 100091 bytes src/site/resources/images/dhbwlogo.png | Bin 0 -> 4124 bytes src/site/site.xml | 25 + src/site/xdoc/devel-hacking.xml | 70 +++ src/site/xdoc/devel-install.xml | 25 + src/site/xdoc/dokumentation.xml | 357 +++++++++++ src/site/xdoc/user-allgemein.xml | 87 +++ src/site/xdoc/user-google.xml | 35 ++ src/site/xdoc/user-lightning.xml | 43 ++ src/site/xdoc/user-outlook.xml | 16 + 25 files changed, 2216 insertions(+) create mode 100644 src/main/java/agpl-3.0.txt create mode 100644 src/main/java/de/dhbw/horb/calendar/ICSServlet.java create mode 100644 src/main/java/de/dhbw/horb/calendar/dualis/DualisConnection.java create mode 100644 src/main/java/de/dhbw/horb/calendar/dualis/DualisException.java create mode 100644 src/main/java/de/dhbw/horb/calendar/ics/AbstractICSType.java create mode 100644 src/main/java/de/dhbw/horb/calendar/ics/VCalendar.java create mode 100644 src/main/java/de/dhbw/horb/calendar/ics/VEvent.java create mode 100644 src/main/java/de/dhbw/horb/calendar/ui/LoginWorker.java create mode 100644 src/main/java/de/dhbw/horb/calendar/ui/MyApplication.java create mode 100644 src/main/java/de/dhbw/horb/calendar/ui/StundenplanComponent.java create mode 100644 src/main/java/de/dhbw/horb/calendar/util/AuthenticatedServlet.java create mode 100644 src/main/webapp/WEB-INF/web.xml create mode 100644 src/main/webapp/index.jsp create mode 100644 src/site/resources/images/dhbwcalendar-google1.jpg create mode 100644 src/site/resources/images/dhbwcalendar-google2.jpg create mode 100644 src/site/resources/images/dhbwcalendar-lightning.jpg create mode 100644 src/site/resources/images/dhbwlogo.png create mode 100644 src/site/site.xml create mode 100644 src/site/xdoc/devel-hacking.xml create mode 100644 src/site/xdoc/devel-install.xml create mode 100644 src/site/xdoc/dokumentation.xml create mode 100644 src/site/xdoc/user-allgemein.xml create mode 100644 src/site/xdoc/user-google.xml create mode 100644 src/site/xdoc/user-lightning.xml create mode 100644 src/site/xdoc/user-outlook.xml (limited to 'src') diff --git a/src/main/java/agpl-3.0.txt b/src/main/java/agpl-3.0.txt new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/src/main/java/agpl-3.0.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. diff --git a/src/main/java/de/dhbw/horb/calendar/ICSServlet.java b/src/main/java/de/dhbw/horb/calendar/ICSServlet.java new file mode 100644 index 0000000..8a1be3e --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/ICSServlet.java @@ -0,0 +1,39 @@ +package de.dhbw.horb.calendar; + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import de.dhbw.horb.calendar.dualis.DualisConnection; +import de.dhbw.horb.calendar.dualis.DualisException; +import de.dhbw.horb.calendar.ics.VCalendar; +import de.dhbw.horb.calendar.ics.VEvent; +import de.dhbw.horb.calendar.util.AuthenticatedServlet; + +public class ICSServlet extends AuthenticatedServlet { + private static final long serialVersionUID = 1L; + + public ICSServlet() { + setLoginRealm("Dualis Calendar Connector"); + } + + @Override + protected void doGet(HttpServletRequest request, + HttpServletResponse response, String username, String password) + throws IOException { + response.setHeader("Content-Type", "text/calendar; charset=utf-8"); + + VCalendar calendar = new VCalendar("DHBW Calendar"); + try { + DualisConnection connection = new DualisConnection(username, + password); + for (VEvent event : connection.getEvents()) { + calendar.add(event); + } + } catch (DualisException e) { + e.printStackTrace(); + } + response.getOutputStream().write(calendar.serialize().getBytes()); + } +} \ No newline at end of file diff --git a/src/main/java/de/dhbw/horb/calendar/dualis/DualisConnection.java b/src/main/java/de/dhbw/horb/calendar/dualis/DualisConnection.java new file mode 100644 index 0000000..f7bf369 --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/dualis/DualisConnection.java @@ -0,0 +1,173 @@ +package de.dhbw.horb.calendar.dualis; + +import java.io.IOException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; + +import com.gargoylesoftware.htmlunit.ElementNotFoundException; +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.DomAttr; +import com.gargoylesoftware.htmlunit.html.HtmlAnchor; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +import de.dhbw.horb.calendar.dualis.DualisException.DualisAuthenticationException; +import de.dhbw.horb.calendar.dualis.DualisException.DualisScrapingException; +import de.dhbw.horb.calendar.ics.VEvent; + +public class DualisConnection { + public static final String DUALIS_URL = "https://dualis.dhbw.de/scripts/mgrqcgi?APPNAME=CampusNet&PRGNAME=EXTERNALPAGES&ARGUMENTS=-N000000000000001,-N,-Awelcome"; + + private final String username; + private final String password; + + /** + * Baut eine Verbindung mit Dualis auf und führt einen Login durch + * + * @param username + * Dualis Benutzername + * @param password + * Dualis Password + * @throws FailingHttpStatusCodeException + * @throws IOException + * @throws DualisScrapingException + * @throws DualisAuthenticationException + */ + public DualisConnection(final String username, final String password) { + this.username = username; + this.password = password; + } + + @SuppressWarnings("deprecation") + public List getEvents() throws FailingHttpStatusCodeException, + IOException, DualisScrapingException, DualisAuthenticationException { + HtmlPage page, loginPage; + final HtmlForm loginForm; + final HtmlInput usernameField, passwordField, submitButton; + final WebClient webClient = new WebClient(); + final List events = new ArrayList(); + + webClient.setJavaScriptEnabled(false); + loginPage = webClient.getPage(DUALIS_URL); + try { + loginForm = loginPage.getFormByName("cn_loginForm"); + } catch (ElementNotFoundException e) { + throw new DualisException.DualisScrapingException( + "Fehler beim Suchen des Login Formular auf der Startseite mit Name 'cn_loginForm'", + e); + } + try { + usernameField = loginForm.getInputByName("usrname"); + } catch (ElementNotFoundException e) { + throw new DualisException.DualisScrapingException( + "Fehler beim Suchen des Username Input mit Name 'usrname'", + e); + } + usernameField.type(username); + try { + passwordField = loginForm.getInputByName("pass"); + } catch (ElementNotFoundException e) { + throw new DualisException.DualisScrapingException( + "Fehler beim Suchen des Password Input mit Name 'pass'", e); + } + passwordField.type(password); + + try { + submitButton = loginForm.getInputByValue("Anmelden"); + } catch (ElementNotFoundException e) { + throw new DualisException.DualisScrapingException( + "Fehler beim Suchen des Login Submit Buttons mit Text 'Anmelden'", + e); + } + page = submitButton.click(); + HtmlAnchor anchorByText; + try { + anchorByText = page.getAnchorByText("Stundenplan"); + } catch (ElementNotFoundException e) { // Login failed + throw new DualisException.DualisAuthenticationException( + "Authentifizierung fehltgeschlagen", e); + } + page = anchorByText.click(); + + HtmlAnchor anchorMonat; + try { + anchorMonat = page.getAnchorByText("Monat"); + } catch (ElementNotFoundException e) { + throw new DualisException.DualisScrapingException( + "Link Studenplan 'Woche' nicht gefunden", e); + } + page = anchorMonat.click(); + + for (HtmlElement elem : page.getElementsByTagName("div")) { + if (!elem.getAttribute("class").equals("tbMonthDay")) + continue; + final Date day; + Object dayTitle = elem + .getFirstByXPath("div[@class='tbsubhead']/a/@title"); + if (dayTitle instanceof DomAttr) { + String value = ((DomAttr) dayTitle).getValue(); + try { + day = dateFormat.parse(value); + } catch (ParseException e) { + e.printStackTrace(); + continue; + } + } else { + System.err.println("kann datum nicht bestimmen"); + continue; + } + for (HtmlElement appLink : elem.getElementsByTagName("a")) { + if (!appLink.getAttribute("class").equals("apmntLink")) + continue; + // title="08:15 - 10:45 / HOR-121 / Open Source Systeme" + String desc = StringUtils.strip(appLink.getAttribute("title")); + java.util.regex.Matcher matcher = appLinkPattern.matcher(desc); + if (matcher.matches() && matcher.groupCount() == 4) { + String timeStart = matcher.group(1); + String timeEnd = matcher.group(2); + String room = matcher.group(3); + String title = matcher.group(4); + System.out.println(timeStart + "-" + timeEnd + "-" + room + + "-" + title + "-" + day); + int hStart = Integer.parseInt(timeStart.split(":")[0]); + int mStart = Integer.parseInt(timeStart.split(":")[1]); + int hEnd = Integer.parseInt(timeEnd.split(":")[0]); + int mEnd = Integer.parseInt(timeEnd.split(":")[1]); + Date start = (Date) day.clone(); + start.setHours(hStart); + start.setMinutes(mStart); + Date end = (Date) day.clone(); + end.setHours(hEnd); + end.setMinutes(mEnd); + VEvent event = new VEvent.Builder().dtstart(start) + .dtstamp(start).dtend(end).summary(title).description(title) + .location(room).status("CONFIRMED").build(); + events.add(event); + } else { + System.err.println("Skip: " + desc + " at day " + day); + } + } + } + + return events; + } + + // Parse Dates + private static final SimpleDateFormat dateFormat = new SimpleDateFormat( + "dd.MM.yyyy"); + + // Appointment Link Title + // example: 08:15 - 10:45 / HOR-121 / Open Source Systeme + private static final Pattern appLinkPattern = Pattern + .compile("(\\d{2}:\\d{2})\\s-\\s(\\d{2}:\\d{2})\\s\\/\\s(.+)\\s\\/\\s(.+)"); + +} \ No newline at end of file diff --git a/src/main/java/de/dhbw/horb/calendar/dualis/DualisException.java b/src/main/java/de/dhbw/horb/calendar/dualis/DualisException.java new file mode 100644 index 0000000..5f337a2 --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/dualis/DualisException.java @@ -0,0 +1,33 @@ +package de.dhbw.horb.calendar.dualis; + +public abstract class DualisException extends Exception { + public DualisException(String msg) { + super(msg); + } + + public DualisException(String msg, Throwable e) { + super(msg, e); + } + + private static final long serialVersionUID = 1L; + + public static class DualisAuthenticationException extends DualisException { + private static final long serialVersionUID = 1L; + + public DualisAuthenticationException(String msg, Throwable e) { + super(msg, e); + } + + public DualisAuthenticationException(String msg) { + super(msg); + } + } + + public static class DualisScrapingException extends DualisException { + private static final long serialVersionUID = 1L; + + public DualisScrapingException(String msg, Throwable e) { + super(msg, e); + } + } +} diff --git a/src/main/java/de/dhbw/horb/calendar/ics/AbstractICSType.java b/src/main/java/de/dhbw/horb/calendar/ics/AbstractICSType.java new file mode 100644 index 0000000..3b6019d --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/ics/AbstractICSType.java @@ -0,0 +1,43 @@ +package de.dhbw.horb.calendar.ics; + +import java.text.SimpleDateFormat; + +import org.apache.commons.lang.StringEscapeUtils; + +public abstract class AbstractICSType { + /** + * Serialisierert dieses Calenderteil. Dem Ergebnis Fehlt noch der vCalendar + * Header und Footer + * + */ + public abstract String serialize(); + + /** + * RFC says: + *
+	 * FORM #2: DATE WITH UTC TIME
+	 * 
+	 *       The date with UTC time, or absolute time, is identified by a LATIN
+	 *       CAPITAL LETTER Z suffix character, the UTC designator, appended to
+	 *       the time value.  For example, the following represents January 19,
+	 *       1998, at 0700 UTC:
+	 * 
+	 *        19980119T070000Z
+	 * 
+	 *       The "TZID" property parameter MUST NOT be applied to DATE-TIME
+	 *       properties whose time values are specified in UTC.
+	 * 
+ */ + public static SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyyMMdd'T'HHmmss'Z'"); + + /** + * described in RFC section 3.3.11 + * + * @param text + * @return + */ + public static String escapeText(String text) { + return StringEscapeUtils.escapeJava(text); //XXX TODO + } +} diff --git a/src/main/java/de/dhbw/horb/calendar/ics/VCalendar.java b/src/main/java/de/dhbw/horb/calendar/ics/VCalendar.java new file mode 100644 index 0000000..fcf083a --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/ics/VCalendar.java @@ -0,0 +1,51 @@ +package de.dhbw.horb.calendar.ics; + +import java.util.ArrayList; +import java.util.List; + +public class VCalendar { + List icsObjects = new ArrayList(); + private final String title; + + public VCalendar(final String title) { + this.title = title; + } + + public void add(AbstractICSType ics) { + icsObjects.add(ics); + } + + /** + * + * @return + */ + public String serialize() { + final StringBuilder sb = new StringBuilder(); + // Einleiten des Kalenders + sb.append("BEGIN:VCALENDAR\n"); + // This property specifies the identifier for the product that created + // the iCalendar object. + sb.append("PRODID:-//DHBW Horb i08005//DHBW Calender 0.1//EN\n"); + // Datenformat version + sb.append("VERSION:2.0\n"); + // This property defines the calendar scale used for the + // calendar information specified in the iCalendar object. + sb.append("CALSCALE:GREGORIAN\n"); + // This property defines the iCalendar object method + // associated with the calendar object. + sb.append("METHOD:PUBLISH\n"); + /* Extensions */ + // + sb.append("X-WR-TIMEZONE:UTC\n"); + // Name des Kalenders + sb.append("X-WR-CALDESC:" + AbstractICSType.escapeText(title)+"\n"); + sb.append("X-WR-CALNAME:" + AbstractICSType.escapeText(title)+"\n"); + + // Elemente + for (AbstractICSType ics : icsObjects) { + sb.append(ics.serialize()); + } + sb.append("END:VCALENDAR\n"); + return sb.toString(); + } +} diff --git a/src/main/java/de/dhbw/horb/calendar/ics/VEvent.java b/src/main/java/de/dhbw/horb/calendar/ics/VEvent.java new file mode 100644 index 0000000..74f00ba --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/ics/VEvent.java @@ -0,0 +1,79 @@ +package de.dhbw.horb.calendar.ics; + +import java.util.Date; + +public class VEvent extends AbstractICSType { + public Date dtstamp = new Date(); + public Date dtstart = new Date(); + public Date dtend = new Date(); + public String status = ""; + public String summary = ""; + public String description = ""; + public String location = ""; + + /** + * {@inheritDoc}
+ *
+ * See RFC section 3.6.1 for VEVENT Specification + */ + @Override + public String serialize() { + final StringBuffer sb = new StringBuffer(); + sb.append("BEGIN:VEVENT\n"); + sb.append("DTSTART:" + dateTimeFormat.format(dtstart) + "\n"); + sb.append("DTEND:" + dateTimeFormat.format(dtend) + "\n"); + sb.append("DTSTAMP:" + dateTimeFormat.format(dtstamp) + "\n"); + sb.append("UID:vevent_" + dateTimeFormat.format(dtstamp) + "@dhbw.de\n"); + sb.append("CREATED:" + dateTimeFormat.format(new Date()) + "\n"); + sb.append("STATUS:" + escapeText(status) + "\n"); + sb.append("SUMMARY:" + escapeText(summary) + "\n"); + sb.append("DESCRIPTION:" + escapeText(description) + "\n"); + sb.append("LOCATION:" + escapeText(location) + "\n"); + sb.append("TRANSP:OPAQUE\n"); + sb.append("END:VEVENT\n"); + return sb.toString(); + } + + public static class Builder { + VEvent event = new VEvent(); + + public Builder dtstamp(Date dtstamp) { + event.dtstamp = dtstamp; + return this; + } + + public Builder dtstart(Date dtstart) { + event.dtstart = dtstart; + return this; + } + + public Builder dtend(Date dtend) { + event.dtend = dtend; + return this; + } + + public Builder summary(String summary) { + event.summary = summary; + return this; + } + + public Builder description(String description) { + event.description = description; + return this; + } + + public Builder location(String location) { + event.location = location; + return this; + } + + public VEvent build() { + return event; + } + + public Builder status(String status) { + event.status = status; + return this; + } + } +} diff --git a/src/main/java/de/dhbw/horb/calendar/ui/LoginWorker.java b/src/main/java/de/dhbw/horb/calendar/ui/LoginWorker.java new file mode 100644 index 0000000..aa2c9b7 --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/ui/LoginWorker.java @@ -0,0 +1,90 @@ +package de.dhbw.horb.calendar.ui; + +import java.io.IOException; + +import com.gargoylesoftware.htmlunit.ElementNotFoundException; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.html.HtmlForm; +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlPage; + +import de.dhbw.horb.calendar.dualis.DualisConnection; +import de.dhbw.horb.calendar.dualis.DualisException; +import de.dhbw.horb.calendar.dualis.DualisException.DualisAuthenticationException; + +class LoginWorker implements Runnable { + private final WebClient client; + private HtmlPage page = null; + private HtmlForm loginForm = null; + private HtmlInput usernameField; + private HtmlInput passwordField; + private HtmlInput submitButton; + private final String username; + private final String password; + private final LoginWorkerListener listener; + + public LoginWorker(final LoginWorkerListener listener, final String username, final String password) { + this.listener = listener; + this.username = username; + this.password = password; + + client = new WebClient(); + } + + private void step1() throws Exception { + page = client.getPage(DualisConnection.DUALIS_URL); + } + + private void step2() { + loginForm = page.getFormByName("cn_loginForm"); + usernameField = loginForm.getInputByName("usrname"); + passwordField = loginForm.getInputByName("pass"); + submitButton = loginForm.getInputByValue("Anmelden"); + } + + private void step3() throws IOException { + usernameField.type(username); + passwordField.type(password); + page = submitButton.click(); + } + + private void step4() throws DualisAuthenticationException { + try { + page.getAnchorByText("Stundenplan"); + } catch (ElementNotFoundException e) { + throw new DualisException.DualisAuthenticationException( + "Authentifizierung fehltgeschlagen", e); + } + } + + @Override + public void run() { + try { + listener.setProgress(0.2, "Lade Seite"); + step1(); + + listener.setProgress(0.4, "Analysiere Seite"); + step2(); + + listener.setProgress(0.6, "Sende Login"); + step3(); + + listener.setProgress(0.8, "Prüfe Login"); + step4(); + listener.setProgress(1.0, "Erfolgreich"); + + listener.success(username,password); + } catch (Exception e) { + e.printStackTrace(); + listener.error(e); + } + } + + public interface LoginWorkerListener { + public void setProgress(double d, String description); + + public void success(String username, String password); + + public void error(Exception e); + } +} \ No newline at end of file diff --git a/src/main/java/de/dhbw/horb/calendar/ui/MyApplication.java b/src/main/java/de/dhbw/horb/calendar/ui/MyApplication.java new file mode 100644 index 0000000..9a0f222 --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/ui/MyApplication.java @@ -0,0 +1,161 @@ +package de.dhbw.horb.calendar.ui; + +import com.vaadin.Application; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.FormLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.LoginForm; +import com.vaadin.ui.LoginForm.LoginEvent; +import com.vaadin.ui.LoginForm.LoginListener; +import com.vaadin.ui.ProgressIndicator; +import com.vaadin.ui.TabSheet; +import com.vaadin.ui.Window; + +import de.dhbw.horb.calendar.ui.LoginWorker.LoginWorkerListener; + +public class MyApplication extends Application { + private static final long serialVersionUID = 1L; + + @Override + public void init() { + setMainWindow(new MyMainWindow()); + } + + public static class MyMainWindow extends Window { + private static final long serialVersionUID = 1L; + private TabSheet tabSheet = new TabSheet(); + private LoginComponent loginComponent; + private StundenplanComponent stundenplanComponent; + private LogoutComponent logoutComponent; + private String password = ""; + private String username = ""; + { + { + loginComponent = new LoginComponent(this); + stundenplanComponent = new StundenplanComponent(this); + logoutComponent = new LogoutComponent(this); + } + } + + public MyMainWindow() { + super("DHBW Calendar"); + tabSheet.addTab(loginComponent, "Login", null); + addComponent(tabSheet); + } + + public void login(String username, String password) { + this.username = username; + this.password = password; + tabSheet.removeTab(tabSheet.getTab(loginComponent)); + + tabSheet.addTab(stundenplanComponent, "Stundenplan", null); + tabSheet.addTab(logoutComponent, "Logout", null); + } + + public void logout() { + this.username = this.password = ""; + tabSheet.removeTab(tabSheet.getTab(stundenplanComponent)); + tabSheet.removeTab(tabSheet.getTab(logoutComponent)); + + tabSheet.addTab(loginComponent, "Login", null); + } + + public String getUsername() { + return username; + } + + public String getPassword() { + return password; + } + } + + private static class LogoutComponent extends FormLayout { + private static final long serialVersionUID = 1L; + + private final MyMainWindow mainWindow; + + public LogoutComponent(MyMainWindow mainWindow) { + this.mainWindow = mainWindow; + Button logoutButton = new Button("Logout"); + logoutButton.addListener(new ClickListener() { + private static final long serialVersionUID = 1L; + + @Override + public void buttonClick(ClickEvent event) { + LogoutComponent.this.mainWindow.logout(); + } + }); + addComponent(logoutButton); + } + } + + private static class LoginComponent extends FormLayout { + private static final long serialVersionUID = 1L; + + private final MyMainWindow mainWindow; + private final DualisLoginForm loginForm; + private final Label labelDescription; + private final ProgressIndicator progressIndicator; + private final LoginWorkerListener loginWorkerListener; + { + { + loginForm = new DualisLoginForm(); + labelDescription = new Label(""); + + progressIndicator = new ProgressIndicator(); + progressIndicator.setVisible(false); + progressIndicator.setSizeFull(); + + loginWorkerListener = new LoginWorkerListener() { + + @Override + public void success(String username, String password) { + mainWindow.login(username, password); + labelDescription.setValue(""); + progressIndicator.setVisible(false); + loginForm.setVisible(true); + } + + @Override + public void setProgress(double d, String description) { + progressIndicator.setValue(new Float(d)); + labelDescription.setValue(description); + } + + @Override + public void error(Exception e) { + progressIndicator.setVisible(false); + labelDescription.setValue("Fehler: " + e.getMessage()); + loginForm.setVisible(true); + } + }; + } + } + + public LoginComponent(final MyMainWindow mainWindow) { + this.mainWindow = mainWindow; + + loginForm.addListener(new LoginListener() { + private static final long serialVersionUID = 1L; + + @Override + public void onLogin(LoginEvent event) { + new Thread(new LoginWorker(loginWorkerListener, event + .getLoginParameter("username"), event + .getLoginParameter("password"))).start(); + loginForm.setVisible(false); + progressIndicator.setVisible(true); + } + }); + addComponent(loginForm); + addComponent(labelDescription); + addComponent(progressIndicator); + } + } + + private static class DualisLoginForm extends LoginForm { + private static final long serialVersionUID = 1L; + } +} \ No newline at end of file diff --git a/src/main/java/de/dhbw/horb/calendar/ui/StundenplanComponent.java b/src/main/java/de/dhbw/horb/calendar/ui/StundenplanComponent.java new file mode 100644 index 0000000..ba3cc1c --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/ui/StundenplanComponent.java @@ -0,0 +1,102 @@ +package de.dhbw.horb.calendar.ui; + +import java.util.Date; + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Alignment; +import com.vaadin.ui.FormLayout; +import com.vaadin.ui.ProgressIndicator; +import com.vaadin.ui.Table; +import com.vaadin.ui.VerticalLayout; + +import de.dhbw.horb.calendar.dualis.DualisConnection; +import de.dhbw.horb.calendar.ics.VEvent; +import de.dhbw.horb.calendar.ui.MyApplication.MyMainWindow; + +public class StundenplanComponent extends FormLayout { + private static final long serialVersionUID = 1L; + + private ClickListener buttonFetchListener = new ClickListener() { + private static final long serialVersionUID = 1L; + + @Override + public void buttonClick(ClickEvent event) { + table.removeAllItems(); + table.setEnabled(false); + buttonFetch.setVisible(false); + StundenplanComponent.this.addComponentAsFirst(refresher); + + new Thread() { + public void run() { + DualisConnection dualisConnection = new DualisConnection( + myMainWindow.getUsername(), + myMainWindow.getPassword()); + try { + for (VEvent vevent : dualisConnection.getEvents()) { + synchronized (getApplication()) { + table.addItem(new Object[] { vevent.dtstart, + vevent.dtend, vevent.summary, + vevent.location }, + vevent.dtstart.getTime()); + } + } + } catch (Exception e) { + e.printStackTrace(); + table.addItem(new Object[] { new Date(), new Date(), + "Fehler", e.getMessage() }); + } + synchronized (getApplication()) { + buttonFetch.setVisible(true); + table.setEnabled(true); + StundenplanComponent.this.removeComponent(refresher); + } + }; + }.start(); + } + }; + + private final Button buttonFetch = new Button("Kalender holen", + buttonFetchListener); + + /** + * The Progress Indicator have no real sense. Its used to force the client + * to poll all 500ms for new events + */ + final ProgressIndicator refresher = new ProgressIndicator(); + { + { + refresher.setPollingInterval(500); + refresher.setSizeFull(); + } + } + + private final Table table = new Table("Stundenplan"); + { + { + table.setSizeFull(); + table.setSelectable(true); + table.addContainerProperty("begin", Date.class, ""); + table.addContainerProperty("end", Date.class, ""); + table.addContainerProperty("summary", String.class, ""); + table.addContainerProperty("location", String.class, ""); + } + } + + private final MyMainWindow myMainWindow; + + public StundenplanComponent(MyMainWindow myMainWindow) { + this.myMainWindow = myMainWindow; + + VerticalLayout layout = new VerticalLayout(); + layout.addComponent(buttonFetch); + layout.addComponent(table); + layout.setSizeFull(); + + addComponent(layout); + layout.setComponentAlignment( + buttonFetch, + Alignment.MIDDLE_CENTER); + } +} \ No newline at end of file diff --git a/src/main/java/de/dhbw/horb/calendar/util/AuthenticatedServlet.java b/src/main/java/de/dhbw/horb/calendar/util/AuthenticatedServlet.java new file mode 100644 index 0000000..47ca537 --- /dev/null +++ b/src/main/java/de/dhbw/horb/calendar/util/AuthenticatedServlet.java @@ -0,0 +1,84 @@ +package de.dhbw.horb.calendar.util; + +import java.io.IOException; +import java.util.StringTokenizer; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringEscapeUtils; + +import sun.misc.BASE64Decoder; + +public abstract class AuthenticatedServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + + private String loginRealm = "Servlet Login"; + + public void setLoginRealm(String loginRealm) { + this.loginRealm = loginRealm; + } + + public String getLoginRealm() { + return loginRealm; + } + + String[] getUsernamePassword(HttpServletRequest request) throws IOException { + String authHeader = request.getHeader("Authorization"); + if (authHeader != null) { + StringTokenizer st = new StringTokenizer(authHeader); + if (st.hasMoreTokens()) { + String basic = st.nextToken(); + if (basic.equalsIgnoreCase("Basic")) { + String credentials = st.nextToken(); + + // XXX fixme, dont use sun.misc + BASE64Decoder decoder = new BASE64Decoder(); + String userPass = new String( + decoder.decodeBuffer(credentials)); + + // The decoded string is in the form + // "userID:password". + int p = userPass.indexOf(":"); + if (p != -1) { + String username = userPass.substring(0, p).trim(); + String password = userPass.substring(p + 1).trim(); + String[] userPassword = new String[] { username, + password }; + if ("".equals(userPassword) || "".equals(password)) { + return null; + } else { + return new String[] { username, password }; + } + } + } + } + } + return null; + } + + void writeAuthenticationRequest(HttpServletResponse response) { + String realm = StringEscapeUtils.escapeJava(getLoginRealm()); + String s = "Basic realm=\"" + realm + "\""; + response.setHeader("WWW-Authenticate", s); + response.setStatus(401); + } + + @Override + protected void doGet(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { + + String[] usernamePassword = getUsernamePassword(request); + if (usernamePassword == null) { + writeAuthenticationRequest(response); + return; + } + doGet(request, response, usernamePassword[0], usernamePassword[1]); + } + + protected abstract void doGet(HttpServletRequest request, + HttpServletResponse response, String username, String password) throws ServletException, IOException; +} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..1bed2f5 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,34 @@ + + + Archetype Created Web Application + + + ics-connector + de.dhbw.horb.calendar.ICSServlet + + + ics-connector + /ics + + + + + vaadin + com.vaadin.terminal.gwt.server.ApplicationServlet + + Vaadin application class to start + application + de.dhbw.horb.calendar.ui.MyApplication + + + + vaadin + /ui/* + + + vaadin + /VAADIN/* + + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp new file mode 100644 index 0000000..0a528b3 --- /dev/null +++ b/src/main/webapp/index.jsp @@ -0,0 +1,8 @@ + + +

Hello World!

+User-Interface +
+iCalendar Link + + diff --git a/src/site/resources/images/dhbwcalendar-google1.jpg b/src/site/resources/images/dhbwcalendar-google1.jpg new file mode 100644 index 0000000..dce9b8d Binary files /dev/null and b/src/site/resources/images/dhbwcalendar-google1.jpg differ diff --git a/src/site/resources/images/dhbwcalendar-google2.jpg b/src/site/resources/images/dhbwcalendar-google2.jpg new file mode 100644 index 0000000..69d945b Binary files /dev/null and b/src/site/resources/images/dhbwcalendar-google2.jpg differ diff --git a/src/site/resources/images/dhbwcalendar-lightning.jpg b/src/site/resources/images/dhbwcalendar-lightning.jpg new file mode 100644 index 0000000..afc0a5a Binary files /dev/null and b/src/site/resources/images/dhbwcalendar-lightning.jpg differ diff --git a/src/site/resources/images/dhbwlogo.png b/src/site/resources/images/dhbwlogo.png new file mode 100644 index 0000000..9179607 Binary files /dev/null and b/src/site/resources/images/dhbwlogo.png differ diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..141c4c4 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/site/xdoc/devel-hacking.xml b/src/site/xdoc/devel-hacking.xml new file mode 100644 index 0000000..554e56f --- /dev/null +++ b/src/site/xdoc/devel-hacking.xml @@ -0,0 +1,70 @@ + + + + Hacking DHBW Calendar + Yves Fischer + 24.02.2011 + + + +
+

+ Der Dualis Scraper mit htmlunit ist im package + ...calendar.dualis + Untergebracht. Vaadin verwendet jedoch für den Login Test noch einen + eigenen Scraper. +

+
+
+

+ Diese Dokumentation wird im Projektverzeichniss unter + src/main/site + verwaltet. +

+

+ Dabei wird durchgehend das + xdoc + Format verwendet. +

+

+ Generiert wird die Dokumentation durch den Befehl + mvn site:site + und der Befehl + mvn site:deploy + veröffentlicht - entsprechende Berechtigungen vorrausgesetzt - die + Seite auf github im + gh-pages + des Repositories. +

+

+ Dazu muss in der lokalen Maven Konfiguration ( + $HOME/.m2/settings.xml + ) der Benutzer zum Zugriff auf das Repository auf + git + eingestellt sein. +

+ + <settings + xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 + http://maven.apache.org/xsd/settings-1.0.0.xsd"> + <servers> + <server> + <id>github-project-site</id> + <username>git</username> + </server> + </servers> + </settings> +

+ Siehe hierzu auch + die wagon-gitsite Seite + und ein bestehendes Problem + issue + . +

+
+ +
+ diff --git a/src/site/xdoc/devel-install.xml b/src/site/xdoc/devel-install.xml new file mode 100644 index 0000000..9796a5b --- /dev/null +++ b/src/site/xdoc/devel-install.xml @@ -0,0 +1,25 @@ + + + + Installation Guide + Yves Fischer + 24.02.2011 + + + +
+ + mvn jetty:run +

Standardmäßig lauscht jetty nun auf Port 8080

+
+ +

Mit .war-File für Servlet Container

+ mvn package +cp +target/dhbwcalendar.war $WEB +
+
+ +
+ diff --git a/src/site/xdoc/dokumentation.xml b/src/site/xdoc/dokumentation.xml new file mode 100644 index 0000000..ac4b483 --- /dev/null +++ b/src/site/xdoc/dokumentation.xml @@ -0,0 +1,357 @@ + + + + Projektdokumentation + Yves Fischer + 24.02.2011 + + + +
+

Die Nutzung von elektronischen Kalendern zur Planung und + Verwaltung + spielt eine + enorme Rolle für viele Privatleute und in + vielen Unternehmen.

+

Firmeninterne und -übergreifende Geschäfte nutzen die vielen + Möglichkeiten + von Kalender (Groupware) Applikationen. Mithilfe des + iCalendar + Standards + existiert ein interoperabler Standard zum + Austausch von + Kalenderinformationen.

+

Die neue Campus-Software ,,Dualis'' der Dualen Hochschule + Baden-Württemberg + stellt den Studenten einen elektronischen + Vorlesungsplan zur Verfügung. + Eine + Schnittstelle zur Anbindung an + gängige Kalenderlösungen wird jedoch nicht + bereitgestellt.

+

Das Ziel dieses Projektes ist es, einen Adapter bereitzustellen, + mithilfe + dessen der ,,Stundenplan'' aus dem ,,Dualis'' System der + Dualen Hochschule + Baden-Württemberg in eine iCalendar-kompatible + Anwendung importiert + werden kann.

+ +

+ Dualis ist das interne Verwaltungssystem der DHBW. Es basiert auf + der Software + ,,CampusNet'' der Firma Datenlotsen Informationssysteme + GmbH, Hamburg.Unter dem Namen ,,BAsys Neu'' wurde Dualis als + Ablösung des alten + ,,BAsys''-Verwaltungssystem entwickelt. Die + Endung ,,-is'' steht + für + Informationssystem ( + Pressemeldung + ). +

+

Studierende können über den Dualis Web-Client ihre Noten, eine + Leistungsübersicht über das gesamte Studium und ihren aktuellen + Stundenplan einsehen.

+
+ +

iCalendar ist ein Internet Standard (RFC 5545) um + Kalenderinformationen + auszutauschen. Dazu gibt es verschiedene + Klassen wie Event, To-Do oder + Free/Busy-Information. + Im Rahmen dieses + Projekts werden nur Events + genutzt.

+

+ iCalendar Daten besitzen den MIME Content-Type + {text/calender + . Die + Daten + sind in einem einfachen, ASCII + Key-Value Format aufgebaut. +

+

Grundsätzlich bestehen iCalendar Daten aus folgendem Block

+ +

Eine Event-Component ist wie folgt aufgebaut, wobei noch weitere + optionale Felder möglich sind:

+ +

Wie zu sehen ist bestehen besondere Vorgaben für Zeit- und + Textformatierung.

+

+ Zeiten können in der UTC-Zone im Format + YYYYMMDDTHHmmssZ + dargestellt + werden. + T + ist ein + Trenner zwischen Datum und + Zeit, + Z + zeigt an, + dass es sich um + einen UTC-Timestamp + handelt (RFC5545 Sec. + 3.3.5). +

+

Text wird + grundsätzlich als ASCII-Test dargestellt. Es bestehen + jedoch + Fluchtzeichen für nicht-ASCII Zeichen und Satz- und + Kontrollzeichen ()RFC5545 Sec. 3.3.11).

+
+
+
+

Dem Anschein nach ist der Dualis Web-Client mithilfe der Software + Oracle + Application Express (APEX) entwickelt. + Das erzeugte Markup ist + schlecht maschienenverarbeitbar, vermutlich weil + es + auf die Anzeige + gegenüber einem menschlichen Benutzer ausgerichtet ist.

+

Eine Web-API von Dualis gibt anscheinend nicht. + Demzufolge müssen + die Webseiten relativ umständlich analysiert + werden, um an die + benötigten Informationen zu gelangen. Diesen Vorgang + nennt man + Web-Scraping (engl. ,,kratzen'').

+ +

Dadurch wird die Schnittstelle anfälliger für kleinere Änderungen + an dem Dualis Web-Client. Schon das Ändern der Beschriftung eines + bestimmten Links kann die Funktion beeinträchtigen.

+ +

Für einen zuverlässigen Betrieb ist es daher unbedingt nötig, dass + von Seiten des Dualis System eine stabile Schnittstelle mit einem + zum Informationsaustausch geeigneten Format (zum Beispiel eine + XML-Schnitstelle) angeboten wird. Oder einfach direkt iCalendar + Format.

+ +

Zum ,,kratzen'' der Informationen aus dem HTML-Dickicht der + Dualis Website wird die Java-Bibliothek htmlunit Verwendet. Deren + eigentlicher Zweck ist das automatisierte Headless Testen von + Websites. Dazu ist sie in der Lage einen Web-Browser inklusive + JavaScript und CSS weitgehend zu emulieren.

+ +

Dies sind optimale Ausgangsbedingungen um eine schwer zugängliche + Seite wie Dualis einfach auszuwerten.

+ +

Ein vereinfachtes Code-Beispiel verdeutlicht die + Arbeit mit + htmlunit:

+ +
+ + +

Die gängige Methode zum Austausch von iCalendar Daten sind + entweder + lokale Files + oder der entfernte Zugriff über HTTP.

+ +

Mit diesem Projekt wird der Zugriff über HTTP ermöglicht. Dabei + entfällt + zusätzlich der Bedarf eine Benutzerkonfiguration zu + pflegen, da der Benutzer über HTTP Basic + Authentication (nach RFC + 1945 Sec. 11.1) vom Client + abgefragt wird.

+ +

Hierzu wurde ein Java-Servlet erstellt welches die + Authentifizerung und + Steuerung der Dualis Abfrage übernimmt.

+ +

+ Bei der + Ansteurerung der Schnittstelle über einfache HTTP-Software + ist zu beachten, dass das + @ + im benutzername mit + %40 + zu escapen ist. +

+
+ +

+ Zusätzlich zur ICS-Schnittstelle existiert eine Schnittstelle für + den Webbrowser. Sie ist mit dem Framework + vaadin ( + vaadin.com + ) + umgesetzt und bietet die + Funktionalität den Login durch eine + Anmeldung zu testen + sowie den + ,,Stundenplan'' in einer Tabelle zu + Betrachten. +

+
+ + +

Wie alle Systeme die Authentifizierungs und Benutzerdaten + verarbeiten ist dieses + hinsichtlich der Vertrauenswürdigkeit zu + untersuchen.

+ +

Hinsichtlich der Authentifizierungsinformationen die der + Benutzer + DHBW Calendar + übergibt sind mehrere Angriffspunkte + auszumachen.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProblempunktAnalyse
Auf dem PC des BenutzersFür die Sicherheit + auf seinem + Zugriffsgerät ist jeder + Benutzer + selbst + verantwortlich.
Die Netzwerkverbindung zum DHBW CalendarDie + Netzwerkverbindung zum + DHBW Calender + sollte entweder als + direkte + Lokale Kommunikation ablaufen + (der + DHBW Calender arbeitet + lokal) oder + eine sichere Verbindung (HTTPS) + verwenden.
Die Verarbeitung im DHBW CalendarDie + Verarbeitung + im DHBW Calender speichert + die verarbeiteten + Daten + vorübergehend im + Arbeitsspeicher des + darunterliegenden System. +
Die Netzwerkverbindung zu Dualisist verschlüsselt (HTTPS) + %%TODO + check was bei + unügliten cets + passiert
Die Verarbeitung in Dualis Über die + Verarbeitung + innerhalb von Dualis + existieren + keine + Informationen.
ggf. weitere Verbindungen von Dualis (AD o.ä.)Über + mögliche Kommunikationen + von Dualis mit Drittsystem + bestehen + keine + Informationen.
+

Durch die quelloffenheit + des + DHBW Calendar ist die + Verarbeitung der + Daten + transparent. Daher + entstehen dem Anwender durch + die Verwendung + des + DHBW Calender + keine + weiteren Sicherheitsrisiken.

+
+
+
+

+ Die Entwicklung des DHBW Calendar ermöglicht den Studenten in + bezug auf + die + Organisierung ihres Studentalltags eine neue Dimension + von Integration und + Komfort.

+

+ Die Unzulänglichkeit des ,,Dualis'' Backend wurde durch die + Verwendung einer High-Level Schnittstelle begegnet. Anstatt + regulärer + Ausdrücke ( + DHBW Connector + ) + werden die Eingabeelemente angesprochen + welche der Benutzer auch + sehen würde. +

+

+ Die Veröffentlichung als Open-Source Projekt unter + AGPL + stellt das Vertrauen der Studenten sowohl in Hinsicht auf ihre + eigene Sicherheit, als auch der Zuverlässigkeit hinsichtlich + möglicherweise zukünftig nötiger Anspassungen. +

+
+ +
+ diff --git a/src/site/xdoc/user-allgemein.xml b/src/site/xdoc/user-allgemein.xml new file mode 100644 index 0000000..6995e77 --- /dev/null +++ b/src/site/xdoc/user-allgemein.xml @@ -0,0 +1,87 @@ + + + + Anbindung Allgemein + Yves Fischer + 24.02.2011 + + + +
+

Die Software stellt Ihnen eine iCalendar Schnittstelle über HTTP + bereit. Sie ist also mit jeder kompatiblen Kalendersoftware nutzbar. +

+

+ Die Internet RFC zu iCalendar findet sich unter + rfc5545 + . +

+

Zusätzlich stellt der DHBW Calendar eine Webschnittstelle bereit + mit dem die Daten in Tabellenform betrachtet werden können. Diese + ist primär zu Test- und Prüfzwecke gedacht.

+ + + +
+ +
+ diff --git a/src/site/xdoc/user-google.xml b/src/site/xdoc/user-google.xml new file mode 100644 index 0000000..983f3e1 --- /dev/null +++ b/src/site/xdoc/user-google.xml @@ -0,0 +1,35 @@ + + + + Anbindung Google Kalender + Yves Fischer + 24.02.2011 + + + +
+

+ Öffnen Sie ihren + Google Kalender + und wählen Sie links unter + "Weitere Kalender" den Button + "Hinzufügen". +

+ Hinzufügen +

+ Im folgenden Menü wählen + Sie "Über URL hinzufügen" und + geben die URL + Ihrer Schnittstelle, + etwa + http://meinhost:8080/dhbwcalendar/ics + . +

+ Ergebnis +

Bitte beachten Sie, dass die URL ihrer Schnittstelle für Google + erreichbar sein muss.

+
+ +
+ diff --git a/src/site/xdoc/user-lightning.xml b/src/site/xdoc/user-lightning.xml new file mode 100644 index 0000000..63d1523 --- /dev/null +++ b/src/site/xdoc/user-lightning.xml @@ -0,0 +1,43 @@ + + + + Anbindung Mozilla Lightning + Yves Fischer + 24.02.2011 + + + +
+

Nach der Installation der Lightning + Extension öffnen Sie die + Kalender + Ansicht.

+

In der linken Sidebar + werden die verfügbaren Kalender verwalten. + Mit + Rechtsklick erscheint + ein Menü in dem "Neuer Kalender" ausgewählt + werden kann.

+

Wählen sie + "Im Netzwerk" aus. Im folgenden wählen "iCalendar (ICS)" + und + geben + die Adresse ihrer Schnitstelle an, beispielsweise + http://localhost:8080/dhbwcalendar/ics.

+

Auf der nächsten Seite können + Sie noch Namen und Farben für den + Kalender vergeben. Mit dem + Abschluss des Assistenten wird der + Kalender synchronisiert. Dabei + fordert die Schnittstelle ein + Passwort + von Ihnen an. Geben Sie Ihr + Dualis-Login an.

+
+ Mozilla Lightning +
+
+ +
+ diff --git a/src/site/xdoc/user-outlook.xml b/src/site/xdoc/user-outlook.xml new file mode 100644 index 0000000..486df58 --- /dev/null +++ b/src/site/xdoc/user-outlook.xml @@ -0,0 +1,16 @@ + + + + Anbindung Microsoft Outlook + Yves Fischer + 24.02.2011 + + + +
+

Dokumentation fehlt noch.

+
+ +
+ -- cgit v1.2.1