diff --git a/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/webresource/DeviceRepoHandler.cpp b/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/webresource/DeviceRepoHandler.cpp index 26c4ad65..ee9f6f67 100644 --- a/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/webresource/DeviceRepoHandler.cpp +++ b/src/hos_cosgi_devicerepository/src/hos/cosgi/service/devicerepository/webresource/DeviceRepoHandler.cpp @@ -327,6 +327,7 @@ void DeviceRepoHandler::__handleCommand(Poco::Net::HTTPServerRequest &req, Poco: } + void DeviceRepoHandler::__handleEventLongPolling(Poco::Net::HTTPServerRequest &req, Poco::Net::HTTPServerResponse &resp, DeviceEventQueue* eventQueue) { Variant msg; bool breakLoop = false; @@ -339,14 +340,12 @@ void DeviceRepoHandler::__handleEventLongPolling(Poco::Net::HTTPServerRequest &r // How to find out whether the client disconnected: Monitor the socket with Posix "select": // If select says that there is data, available() returns 0 then apparently the client has disconnected. // WTF, is this really the only way to notice that a client properly disconnected? Internet says so. - // And don't move anything outside, everything needs to be inside to work auto sockfs = reqImpl->socket().impl()->sockfd(); fd_set fds; FD_ZERO(&fds); FD_SET(sockfs, &fds); struct timeval timeout = {0, 1000}; int sel = select(sockfs + 1, &fds, 0, 0, &timeout); - std::cout << "Debug03: " << sel << " - " << reqImpl->socket().available() << " - " << sockfs << std::endl; if (sel < 0 || (sel > 0 && reqImpl->socket().available() == 0)) { ROS_ERROR_STREAM("Apparently we have a disconnect in device event queue \"" << eventQueue->clientID << "\""); breakLoop = true; @@ -370,34 +369,42 @@ void DeviceRepoHandler::__handleEventLongPolling(Poco::Net::HTTPServerRequest &r handleResponse(req, resp, msg); }; + void DeviceRepoHandler::__handleEventWebSocket(Poco::Net::HTTPServerRequest &req, Poco::Net::HTTPServerResponse &resp, DeviceEventQueue* eventQueue) { try { Net::WebSocket ws(req, resp); std::cout << "WebSocket connection established." << std::endl; - bool error = false; - /*std::thread revcThread([&]() { + bool breakLoop = false; + + parent->getIOService().post([&]() { char buffer[1024]; int flags; int n; + bool timeout = false; do { - n = ws.receiveFrame(buffer, sizeof(buffer), flags); - std::cout << Poco::format("Frame received (length=%d, flags=0x%x).", n, unsigned(flags)) << std::endl; - } while (!error && n > 0 && (flags & Net::WebSocket::FRAME_OP_BITMASK) != Net::WebSocket::FRAME_OP_CLOSE); - error= true; - });*/ - char buffer[1024]; - int flags; - int n; + try { + timeout = false; + n = ws.receiveFrame(buffer, sizeof(buffer), flags); + // ToDo: Handle ping and other shit. + std::cout << Poco::format("Frame received (length=%d, flags=0x%x).", n, unsigned(flags)) << std::endl; + } catch (TimeoutException& e) { + // Timeout may happen, nothing fatal. + timeout = true; + } catch (Net::NetException& e) { + breakLoop= true; + ROS_ERROR_STREAM("Exception in WebSocket receive activity: " << e.what()); + } + } while (timeout || (!breakLoop && n > 0 && (flags & Net::WebSocket::FRAME_OP_BITMASK) != Net::WebSocket::FRAME_OP_CLOSE)); + breakLoop= true; + eventQueue->cancelPopEvent(); + }); + auto format = getResponseDataFormat(req); - while (!error) { + while (!breakLoop) { Variant msg; - try { - msg = eventQueue->popEvent(); - std::string encoded = encodeVariant(msg, req, format); - ws.sendFrame(encoded.c_str(), encoded.size(), Net::WebSocket::FRAME_FLAG_FIN | Net::WebSocket::FRAME_OP_TEXT); - } catch (DeviceEventQueue::DisconnectedException& e) { - error = true; - } + msg = eventQueue->popEvent(); + std::string encoded = encodeVariant(msg, req, format); + ws.sendFrame(encoded.c_str(), encoded.size(), Net::WebSocket::FRAME_FLAG_FIN | Net::WebSocket::FRAME_OP_TEXT); } std::cout << "WebSocket connection closed." << std::endl; } catch (Net::WebSocketException& exc) { @@ -417,6 +424,7 @@ void DeviceRepoHandler::__handleEventWebSocket(Poco::Net::HTTPServerRequest &req } }; + void DeviceRepoHandler::__handleEvent(Poco::Net::HTTPServerRequest &req, Poco::Net::HTTPServerResponse &resp, bool websocket) { std::vector pathPieces, matchPieces; matchUri.getPathSegments(matchPieces); diff --git a/src/hos_cosgi_testwebapp/webroot/CometVisu/AUTHORS b/src/hos_cosgi_testwebapp/webroot/CometVisu/AUTHORS deleted file mode 100644 index ed508a87..00000000 --- a/src/hos_cosgi_testwebapp/webroot/CometVisu/AUTHORS +++ /dev/null @@ -1,14 +0,0 @@ -The CometVisu was originally written by Christian Mayer with additions by -other developers. - -The list of contributors is: -Patrik Häni - swiss1 - paede (dot) haeni (at) bluewin (dot) ch -Jan N. Klug - j-n-k - jan.n.klug (at) rub (dot) de -Julian Makowski - netzkind - julian (at) makowskis (dot) de -Michael Markstaller - makki1 - mm (at) elabnet (dot) de -Christian Mayer - mayerch - CometVisu (at) ChristianMayer (dot) de -Axel Otterstätter - panzaeron - Mr.O (at) gmx (dot) de -Christian - chris_ace - chris_ace (at) users (dot) sourceforge (dot) net -David - daviid5 - daviid5 (at) users (dot) sourceforge (dot) net -Tobias Bräutigam - peuter - tbraeutigam (at) gmail (dot) com -Michael Hausl - hausl - michael (at) hausl (dot) com diff --git a/src/hos_cosgi_testwebapp/webroot/CometVisu/COPYING b/src/hos_cosgi_testwebapp/webroot/CometVisu/COPYING deleted file mode 100644 index a04a6bd2..00000000 --- a/src/hos_cosgi_testwebapp/webroot/CometVisu/COPYING +++ /dev/null @@ -1,682 +0,0 @@ -The project CometVisu generally uses the GPL version 3 as you will -find in this file. -But some parts of the project, especially the icons, might use a -different type of licence. All directories that contain a file -COPYING will have the licencing information for their files there. -For all other files this licence applies: - - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 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 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. - - - Copyright (C) - - 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 . - -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: - - Copyright (C) - 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 -. - - 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 -. diff --git a/src/hos_cosgi_testwebapp/webroot/CometVisu/ChangeLog b/src/hos_cosgi_testwebapp/webroot/CometVisu/ChangeLog deleted file mode 100644 index 26f3fcbf..00000000 --- a/src/hos_cosgi_testwebapp/webroot/CometVisu/ChangeLog +++ /dev/null @@ -1,409 +0,0 @@ -0.8.5 -===== - -- new feature: management interface to handle different configuration files -- new feature: posibity to remember last page for next startup -- better support for Android to add visu to the start screen. This includes - better icons to follow the latest Android style -- diagram plugin: add attribute "resolution" to rrd definitions to allow custom - resolution values -- diagram plugin: allow custom start, end and resolution parameters -- diagram plugin: allow offset for single RRDs -- diagram plugin: bugfixes -- editor: bugfix: xsd:integer did not allow negative values in editor -- Update to latest KNX user forum iconset - -0.8.4 -===== - -- switch to AMD and new loading system -- new widget: audio -- new widget: refresh -- updated icons -- rsslog: mysql backend -- basic support for KNX DPT 24.001 -- feature request #95: Formula and mapping can be combined -- diagram plugin: Added attribute "zoomYAxis" to enable/disable zooming on Y - axis, by default it is disabled -- little bug fixes - -NOTE: ------ - -Due to the new loading system it might be that custom scripts must be modfied! - - -0.8.3 -===== - -- openHAB backend: improvements -- icons updated to the latest version upstream -- diagram plugin: new attribute timeformatTooltip for formatting the date string in the tooltip -- diagram plugin: use flot tooltip plugin and implement basic panning and zooming -- diagram plugin: Made address optional in diagram_info -- diagram plugin: reworked and updated flot library -- gauge plugin: demo config added (visu_config_gauge.xml) -- rsslog plugin: add external sources for rsslog via php-fetcher -- new plugin: calendarlist - -0.8.2 -===== - -- Bug fix to ensure resource loading order -- Improvements and feature enhancements to the gauge plugin -- diagram plugin: new attribute timeformat for formatting x-axis -- diagram plugin: order of rrd-series must be deterministic -- group widget: renamed attribute pagejumpTarget to target to unify naming of - pagejumps - -0.8.1 -===== - -- new plugin: gauge -- Diagram plugin: Improve usage of RRDs with multiple datasources -- Bug-fix: #91 Diagram plugin: previews not shown -- other bugfixes for the diagram plugin -- little bugfixes -- updated icons -- remove external dependencies (SVN feature) - -0.8.0 -===== - -Basically the same as the 0.8.0-RC5 - -0.8.0-RC5 -========= - -- Bug fixes: - - #88 forceDevice=Desktop does not work as expected - - #89 Browser Back-Button sometimes needs to be pressed twice - - #90 RSSLog plugin: rsslog widget on subpage is not shown correctly on switch - to the subpage - - make config check and editor know SVG plugin - - page-widget with missing backdrop-attribute -- remove KNX-UF-Iconset PDF overview as it is always out of date -- rework design of show-icons.php -- update knx-uf-iconset - -0.8.0-RC4 -========= - -- Bug fixes: - - fixes for the RSS log plugin - - #83 Line-Widget don't shown in the metal Design - - editor: fix a problem where navbar had no select-list for position -- Move demo configs in own directory to separate them from the user configs -- Show in demo config how the icons can be recolored -- Add litte additional information that might help debugging during initial load - -0.8.0-RC3 -========= - -- Bug fixes: - - #79: right alignment for toggle, switch, trigger and diagram_info - - The page behaved differently under SVN version and release version due to - different loading times of the CSS - - editor missed base type for some attributes - - sticking buttons (e.g. in the trigger widget) at least under Android 4.3 - - a few minor ones - -0.8.0-RC2 -========= - -- Bug fixes: - - #78 Infotrigger - - remove type attribute of address element - - #79 for Pure design - - #80 y-coordinates not considered on 2D pages in design Metal - - bad icon display under old android versions (e.g. 2.3) - - prevent blocking of long runing RSS requests - - #81 iOS scrolling -- Update of icons -- Implemented check of library version before starting the visu -- add type (text, 2d, 3d) as CSS class (type_text, type_2d, type_3d) to a page - -0.8.0-RC1 -========= - -- Lots of bug fixes -- Code clean up -- Additonal icons -- Dynamical recoloring of the icons to prevent need to supply each color -- Feature Request #66: default mapping and styling -- Reflection API that might end up in an interactive editor -- Change to the internal page and widgets paths - this might have an effect - on user configs! -- Feature Request #69 Infotrigger: infoposition und change attribute -- new pushbutton widget -- temporary disabling of 3D pages in preparation for the next release -- New feature: reload widget - -0.8.0~pre2 -========== - -- Move all the user configuration in separate subdirectory /config/. -- Updated available icons -- Modernisation of Pure design -- Rename forceMobile to a more generic forceDevice -- Implement fixed 2D pages. -- Added scrolling parameter to iframe -- Diagram-Plugin new features: - * steps: show steps instead of diagonal lines between data points - * scaling: multiply y-axis datapoints by scaling - * fill: fill the space below the line -- Better handling of page transitions -- Exclude IE 10 and following from the incompatability warning -- Lots of bug fixes - -0.8.0~pre1 -========== - -- New feature: individual icons can be added in the meta area -- New plugin: strftime -- Obsolete plugin removed: jqclock (use strftime instead) -- New plugin: clock -- New plugin: rsslog -- New plugin: upnpcontroller -- New plugin: New plugin for displaying a blind-status with a svg-file. -- Removed plugin: gweather -- New widget: imagetrigger -- New widget: include -- New widget: pagejump -- New widget: wgpluging_info -- New widget: rgb -- New widget: urltrigger -- New design: pitchblack (needs config-rewrite) -- New design: planet -- New design: metal -- New feature: wirteonly attribute -- New feature: 2D and 3D modes -- New feature: colspan (column-width is 8.33333%, i.e. 1/12) -- New feature: rowspan (row-height is height of -widget) -- New feature: Added handling for browser back button - => go one level higher in page hierarchy. -- New feature: Option to show current status in multitrigger widget -- New feature: navbars -- New feature: allow full JavaScript formulas for a mapping -- New feature: icons -- change text-align in pure-design (switch/un/unpressed) to center -- diagram-Plugin: yaxismin, yaxismax, added diagram_info, multiple graphs per - diagram, multiple axis, labels -- updated jQuery to 1.8.2 -- updated jQuery UI to 1.8.16 -- attribute "variant" for address is now a select-list on a per-widget-basis; - will no longer be displayed when not available (declutter UI) -- Bug fix: numbers between -1 and 0 didn't show a negative sign when the format - string was used. -- Bug fix for #3468526: Initial read is repeated after COMET Timeout -- cometvisu-client: Force full reload before index might overflow during long - periods without interesting bus traffic -- Added jquery.ui.touch-punch.js; script simulates touch events as mouse events - on jquery ui elements like a slider. -- Cleaner file structure and automated build script: - * separation of CometVisu libraries and external dependencies - * initial support for automatic documentation generation (using YUIdoc) - * switch from big structure_pure.js to one file per widget - * switch from big structure_pure.js to one file per widget - part 2 - * initial makefile that can reducde the multiple source files (e.g. for the - widgets) into one to speed up network loading - * create "release" directory for concatenated and (in future) minimized - version -- Switch readonly/writeonly to the new, unified attribute "mode" which might be - set to "disable", "read", "write" or "readwrite" (which is the default). -- Highly improved display of config file XML errors -- enable and disable pages via classes and not via individual style-attribute - anymore - this allows designs to react to it -- Added tools to automatically modify a SVG that is used as a backdrop in 2D - pages: - Pipe-O-Matic and Flow-O-Matic -- New new custom event "scrolltopage" is called at the end of each page scroll -- Additional attributes in pages element: - * max_mobile_screen_width: defines the maximum screen width where the - mobile.css is used - * scroll_speed: defines the page scrolling speed (setting to 0 disables - scrolling) -- slider enhancement to add the possibility to show its value -- extension added to support openHAB (http://code.google.com/p/openhab/) as backend -- Added class parameter for additional styling -- lots of little bugfixes and improvements -- Editor: old WYSIWYG-editor was removed due to existing and forseeable - compatibility issues and replaced by a future proof design -- iframe-widget was renamed to web -- improved performance for mobile devices by using their hardware acceleration -- allow trigger and infotrigger widgets to distinguish between shorttime and - longtime clicks -- improved performance for initial page loading by postponing the diagram - data retrieval -- improved performance for initial page loading by using offline application - caching -- more reliable caching prevention by adding forceReload=true on the URL -- new possibility to enable a simple status-update-queue, which loads the - startpage items status first and then all other items status, can be enabled - via URL-Parameter ?enableQueue=1 -- Implemented feature request #3203398: Make area for actions in - switch/page-widgets bigger by using the new attribute bind_click_to_widget -- show a waring alert if the user is using an unsupported browser -- Implement feature request #3575661: "Screensaver Mode: Back to Home or - Slider through pages..." - -0.6.2 -===== - -This is a bug fix release to address bug 3465482 -("Format string: wrong result for negative numbers above -1") - -0.6.1 -===== - -The identically to release 0.6.0 -This additional release is due to technical reasons. - -0.6.0 -===== - -The public beta release! -(Basically the same as the 0.6.0-RC5) - -0.6.0-RC5 -========= - -- Last minute bug fix: in relative mode the infotrigger is using the variant - types "button" and "display" now -- Last minute bug fix: change diagram to new syntax that uses explicit "label" - element -- Layout fix: make help button in editor look the same - -0.6.0-RC4 -========= - -- Bug Fix: bing XSD up to date - -0.6.0-RC3 -========= - -- Fix rendering problem in discreet_slim -- Fix Bug #3175343 -- Fix Bug in infotrigger (min/max clipping) -- Compatability improvement for iPad -- Improvements to default config and widget demo config -- Fix Bug when value in styling didn't exist -- New Feature: add link to show help (SF Wiki) in the editor -- Add encode function for DPT16 (= 14 byte text) -- Fix Bug: avoid overflow in infotrigger -- Fix Bug in video element: remove "refresh" and add the more - sensible "autoplay" -- New Feature: Add favicon - edit in red, svn in black and release in sodium - -0.6.0-RC2 -========= - -- New Feature: Show version in status bar -- New Feature: toogle-widget (switch toggling multiple values based on mapping) -- New Feature: jqclock - a clock widget with statusbar-support -- infotrigger widget: - - Show infoposition and format attribute in the editor - - New Feature: also send absolute value change -- Add some missing links for DPT sub-types (incomplete; see Artifact 3424149) -- Feature Request #3113716: "Addresses should be shown" -- Fix Bug #3423019 and rendering problem in discreet_slim design -- Fix Bug #3424149 -- Fix Bug #3370929: "Missing text in top line" -- Fix Bug #3204682: "Caching on web server" -- Fix Bug #3427309: "GA list unsorted in editor (transform_knx, get_adreesses)" -- Fix Usability: add a button movement "animation" to the triggers so that a - user has immediate feedback -- Whitespace clean up (DON'T USE TABS IN THE CODE!) - -Config changes: -- As the infotrigger can send absolute values now and the distinguishing of the - addesses for the relative mode based on the readonly attribute was unusual, - the new version is using the variant attribute of the address element now. - This will break backward compatability! - -0.6.0-RC1 -========= - -- Update flot to version 0.7 to have a better fix for bug 3175343 -- Refinement of the "pure" design -- added frameborder and background to iframe -- Plugins RSS and Yahoo-weather -- Add gweather (Google)-Plugin, withdraw zweather -- Fix Bug #3376682 -- Add DPT16 to transform_knx -- Design Alaska: multiple fixes -- New Feature: widgets can be (optionally) marked by a maturity value - -0.6.0-pre1 -========== - -- New Feature: Multitrigger widget -- New Feature: The switch widget can send arbitrary values now -- New Feature: Add selectable config to check_config.php -- New Feature: groups -- New Feature: infotrigger widget -- updated config scheme, added documentaion for widgets -- added "align"-attribute to switch, trigger, multitrigger -- Add jnotify statusbar instead of alerts in editor -- Changed behaviour of the slider to not send any packets when it's changed by - an external packet - even if it can't display that value -- diagrams: Fix Grid timezone and add periods+datasource -- editor fixes: allow attributes for pages, don't drop names of "empty" pages -- fix diagram_popup preview in design pure -- Fix bug #3300926: "Multitrigger display broken" -- Fix bug #3301566 -- Fix bug #3309264: fix for broken infotrigger scheme - -Config changes: -- Change the ColorChooser plugin from using
to the new - common attribute "variant" -NOTE: this breaks backward compatability. Please adjust your config file! - -0.5.3 -===== - -- New Design: "discreet_sand": dark text, light background -- New Design: "discreet_slim": more widgets per line for bigger screens -- New config structure: To allow widgets to listen to multiple addresses - the structure of the config file had to change. - -Config changes: -The format of the config file has changed. Please update the existing file, so: -- the labels are now sub elements of type