diff --git a/LICENSE.web b/LICENSE.web
deleted file mode 100644
index dba13ed2ddf..00000000000
--- a/LICENSE.web
+++ /dev/null
@@ -1,661 +0,0 @@
- 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/Makefile b/Makefile
deleted file mode 100644
index 4beb20d3eed..00000000000
--- a/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-.PHONY: all doc release clean
-
-HOST = 127.0.0.1
-PORT = 8080
-
-all: run
-
-run:
- python openerp-web.py -a ${HOST} -p ${PORT}
-
-release:
- python setup.py sdist
-
-install:
- python setup.py install
-
-clean:
- @find . -name '*.pyc' -exec rm -f {} +
- @find . -name '*.pyo' -exec rm -f {} +
- @find . -name '*.swp' -exec rm -f {} +
- @find . -name '*~' -exec rm -f {} +
- @rm -rf build
- @rm -rf dist
- @rm -rf *.egg-info
-
-doc:
- make -C doc html
-
-cloc:
- cloc addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/*.js addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml
-
-blamestat:
- echo addons/*/common/*.py addons/*/controllers/*.py addons/*/static/src/js/*.js addons/*/static/src/css/*.css addons/*/static/src/xml/*.xml | xargs -t -n 1 bzr blame -v --long --all | awk '{print $2}' | sort | uniq -c | sort -n
-
diff --git a/README.web b/README.web
deleted file mode 100644
index 4c84cefdb22..00000000000
--- a/README.web
+++ /dev/null
@@ -1,16 +0,0 @@
-OpenERP Web
------------
-
-The OpenERP Web Client supports the following web browsers:
-
-* Internet Explorer 9+
-* Google Chrome 22+
-* Firefox 13+
-* Any browser using the latest version of Chrome Frame
-
-To build the documentation use:
-
-$ make doc
-
-then look at doc/build/html/index.html
-
diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 621931e9167..3b447ce748d 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -1,31 +1,4 @@
-import logging
-
-from . import common
-from . import controllers
-
-_logger = logging.getLogger(__name__)
-
-class Options(object):
- pass
-
-def wsgi_postload():
- import openerp
- import os
- import tempfile
- import getpass
- _logger.info("embedded mode")
- o = Options()
- o.dbfilter = openerp.tools.config['dbfilter']
- o.server_wide_modules = openerp.conf.server_wide_modules or ['web']
- try:
- username = getpass.getuser()
- except Exception:
- username = "unknown"
- o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username)
- o.addons_path = openerp.modules.module.ad_paths
- o.serve_static = True
- o.backend = 'local'
-
- app = common.http.Root(o)
- openerp.wsgi.register_wsgi_handler(app)
+import http
+import controllers
+wsgi_postload = http.wsgi_postload
diff --git a/addons/web/common/__init__.py b/addons/web/common/__init__.py
deleted file mode 100644
index 4060be2f87e..00000000000
--- a/addons/web/common/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/python
-from . import http
-from . import nonliterals
-from . import release
-from . import session
-from . import xml2json
diff --git a/addons/web/common/openerplib/__init__.py b/addons/web/common/openerplib/__init__.py
deleted file mode 100644
index 44701ec22fe..00000000000
--- a/addons/web/common/openerplib/__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) Stephane Wirtel
-# Copyright (C) 2011 Nicolas Vanhoren
-# Copyright (C) 2011 OpenERP s.a. ().
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-##############################################################################
-
-from .main import *
-
diff --git a/addons/web/common/openerplib/dates.py b/addons/web/common/openerplib/dates.py
deleted file mode 100644
index 6d4fa9e2f63..00000000000
--- a/addons/web/common/openerplib/dates.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) Stephane Wirtel
-# Copyright (C) 2011 Nicolas Vanhoren
-# Copyright (C) 2011 OpenERP s.a. ().
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-##############################################################################
-
-import datetime
-
-DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
-DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
-DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
- DEFAULT_SERVER_DATE_FORMAT,
- DEFAULT_SERVER_TIME_FORMAT)
-
-def str_to_datetime(str):
- """
- Converts a string to a datetime object using OpenERP's
- datetime string format (exemple: '2011-12-01 15:12:35').
-
- No timezone information is added, the datetime is a naive instance, but
- according to OpenERP 6.1 specification the timezone is always UTC.
- """
- if not str:
- return str
- return datetime.datetime.strptime(str, DEFAULT_SERVER_DATETIME_FORMAT)
-
-def str_to_date(str):
- """
- Converts a string to a date object using OpenERP's
- date string format (exemple: '2011-12-01').
- """
- if not str:
- return str
- return datetime.datetime.strptime(str, DEFAULT_SERVER_DATE_FORMAT).date()
-
-def str_to_time(str):
- """
- Converts a string to a time object using OpenERP's
- time string format (exemple: '15:12:35').
- """
- if not str:
- return str
- return datetime.datetime.strptime(str, DEFAULT_SERVER_TIME_FORMAT).time()
-
-def datetime_to_str(obj):
- """
- Converts a datetime object to a string using OpenERP's
- datetime string format (exemple: '2011-12-01 15:12:35').
-
- The datetime instance should not have an attached timezone and be in UTC.
- """
- if not obj:
- return False
- return obj.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-
-def date_to_str(obj):
- """
- Converts a date object to a string using OpenERP's
- date string format (exemple: '2011-12-01').
- """
- if not obj:
- return False
- return obj.strftime(DEFAULT_SERVER_DATE_FORMAT)
-
-def time_to_str(obj):
- """
- Converts a time object to a string using OpenERP's
- time string format (exemple: '15:12:35').
- """
- if not obj:
- return False
- return obj.strftime(DEFAULT_SERVER_TIME_FORMAT)
-
diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py
deleted file mode 100644
index 93c2d1da69d..00000000000
--- a/addons/web/common/openerplib/main.py
+++ /dev/null
@@ -1,311 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) Stephane Wirtel
-# Copyright (C) 2011 Nicolas Vanhoren
-# Copyright (C) 2011 OpenERP s.a. ().
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-##############################################################################
-
-"""
-OpenERP Client Library
-
-Home page: http://pypi.python.org/pypi/openerp-client-lib
-Code repository: https://code.launchpad.net/~niv-openerp/openerp-client-lib/trunk
-"""
-
-import xmlrpclib
-import logging
-
-_logger = logging.getLogger(__name__)
-
-def _getChildLogger(logger, subname):
- return logging.getLogger(logger.name + "." + subname)
-
-class Connector(object):
- """
- The base abstract class representing a connection to an OpenERP Server.
- """
-
- __logger = _getChildLogger(_logger, 'connector')
-
- def get_service(self, service_name):
- """
- Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
-
- :param service_name: The name of the service.
- """
- return Service(self, service_name)
-
-class XmlRPCConnector(Connector):
- """
- A type of connector that uses the XMLRPC protocol.
- """
- PROTOCOL = 'xmlrpc'
-
- __logger = _getChildLogger(_logger, 'connector.xmlrpc')
-
- def __init__(self, hostname, port=8069):
- """
- Initialize by specifying the hostname and the port.
- :param hostname: The hostname of the computer holding the instance of OpenERP.
- :param port: The port used by the OpenERP instance for XMLRPC (default to 8069).
- """
- self.url = 'http://%s:%d/xmlrpc' % (hostname, port)
-
- def send(self, service_name, method, *args):
- url = '%s/%s' % (self.url, service_name)
- service = xmlrpclib.ServerProxy(url)
- return getattr(service, method)(*args)
-
-class XmlRPCSConnector(XmlRPCConnector):
- """
- A type of connector that uses the secured XMLRPC protocol.
- """
- PROTOCOL = 'xmlrpcs'
-
- __logger = _getChildLogger(_logger, 'connector.xmlrpcs')
-
- def __init__(self, hostname, port=8069):
- super(XmlRPCSConnector, self).__init__(hostname, port)
- self.url = 'https://%s:%d/xmlrpc' % (hostname, port)
-
-class Service(object):
- """
- A class to execute RPC calls on a specific service of the remote server.
- """
- def __init__(self, connector, service_name):
- """
- :param connector: A valid Connector instance.
- :param service_name: The name of the service on the remote server.
- """
- self.connector = connector
- self.service_name = service_name
- self.__logger = _getChildLogger(_getChildLogger(_logger, 'service'),service_name or "")
-
- def __getattr__(self, method):
- """
- :param method: The name of the method to execute on the service.
- """
- self.__logger.debug('method: %r', method)
- def proxy(*args):
- """
- :param args: A list of values for the method
- """
- self.__logger.debug('args: %r', args)
- result = self.connector.send(self.service_name, method, *args)
- self.__logger.debug('result: %r', result)
- return result
- return proxy
-
-class Connection(object):
- """
- A class to represent a connection with authentication to an OpenERP Server.
- It also provides utility methods to interact with the server more easily.
- """
- __logger = _getChildLogger(_logger, 'connection')
-
- def __init__(self, connector,
- database=None,
- login=None,
- password=None,
- user_id=None):
- """
- Initialize with login information. The login information is facultative to allow specifying
- it after the initialization of this object.
-
- :param connector: A valid Connector instance to send messages to the remote server.
- :param database: The name of the database to work on.
- :param login: The login of the user.
- :param password: The password of the user.
- :param user_id: The user id is a number identifying the user. This is only useful if you
- already know it, in most cases you don't need to specify it.
- """
- self.connector = connector
-
- self.set_login_info(database, login, password, user_id)
- self.user_context = None
-
- def set_login_info(self, database, login, password, user_id=None):
- """
- Set login information after the initialisation of this object.
-
- :param connector: A valid Connector instance to send messages to the remote server.
- :param database: The name of the database to work on.
- :param login: The login of the user.
- :param password: The password of the user.
- :param user_id: The user id is a number identifying the user. This is only useful if you
- already know it, in most cases you don't need to specify it.
- """
- self.database, self.login, self.password = database, login, password
-
- self.user_id = user_id
-
- def check_login(self, force=True):
- """
- Checks that the login information is valid. Throws an AuthenticationError if the
- authentication fails.
-
- :param force: Force to re-check even if this Connection was already validated previously.
- Default to True.
- """
- if self.user_id and not force:
- return
-
- if not self.database or not self.login or self.password is None:
- raise AuthenticationError("Credentials not provided")
-
- # TODO use authenticate instead of login
- self.user_id = self.get_service("common").login(self.database, self.login, self.password)
- if not self.user_id:
- raise AuthenticationError("Authentication failure")
- self.__logger.debug("Authenticated with user id %s", self.user_id)
-
- def get_user_context(self):
- """
- Query the default context of the user.
- """
- if not self.user_context:
- self.user_context = self.get_model('res.users').context_get()
- return self.user_context
-
- def get_model(self, model_name):
- """
- Returns a Model instance to allow easy remote manipulation of an OpenERP model.
-
- :param model_name: The name of the model.
- """
- return Model(self, model_name)
-
- def get_service(self, service_name):
- """
- Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
- Please note this Connection instance does not need to have valid authentication information since authentication
- is only necessary for the "object" service that handles models.
-
- :param service_name: The name of the service.
- """
- return self.connector.get_service(service_name)
-
-class AuthenticationError(Exception):
- """
- An error thrown when an authentication to an OpenERP server failed.
- """
- pass
-
-class Model(object):
- """
- Useful class to dialog with one of the models provided by an OpenERP server.
- An instance of this class depends on a Connection instance with valid authentication information.
- """
-
- def __init__(self, connection, model_name):
- """
- :param connection: A valid Connection instance with correct authentication information.
- :param model_name: The name of the model.
- """
- self.connection = connection
- self.model_name = model_name
- self.__logger = _getChildLogger(_getChildLogger(_logger, 'object'), model_name or "")
-
- def __getattr__(self, method):
- """
- Provides proxy methods that will forward calls to the model on the remote OpenERP server.
-
- :param method: The method for the linked model (search, read, write, unlink, create, ...)
- """
- def proxy(*args, **kw):
- """
- :param args: A list of values for the method
- """
- self.connection.check_login(False)
- self.__logger.debug(args)
- result = self.connection.get_service('object').execute_kw(
- self.connection.database,
- self.connection.user_id,
- self.connection.password,
- self.model_name,
- method,
- args, kw)
- if method == "read":
- if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
- index = {}
- for r in result:
- index[r['id']] = r
- result = [index[x] for x in args[0] if x in index]
- self.__logger.debug('result: %r', result)
- return result
- return proxy
-
- def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
- """
- A shortcut method to combine a search() and a read().
-
- :param domain: The domain for the search.
- :param fields: The fields to extract (can be None or [] to extract all fields).
- :param offset: The offset for the rows to read.
- :param limit: The maximum number of rows to read.
- :param order: The order to class the rows.
- :param context: The context.
- :return: A list of dictionaries containing all the specified fields.
- """
- record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
- if not record_ids: return []
- records = self.read(record_ids, fields or [], context or {})
- return records
-
-def get_connector(hostname=None, protocol="xmlrpc", port="auto"):
- """
- A shortcut method to easily create a connector to a remote server using XMLRPC.
-
- :param hostname: The hostname to the remote server.
- :param protocol: The name of the protocol, must be "xmlrpc" or "xmlrpcs".
- :param port: The number of the port. Defaults to auto.
- """
- if port == 'auto':
- port = 8069
- if protocol == "xmlrpc":
- return XmlRPCConnector(hostname, port)
- elif protocol == "xmlrpcs":
- return XmlRPCSConnector(hostname, port)
- else:
- raise ValueError("You must choose xmlrpc or xmlrpcs")
-
-def get_connection(hostname=None, protocol="xmlrpc", port='auto', database=None,
- login=None, password=None, user_id=None):
- """
- A shortcut method to easily create a connection to a remote OpenERP server.
-
- :param hostname: The hostname to the remote server.
- :param protocol: The name of the protocol, must be "xmlrpc" or "xmlrpcs".
- :param port: The number of the port. Defaults to auto.
- :param connector: A valid Connector instance to send messages to the remote server.
- :param database: The name of the database to work on.
- :param login: The login of the user.
- :param password: The password of the user.
- :param user_id: The user id is a number identifying the user. This is only useful if you
- already know it, in most cases you don't need to specify it.
- """
- return Connection(get_connector(hostname, protocol, port), database, login, password, user_id)
-
diff --git a/addons/web/common/release.py b/addons/web/common/release.py
deleted file mode 100644
index b9dafd330d0..00000000000
--- a/addons/web/common/release.py
+++ /dev/null
@@ -1,10 +0,0 @@
-name = 'openerp-web'
-version = '7.0alpha'
-description = "OpenERP Web"
-long_description = "OpenERP Web is the web interface of OpenERP, an Open Source Business Application Suite"
-author = "OpenERP SA"
-author_email = "info@openerp.com"
-support_email = 'support@openerp.com'
-url = "http://www.openerp.com/"
-download_url = ''
-license = "AGPL"
diff --git a/addons/web/common/xml2json.py b/addons/web/common/xml2json.py
deleted file mode 100644
index df3aad67fa5..00000000000
--- a/addons/web/common/xml2json.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# xml2json-direct
-# Simple and straightforward XML-to-JSON converter in Python
-# New BSD Licensed
-#
-# URL: http://code.google.com/p/xml2json-direct/
-
-def from_elementtree(el, preserve_whitespaces=False):
- res = {}
- if el.tag[0] == "{":
- ns, name = el.tag.rsplit("}", 1)
- res["tag"] = name
- res["namespace"] = ns[1:]
- else:
- res["tag"] = el.tag
- res["attrs"] = {}
- for k, v in el.items():
- res["attrs"][k] = v
- kids = []
- if el.text and (preserve_whitespaces or el.text.strip() != ''):
- kids.append(el.text)
- for kid in el:
- kids.append(from_elementtree(kid, preserve_whitespaces))
- if kid.tail and (preserve_whitespaces or kid.tail.strip() != ''):
- kids.append(kid.tail)
- res["children"] = kids
- return res
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 85e9bc076be..72ffd9567f6 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -27,8 +27,11 @@ try:
except ImportError:
xlwt = None
-from .. import common
-openerpweb = common.http
+import openerp
+
+from .. import http
+from .. import nonliterals
+openerpweb = http
#----------------------------------------------------------
# OpenERP Web helpers
@@ -135,7 +138,7 @@ def db_list(req):
dbs = proxy.list()
h = req.httprequest.environ['HTTP_HOST'].split(':')[0]
d = h.split('.')[0]
- r = req.config.dbfilter.replace('%h', h).replace('%d', d)
+ r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
dbs = [i for i in dbs if re.match(r, i)]
return dbs
@@ -227,11 +230,12 @@ def module_installed_bypass_session(dbname):
return sorted_modules
def module_boot(req):
- return [m for m in req.config.server_wide_modules if m in openerpweb.addons_manifest]
+ server_wide_modules = openerp.conf.server_wide_modules or ['web']
+ return [m for m in server_wide_modules if m in openerpweb.addons_manifest]
# TODO the following will be enabled once we separate the module code and translation loading
serverside = []
dbside = []
- for i in req.config.server_wide_modules:
+ for i in server_wide_modules:
if i in openerpweb.addons_manifest:
serverside.append(i)
# if only one db load every module at boot
@@ -502,12 +506,12 @@ def fix_view_modes(action):
def parse_domain(domain, session):
""" Parses an arbitrary string containing a domain, transforms it
- to either a literal domain or a :class:`common.nonliterals.Domain`
+ to either a literal domain or a :class:`nonliterals.Domain`
:param domain: the domain to parse, if the domain is not a string it
is assumed to be a literal domain and is returned as-is
:param session: Current OpenERP session
- :type session: openerpweb.openerpweb.OpenERPSession
+ :type session: openerpweb.OpenERPSession
"""
if not isinstance(domain, basestring):
return domain
@@ -515,24 +519,23 @@ def parse_domain(domain, session):
return ast.literal_eval(domain)
except ValueError:
# not a literal
- return common.nonliterals.Domain(session, domain)
+ return nonliterals.Domain(session, domain)
def parse_context(context, session):
""" Parses an arbitrary string containing a context, transforms it
- to either a literal context or a :class:`common.nonliterals.Context`
+ to either a literal context or a :class:`nonliterals.Context`
:param context: the context to parse, if the context is not a string it
is assumed to be a literal domain and is returned as-is
:param session: Current OpenERP session
- :type session: openerpweb.openerpweb.OpenERPSession
+ :type session: openerpweb.OpenERPSession
"""
if not isinstance(context, basestring):
return context
try:
return ast.literal_eval(context)
except ValueError:
- return common.nonliterals.Context(session, context)
-
+ return nonliterals.Context(session, context)
def _local_web_translations(trans_file):
messages = []
@@ -546,6 +549,31 @@ def _local_web_translations(trans_file):
messages.append({'id': x.id, 'string': x.string})
return messages
+def from_elementtree(el, preserve_whitespaces=False):
+ """ xml2json-direct
+ Simple and straightforward XML-to-JSON converter in Python
+ New BSD Licensed
+ http://code.google.com/p/xml2json-direct/
+ """
+ res = {}
+ if el.tag[0] == "{":
+ ns, name = el.tag.rsplit("}", 1)
+ res["tag"] = name
+ res["namespace"] = ns[1:]
+ else:
+ res["tag"] = el.tag
+ res["attrs"] = {}
+ for k, v in el.items():
+ res["attrs"][k] = v
+ kids = []
+ if el.text and (preserve_whitespaces or el.text.strip() != ''):
+ kids.append(el.text)
+ for kid in el:
+ kids.append(from_elementtree(kid, preserve_whitespaces))
+ if kid.tail and (preserve_whitespaces or kid.tail.strip() != ''):
+ kids.append(kid.tail)
+ res["children"] = kids
+ return res
#----------------------------------------------------------
# OpenERP Web web Controllers
@@ -612,7 +640,6 @@ class Home(openerpweb.Controller):
def login(self, req, db, login, key):
return login_and_redirect(req, db, login, key)
-
class WebClient(openerpweb.Controller):
_cp_path = "/web/webclient"
@@ -746,7 +773,7 @@ class WebClient(openerpweb.Controller):
@openerpweb.jsonrequest
def version_info(self, req):
return {
- "version": common.release.version
+ "version": openerp.release.version
}
class Proxy(openerpweb.Controller):
@@ -862,12 +889,10 @@ class Session(openerpweb.Controller):
@openerpweb.jsonrequest
def authenticate(self, req, db, login, password, base_location=None):
wsgienv = req.httprequest.environ
- release = common.release
env = dict(
base_location=base_location,
HTTP_HOST=wsgienv['HTTP_HOST'],
REMOTE_ADDR=wsgienv['REMOTE_ADDR'],
- user_agent="%s / %s" % (release.name, release.version),
)
req.session.authenticate(db, login, password, env)
@@ -942,8 +967,8 @@ class Session(openerpweb.Controller):
no group by should be performed)
"""
context, domain = eval_context_and_domain(req.session,
- common.nonliterals.CompoundContext(*(contexts or [])),
- common.nonliterals.CompoundDomain(*(domains or [])))
+ nonliterals.CompoundContext(*(contexts or [])),
+ nonliterals.CompoundDomain(*(domains or [])))
group_by_sequence = []
for candidate in (group_by_seq or []):
@@ -1165,14 +1190,14 @@ class DataSet(openerpweb.Controller):
def _call_kw(self, req, model, method, args, kwargs):
for i in xrange(len(args)):
- if isinstance(args[i], common.nonliterals.BaseContext):
+ if isinstance(args[i], nonliterals.BaseContext):
args[i] = req.session.eval_context(args[i])
- elif isinstance(args[i], common.nonliterals.BaseDomain):
+ elif isinstance(args[i], nonliterals.BaseDomain):
args[i] = req.session.eval_domain(args[i])
for k in kwargs.keys():
- if isinstance(kwargs[k], common.nonliterals.BaseContext):
+ if isinstance(kwargs[k], nonliterals.BaseContext):
kwargs[k] = req.session.eval_context(kwargs[k])
- elif isinstance(kwargs[k], common.nonliterals.BaseDomain):
+ elif isinstance(kwargs[k], nonliterals.BaseDomain):
kwargs[k] = req.session.eval_domain(kwargs[k])
# Temporary implements future display_name special field for model#read()
@@ -1303,7 +1328,7 @@ class View(openerpweb.Controller):
xml = self.transform_view(arch, session, evaluation_context)
else:
xml = ElementTree.fromstring(arch)
- fvg['arch'] = common.xml2json.from_elementtree(xml, preserve_whitespaces)
+ fvg['arch'] = from_elementtree(xml, preserve_whitespaces)
if 'id' in fvg['fields']:
# Special case for id's
@@ -1436,12 +1461,12 @@ class SearchView(View):
try:
parsed_context = parse_context(filter["context"], req.session)
filter["context"] = (parsed_context
- if not isinstance(parsed_context, common.nonliterals.BaseContext)
+ if not isinstance(parsed_context, nonliterals.BaseContext)
else req.session.eval_context(parsed_context))
parsed_domain = parse_domain(filter["domain"], req.session)
filter["domain"] = (parsed_domain
- if not isinstance(parsed_domain, common.nonliterals.BaseDomain)
+ if not isinstance(parsed_domain, nonliterals.BaseDomain)
else req.session.eval_domain(parsed_domain))
except Exception:
logger.exception("Failed to parse custom filter %s in %s",
@@ -1932,7 +1957,7 @@ class Reports(View):
report_srv = req.session.proxy("report")
context = req.session.eval_context(
- common.nonliterals.CompoundContext(
+ nonliterals.CompoundContext(
req.context or {}, action[ "context"]))
report_data = {}
diff --git a/doc/Makefile b/addons/web/doc/Makefile
similarity index 100%
rename from doc/Makefile
rename to addons/web/doc/Makefile
diff --git a/doc/_static/openerp.png b/addons/web/doc/_static/openerp.png
similarity index 100%
rename from doc/_static/openerp.png
rename to addons/web/doc/_static/openerp.png
diff --git a/doc/_templates/sidebarintro.html b/addons/web/doc/_templates/sidebarintro.html
similarity index 100%
rename from doc/_templates/sidebarintro.html
rename to addons/web/doc/_templates/sidebarintro.html
diff --git a/doc/_templates/sidebarlogo.html b/addons/web/doc/_templates/sidebarlogo.html
similarity index 100%
rename from doc/_templates/sidebarlogo.html
rename to addons/web/doc/_templates/sidebarlogo.html
diff --git a/doc/_themes/LICENSE b/addons/web/doc/_themes/LICENSE
similarity index 100%
rename from doc/_themes/LICENSE
rename to addons/web/doc/_themes/LICENSE
diff --git a/doc/_themes/README b/addons/web/doc/_themes/README
similarity index 100%
rename from doc/_themes/README
rename to addons/web/doc/_themes/README
diff --git a/doc/_themes/flask/layout.html b/addons/web/doc/_themes/flask/layout.html
similarity index 100%
rename from doc/_themes/flask/layout.html
rename to addons/web/doc/_themes/flask/layout.html
diff --git a/doc/_themes/flask/relations.html b/addons/web/doc/_themes/flask/relations.html
similarity index 100%
rename from doc/_themes/flask/relations.html
rename to addons/web/doc/_themes/flask/relations.html
diff --git a/doc/_themes/flask/static/flasky.css_t b/addons/web/doc/_themes/flask/static/flasky.css_t
similarity index 100%
rename from doc/_themes/flask/static/flasky.css_t
rename to addons/web/doc/_themes/flask/static/flasky.css_t
diff --git a/doc/_themes/flask/static/small_flask.css b/addons/web/doc/_themes/flask/static/small_flask.css
similarity index 100%
rename from doc/_themes/flask/static/small_flask.css
rename to addons/web/doc/_themes/flask/static/small_flask.css
diff --git a/doc/_themes/flask/theme.conf b/addons/web/doc/_themes/flask/theme.conf
similarity index 100%
rename from doc/_themes/flask/theme.conf
rename to addons/web/doc/_themes/flask/theme.conf
diff --git a/doc/_themes/flask_small/layout.html b/addons/web/doc/_themes/flask_small/layout.html
similarity index 100%
rename from doc/_themes/flask_small/layout.html
rename to addons/web/doc/_themes/flask_small/layout.html
diff --git a/doc/_themes/flask_small/static/flasky.css_t b/addons/web/doc/_themes/flask_small/static/flasky.css_t
similarity index 100%
rename from doc/_themes/flask_small/static/flasky.css_t
rename to addons/web/doc/_themes/flask_small/static/flasky.css_t
diff --git a/doc/_themes/flask_small/theme.conf b/addons/web/doc/_themes/flask_small/theme.conf
similarity index 100%
rename from doc/_themes/flask_small/theme.conf
rename to addons/web/doc/_themes/flask_small/theme.conf
diff --git a/doc/_themes/flask_theme_support.py b/addons/web/doc/_themes/flask_theme_support.py
similarity index 100%
rename from doc/_themes/flask_theme_support.py
rename to addons/web/doc/_themes/flask_theme_support.py
diff --git a/doc/addon-structure.txt b/addons/web/doc/addon-structure.txt
similarity index 100%
rename from doc/addon-structure.txt
rename to addons/web/doc/addon-structure.txt
diff --git a/doc/async.rst b/addons/web/doc/async.rst
similarity index 100%
rename from doc/async.rst
rename to addons/web/doc/async.rst
diff --git a/doc/changelog-7.0.rst b/addons/web/doc/changelog-7.0.rst
similarity index 94%
rename from doc/changelog-7.0.rst
rename to addons/web/doc/changelog-7.0.rst
index 00d0236f214..dd08f1bcde7 100644
--- a/doc/changelog-7.0.rst
+++ b/addons/web/doc/changelog-7.0.rst
@@ -1,6 +1,16 @@
API changes from OpenERP Web 6.1 to 7.0
=======================================
+Supported browsers
+------------------
+
+The OpenERP Web Client supports the following web browsers:
+
+* Internet Explorer 9+
+* Google Chrome 22+
+* Firefox 13+
+* Any browser using the latest version of Chrome Frame
+
DataSet -> Model
----------------
diff --git a/doc/conf.py b/addons/web/doc/conf.py
similarity index 100%
rename from doc/conf.py
rename to addons/web/doc/conf.py
diff --git a/doc/form-notes.rst b/addons/web/doc/form-notes.rst
similarity index 100%
rename from doc/form-notes.rst
rename to addons/web/doc/form-notes.rst
diff --git a/doc/guides/client-action.rst b/addons/web/doc/guides/client-action.rst
similarity index 100%
rename from doc/guides/client-action.rst
rename to addons/web/doc/guides/client-action.rst
diff --git a/doc/index.rst b/addons/web/doc/index.rst
similarity index 100%
rename from doc/index.rst
rename to addons/web/doc/index.rst
diff --git a/doc/list-view.rst b/addons/web/doc/list-view.rst
similarity index 100%
rename from doc/list-view.rst
rename to addons/web/doc/list-view.rst
diff --git a/doc/make.bat b/addons/web/doc/make.bat
similarity index 100%
rename from doc/make.bat
rename to addons/web/doc/make.bat
diff --git a/doc/rpc.rst b/addons/web/doc/rpc.rst
similarity index 100%
rename from doc/rpc.rst
rename to addons/web/doc/rpc.rst
diff --git a/doc/search-view.rst b/addons/web/doc/search-view.rst
similarity index 100%
rename from doc/search-view.rst
rename to addons/web/doc/search-view.rst
diff --git a/doc/widget.rst b/addons/web/doc/widget.rst
similarity index 100%
rename from doc/widget.rst
rename to addons/web/doc/widget.rst
diff --git a/addons/web/common/http.py b/addons/web/http.py
similarity index 88%
rename from addons/web/common/http.py
rename to addons/web/http.py
index 4955876894d..65630768737 100644
--- a/addons/web/common/http.py
+++ b/addons/web/http.py
@@ -6,15 +6,18 @@ import ast
import cgi
import contextlib
import functools
+import getpass
import logging
import mimetypes
import os
import pprint
import sys
+import tempfile
import threading
import time
import traceback
import urllib
+import urlparse
import uuid
import xmlrpclib
@@ -26,18 +29,15 @@ import werkzeug.utils
import werkzeug.wrappers
import werkzeug.wsgi
-from . import nonliterals
-from . import session
-from . import openerplib
-import urlparse
+import openerp
-__all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
- 'WebRequest', 'JsonRequest', 'HttpRequest']
+import nonliterals
+import session
_logger = logging.getLogger(__name__)
#----------------------------------------------------------
-# OpenERP Web RequestHandler
+# RequestHandler
#----------------------------------------------------------
class WebRequest(object):
""" Parent class for all OpenERP Web request types, mostly deals with
@@ -46,7 +46,6 @@ class WebRequest(object):
:param request: a wrapped werkzeug Request object
:type request: :class:`werkzeug.wrappers.BaseRequest`
- :param config: configuration object
.. attribute:: httprequest
@@ -58,10 +57,6 @@ class WebRequest(object):
a :class:`~collections.Mapping` holding the HTTP session data for the
current http session
- .. attribute:: config
-
- config parameter provided to the request object
-
.. attribute:: params
:class:`~collections.Mapping` of request parameters, not generally
@@ -85,11 +80,10 @@ class WebRequest(object):
``bool``, indicates whether the debug mode is active on the client
"""
- def __init__(self, request, config):
+ def __init__(self, request):
self.httprequest = request
self.httpresponse = None
self.httpsession = request.session
- self.config = config
def init(self, params):
self.params = dict(params)
@@ -98,7 +92,6 @@ class WebRequest(object):
self.session = self.httpsession.get(self.session_id)
if not self.session:
self.httpsession[self.session_id] = self.session = session.OpenERPSession()
- self.session.config = self.config
self.context = self.params.pop('context', None)
self.debug = self.params.pop('debug', False) != False
@@ -180,7 +173,7 @@ class JsonRequest(WebRequest):
_logger.debug("--> %s.%s\n%s", controller.__class__.__name__, method.__name__, pprint.pformat(self.jsonrequest))
response['id'] = self.jsonrequest.get('id')
response["result"] = method(controller, self, **self.params)
- except openerplib.AuthenticationError:
+ except session.AuthenticationError:
error = {
'code': 100,
'message': "OpenERP Session Invalid",
@@ -238,8 +231,8 @@ def jsonrequest(f):
beforehand)
"""
@functools.wraps(f)
- def json_handler(controller, request, config):
- return JsonRequest(request, config).dispatch(controller, f)
+ def json_handler(controller, request):
+ return JsonRequest(request).dispatch(controller, f)
json_handler.exposed = True
return json_handler
@@ -325,13 +318,13 @@ def httprequest(f):
and ``debug`` keys (which are stripped out beforehand)
"""
@functools.wraps(f)
- def http_handler(controller, request, config):
- return HttpRequest(request, config).dispatch(controller, f)
+ def http_handler(controller, request):
+ return HttpRequest(request).dispatch(controller, f)
http_handler.exposed = True
return http_handler
#----------------------------------------------------------
-# OpenERP Web Controller registration with a metaclass
+# Controller registration with a metaclass
#----------------------------------------------------------
addons_module = {}
addons_manifest = {}
@@ -348,7 +341,7 @@ class Controller(object):
__metaclass__ = ControllerType
#----------------------------------------------------------
-# OpenERP Web Session context manager
+# Session context manager
#----------------------------------------------------------
STORES = {}
@@ -419,12 +412,13 @@ def session_context(request, storage_path, session_cookie='httpsessionid'):
session_store.save(request.session)
#----------------------------------------------------------
-# OpenERP Web WSGI Application
+# WSGI Application
#----------------------------------------------------------
# Add potentially missing (older ubuntu) font mime types
mimetypes.add_type('application/font-woff', '.woff')
mimetypes.add_type('application/vnd.ms-fontobject', '.eot')
mimetypes.add_type('application/x-font-ttf', '.ttf')
+
class DisableCacheMiddleware(object):
def __init__(self, app):
self.app = app
@@ -449,45 +443,23 @@ class DisableCacheMiddleware(object):
class Root(object):
"""Root WSGI application for the OpenERP Web Client.
-
- :param options: mandatory initialization options object, must provide
- the following attributes:
-
- ``server_host`` (``str``)
- hostname of the OpenERP server to dispatch RPC to
- ``server_port`` (``int``)
- RPC port of the OpenERP server
- ``serve_static`` (``bool | None``)
- whether this application should serve the various
- addons's static files
- ``storage_path`` (``str``)
- filesystem path where HTTP session data will be stored
- ``dbfilter`` (``str``)
- only used in case the list of databases is requested
- by the server, will be filtered by this pattern
"""
- def __init__(self, options):
- self.config = options
-
- if not hasattr(self.config, 'connector'):
- if self.config.backend == 'local':
- self.config.connector = session.LocalConnector()
- else:
- self.config.connector = openerplib.get_connector(
- hostname=self.config.server_host, port=self.config.server_port)
-
+ def __init__(self):
self.httpsession_cookie = 'httpsessionid'
self.addons = {}
static_dirs = self._load_addons()
- if options.serve_static:
- app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
- self.dispatch = DisableCacheMiddleware(app)
+ app = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs)
+ self.dispatch = DisableCacheMiddleware(app)
- if options.session_storage:
- if not os.path.exists(options.session_storage):
- os.mkdir(options.session_storage, 0700)
- self.session_storage = options.session_storage
+ try:
+ username = getpass.getuser()
+ except Exception:
+ username = "unknown"
+ self.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username)
+
+ if not os.path.exists(self.session_storage):
+ os.mkdir(self.session_storage, 0700)
_logger.debug('HTTP sessions stored in: %s', self.session_storage)
def __call__(self, environ, start_response):
@@ -512,7 +484,7 @@ class Root(object):
response = werkzeug.exceptions.NotFound()
else:
with session_context(request, self.session_storage, self.httpsession_cookie) as session:
- result = handler( request, self.config)
+ result = handler( request)
if isinstance(result, basestring):
headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
@@ -531,7 +503,7 @@ class Root(object):
static URLs to the corresponding directories
"""
statics = {}
- for addons_path in self.config.addons_path:
+ for addons_path in openerp.modules.module.ad_paths:
for module in os.listdir(addons_path):
if module not in addons_module:
manifest_path = os.path.join(addons_path, module, '__openerp__.py')
@@ -579,4 +551,7 @@ class Root(object):
ps = '/'
return None
+def wsgi_postload():
+ openerp.wsgi.register_wsgi_handler(Root())
+
# vim:et:ts=4:sw=4:
diff --git a/addons/web/common/nonliterals.py b/addons/web/nonliterals.py
similarity index 100%
rename from addons/web/common/nonliterals.py
rename to addons/web/nonliterals.py
diff --git a/addons/web/common/session.py b/addons/web/session.py
similarity index 78%
rename from addons/web/common/session.py
rename to addons/web/session.py
index 45bbb32f64c..e57d3da5b45 100644
--- a/addons/web/common/session.py
+++ b/addons/web/session.py
@@ -4,70 +4,58 @@ import babel
import dateutil.relativedelta
import logging
import time
+import traceback
import sys
+import xmlrpclib
-import openerplib
+import openerp
-from . import nonliterals
+import nonliterals
_logger = logging.getLogger(__name__)
-#----------------------------------------------------------
-# openerplib local connector
-#----------------------------------------------------------
-class LibException(Exception):
- """ Base of all client lib exceptions """
- def __init__(self,code=None,message=None):
- self.code = code
- self.message = message
-
-class ApplicationError(LibException):
- """ maps to code: 1, server side: Exception or openerp.exceptions.DeferredException"""
-
-class Warning(LibException):
- """ maps to code: 2, server side: openerp.exceptions.Warning"""
-
-class AccessError(LibException):
- """ maps to code: 3, server side: openerp.exceptions.AccessError"""
-
-class AccessDenied(LibException):
- """ maps to code: 4, server side: openerp.exceptions.AccessDenied"""
-
-class LocalConnector(openerplib.Connector):
- """
- A type of connector that uses the XMLRPC protocol.
- """
- PROTOCOL = 'local'
-
- def __init__(self):
- pass
-
- def send(self, service_name, method, *args):
- import openerp
- import traceback
- import xmlrpclib
- code_string = "warning -- %s\n\n%s"
- try:
- return openerp.netsvc.dispatch_rpc(service_name, method, args)
- except openerp.osv.osv.except_osv, e:
- # TODO change the except to raise LibException instead of their emulated xmlrpc fault
- raise xmlrpclib.Fault(code_string % (e.name, e.value), '')
- except openerp.exceptions.Warning, e:
- raise xmlrpclib.Fault(code_string % ("Warning", e), '')
- except openerp.exceptions.AccessError, e:
- raise xmlrpclib.Fault(code_string % ("AccessError", e), '')
- except openerp.exceptions.AccessDenied, e:
- raise xmlrpclib.Fault('AccessDenied', str(e))
- except openerp.exceptions.DeferredException, e:
- formatted_info = "".join(traceback.format_exception(*e.traceback))
- raise xmlrpclib.Fault(openerp.tools.ustr(e.message), formatted_info)
- except Exception, e:
- formatted_info = "".join(traceback.format_exception(*(sys.exc_info())))
- raise xmlrpclib.Fault(openerp.tools.exception_to_unicode(e), formatted_info)
-
#----------------------------------------------------------
# OpenERPSession RPC openerp backend access
#----------------------------------------------------------
+class AuthenticationError(Exception):
+ pass
+
+class Service(object):
+ def __init__(self, session, service_name):
+ self.session = session
+ self.service_name = service_name
+
+ def __getattr__(self, method):
+ def proxy_method(*args):
+ result = self.session.send(self.service_name, method, *args)
+ return result
+ return proxy_method
+
+class Model(object):
+ def __init__(self, session, model):
+ self.session = session
+ self.model = model
+ self.proxy = self.session.proxy('object')
+
+ def __getattr__(self, method):
+ def proxy(*args, **kw):
+ result = self.proxy.execute_kw(self.session._db, self.session._uid, self.session._password, self.model, method, args, kw)
+ # reorder read
+ if method == "read":
+ if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
+ index = {}
+ for r in result:
+ index[r['id']] = r
+ result = [index[x] for x in args[0] if x in index]
+ return result
+ return proxy
+
+ def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
+ record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
+ if not record_ids: return []
+ records = self.read(record_ids, fields or [], context or {})
+ return records
+
class OpenERPSession(object):
"""
An OpenERP RPC session, a given user can own multiple such sessions
@@ -87,7 +75,6 @@ class OpenERPSession(object):
"""
def __init__(self):
self._creation_time = time.time()
- self.config = None
self._db = False
self._uid = False
self._login = False
@@ -98,19 +85,27 @@ class OpenERPSession(object):
self.domains_store = {}
self.jsonp_requests = {} # FIXME use a LRU
- def __getstate__(self):
- state = dict(self.__dict__)
- if "config" in state:
- del state['config']
- return state
-
- def build_connection(self):
- conn = openerplib.Connection(self.config.connector, database=self._db, login=self._login,
- user_id=self._uid, password=self._password)
- return conn
+ def send(self, service_name, method, *args):
+ code_string = "warning -- %s\n\n%s"
+ try:
+ return openerp.netsvc.dispatch_rpc(service_name, method, args)
+ except openerp.osv.osv.except_osv, e:
+ raise xmlrpclib.Fault(code_string % (e.name, e.value), '')
+ except openerp.exceptions.Warning, e:
+ raise xmlrpclib.Fault(code_string % ("Warning", e), '')
+ except openerp.exceptions.AccessError, e:
+ raise xmlrpclib.Fault(code_string % ("AccessError", e), '')
+ except openerp.exceptions.AccessDenied, e:
+ raise xmlrpclib.Fault('AccessDenied', str(e))
+ except openerp.exceptions.DeferredException, e:
+ formatted_info = "".join(traceback.format_exception(*e.traceback))
+ raise xmlrpclib.Fault(openerp.tools.ustr(e.message), formatted_info)
+ except Exception, e:
+ formatted_info = "".join(traceback.format_exception(*(sys.exc_info())))
+ raise xmlrpclib.Fault(openerp.tools.exception_to_unicode(e), formatted_info)
def proxy(self, service):
- return self.build_connection().get_service(service)
+ return Service(self, service)
def bind(self, db, uid, login, password):
self._db = db
@@ -119,7 +114,6 @@ class OpenERPSession(object):
self._password = password
def authenticate(self, db, login, password, env=None):
- # TODO use the openerplib API once it exposes authenticate()
uid = self.proxy('common').authenticate(db, login, password, env)
self.bind(db, uid, login, password)
@@ -130,7 +124,12 @@ class OpenERPSession(object):
"""
Ensures this session is valid (logged into the openerp server)
"""
- self.build_connection().check_login(force)
+ if self._uid and not force:
+ return
+ # TODO use authenticate instead of login
+ uid = self.proxy("common").login(self._db, self._login, self._password)
+ if not uid:
+ raise AuthenticationError("Authentication failure")
def ensure_valid(self):
if self._uid:
@@ -141,7 +140,7 @@ class OpenERPSession(object):
def execute(self, model, func, *l, **d):
self.assert_valid()
- model = self.build_connection().get_model(model)
+ model = self.model(model)
r = getattr(model, func)(*l, **d)
return r
@@ -157,7 +156,8 @@ class OpenERPSession(object):
:type model: str
:rtype: a model object
"""
- return self.build_connection().get_model(model)
+
+ return Model(self, model)
def get_context(self):
""" Re-initializes the current user's session context (based on
@@ -167,7 +167,7 @@ class OpenERPSession(object):
:returns: the new context
"""
assert self._uid, "The user needs to be logged-in to initialize his context"
- self.context = self.build_connection().get_user_context() or {}
+ self.context = self.model('res.users').context_get() or {}
self.context['uid'] = self._uid
self._fix_lang(self.context)
return self.context
diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
index e3d626ad48b..6af1f91adc0 100644
--- a/addons/web_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -1,21 +1,14 @@
-try:
- # embedded
- import openerp.addons.web.common.http as openerpweb
- from openerp.addons.web.controllers.main import View
-except ImportError:
- # standalone
- import web.common.http as openerpweb
- from web.controllers.main import View
+import openerp
-class DiagramView(View):
+class DiagramView(openerp.addons.web.controllers.main.View):
_cp_path = "/web_diagram/diagram"
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def load(self, req, model, view_id):
fields_view = self.fields_view_get(req, model, view_id, 'diagram')
return {'fields_view': fields_view}
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def get_diagram_info(self, req, id, model, node, connector,
src_node, des_node, label, **kw):
diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py
index e5c15898155..21ec7d6e973 100644
--- a/addons/web_graph/controllers/graph.py
+++ b/addons/web_graph/controllers/graph.py
@@ -1,19 +1,12 @@
# -*- coding: utf-8 -*-
-try:
- # embedded
- import openerp.addons.web.common.http as openerpweb
- from openerp.addons.web.controllers.main import View
-except ImportError:
- # standalone
- import web.common.http as openerpweb
- from web.controllers.main import View
+import openerp
from lxml import etree
-class GraphView(View):
+class GraphView(openerp.addons.web.controllers.main.View):
_cp_path = '/web_graph/graph'
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def data_get(self, req, model=None, domain=[], context={}, group_by=[], view_id=False, orientation=False, stacked=False, mode="bar", **kwargs):
obj = req.session.model(model)
diff --git a/logging.json b/logging.json
deleted file mode 100644
index 1f982a6d4d0..00000000000
--- a/logging.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": 1,
- "formatters": {
- "simple": {
- "format": "[%(asctime)s] %(levelname)s:%(name)s:%(message)s"
- }
- },
- "handlers": {
- "console": {
- "class": "logging.StreamHandler",
- "level": "DEBUG",
- "formatter": "simple",
- "stream": "ext://sys.stdout"
- }
- },
- "loggers": {
- "web": {
- },
- "web.common.openerplib": {
- "level": "INFO"
- }
- },
- "root": {
- "level": "DEBUG",
- "handlers": ["console"]
- }
-}
diff --git a/openerp-web b/openerp-web
deleted file mode 100755
index 7e536a99442..00000000000
--- a/openerp-web
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env python
-import json
-import logging
-import logging.config
-import optparse
-import os
-import sys
-import tempfile
-
-import werkzeug.serving
-import werkzeug.contrib.fixers
-
-optparser = optparse.OptionParser()
-optparser.add_option("-s", "--session-path", dest="session_storage",
- default=os.path.join(tempfile.gettempdir(), "oe-sessions"),
- help="Directory used for session storage", metavar="DIR")
-optparser.add_option("--server-host", dest="server_host",
- default='127.0.0.1', help="OpenERP server hostname", metavar="HOST")
-optparser.add_option("--server-port", dest="server_port", default=8069,
- help="OpenERP server port", type="int", metavar="NUMBER")
-optparser.add_option("--db-filter", dest="dbfilter", default='.*',
- help="Filter listed databases", metavar="REGEXP")
-optparser.add_option('--addons-path', dest='addons_path', default=[], action='append',
- help="Path to addons directory", metavar="PATH")
-optparser.add_option('--load', dest='server_wide_modules', default=['web'], action='append',
- help="Load an additional module before login (by default only 'web' is loaded)", metavar="MODULE")
-
-server_options = optparse.OptionGroup(optparser, "Server configuration")
-server_options.add_option("-p", "--port", dest="socket_port", default=8002,
- help="listening port", type="int", metavar="NUMBER")
-server_options.add_option('--reloader', dest='reloader',
- default=False, action='store_true',
- help="Reload application when python files change")
-server_options.add_option('--no-serve-static', dest='serve_static',
- default=True, action='store_false',
- help="Do not serve static files via this server")
-server_options.add_option('--multi-threaded', dest='threaded',
- default=False, action='store_true',
- help="Spawn one thread per HTTP request")
-server_options.add_option('--proxy-mode', dest='proxy_mode',
- default=False, action='store_true',
- help="Enable correct behavior when behind a reverse proxy")
-optparser.add_option_group(server_options)
-
-logging_opts = optparse.OptionGroup(optparser, "Logging")
-logging_opts.add_option("--log-level", dest="log_level", type="choice",
- default='debug', help="Global logging level", metavar="LOG_LEVEL",
- choices=['debug', 'info', 'warning', 'error', 'critical'])
-logging_opts.add_option("--log-config", dest="log_config", default=os.path.join(os.path.dirname(__file__), "logging.json"),
- help="Logging configuration file", metavar="FILE")
-optparser.add_option_group(logging_opts)
-
-testing_opts = optparse.OptionGroup(optparser, "Testing")
-testing_opts.add_option('--test-mode', dest='test_mode',
- action='store_true', default=False,
- help="Starts test mode, which provides a few"
- " (utterly unsafe) APIs for testing purposes and"
- " sets up a special connector which always raises"
- " errors on tentative server access. These errors"
- " serialize RPC query information (service,"
- " method, arguments list) in the fault_code"
- " attribute of the error object returned to the"
- " client. This lets javascript code assert the" \
- " XMLRPC consequences of its queries.")
-optparser.add_option_group(testing_opts)
-
-if __name__ == "__main__":
- (options, args) = optparser.parse_args(sys.argv[1:])
-
- if not options.addons_path:
- path_root = os.path.dirname(os.path.abspath(__file__))
- path_addons = os.path.join(path_root, 'addons')
- if os.path.exists(path_addons):
- options.addons_path.append(path_addons)
-
- options.addons_path = [
- path[:-1] if path[-1] in r'\/' else path
- for path in options.addons_path
- if os.path.exists(path)
- ]
-
- for path_addons in options.addons_path:
- if path_addons not in sys.path:
- sys.path.insert(0, path_addons)
-
- try:
- import web.common.http
- except ImportError:
- optparser.error('Error Importing base web module. Check correctness of --addons-path.')
-
- options.backend = 'xmlrpc'
- os.environ["TZ"] = "UTC"
-
- if options.test_mode:
- import web.test_support
- import web.test_support.controllers
- options.connector = web.test_support.TestConnector()
- logging.getLogger('werkzeug').setLevel(logging.WARNING)
-
- if sys.version_info >= (2, 7) and os.path.exists(options.log_config):
- with open(options.log_config) as file:
- dct = json.load(file)
- logging.config.dictConfig(dct)
- logging.getLogger().setLevel(getattr(logging, options.log_level.upper()))
- else:
- logging.basicConfig(level=getattr(logging, options.log_level.upper()))
-
- app = web.common.http.Root(options)
-
- if options.proxy_mode:
- app = werkzeug.contrib.fixers.ProxyFix(app)
-
- werkzeug.serving.run_simple(
- '0.0.0.0', options.socket_port, app,
- use_reloader=options.reloader, threaded=options.threaded)
-
diff --git a/openerp-web.cfg b/openerp-web.cfg
deleted file mode 100644
index 424d1a8c082..00000000000
--- a/openerp-web.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[global]
-
-
diff --git a/setup.py b/setup.py
deleted file mode 100755
index 6550392e106..00000000000
--- a/setup.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# 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 .
-#
-##############################################################################
-
-import glob, os, re, setuptools, sys
-from os.path import join, isfile
-
-# List all data files
-def data():
- files = []
- for root, dirnames, filenames in os.walk('openerp'):
- for filename in filenames:
- if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename):
- files.append(os.path.join(root, filename))
- d = {}
- for v in files:
- k=os.path.dirname(v)
- if k in d:
- d[k].append(v)
- else:
- d[k]=[v]
- r = d.items()
- if os.name == 'nt':
- r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
-
- import babel
- r.append(("localedata",
- glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*'))))
-
- return r
-
-def gen_manifest():
- file_list="\n".join(data())
- open('MANIFEST','w').write(file_list)
-
-if os.name == 'nt':
- sys.path.append("C:\Microsoft.VC90.CRT")
-
-def py2exe_options():
- if os.name == 'nt':
- import py2exe
- return {
- "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("install","openerp-icon.ico"))], }],
- 'options' : {
- "py2exe": {
- "skip_archive": 1,
- "optimize": 2,
- "dist_dir": 'dist',
- "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
- "excludes" : ["Tkconstants","Tkinter","tcl"],
- }
- }
- }
- else:
- return {}
-
-execfile(join(os.path.dirname(__file__), 'openerp', 'release.py'))
-
-setuptools.setup(
- name = 'openerp',
- version = version,
- description = description,
- long_description = long_desc,
- url = url,
- author = author,
- author_email = author_email,
- classifiers = filter(None, classifiers.split("\n")),
- license = license,
- scripts = ['openerp-server'],
- data_files = data(),
- packages = setuptools.find_packages(),
- dependency_links = ['http://download.gna.org/pychart/'],
- #include_package_data = True,
- install_requires = [
- 'pychart',
- 'babel',
- 'docutils',
- 'feedparser',
- 'gdata',
- 'lxml < 3',
- 'mako',
- 'psutil',
- 'psycopg2',
- 'pydot',
- 'python-dateutil < 2',
- 'python-ldap',
- 'python-openid',
- 'pytz',
- 'pywebdav',
- 'pyyaml',
- 'reportlab',
- 'simplejson',
- 'vatnumber',
- 'vobject',
- 'werkzeug',
- 'xlwt',
- 'zsi',
- ],
- extras_require = {
- 'SSL' : ['pyopenssl'],
- },
- tests_require = ['unittest2'],
- **py2exe_options()
-)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: