Removed all files now part of other repos, moved default webapp source up
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Wed, 15 Dec 2010 21:36:33 +0000 (13:36 -0800)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Wed, 15 Dec 2010 21:36:33 +0000 (13:36 -0800)
83 files changed:
COPYING [new file with mode: 0644]
doc/example/guacamole.properties [new file with mode: 0644]
doc/example/user-mapping.xml [new file with mode: 0644]
graphics/LICENSE.txt [deleted file]
graphics/guacamole-logo.svg [deleted file]
pom.xml [new file with mode: 0644]
src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java [new file with mode: 0644]
src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java [new file with mode: 0644]
src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java [new file with mode: 0644]
src/main/webapp/META-INF/context.xml [new file with mode: 0644]
src/main/webapp/WEB-INF/web.xml [new file with mode: 0644]
src/main/webapp/agpl-3.0-standalone.html [new file with mode: 0644]
src/main/webapp/guac-web-lib/css/guacamole.css [new file with mode: 0644]
src/main/webapp/guac-web-lib/images/mouse/blank.cur [new file with mode: 0644]
src/main/webapp/guac-web-lib/images/mouse/blank.gif [new file with mode: 0644]
src/main/webapp/guac-web-lib/images/mouse/dot.gif [new file with mode: 0644]
src/main/webapp/guac-web-lib/images/noimage92.png [new file with mode: 0644]
src/main/webapp/guac-web-lib/images/spinner92.gif [new file with mode: 0644]
src/main/webapp/guac-web-lib/javascript/guacamole.js [new file with mode: 0644]
src/main/webapp/guac-web-lib/javascript/keyboard.js [new file with mode: 0644]
src/main/webapp/guac-web-lib/javascript/keymap.js [new file with mode: 0644]
src/main/webapp/guac-web-lib/javascript/layer.js [new file with mode: 0644]
src/main/webapp/guac-web-lib/javascript/mouse.js [new file with mode: 0644]
src/main/webapp/guac-web-lib/javascript/oskeyboard.js [new file with mode: 0644]
src/main/webapp/guacamole.css [new file with mode: 0644]
src/main/webapp/images/agpl-logo.png [new file with mode: 0644]
src/main/webapp/images/checker.png [new file with mode: 0644]
src/main/webapp/images/guacamole-64-icon.png [new file with mode: 0644]
src/main/webapp/images/guacamole-icon-64.png [new file with mode: 0644]
src/main/webapp/images/guacamole-logo.png [new file with mode: 0644]
src/main/webapp/images/login-logo.png [new file with mode: 0644]
src/main/webapp/images/noguacamole-logo.png [new file with mode: 0644]
src/main/webapp/index.html [new file with mode: 0644]
src/main/webapp/keyboard.css [new file with mode: 0644]
src/main/webapp/layouts/en-us-qwerty.xml [new file with mode: 0644]
web/.gitignore [deleted file]
web/COPYING [deleted file]
web/doc/example/guacamole.properties [deleted file]
web/doc/example/user-mapping.xml [deleted file]
web/guacamole-common/pom.xml [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java [deleted file]
web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java [deleted file]
web/guacamole-default-webapp/pom.xml [deleted file]
web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java [deleted file]
web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java [deleted file]
web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java [deleted file]
web/guacamole-default-webapp/src/main/webapp/META-INF/context.xml [deleted file]
web/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml [deleted file]
web/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js [deleted file]
web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js [deleted file]
web/guacamole-default-webapp/src/main/webapp/guacamole.css [deleted file]
web/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/images/checker.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/images/login-logo.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png [deleted file]
web/guacamole-default-webapp/src/main/webapp/index.html [deleted file]
web/guacamole-default-webapp/src/main/webapp/keyboard.css [deleted file]
web/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml [deleted file]

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..dba13ed
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU 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 <http://www.gnu.org/licenses/>.
+
+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
+<http://www.gnu.org/licenses/>.
diff --git a/doc/example/guacamole.properties b/doc/example/guacamole.properties
new file mode 100644 (file)
index 0000000..b7524a3
--- /dev/null
@@ -0,0 +1,29 @@
+
+#    Guacamole - Clientless Remote Desktop
+#    Copyright (C) 2010  Michael Jumper
+#
+#    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 <http://www.gnu.org/licenses/>.
+
+
+# Hostname and port of guacamole proxy
+guacd-hostname: localhost
+guacd-port:     4822
+
+# Session provider class (provides and configured guacamole session based on authentication information)
+session-provider: net.sourceforge.guacamole.net.authentication.basic.BasicGuacamoleSessionProvider
+
+# Auth provider class (authenticates user/pass combination, needed if using the provided login screen)
+auth-provider: net.sourceforge.guacamole.net.authentication.basic.BasicFileAuthenticationProvider
+basic-user-mapping: /path/to/user-mapping.xml
+
diff --git a/doc/example/user-mapping.xml b/doc/example/user-mapping.xml
new file mode 100644 (file)
index 0000000..3c2421e
--- /dev/null
@@ -0,0 +1,23 @@
+<user-mapping>
+       
+       <!-- Per-user authentication and config information -->
+       <authorize username="USERNAME" password="PASSWORD">
+               <protocol>vnc</protocol>
+               <hostname>localhost</hostname>
+               <port>5900</port>
+               <password>VNCPASS</password>
+       </authorize>
+
+    <!-- Another user, but using md5 to hash the password
+         (example below uses the md5 hash of "PASSWORD") -->
+    <authorize 
+            username="USERNAME2"
+            password="319f4d26e3c536b5dd871bb2c52e3178"
+            encoding="md5">
+               <protocol>vnc</protocol>
+               <hostname>localhost</hostname>
+               <port>5901</port>
+               <password>VNCPASS</password>
+       </authorize>
+
+</user-mapping>
diff --git a/graphics/LICENSE.txt b/graphics/LICENSE.txt
deleted file mode 100644 (file)
index 7392e79..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-The Guacamole Logo
-Copyright (C) 2010 Michael Jumper
-
-Licensed under the Creative Commons Attribution-ShareAlike license.
-
-The full text of the license is available here:
-
-    http://creativecommons.org/licenses/by-sa/3.0/
-
diff --git a/graphics/guacamole-logo.svg b/graphics/guacamole-logo.svg
deleted file mode 100644 (file)
index 3934e64..0000000
+++ /dev/null
@@ -1,2996 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<!--
-
-    The Guacamole Logo
-    Copyright (C) 2010 Michael Jumper
-
-    Licensed under the Creative Commons Attribution-ShareAlike license.
-
-    The full text of the license is available here:
-
-        http://creativecommons.org/licenses/by-sa/3.0/
-
- -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="guacamole-logo.svg"
-   inkscape:export-xdpi="450"
-   inkscape:export-ydpi="450">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3933">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3935" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3937" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3941">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3943" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3945" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3919">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3921" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3923" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3889">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.19327731;"
-         offset="0"
-         id="stop3891" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3893" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4092">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4094" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop4096" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3995">
-      <stop
-         style="stop-color:#91bd67;stop-opacity:1;"
-         offset="0"
-         id="stop3997" />
-      <stop
-         style="stop-color:#91bd67;stop-opacity:0;"
-         offset="1"
-         id="stop3999" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4609">
-      <stop
-         style="stop-color:#92bd68;stop-opacity:1;"
-         offset="0"
-         id="stop4611" />
-      <stop
-         style="stop-color:#7cad4c;stop-opacity:1;"
-         offset="1"
-         id="stop4613" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4747">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4749" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4751" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective3795"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4643">
-      <g
-         id="g4645"
-         transform="translate(265.67012,322.23866)">
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4647"
-           sodipodi:sides="5"
-           sodipodi:cx="-94.954338"
-           sodipodi:cy="394.2478"
-           sodipodi:r1="16.428572"
-           sodipodi:r2="13.290993"
-           sodipodi:arg1="0.78539816"
-           sodipodi:arg2="1.4137167"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -97.510499,409.64612 c -2.478683,0.23907 3.752443,-2.95495 3.316149,-3.83956 -0.436294,-0.8846 -17.66842,-16.53815 -15.80039,-17.52617 1.86803,-0.98801 7.14604,-3.17414 8.52156,-5.71453 1.37553,-2.54039 26.653484,6.4128 26.275069,7.47469 -0.378415,1.06189 -19.833705,19.3665 -22.312388,19.60557 z"
-           transform="matrix(-0.1180304,-0.09666355,0.09666355,-0.1180304,-117.59334,149.71684)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4649"
-           sodipodi:sides="5"
-           sodipodi:cx="116.67262"
-           sodipodi:cy="577.59052"
-           sodipodi:r1="21.219215"
-           sodipodi:r2="17.166706"
-           sodipodi:arg1="0.66730613"
-           sodipodi:arg2="1.2956247"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 150.66537,590.50816 c -2.48037,1.0773 -56.064801,3.78517 -57.356619,1.95509 -1.291818,-1.83008 -17.840558,-15.31128 -14.97215,-16.8996 2.868409,-1.58832 16.464393,-24.60868 18.516411,-26.28102 2.052017,-1.67234 19.621208,3.52562 21.691018,6.35752 2.0698,2.83189 34.60171,33.7907 32.12134,34.86801 z"
-           transform="matrix(-0.1053796,-0.07396046,0.07396046,-0.1053796,-120.71448,136.76612)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4651"
-           sodipodi:sides="5"
-           sodipodi:cx="44.95179"
-           sodipodi:cy="528.59808"
-           sodipodi:r1="14.647212"
-           sodipodi:r2="11.849843"
-           sodipodi:arg1="0.76101275"
-           sodipodi:arg2="1.3893313"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 47.649899,530.83974 c -1.975315,-0.77633 -20.88484,14.65512 -20.533446,13.56325 0.351395,-1.09186 17.418765,-27.82037 16.634063,-29.43241 -0.784703,-1.61204 2.710154,-10.04727 4.685638,-8.51358 1.975484,1.5337 -0.857249,11.29953 0.986807,11.72684 1.844055,0.4273 0.202253,13.43223 -1.773062,12.6559 z"
-           transform="matrix(-0.27246067,-0.22313755,0.22313755,-0.27246067,-207.05687,187.41915)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4653"
-           sodipodi:sides="5"
-           sodipodi:cx="224.25388"
-           sodipodi:cy="514.45593"
-           sodipodi:r1="22.525496"
-           sodipodi:r2="18.223509"
-           sodipodi:arg1="0.83298127"
-           sodipodi:arg2="1.4612998"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 251.84239,546.77026 c 0.94145,1.77531 -26.61485,-7.12801 -29.16243,-4.92362 -2.54758,2.2044 -8.91198,-27.5158 -8.94032,-29.20057 -0.0283,-1.68477 23.74556,-15.50811 25.1068,-13.9627 1.36124,1.54542 7.9383,16.91294 8.39157,18.66343 0.45327,1.75048 3.66294,27.64814 4.60438,29.42346 z"
-           transform="matrix(-0.14344286,-0.11747563,0.11747563,-0.14344286,-181.29844,244.9628)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4655"
-           sodipodi:sides="5"
-           sodipodi:cx="207.58635"
-           sodipodi:cy="592.23767"
-           sodipodi:r1="20.634081"
-           sodipodi:r2="16.693321"
-           sodipodi:arg1="1.1948354"
-           sodipodi:arg2="1.8231539"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 225.20865,606.67001 c -1.20917,-1.76622 -20.6434,0.18208 -21.92836,1.20593 -1.28496,1.02385 -5.76868,-24.9848 -4.64638,-26.8571 1.1223,-1.8723 -2.74958,-11.83622 -0.31778,-11.31001 2.4318,0.52622 30.50239,16.41385 29.13949,16.67194 -1.36291,0.2581 -1.0378,22.05546 -2.24697,20.28924 z"
-           transform="matrix(-0.15929949,-0.13046176,0.13046176,-0.15929949,-143.19204,287.9315)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4657"
-           sodipodi:sides="5"
-           sodipodi:cx="176.27162"
-           sodipodi:cy="639.20978"
-           sodipodi:r1="15.419309"
-           sodipodi:r2="12.474483"
-           sodipodi:arg1="1.0191413"
-           sodipodi:arg2="1.6474599"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 169.27285,666.88847 c -2.23193,0.22359 -10.16669,-20.31579 -10.81271,-21.38078 -0.64602,-1.065 12.54546,-6.41604 10.30853,-7.45583 -2.23693,-1.03979 16.66742,-24.62666 17.47153,-26.60772 0.80411,-1.98106 -7.6591,20.96195 -8.5822,22.27844 -0.92309,1.31648 -6.15321,32.9423 -8.38515,33.16589 z"
-           transform="matrix(-0.27246067,-0.22313755,0.22313755,-0.27246067,-164.80797,378.08993)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4659"
-           sodipodi:sides="5"
-           sodipodi:cx="223.24371"
-           sodipodi:cy="644.26056"
-           sodipodi:r1="23.95787"
-           sodipodi:r2="19.382324"
-           sodipodi:arg1="0.96525166"
-           sodipodi:arg2="1.5935702"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 246.43202,655.33309 c -0.0432,3.07586 -34.89564,11.74005 -38.5676,11.42768 -3.67196,-0.31237 -22.29803,-5.35812 -21.49374,-9.45584 0.80429,-4.09771 41.10072,-38.48184 43.09124,-40.58006 1.99051,-2.09822 18.83484,28.48767 20.44489,32.05116 1.61005,3.56349 -3.43163,3.4812 -3.47479,6.55706 z"
-           transform="matrix(-0.14523442,-0.11894286,0.11894286,-0.14523442,-184.72583,228.0469)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4661"
-           sodipodi:sides="5"
-           sodipodi:cx="285.87317"
-           sodipodi:cy="575.06512"
-           sodipodi:r1="23.952547"
-           sodipodi:r2="19.378017"
-           sodipodi:arg1="1.1354431"
-           sodipodi:arg2="1.7637616"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 298.26288,600.76135 c -1.62988,-1.35212 -51.33766,-8.88058 -53.59133,-10.59784 -2.25367,-1.71725 -1.68294,-32.18959 -0.0897,-32.54336 1.59329,-0.35376 22.05122,4.48486 23.64855,6.05124 1.59732,1.56638 54.54083,-2.32165 56.85581,-1.5669 2.31499,0.75474 -25.1935,40.00899 -26.82338,38.65686 z"
-           transform="matrix(-0.14111507,-0.11556924,0.11556924,-0.14111507,-80.485988,287.45626)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4663"
-           sodipodi:sides="5"
-           sodipodi:cx="278.80209"
-           sodipodi:cy="431.62344"
-           sodipodi:r1="22.004173"
-           sodipodi:r2="17.80175"
-           sodipodi:arg1="1.0146301"
-           sodipodi:arg2="1.6429486"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 298.22605,451.67546 c -2.94292,1.36861 -19.42114,7.22036 -21.39722,6.76996 -1.97608,-0.4504 -10.11957,-13.43004 -8.03149,-13.306 2.08808,0.12404 14.83153,-26.94287 16.2998,-26.9026 1.46827,0.0403 -1.67678,9.36792 0.23599,9.32681 1.91278,-0.0411 15.83584,22.74322 12.89292,24.11183 z"
-           transform="matrix(-0.11153268,-0.0913421,0.0913421,-0.11153268,-131.3158,153.94369)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4665"
-           sodipodi:sides="5"
-           sodipodi:cx="217.68787"
-           sodipodi:cy="370.00415"
-           sodipodi:r1="9.9488487"
-           sodipodi:r2="8.0487881"
-           sodipodi:arg1="1.152572"
-           sodipodi:arg2="1.7808905"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 222.81483,378.00221 c -0.72202,0.79578 -20.72456,-5.76343 -20.6736,-7.37363 0.051,-1.61019 3.33483,2.25583 3.4822,0.68781 0.14737,-1.56803 8.15002,-13.80864 9.15509,-14.49221 1.00507,-0.68357 12.09796,11.02567 11.31093,11.11358 -0.78703,0.0879 -2.5526,9.26866 -3.27462,10.06445 z"
-           transform="matrix(-0.27246067,-0.22313755,0.22313755,-0.27246067,-155.73994,200.4549)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4667"
-           sodipodi:sides="5"
-           sodipodi:cx="285.87317"
-           sodipodi:cy="346.77063"
-           sodipodi:r1="28.607121"
-           sodipodi:r2="23.143646"
-           sodipodi:arg1="0.83535656"
-           sodipodi:arg2="1.4636751"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m 324.79076,347.14787 c -1.41217,4.23064 -74.60069,35.00693 -74.39411,32.88114 0.20659,-2.12579 14.77301,-36.33118 12.18296,-38.12448 -2.59004,-1.79331 15.06354,-32.73919 16.11712,-28.74814 1.05357,3.99104 44.68648,27.63711 48.93602,29.28652 4.24954,1.64942 -1.42983,0.47432 -2.84199,4.70496 z"
-           transform="matrix(-0.05257909,-0.04306078,0.04306078,-0.05257909,-116.98156,89.827738)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4669"
-           sodipodi:sides="5"
-           sodipodi:cx="-208.84904"
-           sodipodi:cy="72.009132"
-           sodipodi:r1="6.9848595"
-           sodipodi:r2="5.6508703"
-           sodipodi:arg1="0.86217005"
-           sodipodi:arg2="1.4904886"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -203.33725,71.791547 c 0.13686,0.742251 -5.89094,11.689488 -6.55581,10.666508 -0.66487,-1.022981 -6.40947,-12.535594 -5.5683,-12.913682 0.84117,-0.378087 0.5155,0.798416 1.23712,0.998173 0.72161,0.199758 14.53198,-7.127401 13.87039,-6.639233 -0.66158,0.488167 -3.12027,7.145983 -2.9834,7.888234 z"
-           transform="matrix(0.45229445,0,0,0.45229445,-18.959408,83.054949)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4671"
-           sodipodi:sides="5"
-           sodipodi:cx="-176.52415"
-           sodipodi:cy="75.039597"
-           sodipodi:r1="3.7542493"
-           sodipodi:r2="3.0372515"
-           sodipodi:arg1="0.83298127"
-           sodipodi:arg2="1.4612998"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -175.38577,80.035189 c -0.20067,0.434214 -5.15564,-4.267361 -5.44478,-4.339983 -0.28913,-0.07262 3.36126,-0.35632 2.94745,-0.855524 -0.41382,-0.499204 0.56455,-3.981924 0.83931,-4.34177 0.27477,-0.359845 4.25397,4.394954 4.47163,4.334327 0.21767,-0.06063 -2.61295,4.768735 -2.81361,5.20295 z"
-           transform="translate(91.833153,42.080808)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4673"
-           sodipodi:sides="5"
-           sodipodi:cx="-151.27034"
-           sodipodi:cy="82.868279"
-           sodipodi:r1="5.890151"
-           sodipodi:r2="4.7652321"
-           sodipodi:arg1="1.0303768"
-           sodipodi:arg2="1.6586954"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -149.01233,88.388085 c -0.52985,0.223827 -1.32259,-1.421523 -1.76223,-1.328693 -0.43963,0.09283 -1.25638,-1.409814 -0.53641,-1.912901 0.71996,-0.503088 -0.10895,-9.537877 0.0278,-9.088236 0.13672,0.449641 11.7214,2.416358 11.57419,2.818768 -0.14721,0.402409 -8.77346,9.287234 -9.30331,9.511062 z"
-           transform="matrix(0.43320161,0,0,0.43320161,-6.2236479,76.826104)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4675"
-           sodipodi:sides="5"
-           sodipodi:cx="-75.508904"
-           sodipodi:cy="106.10178"
-           sodipodi:r1="3.234066"
-           sodipodi:r2="2.6164145"
-           sodipodi:arg1="0.89605538"
-           sodipodi:arg2="1.5243739"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -74.271388,109.23453 c 0.0619,0.47554 -5.375703,-1.73765 -5.675525,-1.50998 -0.299823,0.22768 0.171422,-3.77754 0.256616,-4.33762 0.08519,-0.56007 5.98266,-1.48959 6.301309,-1.7489 0.318649,-0.2593 -1.288577,3.94508 -1.014238,4.42082 0.274339,0.47574 0.06994,2.70014 0.131838,3.17568 z"
-           transform="translate(-32.371431,36.959404)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4677"
-           sodipodi:sides="5"
-           sodipodi:cx="-98.994949"
-           sodipodi:cy="160.65002"
-           sodipodi:r1="4.0720549"
-           sodipodi:r2="3.2943618"
-           sodipodi:arg1="1.0516502"
-           sodipodi:arg2="1.6799687"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -96.921366,162.95615 c 0.06763,0.24202 -3.049915,-2.12696 -3.297454,-2.21782 -0.24755,-0.0909 -0.76716,-2.42558 -0.83584,-3.07703 -0.0687,-0.65145 0.32216,-1.13865 0.99906,-0.94494 0.676894,0.1937 6.565885,0.81401 6.874829,0.84977 0.308944,0.0358 -3.808222,5.148 -3.740595,5.39002 z"
-           transform="translate(-46.017081,-10.28949)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4679"
-           sodipodi:sides="5"
-           sodipodi:cx="-158.8465"
-           sodipodi:cy="129.08276"
-           sodipodi:r1="3.5892413"
-           sodipodi:r2="2.9037571"
-           sodipodi:arg1="0.88506682"
-           sodipodi:arg2="1.5133853"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -153.26537,133.13487 c -0.0591,0.27298 -9.4445,2.53211 -9.23744,2.06961 0.20705,-0.4625 1.2303,-4.87616 1.22542,-5.1018 -0.005,-0.22563 -0.45221,-3.04568 -0.39361,-3.45505 0.0586,-0.40936 3.15592,1.08791 3.46845,1.03432 0.31252,-0.0536 4.99622,5.17994 4.93718,5.45292 z"
-           transform="translate(83.855285,-46.122335)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4681"
-           sodipodi:sides="5"
-           sodipodi:cx="-160.61424"
-           sodipodi:cy="95.747719"
-           sodipodi:r1="5.3272977"
-           sodipodi:r2="4.3098745"
-           sodipodi:arg1="0.5485494"
-           sodipodi:arg2="1.1768679"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -151.23401,100.51092 c 0.18915,0.36291 -11.11886,1.682 -11.31675,1.26721 -0.19788,-0.41479 -1.23839,-4.072831 -0.53929,-4.550254 0.69909,-0.477423 4.20875,-7.917889 4.75777,-7.231445 0.54902,0.686445 -0.50725,0.359429 -0.44372,0.7518 0.0635,0.392371 7.35283,9.399779 7.54199,9.762689 z"
-           transform="matrix(0.65207569,0,0,0.65207569,-28.582045,16.195475)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4683"
-           sodipodi:sides="5"
-           sodipodi:cx="-231.57747"
-           sodipodi:cy="134.89113"
-           sodipodi:r1="4.2030721"
-           sodipodi:r2="3.400357"
-           sodipodi:arg1="0.57133748"
-           sodipodi:arg2="1.199656"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -226.11321,139.778 c -0.63469,0.30108 -2.90505,-1.92842 -3.12131,-2.59367 -0.21625,-0.66526 -10.74626,-1.83484 -10.64083,-2.16737 0.10543,-0.33254 5.39594,-7.45652 5.63235,-7.24406 0.23642,0.21246 5.73977,2.84994 5.29141,3.41462 -0.44837,0.56469 3.47306,8.28941 2.83838,8.59048 z"
-           transform="translate(49.320382,-30.520094)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4685"
-           sodipodi:sides="5"
-           sodipodi:cx="-203.04066"
-           sodipodi:cy="114.68808"
-           sodipodi:r1="5.7254357"
-           sodipodi:r2="4.6319747"
-           sodipodi:arg1="0.72297935"
-           sodipodi:arg2="1.3512979"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -200.1664,114.42462 c -0.45872,0.26952 -1.57728,7.50571 -2.24115,7.46341 -0.66388,-0.0423 -6.92155,-12.17241 -6.90662,-12.7307 0.0149,-0.55829 4.34949,3.23803 4.85513,2.73471 0.50564,-0.50332 1.27176,-4.14418 2.16611,-4.37907 0.89436,-0.2349 2.58526,6.64213 2.12653,6.91165 z"
-           transform="matrix(0.33846976,0,0,0.33718501,0.00101897,109.2727)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4687"
-           sodipodi:sides="5"
-           sodipodi:cx="-192.93913"
-           sodipodi:cy="146.50789"
-           sodipodi:r1="5.5615754"
-           sodipodi:r2="4.4994092"
-           sodipodi:arg1="0.68892439"
-           sodipodi:arg2="1.3172429"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -192.49041,151.05762 c 0.28194,0.724 -0.37617,3.14171 -1.26429,3.28593 -0.88812,0.14422 -4.12617,-12.65624 -3.49341,-12.75657 0.63276,-0.10033 4.82906,-6.39896 5.00722,-5.76434 0.17815,0.63462 5.84077,12.7135 6.78671,12.88485 0.94593,0.17134 -7.31818,1.62614 -7.03623,2.35013 z"
-           transform="matrix(0.64781979,0,0,0.64781979,-41.467606,10.472877)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4689"
-           sodipodi:sides="5"
-           sodipodi:cx="-110.35917"
-           sodipodi:cy="117.21346"
-           sodipodi:r1="4.9744244"
-           sodipodi:r2="4.024394"
-           sodipodi:arg1="1.152572"
-           sodipodi:arg2="1.7808905"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -103.69991,126.65163 c 0.0186,0.67606 -8.5341,-8.16929 -8.7779,-8.4536 -0.2438,-0.28431 -2.13767,1.21912 -1.98181,0.89578 0.15587,-0.32334 4.68821,-11.06771 4.9111,-10.79366 0.22289,0.27404 3.43104,6.47174 3.63053,6.92446 0.1995,0.45272 2.19952,10.75097 2.21808,11.42702 z"
-           transform="matrix(0.57008344,0,0,0.57008344,-113.31777,73.18101)" />
-        <path
-           sodipodi:type="star"
-           style="fill:#000000;fill-opacity:1;stroke:none"
-           id="path4691"
-           sodipodi:sides="5"
-           sodipodi:cx="-122.98607"
-           sodipodi:cy="31.097958"
-           sodipodi:r1="3.7286808"
-           sodipodi:r2="3.0165663"
-           sodipodi:arg1="1.076855"
-           sodipodi:arg2="1.7051735"
-           inkscape:flatsided="true"
-           inkscape:rounded="0.1"
-           inkscape:randomized="1"
-           d="m -121.4349,33.652238 c -0.0621,0.220388 -5.85826,3.087006 -6.29531,2.809393 -0.43706,-0.277613 1.49411,-3.563199 2.01888,-3.360113 0.52478,0.203086 -0.37919,-8.125169 -0.23729,-8.617638 0.14191,-0.492469 6.20634,3.794786 5.95133,4.216171 -0.255,0.421385 -1.37548,4.731799 -1.43761,4.952187 z"
-           transform="translate(60.942091,63.26629)" />
-      </g>
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4747"
-       id="linearGradient4753"
-       x1="336.58282"
-       y1="481.0199"
-       x2="712.76361"
-       y2="481.0199"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4747"
-       id="linearGradient4773"
-       gradientUnits="userSpaceOnUse"
-       x1="336.58282"
-       y1="481.0199"
-       x2="712.76361"
-       y2="481.0199"
-       gradientTransform="matrix(1,0,0,0.9681015,-698.37347,142.62531)" />
-    <inkscape:perspective
-       id="perspective4932"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient4837">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4839" />
-      <stop
-         style="stop-color:#e7e7e7;stop-opacity:1;"
-         offset="1"
-         id="stop4841" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective4948"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830"
-       id="radialGradient5836"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective5846"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-9"
-       id="radialGradient5836-5"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-9">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-2" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-3" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855"
-       xlink:href="#linearGradient5830-9"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-3"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-3"
-       id="radialGradient5836-6"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-3">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-6" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-9" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-2"
-       xlink:href="#linearGradient5830-3"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-35"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-2"
-       id="radialGradient5836-54"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-2">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-5" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-94" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-0"
-       xlink:href="#linearGradient5830-2"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-5"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-5"
-       id="radialGradient5836-3"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-5">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-0" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-2" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-3"
-       xlink:href="#linearGradient5830-5"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-7"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-8"
-       id="radialGradient5836-61"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-8">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-7" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-37" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-1"
-       xlink:href="#linearGradient5830-8"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-4"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-7"
-       id="radialGradient5836-7"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-7">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-3" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-95" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-8"
-       xlink:href="#linearGradient5830-7"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-72"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-96"
-       id="radialGradient5836-8"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-96">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-9" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-1" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-18"
-       xlink:href="#linearGradient5830-96"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-78"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-99"
-       id="radialGradient5836-74"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-99">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-09" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-90" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-34"
-       xlink:href="#linearGradient5830-99"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-2"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-0"
-       id="radialGradient5836-79"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-0">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-66" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-8" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-5"
-       xlink:href="#linearGradient5830-0"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-9"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-08"
-       id="radialGradient5836-76"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-08">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-099" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-4" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-87"
-       xlink:href="#linearGradient5830-08"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-48"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-4"
-       id="radialGradient5836-1"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-4">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-8" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-0" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-6"
-       xlink:href="#linearGradient5830-4"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-6"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-47"
-       id="radialGradient5836-65"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-47">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-72" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-5" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-69"
-       xlink:href="#linearGradient5830-47"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-76"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-74"
-       id="radialGradient5836-4"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-74">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-4" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-6" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-39"
-       xlink:href="#linearGradient5830-74"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-30"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-6"
-       id="radialGradient5836-16"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-6">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-1" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-85" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-4"
-       xlink:href="#linearGradient5830-6"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-93"
-       id="radialGradient5836-11"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-93">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-67" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-24" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-41"
-       xlink:href="#linearGradient5830-93"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-55"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-1"
-       id="radialGradient5836-0"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-665" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-97" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-67"
-       xlink:href="#linearGradient5830-1"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-68"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-27"
-       id="radialGradient5836-53"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-27">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-65" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-81" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-35"
-       xlink:href="#linearGradient5830-27"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-96"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-22"
-       id="radialGradient5836-9"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-22">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-42" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-51" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-9"
-       xlink:href="#linearGradient5830-22"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-61"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-082"
-       id="radialGradient5836-01"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-082">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-63" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-65" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-93"
-       xlink:href="#linearGradient5830-082"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-685"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-25"
-       id="radialGradient5836-69"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-25">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-16" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-04" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-31"
-       xlink:href="#linearGradient5830-25"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-33"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-938"
-       id="radialGradient5836-654"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-938">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-58" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-60" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-7"
-       xlink:href="#linearGradient5830-938"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-763"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-478"
-       id="radialGradient5836-32"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-478">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-53" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-09" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-63"
-       xlink:href="#linearGradient5830-478"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-8"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-44"
-       id="radialGradient5836-90"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-44">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-99" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-44" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-81"
-       xlink:href="#linearGradient5830-44"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-0"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-86"
-       id="radialGradient5836-15"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-86">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-01" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-07" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-17"
-       xlink:href="#linearGradient5830-86"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-98"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-45"
-       id="radialGradient5836-651"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-45">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-10" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-900" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-56"
-       xlink:href="#linearGradient5830-45"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5846-45"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5830-273"
-       id="radialGradient5836-77"
-       cx="10.606602"
-       cy="12.821438"
-       fx="10.606602"
-       fy="12.821438"
-       r="2.7400389"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5830-273">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5832-28" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5834-59" />
-    </linearGradient>
-    <radialGradient
-       r="2.7400389"
-       fy="12.821438"
-       fx="10.606602"
-       cy="12.821438"
-       cx="10.606602"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5855-13"
-       xlink:href="#linearGradient5830-273"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3845"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-3"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-8"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-6"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-2"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-0"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-85"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-4"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-83"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-36"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-47"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-9"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-46"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-5"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-61"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3872-7"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4181"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4250"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4609"
-       id="radialGradient4615"
-       cx="330.99277"
-       cy="379.06653"
-       fx="330.99277"
-       fy="379.06653"
-       r="177.4276"
-       gradientTransform="matrix(1,0,0,0.45970729,0,204.80689)"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective3125"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3995"
-       id="linearGradient4001"
-       x1="821.8905"
-       y1="-227.52014"
-       x2="831.36145"
-       y2="-360.62869"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4092"
-       id="linearGradient4098"
-       x1="127.04308"
-       y1="662.05487"
-       x2="97.299171"
-       y2="663.28125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-10.199692,43.117217)" />
-    <inkscape:perspective
-       id="perspective3905"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3889-9"
-       id="radialGradient3895-1"
-       cx="-2.7842331"
-       cy="32.679401"
-       fx="-2.7842331"
-       fy="32.679401"
-       r="16.579739"
-       gradientTransform="matrix(1,0,0,0.57430667,0,3.7148303)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3889-9">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.19327731;"
-         offset="0"
-         id="stop3891-0" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3893-0" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective3141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3176"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="linearGradient3925"
-       x1="0.1244266"
-       y1="19.904566"
-       x2="23.619171"
-       y2="19.904566"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="linearGradient3931"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       x1="0.1244266"
-       y1="19.904566"
-       x2="23.619171"
-       y2="19.904566"
-       gradientTransform="matrix(0.99935161,0,0,1.2519971,239.56232,598.73103)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="linearGradient3934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99935161,0,0,1.2519971,239.56232,598.73103)"
-       spreadMethod="reflect"
-       x1="0.1244266"
-       y1="19.904566"
-       x2="23.619171"
-       y2="19.904566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3919"
-       id="linearGradient3937"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99935161,0,0,1.2519971,239.56232,598.73103)"
-       spreadMethod="reflect"
-       x1="0.1244266"
-       y1="19.904566"
-       x2="23.619171"
-       y2="19.904566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3941"
-       id="linearGradient3947"
-       x1="4.6293898"
-       y1="21.33046"
-       x2="3.6694343"
-       y2="17.515686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(238.49951,600.78184)"
-       spreadMethod="pad" />
-    <inkscape:perspective
-       id="perspective3969"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3941-0"
-       id="linearGradient3947-8"
-       x1="4.6293898"
-       y1="21.33046"
-       x2="3.6694343"
-       y2="17.515686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(238.49951,600.78184)"
-       spreadMethod="pad" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3941-0">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3943-4" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3945-8" />
-    </linearGradient>
-    <linearGradient
-       y2="17.515686"
-       x2="3.6694343"
-       y1="21.33046"
-       x1="4.6293898"
-       spreadMethod="pad"
-       gradientTransform="translate(268.4099,601.15501)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3980"
-       xlink:href="#linearGradient3941-0"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3933"
-       id="radialGradient3941"
-       cx="22.152317"
-       cy="-4.570848"
-       fx="22.152317"
-       fy="-4.570848"
-       r="22.917021"
-       gradientTransform="matrix(1.0025383,-7.6194812e-8,0,0.40608036,-0.05622864,15.600026)"
-       gradientUnits="userSpaceOnUse" />
-    <inkscape:perspective
-       id="perspective3960"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3933-4"
-       id="radialGradient3941-0"
-       cx="22.152317"
-       cy="18.346174"
-       fx="22.152317"
-       fy="18.346174"
-       r="22.917021"
-       gradientTransform="matrix(1.0002293,-4.4800467e-8,0,0.20287034,-0.00508039,14.624279)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3933-4">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3935-1" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3937-1" />
-    </linearGradient>
-    <radialGradient
-       r="22.917021"
-       fy="18.346174"
-       fx="22.152317"
-       cy="18.346174"
-       cx="22.152317"
-       gradientTransform="matrix(1.0002293,-4.4800467e-8,0,0.20287034,-0.00508039,14.624279)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3969"
-       xlink:href="#linearGradient3933-4"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3933"
-       id="radialGradient4007"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.081151,0.00675424,-0.00411175,0.42372978,-1.8164762,15.531075)"
-       cx="22.152317"
-       cy="-4.570848"
-       fx="22.152317"
-       fy="-4.570848"
-       r="22.917021" />
-    <inkscape:perspective
-       id="perspective4032"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3169"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3954"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3935"
-       id="radialGradient3944"
-       cx="22.000668"
-       cy="52.15041"
-       fx="22.000668"
-       fy="52.15041"
-       r="19.531643"
-       gradientTransform="matrix(1.3592497,0.02491314,-0.02606566,1.4903917,-6.6075648,-40.631381)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3935">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.36078432;"
-         offset="0"
-         id="stop3938" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3940" />
-    </linearGradient>
-    <radialGradient
-       r="19.531643"
-       fy="52.15041"
-       fx="22.000668"
-       cy="52.15041"
-       cx="22.000668"
-       gradientTransform="matrix(1.3592497,0.02491314,-0.02606566,1.4903917,-6.6075648,-40.631381)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3963"
-       xlink:href="#linearGradient3935"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="43.149764"
-     inkscape:cy="17.697426"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4435"
-     showgrid="false"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1002"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     showborder="true"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-238.49951,-601.9374)">
-    <g
-       id="g3172"
-       transform="translate(0,-2.6102678)">
-      <path
-         sodipodi:type="arc"
-         style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none"
-         id="path5793"
-         sodipodi:cx="22.5"
-         sodipodi:cy="44.46875"
-         sodipodi:rx="13.9375"
-         sodipodi:ry="3.46875"
-         d="m 36.4375,44.46875 c 0,1.915738 -6.240031,3.46875 -13.9375,3.46875 -7.697469,0 -13.9375,-1.553012 -13.9375,-3.46875 C 8.5625,42.553012 14.802531,41 22.5,41 c 7.697469,0 13.9375,1.553012 13.9375,3.46875 z"
-         transform="matrix(1.4327134,0,0,2.6126435,230.26346,527.30407)" />
-      <g
-         transform="matrix(1.0792143,0,0,1.0792143,-18.876771,-45.892887)"
-         id="g4460">
-        <g
-           transform="matrix(1,0,0,1.0786868,0,-51.141521)"
-           id="g4448">
-          <g
-             id="g4858"
-             transform="matrix(0.12505866,0,0,0.15169753,220.07025,556.48424)">
-            <path
-               sodipodi:nodetypes="ccscssc"
-               id="path4815"
-               d="m 499.74578,425.90363 c 0,9.29698 0.53101,21.36296 -4.41493,26.94945 -12.45549,79.29357 -79.47581,116.34257 -166.74231,116.34257 -91.56699,0 -165.00323,-29.97466 -172.72351,-117.50765 -7.07268,-5.14958 -5.46759,-20.83162 -5.46759,-25.78437 0,-26.44082 75.39414,-58.68216 171.86402,-58.68216 96.46988,0 177.48432,28.71352 177.48432,58.68216 z"
-               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5.5068388;stroke-miterlimit:4;stroke-opacity:1"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             id="g4435">
-            <path
-               transform="matrix(0.12505866,0,0,0.15169753,220.07025,556.48424)"
-               style="opacity:0.23589872;fill:#367ece;fill-opacity:0.99215686;stroke:none"
-               d="m 161.30702,476.49213 c 77.31949,48.68553 241.59797,59.57562 326.18103,4.75598 -4.95001,13.08723 -11.58227,22.80994 -18.62759,31.70654 -66.1363,40.56168 -227.96756,35.02615 -291.70017,-7.13397 -5.0142,-8.15484 -9.8304,-15.12166 -15.85327,-29.32855 z"
-               id="rect4818"
-               sodipodi:nodetypes="ccccc"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3963);fill-opacity:1;stroke:#000000;stroke-width:0.68828493;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path3151"
-           sodipodi:cx="21.9375"
-           sodipodi:cy="17.8125"
-           sodipodi:rx="19.1875"
-           sodipodi:ry="8.9375"
-           d="m 41.125,17.8125 c 0,4.936045 -8.590536,8.9375 -19.1875,8.9375 C 11.340536,26.75 2.75,22.748545 2.75,17.8125 c 0,-4.936045 8.590536,-8.9375 19.1875,-8.9375 10.596964,0 19.1875,4.001455 19.1875,8.9375 z"
-           transform="matrix(0.97470873,0,0,0.95212582,239.37917,601.7217)" />
-        <g
-           id="g4968"
-           transform="matrix(0.12991603,0,0,0.13268152,210.79912,552.10134)">
-          <g
-             id="g4322">
-            <path
-               transform="matrix(0.82439483,0,0,1,112.13127,109.03177)"
-               style="fill:url(#radialGradient4615);fill-opacity:1;stroke:#000000;stroke-width:5.5068388;stroke-miterlimit:4;stroke-opacity:1"
-               d="m 505.66695,392.15302 c 0,36.29883 -78.2043,65.72486 -174.67418,65.72486 -96.46989,0 -174.67418,-29.42603 -174.67418,-65.72486 0,-10.15253 7.84368,-17.2003 16.55008,-27.39513 4.18504,-4.90051 4.83848,-13.21946 11.96686,-17.87376 6.63514,-4.33226 20.73873,-7.61318 28.84343,-11.83091 8.86237,-4.61204 16.25923,-13.8266 26.95944,-17.46483 8.26039,-2.80865 22.02966,-5.75351 31.32862,-5.01542 10.0129,0.79476 19.33461,-1.02985 28.08644,-6.61832 7.28155,-4.64963 18.06922,-4.4634 28.51329,-5.5265 13.82953,-1.4077 24.8845,6.2247 38.19092,6.74458 12.29984,0.48056 28.44138,-0.3364 39.75167,2.94034 9.98788,2.89362 15.76202,9.37611 24.51459,13.29175 9.99616,4.472 30.06748,5.37111 35.03652,12.98081 3.31683,5.07947 5.61822,13.41784 12.21801,15.06282 12.90845,3.2174 12.28663,8.42711 15.47488,12.60046 3.77886,4.94644 1.21379,11.99509 3.20244,16.40367 2.1601,4.78867 8.71117,6.91206 8.71117,11.70044 z"
-               id="path4813"
-               sodipodi:nodetypes="cssssssssssssssssc"
-               inkscape:connector-curvature="0" />
-            <g
-               id="g4131"
-               style="opacity:0.37021275">
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 13.762829,17.725891 c -0.03256,0.125571 -1.650168,0.627105 -1.805675,0.633922 -0.155506,0.0068 -0.208597,-1.211754 -0.179354,-1.372091 0.02924,-0.160336 1.322411,-0.701292 1.419463,-0.599229 0.09705,0.102062 0.598129,1.211827 0.565566,1.337398 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2120257"
-                 sodipodi:arg1="0.42662749"
-                 sodipodi:r2="0.75519037"
-                 sodipodi:r1="1.0680006"
-                 sodipodi:cy="17.152468"
-                 sodipodi:cx="12.551145"
-                 sodipodi:sides="4"
-                 id="path4025"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 18.996763,13.332937 c -0.08104,0.05755 -0.637214,0.44555 -0.714463,0.415114 -0.07725,-0.03044 -0.255165,-1.095073 -0.197799,-1.178123 0.05737,-0.08305 0.675054,0.129376 0.735473,0.176864 0.06042,0.04749 0.257827,0.528595 0.176789,0.586145 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3734008"
-                 sodipodi:arg1="0.5880026"
-                 sodipodi:r2="0.45069391"
-                 sodipodi:r1="0.63737744"
-                 sodipodi:cy="13.086603"
-                 sodipodi:cx="18.561552"
-                 sodipodi:sides="4"
-                 id="path4027"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,233.83824,381.36791)"
-                 d="m 24.253943,19.493274 c -0.06652,0.139639 -1.188819,0.283732 -1.327427,0.227898 -0.138608,-0.05583 -0.271044,-1.754573 -0.177508,-1.875258 0.09353,-0.120686 1.226934,0.250988 1.326727,0.392585 0.09979,0.141597 0.24473,1.115137 0.178208,1.254775 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4601391"
-                 sodipodi:arg1="0.67474094"
-                 sodipodi:r2="0.80039054"
-                 sodipodi:r1="1.1319231"
-                 sodipodi:cy="18.831844"
-                 sodipodi:cx="23.688078"
-                 sodipodi:sides="4"
-                 id="path4029"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 16.820009,21.077916 c -0.08239,0.05594 -0.705733,-0.04533 -0.70537,-0.136732 3.62e-4,-0.0914 0.280051,-0.789551 0.374898,-0.821796 0.09485,-0.03224 0.680421,0.302192 0.683604,0.398921 0.0032,0.09673 -0.270737,0.503667 -0.353132,0.559607 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.9513027"
-                 sodipodi:arg1="1.1659045"
-                 sodipodi:r2="0.47598583"
-                 sodipodi:r1="0.67314559"
-                 sodipodi:cy="20.599611"
-                 sodipodi:cx="16.705399"
-                 sodipodi:sides="4"
-                 id="path4031"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 27.500233,11.483563 c -0.167199,0.03841 -1.891638,0.07616 -1.997508,-0.07003 -0.10587,-0.146189 -0.214489,-1.7685402 -0.108389,-1.935528 0.1061,-0.1669878 1.922737,0.2273843 2.04185,0.3846253 0.119113,0.1572407 0.231246,1.5825287 0.06405,1.6209347 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.7506498"
-                 sodipodi:arg1="0.96525166"
-                 sodipodi:r2="0.98821175"
-                 sodipodi:r1="1.3975425"
-                 sodipodi:cy="10.523341"
-                 sodipodi:cx="26.339727"
-                 sodipodi:sides="4"
-                 id="path4033"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 32.775474,19.451704 c -0.188893,0.09558 -1.143817,-0.07054 -1.331322,-0.16023 -0.187505,-0.08969 -0.745217,-1.286465 -0.586403,-1.41111 0.158814,-0.124646 2.427559,-0.382272 2.584172,-0.257871 0.156612,0.124401 -0.477555,1.733629 -0.666447,1.829211 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.6142472"
-                 sodipodi:arg1="0.82884906"
-                 sodipodi:r2="1.0174263"
-                 sodipodi:r1="1.4388582"
-                 sodipodi:cy="18.566681"
-                 sodipodi:cx="32.173359"
-                 sodipodi:sides="4"
-                 id="path4035"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 23.408931,24.854968 c -0.129355,0.157344 -1.250283,0.220466 -1.376388,0.06123 -0.126104,-0.159241 -0.579917,-2.177705 -0.484515,-2.345788 0.0954,-0.168082 2.048047,0.386359 2.164755,0.552579 0.116707,0.16622 -0.174496,1.57464 -0.303852,1.731984 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.6183794"
-                 sodipodi:arg1="0.83298127"
-                 sodipodi:r2="0.9291293"
-                 sodipodi:r1="1.3139873"
-                 sodipodi:cy="23.693205"
-                 sodipodi:cx="22.715805"
-                 sodipodi:sides="4"
-                 id="path4037"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 9.5693978,22.798078 c -0.050276,0.137753 -1.4548592,0.551723 -1.5959439,0.487635 -0.1410847,-0.06409 -0.4421355,-1.392248 -0.3922865,-1.567836 0.049849,-0.175588 1.8824056,-0.585632 2.0141031,-0.482164 0.1316976,0.103469 0.024404,1.424612 -0.025873,1.562365 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3521274"
-                 sodipodi:arg1="0.56672922"
-                 sodipodi:r2="0.81490028"
-                 sodipodi:r1="1.1524431"
-                 sodipodi:cy="22.013826"
-                 sodipodi:cx="8.8388348"
-                 sodipodi:sides="4"
-                 id="path4039"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="M 7.8404981,14.764316 C 7.8183255,14.897218 7.1281664,15.186501 7.0027338,15.160792 6.8773012,15.135082 6.159824,14.059205 6.218247,13.944447 6.2766699,13.82969 7.4362167,13.491 7.5591265,13.547972 c 0.1229099,0.05697 0.3035441,1.083443 0.2813716,1.216344 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.1071487"
-                 sodipodi:arg1="0.32175055"
-                 sodipodi:r2="0.59292704"
-                 sodipodi:r1="0.83852547"
-                 sodipodi:cy="14.324039"
-                 sodipodi:cx="7.2478447"
-                 sodipodi:sides="4"
-                 id="path4041"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 4.4906697,18.094444 c -0.033249,0.128042 -1.4217796,0.244145 -1.5415463,0.208286 -0.1197668,-0.03586 -0.119162,-1.087317 -0.054497,-1.201545 0.064665,-0.114228 0.8735568,-0.191415 0.9961,-0.161118 0.1225432,0.0303 0.6331921,1.026334 0.5999433,1.154377 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2924967"
-                 sodipodi:arg1="0.5070985"
-                 sodipodi:r2="0.6434769"
-                 sodipodi:r1="0.91001374"
-                 sodipodi:cy="17.50602"
-                 sodipodi:cx="3.6239223"
-                 sodipodi:sides="4"
-                 id="path4043"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 13.995726,10.59812 c -0.117287,0.207433 -1.735836,0.538778 -1.926617,0.355525 -0.19078,-0.183253 -0.34032,-1.7154051 -0.178852,-1.9222738 0.161467,-0.2068687 2.229461,-0.997521 2.464259,-0.883619 0.234799,0.1139019 -0.241504,2.2429338 -0.35879,2.4503678 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4940244"
-                 sodipodi:arg1="0.70862627"
-                 sodipodi:r2="1.1524431"
-                 sodipodi:r1="1.6298006"
-                 sodipodi:cy="9.6394567"
-                 sodipodi:cx="12.81631"
-                 sodipodi:sides="4"
-                 id="path4045"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 26.226534,14.605256 c -0.07759,0.03547 -0.855682,0.09411 -0.924316,0.02883 -0.06863,-0.06529 -0.03469,-0.872306 -3.92e-4,-0.957801 0.0343,-0.08549 0.864548,-0.08599 0.924316,-0.02883 0.05977,0.05716 0.07798,0.922334 3.92e-4,0.957801 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.5707963"
-                 sodipodi:arg1="0.78539816"
-                 sodipodi:r2="0.44194174"
-                 sodipodi:r1="0.625"
-                 sodipodi:cy="14.147263"
-                 sodipodi:cx="25.809399"
-                 sodipodi:sides="4"
-                 id="path4049"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 22.641184,8.453283 c -0.101495,0.029626 -1.344478,-0.4532763 -1.349911,-0.5490308 -0.0054,-0.095754 0.699907,-0.7554919 0.794673,-0.7606951 0.09477,-0.0052 0.927099,0.2429788 0.921232,0.3552283 -0.0059,0.1122495 -0.264498,0.9248711 -0.365994,0.9544976 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.9974238"
-                 sodipodi:arg1="1.2120257"
-                 sodipodi:r2="0.53400022"
-                 sodipodi:r1="0.75519037"
-                 sodipodi:cy="7.6949134"
-                 sodipodi:cx="22.185474"
-                 sodipodi:sides="4"
-                 id="path4051"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 30.520342,23.175268 c -0.106209,0.06498 -0.87667,0.567105 -1.002493,0.50729 -0.125822,-0.05981 -0.315795,-1.606096 -0.206475,-1.691287 0.10932,-0.08519 0.895468,-0.0693 1.00303,0.01013 0.107562,0.07943 0.312147,1.108882 0.205938,1.173864 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4288993"
-                 sodipodi:arg1="0.64350111"
-                 sodipodi:r2="0.625"
-                 sodipodi:r1="0.88388348"
-                 sodipodi:cy="22.720934"
-                 sodipodi:cx="29.875261"
-                 sodipodi:sides="4"
-                 id="path4053"
-                 style="fill:#008000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 38.567098,20.98178 c -0.04913,0.07616 -0.999859,0.268147 -1.076273,0.209201 -0.07641,-0.05895 -0.265485,-0.740445 -0.197799,-0.795696 0.06769,-0.05525 1.028715,-0.09027 1.097277,-0.04199 0.06856,0.04827 0.225927,0.552332 0.176795,0.628489 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3734008"
-                 sodipodi:arg1="0.5880026"
-                 sodipodi:r2="0.45069391"
-                 sodipodi:r1="0.63737744"
-                 sodipodi:cy="20.776388"
-                 sodipodi:cx="37.918602"
-                 sodipodi:sides="4"
-                 id="path4057"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 17.355268,16.686461 c -0.08515,0.0362 -0.783727,-0.123648 -0.861767,-0.208424 -0.07804,-0.08478 -0.0598,-0.958519 0.0069,-1.027192 0.06674,-0.06867 0.815429,0.114335 0.861767,0.208424 0.04634,0.09409 0.07822,0.990991 -0.0069,1.027192 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.5707963"
-                 sodipodi:arg1="0.78539816"
-                 sodipodi:r2="0.53033006"
-                 sodipodi:r1="0.75"
-                 sodipodi:cy="16.003418"
-                 sodipodi:cx="16.970564"
-                 sodipodi:sides="4"
-                 id="path4059"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 22.259936,13.042031 c -0.06184,0.04718 -1.015928,0.435028 -1.097283,0.382076 -0.08135,-0.05295 -0.218904,-0.9297 -0.177182,-1.001609 0.04172,-0.07191 0.982997,-0.195712 1.076666,-0.176164 0.09367,0.01955 0.259636,0.748518 0.197799,0.795697 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3734008"
-                 sodipodi:arg1="0.5880026"
-                 sodipodi:r2="0.45069391"
-                 sodipodi:r1="0.63737744"
-                 sodipodi:cy="12.821438"
-                 sodipodi:cx="21.566757"
-                 sodipodi:sides="4"
-                 id="path4061"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 32.180693,15.053436 c -0.118851,0.119575 -1.425406,0.07008 -1.495225,-0.05734 -0.06982,-0.127421 0.398326,-1.446116 0.481098,-1.56716 0.08277,-0.121044 1.099125,-0.365235 1.189484,-0.234228 0.09036,0.131007 -0.05651,1.739155 -0.175357,1.85873 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.6814535"
-                 sodipodi:arg1="0.89605538"
-                 sodipodi:r2="0.80039054"
-                 sodipodi:r1="1.1319231"
-                 sodipodi:cy="14.147263"
-                 sodipodi:cx="31.643028"
-                 sodipodi:sides="4"
-                 id="path4063"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 29.794033,15.753489 c -0.0171,0.06345 -0.801258,0.300851 -0.846042,0.251952 -0.04478,-0.0489 -0.19723,-0.589256 -0.182108,-0.662257 0.01512,-0.073 0.615801,-0.335972 0.668927,-0.307075 0.05313,0.0289 0.376319,0.653928 0.359223,0.71738 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.1659045"
-                 sodipodi:arg1="0.38050638"
-                 sodipodi:r2="0.3365728"
-                 sodipodi:r1="0.47598583"
-                 sodipodi:cy="15.561476"
-                 sodipodi:cx="29.256542"
-                 sodipodi:sides="4"
-                 id="path4065"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 13.573994,22.744332 c -0.111415,0.09422 -1.683661,0.147215 -1.781368,0.04516 -0.09771,-0.102052 -0.128032,-0.997856 -6.46e-4,-1.065351 0.127385,-0.0675 1.719936,-0.180684 1.781367,-0.04516 0.06143,0.135521 0.112062,0.971127 6.47e-4,1.065351 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.5707963"
-                 sodipodi:arg1="0.78539816"
-                 sodipodi:r2="0.70710677"
-                 sodipodi:r1="1"
-                 sodipodi:cy="22.190601"
-                 sodipodi:cx="12.639534"
-                 sodipodi:sides="4"
-                 id="path4067"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 17.962727,25.182809 c -0.190658,0.09284 -1.868808,0.212774 -1.963078,0.05517 -0.09427,-0.157607 0.180157,-1.353174 0.320984,-1.444985 0.140827,-0.09181 1.676857,-0.60069 1.729362,-0.408495 0.05251,0.192196 0.10339,1.705475 -0.08727,1.798313 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.7126934"
-                 sodipodi:arg1="0.92729522"
-                 sodipodi:r2="0.9375"
-                 sodipodi:r1="1.3258252"
-                 sodipodi:cy="24.488699"
-                 sodipodi:cx="17.05895"
-                 sodipodi:sides="4"
-                 id="path4069"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 19.864759,20.86775 c 0.02823,0.04477 -0.379641,0.515165 -0.435391,0.510079 -0.05575,-0.0051 -0.395569,-0.167455 -0.393732,-0.215918 0.0018,-0.04846 0.366397,-0.416124 0.4236,-0.416555 0.0572,-4.3e-4 0.377295,0.07762 0.405523,0.122394 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="0.5404195"
-                 sodipodi:arg1="-0.24497866"
-                 sodipodi:r2="0.2576941"
-                 sodipodi:r1="0.36443448"
-                 sodipodi:cy="21.041553"
-                 sodipodi:cx="19.445436"
-                 sodipodi:sides="4"
-                 id="path4071"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 11.883127,13.279409 c -0.07748,0.06572 -1.042976,0.04838 -1.097289,-0.01382 -0.05431,-0.0622 0.09741,-0.946986 0.176377,-0.959265 0.07897,-0.01228 1.031561,0.343602 1.097676,0.386941 0.06611,0.04334 -0.09928,0.520428 -0.176764,0.586145 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.7681919"
-                 sodipodi:arg1="0.98279372"
-                 sodipodi:r2="0.45069391"
-                 sodipodi:r1="0.63737744"
-                 sodipodi:cy="12.909826"
-                 sodipodi:cx="11.490485"
-                 sodipodi:sides="4"
-                 id="path4073"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="M 7.9795464,17.612437 C 7.962238,17.780371 7.0149141,18.42217 6.8820144,18.311463 6.7491148,18.200756 5.9069987,16.552995 5.9571968,16.396171 c 0.050198,-0.156824 1.5608754,-0.146845 1.6903774,-0.05702 0.129502,0.08983 0.3492807,1.105351 0.3319722,1.273285 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2847449"
-                 sodipodi:arg1="0.49934672"
-                 sodipodi:r2="0.78312278"
-                 sodipodi:r1="1.1075028"
-                 sodipodi:cy="17.152468"
-                 sodipodi:cx="7.2478447"
-                 sodipodi:sides="4"
-                 id="path4075"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 31.607306,9.9274567 c -0.09499,0.027773 -1.283283,0.1213373 -1.315237,0.017618 -0.03195,-0.1037193 0.09423,-1.084519 0.176299,-1.1505846 0.08207,-0.066066 1.277475,0.2798698 1.315231,0.388076 0.03776,0.1082063 -0.0813,0.7171177 -0.176293,0.7448909 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.735945"
-                 sodipodi:arg1="0.95054684"
-                 sodipodi:r2="0.53764534"
-                 sodipodi:r1="0.76034534"
-                 sodipodi:cy="9.4626808"
-                 sodipodi:cx="31.112698"
-                 sodipodi:sides="4"
-                 id="path4077"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 27.329687,19.067338 c -0.07917,0.08481 -1.291995,0.17235 -1.31523,0.06813 -0.02323,-0.104219 0.101469,-0.929435 0.200886,-0.99053 0.09942,-0.0611 0.944947,-0.105983 1.039812,-0.03233 0.09486,0.07365 0.153706,0.869916 0.07453,0.954729 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.735945"
-                 sodipodi:arg1="0.95054684"
-                 sodipodi:r2="0.53764534"
-                 sodipodi:r1="0.76034534"
-                 sodipodi:cy="18.655069"
-                 sodipodi:cx="26.693281"
-                 sodipodi:sides="4"
-                 id="path4081"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 23.666714,16.194338 c 0.01883,0.09686 -0.563145,0.673253 -0.666561,0.615831 -0.103415,-0.05742 -0.578416,-1.144982 -0.570744,-1.255061 0.0077,-0.110078 0.574031,-0.417781 0.690137,-0.413979 0.116105,0.0038 0.528334,0.956348 0.547168,1.053209 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.0303768"
-                 sodipodi:arg1="0.24497866"
-                 sodipodi:r2="0.51538819"
-                 sodipodi:r1="0.72886896"
-                 sodipodi:cy="15.91503"
-                 sodipodi:cx="23.069359"
-                 sodipodi:sides="4"
-                 id="path4083"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 19.270682,17.397012 c -0.0351,0.109429 -0.932293,0.569515 -1.024973,0.502278 -0.09268,-0.06724 -0.159977,-1.137978 -0.05394,-1.214834 0.106034,-0.07686 1.120826,-0.471142 1.241357,-0.398972 0.120532,0.07217 -0.127344,1.002099 -0.16244,1.111528 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2924967"
-                 sodipodi:arg1="0.5070985"
-                 sodipodi:r2="0.6434769"
-                 sodipodi:r1="0.91001374"
-                 sodipodi:cy="17.064077"
-                 sodipodi:cx="18.738331"
-                 sodipodi:sides="4"
-                 id="path4085"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 19.017423,10.264909 c -0.06573,0.142033 -1.114125,0.202237 -1.258406,0.145009 -0.144281,-0.05723 -0.320947,-1.0431001 -0.279889,-1.1667877 0.04106,-0.1236877 0.764839,-0.6661498 0.900458,-0.6257547 0.135618,0.040395 0.703565,1.5054994 0.637837,1.6475334 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2490458"
-                 sodipodi:arg1="0.46364761"
-                 sodipodi:r2="0.69877124"
-                 sodipodi:r1="0.98821175"
-                 sodipodi:cy="9.5510683"
-                 sodipodi:cx="18.119612"
-                 sodipodi:sides="4"
-                 id="path4087"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 14.036067,14.073763 c -0.07857,0.07559 -0.808939,0.294784 -0.900605,0.248393 -0.09167,-0.04639 -0.62187,-0.752165 -0.575873,-0.857589 0.046,-0.105423 1.21668,-0.406001 1.305569,-0.361463 0.08889,0.04454 0.249483,0.895067 0.170909,0.970659 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3045443"
-                 sodipodi:arg1="0.51914611"
-                 sodipodi:r2="0.50389111"
-                 sodipodi:r1="0.71260965"
-                 sodipodi:cy="13.616933"
-                 sodipodi:cx="13.346641"
-                 sodipodi:sides="4"
-                 id="path4089"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 10.613646,19.354238 c -0.02825,0.08588 -1.0192587,0.09429 -1.0972762,0.04199 -0.078017,-0.0523 -0.2182584,-0.932971 -0.1771826,-1.001609 0.041076,-0.06864 0.8661598,-0.283748 0.9251158,-0.206175 0.05896,0.07757 0.37759,1.079914 0.349343,1.16579 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3734008"
-                 sodipodi:arg1="0.5880026"
-                 sodipodi:r2="0.45069391"
-                 sodipodi:r1="0.63737744"
-                 sodipodi:cy="18.831844"
-                 sodipodi:cx="9.8994951"
-                 sodipodi:sides="4"
-                 id="path4091"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 4.8753789,20.481883 c -0.08062,0.08105 -1.4409757,0.311678 -1.5420995,0.221575 -0.1011238,-0.0901 -0.4321999,-1.035472 -0.3835766,-1.171985 0.048623,-0.136512 1.4332247,-0.788435 1.5415463,-0.754295 0.1083216,0.03414 0.4647499,1.623656 0.3841298,1.704705 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2924967"
-                 sodipodi:arg1="0.5070985"
-                 sodipodi:r2="0.6434769"
-                 sodipodi:r1="0.91001374"
-                 sodipodi:cy="19.804117"
-                 sodipodi:cx="3.9774756"
-                 sodipodi:sides="4"
-                 id="path4093"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 26.172598,21.564914 c -0.04445,0.08724 -0.831794,0.309932 -0.880943,0.227538 -0.04915,-0.08239 -0.0524,-0.904046 0.0029,-0.970709 0.05532,-0.06666 0.834145,-0.290048 0.925182,-0.249299 0.09104,0.04075 -0.0027,0.905234 -0.04716,0.99247 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4801364"
-                 sodipodi:arg1="0.69473828"
-                 sodipodi:r2="0.48814061"
-                 sodipodi:r1="0.69033504"
-                 sodipodi:cy="21.306719"
-                 sodipodi:cx="25.809399"
-                 sodipodi:sides="4"
-                 id="path4095"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 34.404268,17.34762 c -0.07207,0.06306 -0.760705,0.490317 -0.859016,0.472198 -0.09831,-0.01812 -0.250374,-1.300462 -0.201854,-1.411666 0.04852,-0.111205 0.803928,-0.119355 0.859015,-0.01599 0.05509,0.103364 0.273926,0.892399 0.201855,0.955459 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4056476"
-                 sodipodi:arg1="0.62024949"
-                 sodipodi:r2="0.53764534"
-                 sodipodi:r1="0.76034534"
-                 sodipodi:cy="16.975691"
-                 sodipodi:cx="33.852737"
-                 sodipodi:sides="4"
-                 id="path4097"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 35.54547,22.98241 c -0.07449,0.103083 -1.491022,-0.133472 -1.530394,-0.243162 -0.03937,-0.10969 -0.06382,-1.356315 -5.66e-4,-1.457182 0.06325,-0.100868 1.449992,0.141387 1.530395,0.243161 0.0804,0.101774 0.07506,1.354099 5.65e-4,1.457183 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.5707963"
-                 sodipodi:arg1="0.78539816"
-                 sodipodi:r2="0.61871845"
-                 sodipodi:r1="0.875"
-                 sodipodi:cy="22.102215"
-                 sodipodi:cx="34.736622"
-                 sodipodi:sides="4"
-                 id="path4101"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 27.87425,24.870008 c -0.0086,0.122102 -0.80608,0.496626 -0.896323,0.424168 -0.09024,-0.07246 -0.809161,-0.644782 -0.820062,-0.765732 -0.0109,-0.12095 1.033613,-0.65413 1.100321,-0.582412 0.06671,0.07172 0.624659,0.801875 0.616064,0.923976 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.1441688"
-                 sodipodi:arg1="0.35877067"
-                 sodipodi:r2="0.53400022"
-                 sodipodi:r1="0.75519037"
-                 sodipodi:cy="24.665476"
-                 sodipodi:cx="27.046835"
-                 sodipodi:sides="4"
-                 id="path4103"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 13.380162,25.610619 c -0.0549,0.160595 -1.302069,0.686952 -1.419464,0.59923 -0.117395,-0.08772 -0.6055,-1.184874 -0.565566,-1.337399 0.03993,-0.152524 0.9681,-1.036786 1.130319,-1.000644 0.16222,0.03614 0.909613,1.578218 0.854711,1.738813 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2120257"
-                 sodipodi:arg1="0.42662749"
-                 sodipodi:r2="0.75519037"
-                 sodipodi:r1="1.0680006"
-                 sodipodi:cy="25.107418"
-                 sodipodi:cx="12.197592"
-                 sodipodi:sides="4"
-                 id="path4105"
-                 style="fill:#9a2b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 29.492002,20.744543 c -0.10167,0.02499 -1.286371,-0.328037 -1.315238,-0.438589 -0.02887,-0.110552 0.08321,-0.715416 0.176293,-0.744891 0.09308,-0.02948 1.280567,-0.132847 1.315237,-0.01762 0.03467,0.11523 -0.07462,1.17611 -0.176292,1.201098 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.735945"
-                 sodipodi:arg1="0.95054684"
-                 sodipodi:r2="0.53764534"
-                 sodipodi:r1="0.76034534"
-                 sodipodi:cy="20.069283"
-                 sodipodi:cx="28.90299"
-                 sodipodi:sides="4"
-                 id="path4109"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,238.49953,377.87194)"
-                 d="m 33.5099,24.873287 c 0.0066,0.08027 -0.80716,0.418799 -0.883782,0.396498 -0.07662,-0.0223 -0.37143,-0.748845 -0.357228,-0.827391 0.0142,-0.07855 0.800146,-0.391935 0.883788,-0.353749 0.08364,0.03819 0.350609,0.704368 0.357222,0.784642 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.0636978"
-                 sodipodi:arg1="0.27829966"
-                 sodipodi:r2="0.45500687"
-                 sodipodi:r1="0.6434769"
-                 sodipodi:cy="24.753864"
-                 sodipodi:cx="32.880466"
-                 sodipodi:sides="4"
-                 id="path4111"
-                 style="fill:#ffdd55;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="matrix(6.5920651,0,0,6.5920651,240.83018,383.69856)"
-                 d="m 20.636335,25.899681 c -0.09079,0.05475 -1.186538,0.234955 -1.287724,0.197725 -0.101187,-0.03723 0.208556,-0.83738 0.239507,-0.937294 0.03095,-0.09991 1.025685,-0.377452 1.093461,-0.278335 0.06778,0.09912 0.04555,0.963149 -0.04524,1.017904 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4940244"
-                 sodipodi:arg1="0.70862627"
-                 sodipodi:r2="0.57622153"
-                 sodipodi:r1="0.81490028"
-                 sodipodi:cy="25.460972"
-                 sodipodi:cx="19.975767"
-                 sodipodi:sides="4"
-                 id="path4115"
-                 style="fill:#992b2b;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-            </g>
-          </g>
-          <g
-             id="g4303">
-            <path
-               sodipodi:nodetypes="cscssscz"
-               id="path2836"
-               d="m 488.81898,409.72368 c 7.04094,-7.12896 67.49608,26.44679 64.06367,37.28558 -5.26484,16.6252 -51.61669,39.87768 -60.27415,44.60195 -0.29844,-3.18066 -3.30009,-6.42371 -4.96639,-9.27062 -1.50208,-2.56633 -6.15265,-4.00254 -8.16921,-5.5492 -3.81059,-2.92265 -2.80196,-7.492 -5.79967,-10.71285 -2.90276,-3.11883 -6.23861,-2.87243 -9.68983,-4.76464 8.07735,-23.33256 17.79464,-44.46125 24.83558,-51.59022 z"
-               style="fill:#f4f0b6;fill-opacity:1;stroke:#000000;stroke-width:3.79063106;stroke-opacity:1"
-               inkscape:connector-curvature="0" />
-            <g
-               transform="matrix(6.5920651,0,0,6.5920651,-1332.8181,-3590.3948)"
-               id="g4227">
-              <path
-                 transform="translate(236.96826,605.15615)"
-                 d="m 40.22828,3.3137635 c -0.03327,0.026993 -0.311904,-0.1455253 -0.310322,-0.1916135 0.0016,-0.046088 0.08617,-0.3459723 0.124447,-0.3720786 0.03827,-0.026106 0.472548,0.1515001 0.488201,0.1916134 0.01565,0.040113 -0.269054,0.3450855 -0.302326,0.3720787 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="2.0344439"
-                 sodipodi:arg1="1.2490458"
-                 sodipodi:r2="0.20963137"
-                 sodipodi:r1="0.29646352"
-                 sodipodi:cy="3.03125"
-                 sodipodi:cx="40.21875"
-                 sodipodi:sides="4"
-                 id="path4195"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 40.117736,7.8838591 c -0.02045,0.034784 -0.308612,0.03428 -0.33037,0.0058 -0.02176,-0.02848 -0.211993,-0.2829025 -0.200477,-0.3158199 0.01152,-0.032917 0.456814,-0.036456 0.481538,-0.0058 0.02472,0.030656 0.06976,0.2810356 0.04931,0.3158199 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3045443"
-                 sodipodi:arg1="0.51914611"
-                 sodipodi:r2="0.17815241"
-                 sodipodi:r1="0.25194556"
-                 sodipodi:cy="7.71875"
-                 sodipodi:cx="39.875"
-                 sodipodi:sides="4"
-                 id="path4201"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 43.392373,8.7797917 c -0.05232,0.026251 -0.394168,0.013436 -0.405554,-0.035978 -0.01139,-0.049414 -0.04662,-0.5393936 0.0016,-0.5511686 0.04821,-0.011775 0.607994,0.2138421 0.634428,0.2648513 0.02643,0.051009 -0.178141,0.2960451 -0.230463,0.3222957 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.7454685"
-                 sodipodi:arg1="0.96007036"
-                 sodipodi:r2="0.26972932"
-                 sodipodi:r1="0.38145486"
-                 sodipodi:cy="8.5625"
-                 sodipodi:cx="43.28125"
-                 sodipodi:sides="4"
-                 id="path4205"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 45.711805,11.350221 c -0.04891,0.05684 -0.71283,0.09007 -0.748557,0.01654 -0.03573,-0.07353 0.111955,-0.733937 0.147695,-0.798714 0.03574,-0.06478 0.714456,-0.07446 0.748556,-0.01654 0.0341,0.05792 -0.09878,0.741877 -0.147694,0.798713 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.6142472"
-                 sodipodi:arg1="0.82884906"
-                 sodipodi:r2="0.35971451"
-                 sodipodi:r1="0.50871313"
-                 sodipodi:cy="11"
-                 sodipodi:cx="45.34375"
-                 sodipodi:sides="4"
-                 id="path4207"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 42.978425,11.343193 c -0.01872,0.02265 -0.204226,0.09252 -0.233681,0.09206 -0.02946,-4.61e-4 -0.2041,-0.151049 -0.18896,-0.177334 0.01514,-0.02628 0.204398,-0.218282 0.233682,-0.210647 0.02928,0.0076 0.207678,0.273266 0.188959,0.29592 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.1071487"
-                 sodipodi:arg1="0.32175055"
-                 sodipodi:r2="0.13975425"
-                 sodipodi:r1="0.19764236"
-                 sodipodi:cy="11.28125"
-                 sodipodi:cx="42.78125"
-                 sodipodi:sides="4"
-                 id="path4209"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 42.310012,13.904369 c -0.03725,0.01928 -0.304332,0.03963 -0.345542,0.01473 -0.04121,-0.0249 -0.08268,-0.465801 -0.06444,-0.499546 0.01825,-0.03374 0.51026,-0.05402 0.533042,-0.01473 0.02278,0.03929 -0.08581,0.480265 -0.123064,0.499547 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.7126934"
-                 sodipodi:arg1="0.92729522"
-                 sodipodi:r2="0.22097087"
-                 sodipodi:r1="0.3125"
-                 sodipodi:cy="13.65625"
-                 sodipodi:cx="42.15625"
-                 sodipodi:sides="4"
-                 id="path4211"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 39.64056,14.8626 c -0.01461,0.01395 -0.241958,0.06949 -0.263686,0.06043 -0.02173,-0.0091 -0.02113,-0.193028 -0.0055,-0.20594 0.01559,-0.01291 0.241588,-0.0685 0.263686,-0.06043 0.0221,0.0081 0.02015,0.191994 0.0055,0.205941 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4288993"
-                 sodipodi:arg1="0.64350111"
-                 sodipodi:r2="0.11048543"
-                 sodipodi:r1="0.15625"
-                 sodipodi:cy="14.8125"
-                 sodipodi:cx="39.5"
-                 sodipodi:sides="4"
-                 id="path4213"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 37.937508,13.547465 c -0.03274,0.03097 -0.434784,0.04124 -0.468859,0.01566 -0.03408,-0.02558 -0.02352,-0.493661 -0.0021,-0.529911 0.02146,-0.03625 0.434866,0.1548 0.468859,0.183655 0.03399,0.02886 0.03479,0.299625 0.0021,0.330595 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.6373645"
-                 sodipodi:arg1="0.85196633"
-                 sodipodi:r2="0.23489526"
-                 sodipodi:r1="0.33219206"
-                 sodipodi:cy="13.34375"
-                 sodipodi:cx="37.71875"
-                 sodipodi:sides="4"
-                 id="path4215"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 40.120895,11.703668 c -0.04458,0.05555 -0.522654,-0.05499 -0.557983,-0.11582 -0.03533,-0.06083 -0.07733,-0.522917 -0.01538,-0.554664 0.06195,-0.03175 0.505398,0.06886 0.557983,0.11582 0.05259,0.04696 0.05995,0.499113 0.01538,0.554664 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.6183794"
-                 sodipodi:arg1="0.83298127"
-                 sodipodi:r2="0.32849681"
-                 sodipodi:r1="0.46456465"
-                 sodipodi:cy="11.375"
-                 sodipodi:cx="39.875"
-                 sodipodi:sides="4"
-                 id="path4217"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 41.436454,9.9116339 c -0.03804,0.028667 -0.565355,-0.2182238 -0.559938,-0.2671191 0.0054,-0.048895 0.177418,-0.3835196 0.224563,-0.3798693 0.04715,0.00365 0.335472,0.2315317 0.364183,0.2671191 0.02871,0.035587 0.0092,0.3512024 -0.02881,0.3798693 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="2.0647377"
-                 sodipodi:arg1="1.2793395"
-                 sodipodi:r2="0.23070036"
-                 sodipodi:r1="0.32625958"
-                 sodipodi:cy="9.59375"
-                 sodipodi:cx="41.25"
-                 sodipodi:sides="4"
-                 id="path4219"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 38.562088,8.7777132 c -0.0092,0.052582 -0.466647,0.1693168 -0.517779,0.1471636 -0.05113,-0.022153 -0.144742,-0.3295691 -0.11746,-0.3616494 0.02728,-0.03208 0.259453,-0.171839 0.308148,-0.1471637 0.0487,0.024675 0.336286,0.3090676 0.327091,0.3616495 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.2490458"
-                 sodipodi:arg1="0.46364761"
-                 sodipodi:r2="0.24705294"
-                 sodipodi:r1="0.34938562"
-                 sodipodi:cy="8.625"
-                 sodipodi:cx="38.15625"
-                 sodipodi:sides="4"
-                 id="path4221"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 38.02286,10.361004 c -0.02762,0.01777 -0.290561,0.106649 -0.308485,0.08072 -0.01792,-0.02593 -0.11485,-0.274082 -0.09183,-0.302452 0.02302,-0.02837 0.287116,-0.09926 0.308484,-0.08072 0.02137,0.01854 0.119449,0.284681 0.09184,0.302452 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.3734008"
-                 sodipodi:arg1="0.5880026"
-                 sodipodi:r2="0.15934436"
-                 sodipodi:r1="0.22534695"
-                 sodipodi:cy="10.25"
-                 sodipodi:cx="37.84375"
-                 sodipodi:sides="4"
-                 id="path4223"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-              <path
-                 transform="translate(238.49951,601.9374)"
-                 d="m 35.896004,11.839926 c -0.0053,0.02432 -0.247781,-0.0187 -0.263686,-0.03332 -0.0159,-0.01462 -0.02454,-0.185344 -0.0055,-0.197841 0.01909,-0.0125 0.246257,-0.06912 0.263686,-0.06043 0.01743,0.0087 0.01074,0.267274 0.0055,0.291591 z"
-                 inkscape:randomized="0.3"
-                 inkscape:rounded="0.1"
-                 inkscape:flatsided="true"
-                 sodipodi:arg2="1.4288993"
-                 sodipodi:arg1="0.64350111"
-                 sodipodi:r2="0.11048543"
-                 sodipodi:r1="0.15625"
-                 sodipodi:cy="11.71875"
-                 sodipodi:cx="35.75"
-                 sodipodi:sides="4"
-                 id="path4225"
-                 style="fill:#000000;fill-opacity:1;stroke:none"
-                 sodipodi:type="star" />
-            </g>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/pom.xml b/pom.xml
new file mode 100644 (file)
index 0000000..b69fafe
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,66 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>net.sourceforge.guacamole</groupId>
+    <artifactId>guacamole-default-webapp</artifactId>
+    <packaging>war</packaging>
+    <version>0.3.0rc1</version>
+    <name>guacamole-default-webapp</name>
+    <url>http://guacamole.sourceforge.net/</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <extensions>
+            <!-- Required for SSH deploy -->
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh-external</artifactId>
+            </extension>
+        </extensions>
+
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.guacamole</groupId>
+            <artifactId>guacamole-common</artifactId>
+            <version>0.3.0rc1</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <repositories>
+        <repository>
+            <id>guac-dev</id>
+            <url>http://guac-dev.org/repo</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <repository>
+            <id>guac-dev</id>
+            <url>scpexe://guac-dev.org/var/www/repo</url>
+        </repository>
+    </distributionManagement>
+
+</project>
diff --git a/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java b/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
new file mode 100644 (file)
index 0000000..83fcfd3
--- /dev/null
@@ -0,0 +1,318 @@
+
+package net.sourceforge.guacamole.net.authentication.basic;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import net.sourceforge.guacamole.GuacamoleException;
+import net.sourceforge.guacamole.net.GuacamoleProperties;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+public class BasicFileAuthenticationProvider implements BasicLogin.AuthenticationProvider {
+
+    private long mappingTime;
+    private Map<String, AuthInfo> mapping;
+
+    private File getUserMappingFile() throws GuacamoleException {
+
+        // Get user mapping filename
+        String filename = GuacamoleProperties.getProperty("basic-user-mapping");
+        if (filename == null)
+            return null;
+
+        return new File(filename);
+
+    }
+
+    public synchronized void init() throws GuacamoleException {
+
+        // Get user mapping file
+        File mapFile = getUserMappingFile();
+        if (mapFile == null)
+            throw new GuacamoleException("Missing \"basic-user-mapping\" parameter required for basic login.");
+
+        // Parse document
+        try {
+
+            BasicUserMappingContentHandler contentHandler = new BasicUserMappingContentHandler();
+
+            XMLReader parser = XMLReaderFactory.createXMLReader();
+            parser.setContentHandler(contentHandler);
+            parser.parse(mapFile.getAbsolutePath());
+
+            mappingTime = mapFile.lastModified();
+            mapping = contentHandler.getUserMapping();
+
+        }
+        catch (IOException e) {
+            throw new GuacamoleException("Error reading basic user mapping file.", e);
+        }
+        catch (SAXException e) {
+            throw new GuacamoleException("Error parsing basic user mapping XML.", e);
+        }
+
+    }
+
+    @Override
+    public BasicLogin.AuthorizedConfiguration getAuthorizedConfiguration(String username, String password) throws GuacamoleException {
+
+        // Check mapping file mod time
+        File userMappingFile = getUserMappingFile();
+        if (userMappingFile.exists() && mappingTime < userMappingFile.lastModified()) {
+
+            // If modified recently, gain exclusive access and recheck
+            synchronized (this) {
+                if (userMappingFile.exists() && mappingTime < userMappingFile.lastModified())
+                    init(); // If still not up to date, re-init
+            }
+
+        }
+
+        AuthInfo info = mapping.get(username);
+        if (info != null && info.validate(username, password))
+            return new BasicLogin.AuthorizedConfiguration(
+                info.getProtocol(),
+                info.getHostname(),
+                info.getPort(),
+                info.getPassword()
+            );
+
+        return null;
+
+    }
+
+    public static class AuthInfo {
+
+        public static enum Encoding {
+            PLAIN_TEXT,
+            MD5
+        }
+
+        private String auth_username;
+        private String auth_password;
+        private Encoding auth_encoding;
+
+        private String protocol;
+        private String hostname;
+        private int port;
+        private String password;
+
+        public AuthInfo(String auth_username, String auth_password, Encoding auth_encoding) {
+            this.auth_username = auth_username;
+            this.auth_password = auth_password;
+            this.auth_encoding = auth_encoding;
+        }
+
+        private static final char HEX_CHARS[] = {
+            '0', '1', '2', '3', '4', '5', '6', '7',
+            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+        };
+
+        public static String getHexString(byte[] bytes) {
+
+            if (bytes == null)
+                return null;
+
+            StringBuilder hex = new StringBuilder(2 * bytes.length);
+            for (byte b : bytes) {
+                hex.append(HEX_CHARS[(b & 0xF0) >> 4])
+                   .append(HEX_CHARS[(b & 0x0F)     ]);
+            }
+
+            return hex.toString();
+
+        }
+
+
+        public boolean validate(String username, String password) {
+
+            // If username matches
+            if (username != null && password != null && username.equals(auth_username)) {
+
+                switch (auth_encoding) {
+
+                    case PLAIN_TEXT:
+
+                        // Compare plaintext
+                        return password.equals(auth_password);
+
+                    case MD5:
+
+                        // Compare hashed password
+                        try {
+                            MessageDigest digest = MessageDigest.getInstance("MD5");
+                            String hashedPassword = getHexString(digest.digest(password.getBytes()));
+                            return hashedPassword.equals(auth_password.toUpperCase());
+                        }
+                        catch (NoSuchAlgorithmException e) {
+                            throw new UnsupportedOperationException("Unexpected lack of MD5 support.", e);
+                        }
+
+                }
+
+            }
+
+            return false;
+
+        }
+
+        public String getHostname() {
+            return hostname;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public int getPort() {
+            return port;
+        }
+
+        public String getProtocol() {
+            return protocol;
+        }
+
+    }
+
+
+    private static class BasicUserMappingContentHandler extends DefaultHandler {
+
+        private Map<String, AuthInfo> authMapping = new HashMap<String, AuthInfo>();
+
+        public Map<String, AuthInfo> getUserMapping() {
+            return Collections.unmodifiableMap(authMapping);
+        }
+
+        private AuthInfo current;
+
+        private enum AUTH_INFO_STATE {
+            PROTOCOL,
+            HOSTNAME,
+            PORT,
+            PASSWORD
+        };
+
+        private AUTH_INFO_STATE infoState;
+
+        @Override
+        public void endElement(String uri, String localName, String qName) throws SAXException {
+
+            if (localName.equals("authorize")) {
+
+                // Finalize mapping for this user
+                authMapping.put(
+                    current.auth_username,
+                    current
+                );
+
+            }
+
+            infoState = null;
+
+        }
+
+        @Override
+        public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+
+            if (localName.equals("authorize")) {
+
+                AuthInfo.Encoding encoding;
+                String encodingString = attributes.getValue("encoding");
+                if (encodingString == null)
+                    encoding = AuthInfo.Encoding.PLAIN_TEXT;
+                else if (encodingString.equals("plain"))
+                    encoding = AuthInfo.Encoding.PLAIN_TEXT;
+                else if (encodingString.equals("md5"))
+                    encoding = AuthInfo.Encoding.MD5;
+                else
+                    throw new SAXException("Invalid encoding type");
+
+
+                current = new AuthInfo(
+                    attributes.getValue("username"),
+                    attributes.getValue("password"),
+                    encoding
+                );
+
+                infoState = null;
+
+            }
+
+            else if (localName.equals("protocol"))
+                infoState = AUTH_INFO_STATE.PROTOCOL;
+
+            else if (localName.equals("hostname"))
+                infoState = AUTH_INFO_STATE.HOSTNAME;
+
+            else if (localName.equals("port"))
+                infoState = AUTH_INFO_STATE.PORT;
+
+            else if (localName.equals("password"))
+                infoState = AUTH_INFO_STATE.PASSWORD;
+
+            else
+                infoState = null;
+
+        }
+
+        @Override
+        public void characters(char[] ch, int start, int length) throws SAXException {
+
+            String str = new String(ch, start, length);
+
+            if (infoState == null)
+                return;
+
+            switch (infoState) {
+
+                case PROTOCOL:
+                    current.protocol = str;
+                    break;
+
+                case HOSTNAME:
+                    current.hostname = str;
+                    break;
+
+                case PORT:
+                    current.port = Integer.parseInt(str);
+                    break;
+
+                case PASSWORD:
+                    current.password = str;
+                    break;
+
+            }
+
+        }
+
+
+    }
+
+
+}
diff --git a/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java b/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
new file mode 100644 (file)
index 0000000..959bf0e
--- /dev/null
@@ -0,0 +1,50 @@
+
+package net.sourceforge.guacamole.net.authentication.basic;
+
+import javax.servlet.http.HttpSession;
+import net.sourceforge.guacamole.GuacamoleException;
+import net.sourceforge.guacamole.net.GuacamoleSession;
+import net.sourceforge.guacamole.net.authentication.GuacamoleSessionProvider;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+public class BasicGuacamoleSessionProvider implements GuacamoleSessionProvider {
+
+    public GuacamoleSession createSession(HttpSession session) throws GuacamoleException {
+
+        // Retrieve authorized config data from session
+        BasicLogin.AuthorizedConfiguration config = (BasicLogin.AuthorizedConfiguration)
+                session.getAttribute("BASIC-LOGIN-AUTH");
+
+        // If no data, not authorized
+        if (config == null)
+            throw new GuacamoleException("Unauthorized");
+
+        // Configure session from authorized config info
+        GuacamoleSession guacSession = new GuacamoleSession(session);
+        guacSession.setConnection(config.getProtocol(), config.getHostname(), config.getPort());
+        if (config.getPassword() != null)
+            guacSession.setPassword(config.getPassword());
+
+        // Return authorized session
+        return guacSession;
+
+    }
+
+}
diff --git a/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java b/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
new file mode 100644 (file)
index 0000000..43e8721
--- /dev/null
@@ -0,0 +1,161 @@
+
+package net.sourceforge.guacamole.net.authentication.basic;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import net.sourceforge.guacamole.GuacamoleException;
+import net.sourceforge.guacamole.net.Configuration;
+
+public class BasicLogin extends HttpServlet {
+
+    private Config config;
+
+    @Override
+    public void init() throws ServletException {
+        try {
+            config = new Config();
+        }
+        catch (GuacamoleException e) {
+            throw new ServletException(e);
+        }
+    }
+
+
+    private class Config extends Configuration {
+
+        private AuthenticationProvider authProvider;
+
+        public Config() throws GuacamoleException {
+
+            // Get auth provider instance
+            try {
+                String authProviderClassName = readParameter("auth-provider");
+                Object obj = Class.forName(authProviderClassName).getConstructor().newInstance();
+                if (!(obj instanceof AuthenticationProvider))
+                    throw new GuacamoleException("Specified session provider class is not a GuacamoleSessionProvider");
+
+                authProvider = (AuthenticationProvider) obj;
+            }
+            catch (ClassNotFoundException e) {
+                throw new GuacamoleException("Session provider class not found", e);
+            }
+            catch (NoSuchMethodException e) {
+                throw new GuacamoleException("Default constructor for session provider not present", e);
+            }
+            catch (SecurityException e) {
+                throw new GuacamoleException("Creation of session provider disallowed; check your security settings", e);
+            }
+            catch (InstantiationException e) {
+                throw new GuacamoleException("Unable to instantiate session provider", e);
+            }
+            catch (IllegalAccessException e) {
+                throw new GuacamoleException("Unable to access default constructor of session provider", e);
+            }
+            catch (InvocationTargetException e) {
+                throw new GuacamoleException("Internal error in constructor of session provider", e.getTargetException());
+            }
+
+        }
+
+        public AuthenticationProvider getAuthenticationProvider() {
+            return authProvider;
+        }
+
+    }
+
+    public static interface AuthenticationProvider {
+        public AuthorizedConfiguration getAuthorizedConfiguration(String username, String password) throws GuacamoleException;
+    }
+
+    // Added to session when session validated
+    public static class AuthorizedConfiguration {
+
+        private String protocol;
+        private String hostname;
+        private int port;
+        private String password;
+
+        public AuthorizedConfiguration(String protocol, String hostname, int port, String password) {
+            this.protocol = protocol;
+            this.hostname = hostname;
+            this.port = port;
+            this.password = password;
+        }
+
+        public String getHostname() {
+            return hostname;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public int getPort() {
+            return port;
+        }
+
+        public String getProtocol() {
+            return protocol;
+        }
+
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+        // Retrieve username and password from parms
+        String username = req.getParameter("username");
+        String password = req.getParameter("password");
+
+        // Validate username and password
+        try {
+
+            AuthorizedConfiguration info = config.getAuthenticationProvider().getAuthorizedConfiguration(username, password);
+            if (info != null) {
+
+                // Store authorized configuration
+                HttpSession session = req.getSession(true);
+                session.setAttribute(
+                    "BASIC-LOGIN-AUTH",
+                    info
+                );
+
+                // Success
+                return;
+
+            }
+
+            // Report "forbidden" on any failure
+            resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Login invalid");
+        }
+        catch (GuacamoleException e) {
+            throw new ServletException("Error validating credentials", e);
+        }
+
+    }
+
+
+}
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
new file mode 100644 (file)
index 0000000..5bee3dc
--- /dev/null
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiJARLocking="true" path=""/>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644 (file)
index 0000000..c7cbc9f
--- /dev/null
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Guacamole - Clientless Remote Desktop
+    Copyright (C) 2010  Michael Jumper
+
+    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 <http://www.gnu.org/licenses/>.
+-->
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <!-- Basic config -->
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    <session-config>
+        <session-timeout>
+                       30
+        </session-timeout>
+    </session-config>
+    <!-- Guacamole Tunnel Servlets -->
+    <servlet>
+        <description>Connect servlet.</description>
+        <servlet-name>Connect</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.tunnel.Connect</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Connect</servlet-name>
+        <url-pattern>/connect</url-pattern>
+    </servlet-mapping>
+    <servlet>
+        <description>Outbound servlet.</description>
+        <servlet-name>Outbound</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.tunnel.Outbound</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Outbound</servlet-name>
+        <url-pattern>/outbound</url-pattern>
+    </servlet-mapping>
+    <servlet>
+        <description>Input servlet.</description>
+        <servlet-name>Inbound</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.tunnel.Inbound</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Inbound</servlet-name>
+        <url-pattern>/inbound</url-pattern>
+    </servlet-mapping>
+    <!-- Basic Login Servlets -->
+    <servlet>
+        <servlet-name>BasicLogin</servlet-name>
+        <servlet-class>net.sourceforge.guacamole.net.authentication.basic.BasicLogin</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>BasicLogin</servlet-name>
+        <url-pattern>/login</url-pattern>
+    </servlet-mapping>
+</web-app>
diff --git a/src/main/webapp/agpl-3.0-standalone.html b/src/main/webapp/agpl-3.0-standalone.html
new file mode 100644 (file)
index 0000000..bf47c6c
--- /dev/null
@@ -0,0 +1,688 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html><head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <title>GNU Affero General Public License - GNU Project - Free Software Foundation (FSF)</title>
+</head>
+ <link rel="alternate" type="application/rdf+xml"
+       href="http://www.gnu.org/licenses/agpl-3.0.rdf" /> 
+<body>
+<h3 style="text-align: center;">GNU AFFERO GENERAL PUBLIC LICENSE</h3>
+<p style="text-align: center;">Version 3, 19 November 2007</p>
+
+<p>Copyright &copy; 2007 Free Software Foundation,
+Inc. &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;
+ <br />
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.</p>
+
+<h3><a name="preamble"></a>Preamble</h3>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
+
+<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
+
+<h4><a name="section0"></a>0. Definitions.</h4>
+
+<p>&quot;This License&quot; refers to version 3 of the GNU Affero General Public
+License.</p>
+
+<p>&quot;Copyright&quot; also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.</p>
+
+<p>&quot;The Program&quot; refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as &quot;you&quot;.  &quot;Licensees&quot; and
+&quot;recipients&quot; may be individuals or organizations.</p>
+
+<p>To &quot;modify&quot; 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 &quot;modified version&quot; of the
+earlier work or a work &quot;based on&quot; the earlier work.</p>
+
+<p>A &quot;covered work&quot; means either the unmodified Program or a work based
+on the Program.</p>
+
+<p>To &quot;propagate&quot; 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.</p>
+
+<p>To &quot;convey&quot; 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.</p>
+
+<p>An interactive user interface displays &quot;Appropriate Legal Notices&quot;
+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.</p>
+
+<h4><a name="section1"></a>1. Source Code.</h4>
+
+<p>The &quot;source code&quot; for a work means the preferred form of the work
+for making modifications to it.  &quot;Object code&quot; means any non-source
+form of a work.</p>
+
+<p>A &quot;Standard Interface&quot; 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.</p>
+
+<p>The &quot;System Libraries&quot; 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
+&quot;Major Component&quot;, 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.</p>
+
+<p>The &quot;Corresponding Source&quot; 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.</p>
+
+<p>The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that
+same work.</p>
+
+<h4><a name="section2"></a>2. Basic Permissions.</h4>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.</p>
+
+<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
+
+<p>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:</p>
+
+<ul>
+
+<li>a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.</li>
+
+<li>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
+    &quot;keep intact all notices&quot;.</li>
+
+<li>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.</li>
+
+<li>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.</li>
+
+</ul>
+
+<p>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
+&quot;aggregate&quot; 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.</p>
+
+<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
+
+<p>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:</p>
+
+<ul>
+
+<li>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.</li>
+
+<li>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.</li>
+
+<li>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.</li>
+
+<li>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.</li>
+
+<li>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.</li>
+
+</ul>
+
+<p>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.</p>
+
+<p>A &quot;User Product&quot; is either (1) a &quot;consumer product&quot;, 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, &quot;normally used&quot; 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.</p>
+
+<p>&quot;Installation Information&quot; 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.</p>
+
+<p>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).</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h4><a name="section7"></a>7. Additional Terms.</h4>
+
+<p>&quot;Additional permissions&quot; 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.</p>
+
+<p>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.</p>
+
+<p>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:</p>
+
+<ul>
+
+<li>a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or</li>
+
+<li>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</li>
+
+<li>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</li>
+
+<li>d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or</li>
+
+<li>e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or</li>
+
+<li>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.</li>
+
+</ul>
+
+<p>All other non-permissive additional terms are considered &quot;further
+restrictions&quot; 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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h4><a name="section8"></a>8. Termination.</h4>
+
+<p>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).</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
+
+<p>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.</p>
+
+<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
+
+<p>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.</p>
+
+<p>An &quot;entity transaction&quot; 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.</p>
+
+<p>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.</p>
+
+<h4><a name="section11"></a>11. Patents.</h4>
+
+<p>A &quot;contributor&quot; 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 &quot;contributor version&quot;.</p>
+
+<p>A contributor's &quot;essential patent claims&quot; 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, &quot;control&quot; includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
+
+<p>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.</p>
+
+<p>In the following three paragraphs, a &quot;patent license&quot; 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 &quot;grant&quot; such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
+
+<p>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.  &quot;Knowingly relying&quot; 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.</p>
+
+<p>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.</p>
+
+<p>A patent license is &quot;discriminatory&quot; 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.</p>
+
+<p>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.</p>
+
+<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
+
+<p>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.</p>
+
+<h4><a name="section13"></a>13. Remote Network Interaction; Use with the GNU General Public License.</h4>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
+
+<p>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.</p>
+
+<p>Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero
+General Public License &quot;or any later version&quot; 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.</p>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
+
+<p>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 &quot;AS IS&quot; 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.</p>
+
+<h4><a name="section16"></a>16. Limitation of Liability.</h4>
+
+<p>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.</p>
+
+<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
+
+<p>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.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>
+
+<h3><a name="howto"></a>How to Apply These Terms to Your New Programs</h3>
+
+<p>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.</p>
+
+<p>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 &quot;copyright&quot; line and a pointer to where the full notice is found.</p>
+
+<pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
+    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+    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 &lt;http://www.gnu.org/licenses/&gt;.
+</pre>
+
+<p>Also add information on how to contact you by electronic and paper mail.</p>
+
+<p>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 &quot;Source&quot; 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.</p>
+
+<p>You should also get your employer (if you work as a programmer) or school,
+if any, to sign a &quot;copyright disclaimer&quot; for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+&lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
+
+</body></html>
diff --git a/src/main/webapp/guac-web-lib/css/guacamole.css b/src/main/webapp/guac-web-lib/css/guacamole.css
new file mode 100644 (file)
index 0000000..471c2fb
--- /dev/null
@@ -0,0 +1,37 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+.guac-display.guac-loading {
+    border: 1px dotted gray;
+    background-image: url('../images/spinner92.gif');
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.guac-display.guac-error {
+    border: 1px dotted red;
+    background-image: url('../images/noimage92.png');
+    background-position: center;
+    background-repeat: no-repeat;
+}
+
+.guac-hide-cursor {
+    cursor: url('../images/mouse/dot.gif'),url('../images/mouse/blank.cur'),default;
+}
+
diff --git a/src/main/webapp/guac-web-lib/images/mouse/blank.cur b/src/main/webapp/guac-web-lib/images/mouse/blank.cur
new file mode 100644 (file)
index 0000000..dfcdea8
Binary files /dev/null and b/src/main/webapp/guac-web-lib/images/mouse/blank.cur differ
diff --git a/src/main/webapp/guac-web-lib/images/mouse/blank.gif b/src/main/webapp/guac-web-lib/images/mouse/blank.gif
new file mode 100644 (file)
index 0000000..ec5c17c
Binary files /dev/null and b/src/main/webapp/guac-web-lib/images/mouse/blank.gif differ
diff --git a/src/main/webapp/guac-web-lib/images/mouse/dot.gif b/src/main/webapp/guac-web-lib/images/mouse/dot.gif
new file mode 100644 (file)
index 0000000..9ac8a00
Binary files /dev/null and b/src/main/webapp/guac-web-lib/images/mouse/dot.gif differ
diff --git a/src/main/webapp/guac-web-lib/images/noimage92.png b/src/main/webapp/guac-web-lib/images/noimage92.png
new file mode 100644 (file)
index 0000000..657d85e
Binary files /dev/null and b/src/main/webapp/guac-web-lib/images/noimage92.png differ
diff --git a/src/main/webapp/guac-web-lib/images/spinner92.gif b/src/main/webapp/guac-web-lib/images/spinner92.gif
new file mode 100644 (file)
index 0000000..0dfe069
Binary files /dev/null and b/src/main/webapp/guac-web-lib/images/spinner92.gif differ
diff --git a/src/main/webapp/guac-web-lib/javascript/guacamole.js b/src/main/webapp/guac-web-lib/javascript/guacamole.js
new file mode 100644 (file)
index 0000000..020e88a
--- /dev/null
@@ -0,0 +1,601 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+function GuacamoleClient(display) {
+
+    var STATE_IDLE          = 0;
+    var STATE_CONNECTING    = 1;
+    var STATE_WAITING       = 2;
+    var STATE_CONNECTED     = 3;
+    var STATE_DISCONNECTING = 4;
+    var STATE_DISCONNECTED  = 5;
+
+    var currentState = STATE_IDLE;
+    var stateChangeHandler = null;
+
+    function setState(state) {
+        if (state != currentState) {
+            currentState = state;
+            if (stateChangeHandler)
+                stateChangeHandler(currentState);
+        }
+    }
+
+    this.setOnStateChangeHandler = function(handler) {
+        stateChangeHandler = handler;
+    }
+
+    function isConnected() {
+        return currentState == STATE_CONNECTED
+            || currentState == STATE_WAITING;
+    }
+
+    // Layers
+    var background = null;
+    var cursor = null;
+
+    var cursorImage = null;
+    var cursorHotspotX = 0;
+    var cursorHotspotY = 0;
+
+    // FIXME: Make object. Clean up.
+    var cursorRectX = 0;
+    var cursorRectY = 0;
+    var cursorRectW = 0;
+    var cursorRectH = 0;
+
+    var cursorHidden = 0;
+
+    function redrawCursor() {
+
+        // Hide hardware cursor
+        if (cursorHidden == 0) {
+            display.className += " guac-hide-cursor";
+            cursorHidden = 1;
+        }
+
+        // Erase old cursor
+        cursor.clearRect(cursorRectX, cursorRectY, cursorRectW, cursorRectH);
+
+        // Update rect
+        cursorRectX = mouse.getX() - cursorHotspotX;
+        cursorRectY = mouse.getY() - cursorHotspotY;
+        cursorRectW = cursorImage.width;
+        cursorRectH = cursorImage.height;
+
+        // Draw new cursor
+        cursor.drawImage(cursorRectX, cursorRectY, cursorImage);
+    }
+
+
+
+
+       /*****************************************/
+       /*** Keyboard                          ***/
+       /*****************************************/
+
+    var keyboard = new GuacamoleKeyboard(document);
+
+    this.disableKeyboard = function() {
+        keyboard.setKeyPressedHandler(null);
+        keyboard.setKeyReleasedHandler(null);
+    };
+
+    this.enableKeyboard = function() {
+        keyboard.setKeyPressedHandler(
+            function (keysym) {
+                sendKeyEvent(1, keysym);
+            }
+        );
+
+        keyboard.setKeyReleasedHandler(
+            function (keysym) {
+                sendKeyEvent(0, keysym);
+            }
+        );
+    };
+
+    // Enable keyboard by default
+    this.enableKeyboard();
+
+    function sendKeyEvent(pressed, keysym) {
+        // Do not send requests if not connected
+        if (!isConnected())
+            return;
+
+        sendMessage("key:" +  keysym + "," + pressed + ";");
+    }
+
+    this.pressKey = function(keysym) {
+        sendKeyEvent(1, keysym);
+    };
+
+    this.releaseKey = function(keysym) {
+        sendKeyEvent(0, keysym);
+    };
+
+
+       /*****************************************/
+       /*** Mouse                             ***/
+       /*****************************************/
+
+    var mouse = new GuacamoleMouse(display);
+    mouse.setButtonPressedHandler(
+        function(mouseState) {
+            sendMouseState(mouseState);
+        }
+    );
+
+    mouse.setButtonReleasedHandler(
+        function(mouseState) {
+            sendMouseState(mouseState);
+        }
+    );
+
+    mouse.setMovementHandler(
+        function(mouseState) {
+
+            // Draw client-side cursor
+            if (cursorImage != null) {
+                redrawCursor();
+            }
+
+            sendMouseState(mouseState);
+        }
+    );
+
+
+    function sendMouseState(mouseState) {
+
+        // Do not send requests if not connected
+        if (!isConnected())
+            return;
+
+        // Build mask
+        var buttonMask = 0;
+        if (mouseState.getLeft())   buttonMask |= 1;
+        if (mouseState.getMiddle()) buttonMask |= 2;
+        if (mouseState.getRight())  buttonMask |= 4;
+        if (mouseState.getUp())     buttonMask |= 8;
+        if (mouseState.getDown())   buttonMask |= 16;
+
+        // Send message
+        sendMessage("mouse:" + mouseState.getX() + "," + mouseState.getY() + "," + buttonMask + ";");
+    }
+
+    var sendingMessages = 0;
+    var outputMessageBuffer = "";
+
+    function sendMessage(message) {
+
+        // Add event to queue, restart send loop if finished.
+        outputMessageBuffer += message;
+        if (sendingMessages == 0)
+            sendPendingMessages();
+
+    }
+
+    function sendPendingMessages() {
+
+        if (outputMessageBuffer.length > 0) {
+
+            sendingMessages = 1;
+
+            var message_xmlhttprequest = new XMLHttpRequest();
+            message_xmlhttprequest.open("POST", "inbound");
+            message_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+            message_xmlhttprequest.setRequestHeader("Content-length", outputMessageBuffer.length);
+
+            // Once response received, send next queued event.
+            message_xmlhttprequest.onreadystatechange = function() {
+                if (message_xmlhttprequest.readyState == 4)
+                    sendPendingMessages();
+            }
+
+            message_xmlhttprequest.send(outputMessageBuffer);
+            outputMessageBuffer = ""; // Clear buffer
+
+        }
+        else
+            sendingMessages = 0;
+
+    }
+
+
+       /*****************************************/
+       /*** Clipboard                         ***/
+       /*****************************************/
+
+    this.setClipboard = function(data) {
+
+        // Do not send requests if not connected
+        if (!isConnected())
+            return;
+
+        sendMessage("clipboard:" + escapeGuacamoleString(data) + ";");
+    }
+
+
+    function desaturateFilter(data, width, height) {
+
+        for (var i=0; i<data.length; i+=4) {
+
+            // Get RGB values
+            var r = data[i];
+            var g = data[i+1];
+            var b = data[i+2];
+
+            // Desaturate
+            var v = Math.max(r, g, b) / 2;
+            data[i]   = v;
+            data[i+1] = v;
+            data[i+2] = v;
+
+        }
+
+    }
+
+
+    var errorHandler = null;
+    this.setErrorHandler = function(handler) {
+        errorHandler = handler;
+    };
+
+    var errorEncountered = 0;
+    function showError(error) {
+        // Only display first error (avoid infinite error loops)
+        if (errorEncountered == 0) {
+            errorEncountered = 1;
+
+            disconnect();
+
+            // In case nothing has been rendered yet, use error style
+            display.className += " guac-error";
+
+            // Show error by desaturating display
+            if (background)
+                background.filter(desaturateFilter);
+
+            if (errorHandler)
+                errorHandler(error);
+        }
+    }
+
+    function handleErrors(message) {
+        var errors = message.getErrors();
+        for (var errorIndex=0; errorIndex<errors.length; errorIndex++)
+            showError(errors[errorIndex].getMessage());
+    }
+
+    var clipboardHandler = null;
+    var requests = 0;
+
+    this.setClipboardHandler = function(handler) {
+        clipboardHandler = handler;
+    };
+
+
+    function handleResponse(xmlhttprequest) {
+
+        var nextRequest = null;
+
+        var instructionStart = 0;
+        var startIndex = 0;
+
+        function parseResponse() {
+
+            // Start next request as soon as possible
+            if (xmlhttprequest.readyState >= 2 && nextRequest == null)
+                nextRequest = makeRequest();
+
+            // Parse stream when data is received and when complete.
+            if (xmlhttprequest.readyState == 3 ||
+                xmlhttprequest.readyState == 4) {
+
+                // Halt on error during request
+                if (xmlhttprequest.status == 0) {
+                    showError("Request canceled by browser.");
+                    return;
+                }
+                else if (xmlhttprequest.status != 200) {
+                    showError("Error during request (HTTP " + xmlhttprequest.status + "): " + xmlhttprequest.statusText);
+                    return;
+                }
+
+                var current = xmlhttprequest.responseText;
+                var instructionEnd;
+                
+                while ((instructionEnd = current.indexOf(";", startIndex)) != -1) {
+
+                    // Start next search at next instruction
+                    startIndex = instructionEnd+1;
+
+                    var instruction = current.substr(instructionStart,
+                            instructionEnd - instructionStart);
+
+                    instructionStart = startIndex;
+
+                    var opcodeEnd = instruction.indexOf(":");
+
+                    var opcode;
+                    var parameters;
+                    if (opcodeEnd == -1) {
+                        opcode = instruction;
+                        parameters = new Array();
+                    }
+                    else {
+                        opcode = instruction.substr(0, opcodeEnd);
+                        parameters = instruction.substr(opcodeEnd+1).split(",");
+                    }
+
+                    // If we're done parsing, handle the next response.
+                    if (opcode.length == 0) {
+
+                        if (isConnected()) {
+                            delete xmlhttprequest;
+                            if (nextRequest)
+                                handleResponse(nextRequest);
+                        }
+
+                        break;
+                    }
+
+                    // Call instruction handler.
+                    doInstruction(opcode, parameters);
+                }
+
+                // Start search at end of string.
+                startIndex = current.length;
+
+                delete instruction;
+                delete parameters;
+
+            }
+
+        }
+
+        xmlhttprequest.onreadystatechange = parseResponse;
+        parseResponse();
+
+    }
+
+
+    function makeRequest() {
+
+        // Download self
+        var xmlhttprequest = new XMLHttpRequest();
+        xmlhttprequest.open("POST", "outbound");
+        xmlhttprequest.send(null); 
+
+        return xmlhttprequest;
+
+    }
+
+    function escapeGuacamoleString(str) {
+
+        var escapedString = "";
+
+        for (var i=0; i<str.length; i++) {
+
+            var c = str.charAt(i);
+            if (c == ",")
+                escapedString += "\\c";
+            else if (c == ";")
+                escapedString += "\\s";
+            else if (c == "\\")
+                escapedString += "\\\\";
+            else
+                escapedString += c;
+
+        }
+
+        return escapedString;
+
+    }
+
+    function unescapeGuacamoleString(str) {
+
+        var unescapedString = "";
+
+        for (var i=0; i<str.length; i++) {
+
+            var c = str.charAt(i);
+            if (c == "\\" && i<str.length-1) {
+
+                var escapeChar = str.charAt(++i);
+                if (escapeChar == "c")
+                    unescapedString += ",";
+                else if (escapeChar == "s")
+                    unescapedString += ";";
+                else if (escapeChar == "\\")
+                    unescapedString += "\\";
+                else
+                    unescapedString += "\\" + escapeChar;
+
+            }
+            else
+                unescapedString += c;
+
+        }
+
+        return unescapedString;
+
+    }
+
+    var instructionHandlers = {
+
+        "error": function(parameters) {
+            showError(unescapeGuacamoleString(parameters[0]));
+        },
+
+        "name": function(parameters) {
+            document.title = unescapeGuacamoleString(parameters[0]);
+        },
+
+        "clipboard": function(parameters) {
+            clipboardHandler(unescapeGuacamoleString(parameters[0]));
+        },
+
+        "size": function(parameters) {
+
+            var width = parseInt(parameters[0]);
+            var height = parseInt(parameters[1]);
+
+            // Update (set) display size
+            if (display && (background == null || cursor == null)) {
+                display.style.width = width + "px";
+                display.style.height = height + "px";
+
+                background = new Layer(width, height);
+                cursor = new Layer(width, height);
+
+                display.appendChild(background);
+                display.appendChild(cursor);
+            }
+
+        },
+
+        "rect": function(parameters) {
+
+            var x = parseInt(parameters[0]);
+            var y = parseInt(parameters[1]);
+            var w = parseInt(parameters[2]);
+            var h = parseInt(parameters[3]);
+            var color = parameters[4];
+
+            background.drawRect(
+                x,
+                y,
+                w,
+                h,
+                color
+            );
+
+        },
+
+        "png": function(parameters) {
+
+            var x = parseInt(parameters[0]);
+            var y = parseInt(parameters[1]);
+            var data = parameters[2];
+
+            background.draw(
+                x,
+                y,
+                "data:image/png;base64," + data
+            );
+
+            // If received first update, no longer waiting.
+            if (currentState == STATE_WAITING)
+                setState(STATE_CONNECTED);
+
+        },
+
+        "copy": function(parameters) {
+
+            var srcX = parseInt(parameters[0]);
+            var srcY = parseInt(parameters[1]);
+            var srcWidth = parseInt(parameters[2]);
+            var srcHeight = parseInt(parameters[3]);
+            var dstX = parseInt(parameters[4]);
+            var dstY = parseInt(parameters[5]);
+
+            background.copyRect(
+                srcX,
+                srcY,
+                srcWidth, 
+                srcHeight, 
+                dstX,
+                dstY 
+            );
+
+        },
+
+        "cursor": function(parameters) {
+
+            var x = parseInt(parameters[0]);
+            var y = parseInt(parameters[1]);
+            var data = parameters[2];
+
+            // Start cursor image load
+            var image = new Image();
+            image.onload = function() {
+                cursorImage = image;
+                cursorHotspotX = x;
+                cursorHotspotY = y;
+                redrawCursor();
+            };
+            image.src = "data:image/png;base64," + data
+
+        }
+      
+    };
+
+
+    function doInstruction(opcode, parameters) {
+
+        var handler = instructionHandlers[opcode];
+        if (handler)
+            handler(parameters);
+
+    }
+        
+
+    this.connect = function() {
+
+        setState(STATE_CONNECTING);
+
+        // Start tunnel and connect synchronously
+        var connect_xmlhttprequest = new XMLHttpRequest();
+        connect_xmlhttprequest.open("POST", "connect", false);
+        connect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        connect_xmlhttprequest.setRequestHeader("Content-length", 0);
+        connect_xmlhttprequest.send(null);
+
+        // Start reading data
+        setState(STATE_WAITING);
+        handleResponse(makeRequest());
+
+    };
+
+    
+    function disconnect() {
+
+        // Only attempt disconnection not disconnected.
+        if (currentState != STATE_DISCONNECTED
+                && currentState != STATE_DISCONNECTING) {
+
+            var message = "disconnect;";
+            setState(STATE_DISCONNECTING);
+
+            // Send disconnect message (synchronously... as necessary until handoff is implemented)
+            var disconnect_xmlhttprequest = new XMLHttpRequest();
+            disconnect_xmlhttprequest.open("POST", "inbound", false);
+            disconnect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+            disconnect_xmlhttprequest.setRequestHeader("Content-length", message.length);
+            disconnect_xmlhttprequest.send(message);
+
+            setState(STATE_DISCONNECTED);
+        }
+
+    }
+
+    this.disconnect = disconnect;
+
+}
diff --git a/src/main/webapp/guac-web-lib/javascript/keyboard.js b/src/main/webapp/guac-web-lib/javascript/keyboard.js
new file mode 100644 (file)
index 0000000..b5e6e93
--- /dev/null
@@ -0,0 +1,270 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+function GuacamoleKeyboard(element) {
+
+       /*****************************************/
+       /*** Keyboard Handler                  ***/
+       /*****************************************/
+
+       // Single key state/modifier buffer
+       var modShift = 0;
+       var modCtrl = 0;
+       var modAlt = 0;
+
+    var keydownChar = new Array();
+
+
+    // ID of routine repeating keystrokes. -1 = not repeating.
+    var repeatKeyTimeoutId = -1;
+    var repeatKeyIntervalId = -1;
+
+       // Starts repeating keystrokes
+       function startRepeat(keySym) {
+               repeatKeyIntervalId = setInterval(function() {
+            sendKeyReleased(keySym);
+            sendKeyPressed(keySym);
+        }, 50);
+       }
+
+       // Stops repeating keystrokes
+       function stopRepeat() {
+               if (repeatKeyTimeoutId != -1) clearInterval(repeatKeyTimeoutId);
+               if (repeatKeyIntervalId != -1) clearInterval(repeatKeyIntervalId);
+       }
+
+
+    function getKeySymFromKeyIdentifier(shifted, keyIdentifier) {
+
+            var unicodePrefixLocation = keyIdentifier.indexOf("U+");
+            if (unicodePrefixLocation >= 0) {
+
+                var hex = keyIdentifier.substring(unicodePrefixLocation+2);
+                var codepoint = parseInt(hex, 16);
+                var typedCharacter;
+
+                // Convert case if shifted
+                if (shifted == 0)
+                    typedCharacter = String.fromCharCode(codepoint).toLowerCase();
+                else
+                    typedCharacter = String.fromCharCode(codepoint).toUpperCase();
+
+                // Get codepoint
+                codepoint = typedCharacter.charCodeAt(0);
+
+                return getKeySymFromCharCode(codepoint);
+
+            }
+
+            return null;
+
+    }
+
+    function getKeySymFromCharCode(keyCode) {
+
+        if (keyCode >= 0x0000 && keyCode <= 0x00FF)
+            return keyCode;
+
+        if (keyCode >= 0x0100 && keyCode <= 0x10FFFF)
+            return 0x01000000 | keyCode;
+
+        return null;
+
+    }
+
+    function getKeySymFromKeyCode(keyCode) {
+
+        var keysym = null;
+               if (modShift == 0) keysym = unshiftedKeySym[keyCode];
+               else {
+            keysym = shiftedKeySym[keyCode];
+            if (keysym == null) keysym = unshiftedKeySym[keyCode];
+        }
+
+        return keysym;
+
+    }
+
+
+       // Sends a single keystroke over the network
+       function sendKeyPressed(keysym) {
+               if (keysym != null && keyPressedHandler)
+                       keyPressedHandler(keysym);
+       }
+
+       // Sends a single keystroke over the network
+       function sendKeyReleased(keysym) {
+               if (keysym != null)
+                       keyReleasedHandler(keysym);
+       }
+
+
+    var KEYDOWN = 1;
+    var KEYPRESS = 2;
+
+    var keySymSource = null;
+
+       // When key pressed
+    var keydownCode = null;
+       element.onkeydown = function(e) {
+
+        // Only intercept if handler set
+        if (!keyPressedHandler) return true;
+
+               var keynum;
+               if (window.event) keynum = window.event.keyCode;
+               else if (e.which) keynum = e.which;
+
+               // Ctrl/Alt/Shift
+               if (keynum == 16)
+                       modShift = 1;
+               else if (keynum == 17)
+                       modCtrl = 1;
+               else if (keynum == 18)
+                       modAlt = 1;
+
+        var keysym = getKeySymFromKeyCode(keynum);
+        if (keysym) {
+            // Get keysyms and events from KEYDOWN
+            keySymSource = KEYDOWN;
+        }
+
+        // If modifier keys are held down, and we have keyIdentifier
+        else if ((modCtrl == 1 || modAlt == 1) && e.keyIdentifier) {
+
+            // Get keysym from keyIdentifier
+            keysym = getKeySymFromKeyIdentifier(modShift, e.keyIdentifier);
+
+            // Get keysyms and events from KEYDOWN
+            keySymSource = KEYDOWN;
+
+        }
+
+        else
+            // Get keysyms and events from KEYPRESS
+            keySymSource = KEYPRESS;
+
+        keydownCode = keynum;
+
+        // Ignore key if we don't need to use KEYPRESS.
+        // Send key event here
+        if (keySymSource == KEYDOWN) {
+
+            if (keydownChar[keynum] != keysym) {
+
+                // Send event
+                keydownChar[keynum] = keysym;
+                sendKeyPressed(keysym);
+
+                // Clear old key repeat, if any.
+                stopRepeat();
+
+                // Start repeating (if not a modifier key) after a short delay
+                if (keynum != 16 && keynum != 17 && keynum != 18)
+                    repeatKeyTimeoutId = setTimeout(function() { startRepeat(keysym); }, 500);
+            }
+
+            return false;
+        }
+
+       };
+
+       // When key pressed
+    element.onkeypress = function(e) {
+
+        // Only intercept if handler set
+        if (!keyPressedHandler) return true;
+
+        if (keySymSource != KEYPRESS) return false;
+
+               var keynum;
+               if (window.event) keynum = window.event.keyCode;
+               else if (e.which) keynum = e.which;
+
+        var keysym = getKeySymFromCharCode(keynum);
+        if (keysym && keydownChar[keynum] != keysym) {
+
+            // If this button already pressed, release first
+            var lastKeyDownChar = keydownChar[keydownCode];
+            if (lastKeyDownChar)
+                sendKeyReleased(lastKeyDownChar);
+
+            keydownChar[keydownCode] = keysym;
+
+            // Clear old key repeat, if any.
+            stopRepeat();
+
+            // Send key event
+            sendKeyPressed(keysym);
+
+            // Start repeating (if not a modifier key) after a short delay
+            repeatKeyTimeoutId = setTimeout(function() { startRepeat(keysym); }, 500);
+        }
+
+        return false;
+       };
+
+       // When key released
+       element.onkeyup = function(e) {
+
+        // Only intercept if handler set
+        if (!keyReleasedHandler) return true;
+
+               var keynum;
+               if (window.event) keynum = window.event.keyCode;
+               else if (e.which) keynum = e.which;
+               
+               // Ctrl/Alt/Shift
+               if (keynum == 16)
+                       modShift = 0;
+               else if (keynum == 17)
+                       modCtrl = 0;
+               else if (keynum == 18)
+                       modAlt = 0;
+        else
+            stopRepeat();
+
+        // Get corresponding character
+        var lastKeyDownChar = keydownChar[keynum];
+
+        // Clear character record
+        keydownChar[keynum] = null;
+
+        // Send release event
+        sendKeyReleased(lastKeyDownChar);
+
+               return false;
+       };
+
+       // When focus is lost, clear modifiers.
+       var docOnblur = element.onblur;
+       element.onblur = function() {
+               modAlt = 0;
+               modCtrl = 0;
+               modShift = 0;
+               if (docOnblur != null) docOnblur();
+       };
+
+       var keyPressedHandler = null;
+       var keyReleasedHandler = null;
+
+       this.setKeyPressedHandler = function(kh) { keyPressedHandler = kh; };
+       this.setKeyReleasedHandler = function(kh) { keyReleasedHandler = kh; };
+
+}
diff --git a/src/main/webapp/guac-web-lib/javascript/keymap.js b/src/main/webapp/guac-web-lib/javascript/keymap.js
new file mode 100644 (file)
index 0000000..016bf59
--- /dev/null
@@ -0,0 +1,72 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+
+// Keymap
+
+var unshiftedKeySym = new Array();
+unshiftedKeySym[8]   = 0xFF08; // backspace
+unshiftedKeySym[9]   = 0xFF09; // tab
+unshiftedKeySym[13]  = 0xFF0D; // enter
+unshiftedKeySym[16]  = 0xFFE1; // shift
+unshiftedKeySym[17]  = 0xFFE3; // ctrl
+unshiftedKeySym[18]  = 0xFFE9; // alt
+unshiftedKeySym[19]  = 0xFF13; // pause/break
+unshiftedKeySym[20]  = 0xFFE5; // caps lock
+unshiftedKeySym[27]  = 0xFF1B; // escape
+unshiftedKeySym[33]  = 0xFF55; // page up
+unshiftedKeySym[34]  = 0xFF56; // page down
+unshiftedKeySym[35]  = 0xFF57; // end
+unshiftedKeySym[36]  = 0xFF50; // home
+unshiftedKeySym[37]  = 0xFF51; // left arrow
+unshiftedKeySym[38]  = 0xFF52; // up arrow
+unshiftedKeySym[39]  = 0xFF53; // right arrow
+unshiftedKeySym[40]  = 0xFF54; // down arrow
+unshiftedKeySym[45]  = 0xFF63; // insert
+unshiftedKeySym[46]  = 0xFFFF; // delete
+unshiftedKeySym[91]  = 0xFFEB; // left window key (super_l)
+unshiftedKeySym[92]  = 0xFF67; // right window key (menu key?)
+unshiftedKeySym[93]  = null; // select key
+unshiftedKeySym[112] = 0xFFBE; // f1
+unshiftedKeySym[113] = 0xFFBF; // f2
+unshiftedKeySym[114] = 0xFFC0; // f3
+unshiftedKeySym[115] = 0xFFC1; // f4
+unshiftedKeySym[116] = 0xFFC2; // f5
+unshiftedKeySym[117] = 0xFFC3; // f6
+unshiftedKeySym[118] = 0xFFC4; // f7
+unshiftedKeySym[119] = 0xFFC5; // f8
+unshiftedKeySym[120] = 0xFFC6; // f9
+unshiftedKeySym[121] = 0xFFC7; // f10
+unshiftedKeySym[122] = 0xFFC8; // f11
+unshiftedKeySym[123] = 0xFFC9; // f12
+unshiftedKeySym[144] = 0xFF7F; // num lock
+unshiftedKeySym[145] = 0xFF14; // scroll lock
+
+// Shifted versions, IF DIFFERENT FROM UNSHIFTED!
+// If any of these are null, the unshifted one will be used.
+var shiftedKeySym  = new Array();
+shiftedKeySym[18]  = 0xFFE7; // alt
+
+// Constants for keysyms for special keys
+var KEYSYM_CTRL = 65507;
+var KEYSYM_ALT = 65513;
+var KEYSYM_DELETE = 65535;
+var KEYSYM_SHIFT = 65505;
+
+
diff --git a/src/main/webapp/guac-web-lib/javascript/layer.js b/src/main/webapp/guac-web-lib/javascript/layer.js
new file mode 100644 (file)
index 0000000..79080fe
--- /dev/null
@@ -0,0 +1,128 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+function Layer(width, height) {
+
+    // Off-screen buffer
+    var display = document.createElement("canvas");
+
+    display.style.position = "absolute";
+    display.style.left = "0px";
+    display.style.right = "0px";
+
+    display.width = width;
+    display.height = height;
+
+    var displayContext = display.getContext("2d");
+
+    var nextUpdateToDraw = 0;
+    var currentUpdate = 0;
+    var updates = new Array();
+
+    // Given an update ID, either call the provided update callback, or
+    // schedule the update for later.
+    function setUpdate(updateId, update) {
+
+        // If this update is the next to draw...
+        if (updateId == nextUpdateToDraw) {
+
+            // Call provided update handler.
+            update();
+
+            // Draw all pending updates.
+            var updateCallback;
+            while (updateCallback = updates[++nextUpdateToDraw]) {
+                updateCallback();
+                delete updates[nextUpdateToDraw];
+            }
+
+        }
+
+        // If not next to draw, set callback and wait.
+        else
+            updates[updateId] = update;
+
+    }
+
+    display.drawImage = function(x, y, image) {
+        var updateId = currentUpdate++;
+
+        setUpdate(updateId, function() {
+            displayContext.drawImage(image, x, y);
+        });
+
+    }
+
+
+    display.draw = function(x, y, url) {
+        var updateId = currentUpdate++;
+
+        var image = new Image();
+        image.onload = function() {
+            setUpdate(updateId, function() {
+                displayContext.drawImage(image, x, y);
+            });
+        };
+        image.src = url;
+    };
+
+
+    display.copyRect = function(srcx, srcy, w, h, x, y) {
+        var updateId = currentUpdate++;
+    
+        setUpdate(updateId, function() {
+            displayContext.drawImage(display, srcx, srcy, w, h, x, y, w, h);
+        });
+
+    };
+
+    display.drawRect = function(x, y, w, h, color) {
+        var updateId = currentUpdate++;
+
+        setUpdate(updateId, function() {
+            displayContext.fillStyle = color;
+            displayContext.fillRect(x, y, w, h);
+        });
+
+    };
+
+    display.clearRect = function(x, y, w, h) {
+        var updateId = currentUpdate++;
+
+        setUpdate(updateId, function() {
+            displayContext.clearRect(x, y, w, h);
+        });
+
+    };
+
+    display.filter = function(filter) {
+        var updateId = currentUpdate++;
+
+        setUpdate(updateId, function() {
+            var imageData = displayContext.getImageData(0, 0, width, height);
+            filter(imageData.data, width, height);
+            displayContext.putImageData(imageData, 0, 0);
+        });
+
+    };
+
+    return display;
+
+}
+
diff --git a/src/main/webapp/guac-web-lib/javascript/mouse.js b/src/main/webapp/guac-web-lib/javascript/mouse.js
new file mode 100644 (file)
index 0000000..3a1234a
--- /dev/null
@@ -0,0 +1,205 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+
+function GuacamoleMouse(element) {
+
+       /*****************************************/
+       /*** Mouse Handler                     ***/
+       /*****************************************/
+
+
+    var mouseIndex = 0;
+
+    var mouseLeftButton   = 0;
+    var mouseMiddleButton = 0;
+    var mouseRightButton  = 0;
+
+    var mouseX = 0;
+    var mouseY = 0;
+
+    var absoluteMouseX = 0;
+    var absoluteMouseY = 0;
+
+
+    function getMouseState(up, down) {
+        var mouseState = new MouseEvent(mouseX, mouseY,
+                mouseLeftButton, mouseMiddleButton, mouseRightButton, up, down);
+
+        return mouseState;
+    }
+
+
+    // Block context menu so right-click gets sent properly
+    element.oncontextmenu = function(e) {return false;};
+
+    element.onmousemove = function(e) {
+
+        e.stopPropagation();
+
+        absoluteMouseX = e.pageX;
+        absoluteMouseY = e.pageY;
+
+        mouseX = absoluteMouseX - element.offsetLeft;
+        mouseY = absoluteMouseY - element.offsetTop;
+
+        // This is all JUST so we can get the mouse position within the element
+        var parent = element.offsetParent;
+        while (parent) {
+            if (parent.offsetLeft && parent.offsetTop) {
+                mouseX -= parent.offsetLeft;
+                mouseY -= parent.offsetTop;
+            }
+            parent = parent.offsetParent;
+        }
+
+        movementHandler(getMouseState(0, 0));
+    };
+
+
+    element.onmousedown = function(e) {
+
+        e.stopPropagation();
+
+        switch (e.button) {
+            case 0:
+                mouseLeftButton = 1;
+                break;
+            case 1:
+                mouseMiddleButton = 1;
+                break;
+            case 2:
+                mouseRightButton = 1;
+                break;
+        }
+
+        buttonPressedHandler(getMouseState(0, 0));
+    };
+
+
+    element.onmouseup = function(e) {
+
+        e.stopPropagation();
+
+        switch (e.button) {
+            case 0:
+                mouseLeftButton = 0;
+                break;
+            case 1:
+                mouseMiddleButton = 0;
+                break;
+            case 2:
+                mouseRightButton = 0;
+                break;
+        }
+
+        buttonReleasedHandler(getMouseState(0, 0));
+    };
+
+    // Override selection on mouse event element.
+    element.onselectstart = function() {
+        return false;
+    };
+
+    // Scroll wheel support
+    function handleScroll(e) {
+
+        var delta = 0;
+        if (e.detail)
+            delta = e.detail;
+        else if (e.wheelDelta)
+            delta = -event.wheelDelta;
+
+        // Up
+        if (delta < 0) {
+            buttonPressedHandler(getMouseState(1, 0));
+            buttonReleasedHandler(getMouseState(0, 0));
+        }
+
+        // Down
+        if (delta > 0) {
+            buttonPressedHandler(getMouseState(0, 1));
+            buttonReleasedHandler(getMouseState(0, 0));
+        }
+
+        if (e.preventDefault)
+            e.preventDefault();
+
+        e.returnValue = false;
+    }
+
+    element.addEventListener('DOMMouseScroll', handleScroll, false);
+
+    element.onmousewheel = function(e) {
+        handleScroll(e);
+    }
+
+    function MouseEvent(x, y, left, middle, right, up, down) {
+
+        this.getX = function() {
+            return x;
+        };
+
+        this.getY = function() {
+            return y;
+        };
+
+        this.getLeft = function() {
+            return left;
+        };
+
+        this.getMiddle = function() {
+            return middle;
+        };
+
+        this.getRight = function() {
+            return right;
+        };
+
+        this.getUp = function() {
+            return up;
+        };
+
+        this.getDown = function() {
+            return down;
+        };
+
+        this.toString = function() {
+            return (mouseIndex++) + "," + x + "," + y + "," + left + "," + middle + "," + right + "," + up + "," + down;
+        };
+
+    }
+
+
+       var buttonPressedHandler = null;
+       var buttonReleasedHandler = null;
+       var movementHandler = null;
+
+       this.setButtonPressedHandler  = function(mh) {buttonPressedHandler = mh;};
+       this.setButtonReleasedHandler = function(mh) {buttonReleasedHandler = mh;};
+       this.setMovementHandler = function(mh) {movementHandler = mh;};
+
+
+    this.getX = function() {return mouseX;};
+    this.getY = function() {return mouseY;};
+    this.getLeftButton = function() {return mouseLeftButton;};
+    this.getMiddleButton = function() {return mouseMiddleButton;};
+    this.getRightButton = function() {return mouseRightButton;};
+
+}
diff --git a/src/main/webapp/guac-web-lib/javascript/oskeyboard.js b/src/main/webapp/guac-web-lib/javascript/oskeyboard.js
new file mode 100644 (file)
index 0000000..872bac2
--- /dev/null
@@ -0,0 +1,487 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+
+function GuacamoleOnScreenKeyboard(url) {
+
+    var tabIndex = 1;
+    var allKeys = new Array();
+    var modifierState = new function() {};
+
+    function getKeySize(size) {
+        return (5*size) + "ex";
+    }
+
+    function getCapSize(size) {
+        return (5*size - 0.5) + "ex";
+    }
+
+    function clearModifiers() {
+
+        // Send key release events for all pressed modifiers
+        for (var k=0; k<allKeys.length; k++) {
+
+            var key = allKeys[k];
+            var cap = key.getCap();
+            var modifier = cap.getModifier();
+
+            if (modifier && isModifierActive(modifier) && !cap.isSticky() && key.isPressed())
+                key.release();
+
+        }
+
+    }
+
+    function setModifierReleased(modifier) {
+        if (isModifierActive(modifier))
+            modifierState[modifier]--;
+    }
+
+    function setModifierPressed(modifier) {
+        if (modifierState[modifier] == null)
+            modifierState[modifier] = 1;
+        else
+            modifierState[modifier]++;
+    }
+
+    function isModifierActive(modifier) {
+        if (modifierState[modifier] > 0)
+            return true;
+
+        return false;
+    }
+
+    function toggleModifierPressed(modifier) {
+        if (isModifierActive(modifier))
+            setModifierReleased(modifier);
+        else
+            setModifierPressed(modifier);
+    }
+
+    function refreshAllKeysState() {
+        for (var k=0; k<allKeys.length; k++)
+            allKeys[k].refreshState();
+    }
+
+    function Key(key) {
+
+        function Cap(cap) {
+
+            // Displayed text
+            var displayText = cap.textContent;
+            
+            // Keysym
+            var keysym = null;
+            if (cap.attributes["keysym"])
+                keysym = parseInt(cap.attributes["keysym"].value);
+
+            // If keysym not specified, get keysym from display text.
+            else if (displayText.length == 1) {
+
+                var charCode = displayText.charCodeAt(0);
+
+                if (charCode >= 0x0000 && charCode <= 0x00FF)
+                    keysym = charCode;
+
+                else if (charCode >= 0x0100 && charCode <= 0x10FFFF)
+                    keysym = 0x01000000 | charCode;
+            }
+
+            // Required modifiers for this keycap
+            var reqMod = null;
+            if (cap.attributes["if"])
+                reqMod = cap.attributes["if"].value.split(",");
+
+
+            // Modifier represented by this keycap
+            var modifier = null;
+            if (cap.attributes["modifier"])
+                modifier = cap.attributes["modifier"].value;
+            
+
+            // Whether this key is sticky (toggles)
+            // Currently only valid for modifiers.
+            var sticky = false;
+            if (cap.attributes["sticky"] && cap.attributes["sticky"].value == "true")
+                sticky = true;
+
+            this.getDisplayText = function() {
+                return cap.textContent;
+            };
+
+            this.getKeySym = function() {
+                return keysym;
+            };
+
+            this.getRequiredModifiers = function() {
+                return reqMod;
+            };
+
+            this.getModifier = function() {
+                return modifier;
+            };
+
+            this.isSticky = function() {
+                return sticky;
+            };
+
+        }
+
+        var size = null;
+        if (key.attributes["size"])
+            size = parseFloat(key.attributes["size"].value);
+
+        var caps = key.getElementsByTagName("cap");
+        var keycaps = new Array();
+        for (var i=0; i<caps.length; i++)
+            keycaps.push(new Cap(caps[i]));
+
+        var rowKey = document.createElement("div");
+        rowKey.className = "key";
+
+        var keyCap = document.createElement("div");
+        keyCap.className = "cap";
+        rowKey.appendChild(keyCap);
+
+
+        var STATE_RELEASED = 0;
+        var STATE_PRESSED = 1;
+        var state = STATE_RELEASED;
+
+        rowKey.isPressed = function() {
+            return state == STATE_PRESSED;
+        }
+
+        var currentCap = null;
+        function refreshState(modifier) {
+
+            // Find current cap
+            currentCap = null;
+            for (var j=0; j<keycaps.length; j++) {
+
+                var keycap = keycaps[j];
+                var required = keycap.getRequiredModifiers();
+
+                var matches = true;
+
+                // If modifiers required, make sure all modifiers are active
+                if (required) {
+
+                    for (var k=0; k<required.length; k++) {
+                        if (!isModifierActive(required[k])) {
+                            matches = false;
+                            break;
+                        }
+                    }
+
+                }
+
+                if (matches)
+                    currentCap = keycap;
+
+            }
+
+            rowKey.className = "key";
+
+            if (currentCap.getModifier())
+                rowKey.className += " modifier";
+
+            if (currentCap.isSticky())
+                rowKey.className += " sticky";
+
+            if (isModifierActive(currentCap.getModifier()))
+                rowKey.className += " active";
+
+            if (state == STATE_PRESSED)
+                rowKey.className += " pressed";
+
+            keyCap.textContent = currentCap.getDisplayText();
+        }
+        rowKey.refreshState = refreshState;
+
+        rowKey.getCap = function() {
+            return currentCap;
+        };
+
+        refreshState();
+
+        // Set size
+        if (size) {
+            rowKey.style.width = getKeySize(size);
+            keyCap.style.width = getCapSize(size);
+        }
+
+
+
+        // Set pressed, if released
+        function press() {
+
+            if (state == STATE_RELEASED) {
+
+                state = STATE_PRESSED;
+
+                var keysym = currentCap.getKeySym();
+                var modifier = currentCap.getModifier();
+                var sticky = currentCap.isSticky();
+
+                if (keyPressedHandler && keysym)
+                    keyPressedHandler(keysym);
+
+                if (modifier) {
+
+                    // If sticky modifier, toggle
+                    if (sticky) 
+                        toggleModifierPressed(modifier);
+
+                    // Otherwise, just set on.
+                    else 
+                        setModifierPressed(modifier);
+
+                    refreshAllKeysState();
+                }
+                else
+                    refreshState();
+            }
+
+        }
+        rowKey.press = press;
+
+
+        // Set released, if pressed 
+        function release() {
+
+            if (state == STATE_PRESSED) {
+
+                state = STATE_RELEASED;
+
+                var keysym = currentCap.getKeySym();
+                var modifier = currentCap.getModifier();
+                var sticky = currentCap.isSticky();
+
+                if (keyReleasedHandler && keysym)
+                    keyReleasedHandler(keysym);
+
+                if (modifier) {
+
+                    // If not sticky modifier, release modifier
+                    if (!sticky) {
+                        setModifierReleased(modifier);
+                        refreshAllKeysState();
+                    }
+                    else
+                        refreshState();
+
+                }
+                else {
+                    refreshState();
+
+                    // If not a modifier, also release all pressed modifiers
+                    clearModifiers();
+                }
+
+            }
+
+        }
+        rowKey.release = release;
+
+        // Toggle press/release states
+        function toggle() {
+            if (state == STATE_PRESSED)
+                release();
+            else
+                press();
+        }
+
+
+        // Send key press on mousedown
+        rowKey.onmousedown = function(e) {
+
+            e.stopPropagation();
+
+            var modifier = currentCap.getModifier();
+            var sticky = currentCap.isSticky();
+
+            // Toggle non-sticky modifiers
+            if (modifier && !sticky)
+                toggle();
+
+            // Press all others
+            else
+                press();
+
+            return false;
+        };
+
+        // Send key release on mouseup/out
+        rowKey.onmouseout =
+        rowKey.onmouseout =
+        rowKey.onmouseup = function(e) {
+
+            e.stopPropagation();
+
+            var modifier = currentCap.getModifier();
+            var sticky = currentCap.isSticky();
+
+            // Release non-modifiers and sticky modifiers
+            if (!modifier || sticky)
+                release();
+
+            return false;
+        };
+
+        rowKey.onselectstart = function() { return false; };
+
+        return rowKey;
+
+    }
+
+    function Gap(gap) {
+
+        var keyboardGap = document.createElement("div");
+        keyboardGap.className = "gap";
+        keyboardGap.textContent = " ";
+
+        var size = null;
+        if (gap.attributes["size"])
+            size = parseFloat(gap.attributes["size"].value);
+
+        if (size) {
+            keyboardGap.style.width = getKeySize(size);
+            keyboardGap.style.height = getKeySize(size);
+        }
+
+        return keyboardGap;
+
+    }
+
+    function Row(row) {
+
+        var keyboardRow = document.createElement("div");
+        keyboardRow.className = "row";
+
+        var children = row.childNodes;
+        for (var j=0; j<children.length; j++) {
+            var child = children[j];
+
+            // <row> can contain <key> or <column>
+            if (child.tagName == "key") {
+                var key = new Key(child);
+                keyboardRow.appendChild(key);
+                allKeys.push(key);
+            }
+            else if (child.tagName == "gap") {
+                var gap = new Gap(child);
+                keyboardRow.appendChild(gap);
+            }
+            else if (child.tagName == "column") {
+                var col = new Column(child);
+                keyboardRow.appendChild(col);
+            }
+
+        }
+
+        return keyboardRow;
+
+    }
+
+    function Column(col) {
+
+        var keyboardCol = document.createElement("div");
+        keyboardCol.className = "col";
+
+        var align = null;
+        if (col.attributes["align"])
+            align = col.attributes["align"].value;
+
+        var children = col.childNodes;
+        for (var j=0; j<children.length; j++) {
+            var child = children[j];
+
+            // <column> can only contain <row> 
+            if (child.tagName == "row") {
+                var row = new Row(child);
+                keyboardCol.appendChild(row);
+            }
+
+        }
+
+        if (align)
+            keyboardCol.style.textAlign = align;
+
+        return keyboardCol;
+
+    }
+
+
+
+    // Create keyboard
+    var keyboard = document.createElement("div");
+    keyboard.className = "keyboard";
+
+
+    // Retrieve keyboard XML
+    var xmlhttprequest = new XMLHttpRequest();
+    xmlhttprequest.open("GET", url, false);
+    xmlhttprequest.send(null);
+
+    var xml = xmlhttprequest.responseXML;
+
+    if (xml) {
+
+        // Parse document
+        var root = xml.documentElement;
+        if (root) {
+
+            var children = root.childNodes;
+            for (var i=0; i<children.length; i++) {
+                var child = children[i];
+
+                // <keyboard> can contain <row> or <column>
+                if (child.tagName == "row") {
+                    keyboard.appendChild(new Row(child));
+                }
+                else if (child.tagName == "column") {
+                    keyboard.appendChild(new Column(child));
+                }
+
+            }
+
+        }
+
+    }
+
+    var keyPressedHandler = null;
+    var keyReleasedHandler = null;
+
+    keyboard.setKeyPressedHandler = function(kh) { keyPressedHandler = kh; };
+    keyboard.setKeyReleasedHandler = function(kh) { keyReleasedHandler = kh; };
+
+    // Do not allow selection or mouse movement to propagate/register.
+    keyboard.onselectstart =
+    keyboard.onmousemove   =
+    keyboard.onmouseup     =
+    keyboard.onmousedown   =
+    function(e) {
+        e.stopPropagation();
+        return false;
+    };
+
+    return keyboard;
+}
+
diff --git a/src/main/webapp/guacamole.css b/src/main/webapp/guacamole.css
new file mode 100644 (file)
index 0000000..3e5b541
--- /dev/null
@@ -0,0 +1,236 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+body {
+    background: black;
+    font-family: sans-serif;
+    padding: 0;
+    margin: 0;
+}
+
+div#login-ui {
+    background: silver;
+    height: 100%;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    display: table;
+}
+
+p#login-error {
+    text-align: center;
+    background: #FDD;
+    color: red;
+    margin: 0.2em;
+}
+
+div#login-logo {
+    position: relative;
+    bottom: 0;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+div#login-dialog-middle {
+    width: 100%;
+    display: table-cell;
+    vertical-align: middle;
+    text-align: center;
+}
+
+div#login-dialog {
+
+    background: white;
+    vertical-align: middle;
+
+    padding: 1em;
+    border: 0.2em solid black;
+
+    -khtml-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -moz-border-radius: 0.5em;
+    border-radius: 0.5em;
+
+    max-width: 75%;
+    text-align: left;
+
+    display: inline-block;
+}
+
+div#login-dialog h1 {
+    margin-top: 0;
+    margin-bottom: 0em;
+    text-align: center;
+}
+
+div#login-dialog #buttons {
+    padding-top: 0.5em;
+    text-align: center;
+}
+
+div#login-dialog #login-fields {
+    border-top: 1px solid silver;
+    border-bottom: 1px solid silver;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+}
+
+div.errorDialogOuter {
+    display: table;
+    height: 100%;
+    width: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+
+    visibility: hidden;
+}
+
+div.errorDialogMiddle {
+    width: 100%;
+    text-align: center;
+    display: table-cell;
+    vertical-align: middle;
+}
+
+div.errorDialog {
+
+    background: #D44;
+    border: 1px solid black;
+    padding: 1em;
+
+    -khtml-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -moz-border-radius: 0.5em;
+    border-radius: 0.5em;
+
+    -moz-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
+    -webkit-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
+    -khtml-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
+    box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
+
+    max-width: 75%;
+    text-align: left;
+
+    display: inline-block;
+}
+
+div.errorDialog h1 {
+    margin: 0;
+    margin-bottom: 0.25em;
+    text-align: center;
+    text-shadow: 0 0 0.25em white;
+}
+
+div.errorDialog div.buttons {
+    margin: 0;
+    margin-top: 0.5em;
+    text-align: center;
+}
+
+div.errorDialog p {
+    margin: 0;
+}
+
+
+#menu {
+    margin-left: auto;
+    margin-right: auto;
+    margin-bottom: 1em;
+    font-size: 0.8em;
+    background: #FEA;
+    border: 1px solid black;
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    z-index: 1;
+}
+
+#menu.connected {
+    opacity: 0.5;
+}
+
+#menu.connected:hover {
+    opacity: 1;
+}
+
+#menu.error {
+    background: #D44;
+}
+
+.error #state {
+    font-weight: bold;
+}
+
+img {
+    border: none;
+}
+
+img#license {
+    border: none;
+    float: right;
+    margin: 2px;
+}
+
+div#display {
+    position: relative;
+    width: 640px;
+    height: 480px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#menu img {
+    vertical-align: middle;
+}
+
+#menu button {
+    vertical-align: middle;
+}
+
+#menu span {
+    vertical-align: middle;
+}
+
+div#clipboardDiv {
+    display: none;
+    position: absolute;
+    background: #FA5;
+    padding: 1em;
+
+    border: 1px solid black;
+    -khtml-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -moz-border-radius: 0.5em;
+    border-radius: 0.5em;
+
+    width: 50em;
+}
+
+div#clipboardDiv h2 {
+    margin: 0;
+    font-size: 1em;
+}
+
+div#clipboardDiv textarea {
+    width: 100%;
+}
+
diff --git a/src/main/webapp/images/agpl-logo.png b/src/main/webapp/images/agpl-logo.png
new file mode 100644 (file)
index 0000000..37f0158
Binary files /dev/null and b/src/main/webapp/images/agpl-logo.png differ
diff --git a/src/main/webapp/images/checker.png b/src/main/webapp/images/checker.png
new file mode 100644 (file)
index 0000000..06f8903
Binary files /dev/null and b/src/main/webapp/images/checker.png differ
diff --git a/src/main/webapp/images/guacamole-64-icon.png b/src/main/webapp/images/guacamole-64-icon.png
new file mode 100644 (file)
index 0000000..02897db
Binary files /dev/null and b/src/main/webapp/images/guacamole-64-icon.png differ
diff --git a/src/main/webapp/images/guacamole-icon-64.png b/src/main/webapp/images/guacamole-icon-64.png
new file mode 100644 (file)
index 0000000..02897db
Binary files /dev/null and b/src/main/webapp/images/guacamole-icon-64.png differ
diff --git a/src/main/webapp/images/guacamole-logo.png b/src/main/webapp/images/guacamole-logo.png
new file mode 100644 (file)
index 0000000..3652598
Binary files /dev/null and b/src/main/webapp/images/guacamole-logo.png differ
diff --git a/src/main/webapp/images/login-logo.png b/src/main/webapp/images/login-logo.png
new file mode 100644 (file)
index 0000000..d20a2e7
Binary files /dev/null and b/src/main/webapp/images/login-logo.png differ
diff --git a/src/main/webapp/images/noguacamole-logo.png b/src/main/webapp/images/noguacamole-logo.png
new file mode 100644 (file)
index 0000000..2245bfd
Binary files /dev/null and b/src/main/webapp/images/noguacamole-logo.png differ
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
new file mode 100644 (file)
index 0000000..8c3e816
--- /dev/null
@@ -0,0 +1,335 @@
+<!DOCTYPE HTML>
+
+<!--
+    Guacamole - Clientless Remote Desktop
+    Copyright (C) 2010  Michael Jumper
+
+    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 <http://www.gnu.org/licenses/>.
+-->
+
+<html>
+
+    <head>
+        <link rel="icon" type="image/png" href="images/guacamole-icon-64.png"/>
+        <link rel="stylesheet" type="text/css" href="guacamole.css"/>
+        <link rel="stylesheet" type="text/css" href="guac-web-lib/css/guacamole.css"/>
+        <link rel="stylesheet" type="text/css" href="keyboard.css"/>
+        <title>Guacamole</title>
+    </head>
+
+    <body>
+
+        <div id="login-ui">
+            <div id="login-dialog-middle">
+
+                <div id="login-logo">
+                    <img src="images/login-logo.png" alt="\_GUAC_/"/>
+                </div>
+
+                <div id="login-dialog">
+
+                    <h1>Guacamole Login</h1>
+
+                    <p id="login-error"></p>
+
+                    <form id="login-form" action="login" method="post">
+                        <table id="login-fields">
+                            <tr>
+                                <th>Username</th>
+                                <td><input type="text" name="username" id="username"/></td>
+                            </tr>
+                            <tr>
+                                <th>Password</th>
+                                <td><input type="password" name="password" id="password"/></td>
+                            </tr>
+                        </table>
+
+                        <div id="buttons">
+                            <input type="submit" name="login" id="login" value="Login"/>
+                        </div>
+                    </form>
+                </div>
+
+            </div>
+        </div>
+
+        <!-- Main UI - hidden until login succeeds -->
+        <div id="main-guacamole-ui" style="display: none">
+
+            <!-- Menu -->
+            <div id="menu">
+
+                <!-- Clipboard -->
+                <button id="showClipboard">Show Clipboard</button>
+                <div id="clipboardDiv">
+                    <h2>Clipboard</h2>
+                    <p>
+                    Text copied/cut within Guacamole will appear here. Changes to the text will affect the remote clipboard, and will be pastable within the remote desktop. Use the textbox below as an interface between the client and server clipboards.
+                    </p>
+                    <textarea rows="10" cols="40" id="clipboard"></textarea>
+                </div>
+
+                <button id="showKeyboard">Show Keyboard</button>
+                <button id="CtrlAltDelete">Ctrl-Alt-Delete</button>
+
+                <!-- Logo and status -->
+                <img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="__GUAC_VERSION"/>
+                <span id="state"></span>
+
+                <a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a>
+            </div>
+
+
+            <!-- Display -->
+            <div id="display" class="guac-display guac-loading">
+                <!-- On-screen keyboard -->
+                <div id="keyboardContainer"></div>
+            </div>
+
+
+            <!-- Error Dialog-->
+            <div id="errorDialog" class="errorDialogOuter">
+                <div class="errorDialogMiddle">
+                    <div class="errorDialog">
+                        <h1>Error</h1>
+                        <p id="errorText"></p>
+                        <div class="buttons"><button id="reconnect">Reconnect</button></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+        <!-- Scripts -->
+        <script type="text/javascript" src="guac-web-lib/javascript/keymap.js"></script>
+        <script type="text/javascript" src="guac-web-lib/javascript/keyboard.js"></script>
+        <script type="text/javascript" src="guac-web-lib/javascript/mouse.js"></script>
+        <script type="text/javascript" src="guac-web-lib/javascript/layer.js"></script>
+        <script type="text/javascript" src="guac-web-lib/javascript/guacamole.js"></script>
+        <script type="text/javascript" src="guac-web-lib/javascript/oskeyboard.js"></script>
+
+        <!-- Init -->
+        <script type="text/javascript"> /* <![CDATA[ */
+
+            var loginForm = document.getElementById("login-form");
+            var loginUI = document.getElementById("login-ui");
+
+            loginForm.onsubmit = function() {
+
+                var username = document.getElementById("username");
+                var password = document.getElementById("password");
+
+                var data =
+                       "username=" + encodeURIComponent(username.value)
+                    + "&password=" + encodeURIComponent(password.value)
+
+                var xmlhttprequest = new XMLHttpRequest();
+                xmlhttprequest.open("POST", "login", false);
+                xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+                xmlhttprequest.setRequestHeader("Content-length", data.length);
+                xmlhttprequest.send(data);
+
+                if (xmlhttprequest.status == 200) {
+                    loginUI.style.display = "none";
+                    startGuacamole();
+                }
+                else {
+
+                    var loginError = document.getElementById("login-error");
+
+                    // Display error, reset and refocus password field
+                    loginError.textContent = "Invalid login. Please try again.";
+                    password.value = "";
+                    password.focus();
+
+                }
+
+                return false;
+
+            }
+
+            // Shows guacamole interface and initiates connection to guacamole
+            function startGuacamole() {
+
+                document.getElementById("main-guacamole-ui").style.display = "block";
+
+                var menu = document.getElementById("menu");
+                var display = document.getElementById("display");
+                var logo = document.getElementById("logo");
+
+                var errorDialog = document.getElementById("errorDialog");
+                var errorDialogText = document.getElementById("errorText");
+
+                // Position display correctly
+                window.onresize = function() {
+                    display.style.top = menu.offsetHeight + "px";
+                };
+
+                window.onresize();
+
+                // Instantiate client
+                var guac = new GuacamoleClient(display);
+
+                var state = document.getElementById("state");
+                guac.setOnStateChangeHandler(function(clientState) {
+
+                        switch (clientState) {
+                            case 0:
+                                state.textContent = "Idle."
+                                break;
+                            case 1:
+                                state.textContent = "Connecting...";
+                                break;
+                            case 2:
+                                state.textContent = "Connected, waiting for first update...";
+                                break;
+                            case 3:
+                                display.className = display.className.replace(/guac-loading/, '');
+                                menu.className = "connected";
+                                state.textContent = "Connected.";
+                                break;
+                            case 4:
+                                state.textContent = "Disconnecting...";
+                                break;
+                            case 5:
+                                state.textContent = "Disconnected.";
+                                break;
+                            default:
+                                state.textContent = "Unknown";
+                        }
+                });
+
+                // Cache error image (might not be available when error occurs)
+                var guacErrorImage = new Image();
+                guacErrorImage.src = "images/noguacamole-logo.png";
+
+                guac.setErrorHandler(function(error) {
+                    menu.className = "error";
+                    logo.src = guacErrorImage.src;
+                    errorDialogText.textContent = error;
+                    errorDialog.style.visibility = "visible";
+                });
+
+                // Reconnect button
+                var reconnect = document.getElementById("reconnect");
+                reconnect.onclick = function() {
+                    window.location.reload();
+                };
+
+                // Connect
+                guac.connect();
+
+                // Disconnect on close
+                window.onunload = function() {
+                    guac.disconnect();
+                }
+
+                // Handle clipboard events
+                var clipboardElement = document.getElementById("clipboard");
+                clipboardElement.onchange = function() {
+
+                    var text = clipboardElement.value;
+                    guac.setClipboard(text);
+
+                };
+
+                // Ignore keypresses when clipboard is focused
+                clipboardElement.onfocus = function() {
+                    guac.disableKeyboard();
+                };
+
+                // Capture keypresses when clipboard is not focused
+                clipboardElement.onblur = function() {
+                    guac.enableKeyboard();
+                };
+
+                // Server copy handler
+                guac.setClipboardHandler(
+                    function(data) {
+                        clipboardElement.value = data;
+                    }
+                );
+
+
+                // Show/Hide clipboard
+                var clipboardDiv = document.getElementById("clipboardDiv");
+                var showClipboard = document.getElementById("showClipboard");
+                showClipboard.onclick = function() {
+
+                    var displayed = clipboardDiv.style.display;
+                    if (displayed != "block") {
+                        clipboardDiv.style.display = "block";
+                        showClipboard.innerHTML = "Hide Clipboard";
+                    }
+                    else {
+                        clipboardDiv.style.display = "none";
+                        showClipboard.innerHTML = "Show Clipboard";
+                        clipboardElement.onchange();
+                    }
+
+                };
+
+
+                // Show/Hide keyboard
+                var keyboardContainer = document.getElementById("keyboardContainer");
+                var showKeyboard = document.getElementById("showKeyboard");
+                showKeyboard.onclick = function() {
+
+                    var displayed = keyboardContainer.style.display;
+                    if (displayed != "block") {
+                        keyboardContainer.style.display = "block";
+                        showKeyboard.textContent = "Hide Keyboard";
+                    }
+                    else {
+                        keyboardContainer.style.display = "none";
+                        showKeyboard.textContent = "Show Keyboard";
+                    }
+
+                };
+
+                // On-screen keyboard
+                var osKeyboard = new GuacamoleOnScreenKeyboard("layouts/en-us-qwerty.xml");
+                keyboardContainer.appendChild(osKeyboard);
+
+                osKeyboard.setKeyPressedHandler(
+                        function(keysym) {
+                            guac.pressKey(keysym);
+                        }
+                );
+
+                osKeyboard.setKeyReleasedHandler(
+                        function(keysym) {
+                            guac.releaseKey(keysym);
+                        }
+                );
+
+                // Send Ctrl-Alt-Delete
+                var CtrlAltDelete = document.getElementById("CtrlAltDelete");
+
+                CtrlAltDelete.onclick = function() {
+                    guac.pressKey(KEYSYM_CTRL);
+                    guac.pressKey(KEYSYM_ALT);
+                    guac.pressKey(KEYSYM_DELETE);
+                    guac.releaseKey(KEYSYM_DELETE);
+                    guac.releaseKey(KEYSYM_ALT);
+                    guac.releaseKey(KEYSYM_CTRL);
+                }
+
+            }
+
+            /* ]]> */ </script>
+
+    </body>
+
+</html>
diff --git a/src/main/webapp/keyboard.css b/src/main/webapp/keyboard.css
new file mode 100644 (file)
index 0000000..690c14f
--- /dev/null
@@ -0,0 +1,123 @@
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+div#keyboardContainer {
+    position: fixed;
+    left: 0px;
+    bottom: 0px;
+    text-align: center;
+    width: 100%;
+    display: none;
+    z-index: 1;
+}
+
+div.keyboard {
+
+    font-size: 10pt;
+    white-space: pre;
+
+    border: 1px solid black;
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -khtml-border-radius: 0.5em;
+    border-radius: 0.5em;
+    background: #222;
+
+    cursor: default;
+
+    opacity: 0.85;
+
+    padding: 0.25em;
+    margin: 0.25em;
+
+    display: inline-block;
+    text-align: left;
+}
+
+div.key {
+
+    margin: 0;
+    padding: 0;
+
+    width: 5ex;
+    height: 5ex;
+
+    display: inline-block;
+    text-align: center;
+}
+
+div.cap {
+
+    border: 1px solid #888;
+    -moz-border-radius: 0.25em;
+    -webkit-border-radius: 0.25em;
+    -khtml-border-radius: 0.25em;
+    border-radius: 0.25em;
+    background: #444;
+
+    margin: 0;
+    padding: 0;
+
+    color: white;
+    text-shadow: 0 0.1em 0.1em black;
+
+    width: 4.5ex;
+    height: 4.5ex;
+    line-height: 4.5ex;
+    white-space: pre;
+
+    display: inline-block;
+    text-align: center;
+}
+
+div.key:hover div.cap {
+    background: #666;
+    border-color: #666;
+    cursor: pointer;
+}
+
+div.key.pressed div.cap {
+    background: #822;
+    border-color: #D44;
+}
+
+div.key.sticky.active div.cap {
+    background: #882;
+    border-color: #DD4;
+}
+
+div.gap {
+    margin: 0;
+    padding: 0;
+
+    width: 5ex;
+    height: 5ex;
+
+    display: inline-block;
+}
+
+div.row {
+    vertical-align: top;
+}
+
+div.col {
+    display: inline-block;
+    vertical-align: top;
+}
+
diff --git a/src/main/webapp/layouts/en-us-qwerty.xml b/src/main/webapp/layouts/en-us-qwerty.xml
new file mode 100644 (file)
index 0000000..2223de9
--- /dev/null
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Guacamole - Clientless Remote Desktop
+    Copyright (C) 2010  Michael Jumper
+
+    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 <http://www.gnu.org/licenses/>.
+-->
+
+<keyboard lang="en_US" layout="qwerty">
+    <row>
+        <key>
+            <cap keysym="0xFF1B">Esc</cap>
+        </key>
+        <gap size="0.25"/>
+        <key>
+            <cap keysym="0xFFBE">F1</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFBF">F2</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC0">F3</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC1">F4</cap>
+        </key>
+        <gap size="0.25"/>
+        <key>
+            <cap keysym="0xFFC2">F5</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC3">F6</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC4">F7</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC5">F8</cap>
+        </key>
+        <gap size="0.25"/>
+        <key>
+            <cap keysym="0xFFC6">F9</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC7">F10</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC8">F11</cap>
+        </key>
+        <key>
+            <cap keysym="0xFFC9">F12</cap>
+        </key>
+    </row>
+    <row>
+        <gap size="0.25"/>
+    </row>
+    <column>
+        <row>
+            <key>
+                <cap>`</cap>
+                <cap if="shift">~</cap>
+            </key>
+            <key>
+                <cap>1</cap>
+                <cap if="shift">!</cap>
+            </key>
+            <key>
+                <cap>2</cap>
+                <cap if="shift">@</cap>
+            </key>
+            <key>
+                <cap>3</cap>
+                <cap if="shift">#</cap>
+            </key>
+            <key>
+                <cap>4</cap>
+                <cap if="shift">$</cap>
+            </key>
+            <key>
+                <cap>5</cap>
+                <cap if="shift">%</cap>
+            </key>
+            <key>
+                <cap>6</cap>
+                <cap if="shift">^</cap>
+            </key>
+            <key>
+                <cap>7</cap>
+                <cap if="shift">&amp;</cap>
+            </key>
+            <key>
+                <cap>8</cap>
+                <cap if="shift">*</cap>
+            </key>
+            <key>
+                <cap>9</cap>
+                <cap if="shift">(</cap>
+            </key>
+            <key>
+                <cap>0</cap>
+                <cap if="shift">)</cap>
+            </key>
+            <key>
+                <cap>-</cap>
+                <cap if="shift">_</cap>
+            </key>
+            <key>
+                <cap>=</cap>
+                <cap if="shift">+</cap>
+            </key>
+            <key size="2">
+                <cap keysym="0xFF08">Back</cap>
+            </key>
+        </row>
+
+        <row>
+            <key size="1.5">
+                <cap keysym="0xFF09">Tab</cap>
+            </key>
+            <key>
+                <cap>q</cap>
+                <cap if="caps">Q</cap>
+                <cap if="shift">Q</cap>
+                <cap if="caps,shift">q</cap>
+            </key>
+            <key>
+                <cap>w</cap>
+                <cap if="caps">W</cap>
+                <cap if="shift">W</cap>
+                <cap if="caps,shift">w</cap>
+            </key>
+            <key>
+                <cap>e</cap>
+                <cap if="caps">E</cap>
+                <cap if="shift">E</cap>
+                <cap if="caps,shift">e</cap>
+            </key>
+            <key>
+                <cap>r</cap>
+                <cap if="caps">R</cap>
+                <cap if="shift">R</cap>
+                <cap if="caps,shift">r</cap>
+            </key>
+            <key>
+                <cap>t</cap>
+                <cap if="caps">T</cap>
+                <cap if="shift">T</cap>
+                <cap if="caps,shift">t</cap>
+            </key>
+            <key>
+                <cap>y</cap>
+                <cap if="caps">Y</cap>
+                <cap if="shift">Y</cap>
+                <cap if="caps,shift">y</cap>
+            </key>
+            <key>
+                <cap>u</cap>
+                <cap if="caps">U</cap>
+                <cap if="shift">U</cap>
+                <cap if="caps,shift">u</cap>
+            </key>
+            <key>
+                <cap>i</cap>
+                <cap if="caps">I</cap>
+                <cap if="shift">I</cap>
+                <cap if="caps,shift">i</cap>
+            </key>
+            <key>
+                <cap>o</cap>
+                <cap if="caps">O</cap>
+                <cap if="shift">O</cap>
+                <cap if="caps,shift">o</cap>
+            </key>
+            <key>
+                <cap>p</cap>
+                <cap if="caps">P</cap>
+                <cap if="shift">P</cap>
+                <cap if="caps,shift">p</cap>
+            </key>
+            <key>
+                <cap>[</cap>
+                <cap if="shift">{</cap>
+            </key>
+            <key>
+                <cap>]</cap>
+                <cap if="shift">}</cap>
+            </key>
+            <key size="1.5">
+                <cap>\</cap>
+                <cap if="shift">|</cap>
+            </key>
+        </row>
+        <row>
+            <key size="1.75">
+                <cap modifier="caps" keysym="0xFFE5" sticky="true">Caps</cap>
+            </key>
+            <key>
+                <cap>a</cap>
+                <cap if="caps">A</cap>
+                <cap if="shift">A</cap>
+                <cap if="caps,shift">a</cap>
+            </key>
+            <key>
+                <cap>s</cap>
+                <cap if="caps">S</cap>
+                <cap if="shift">S</cap>
+                <cap if="caps,shift">s</cap>
+            </key>
+            <key>
+                <cap>d</cap>
+                <cap if="caps">D</cap>
+                <cap if="shift">D</cap>
+                <cap if="caps,shift">d</cap>
+            </key>
+            <key>
+                <cap>f</cap>
+                <cap if="caps">F</cap>
+                <cap if="shift">F</cap>
+                <cap if="caps,shift">f</cap>
+            </key>
+            <key>
+                <cap>g</cap>
+                <cap if="caps">G</cap>
+                <cap if="shift">G</cap>
+                <cap if="caps,shift">g</cap>
+            </key>
+            <key>
+                <cap>h</cap>
+                <cap if="caps">H</cap>
+                <cap if="shift">H</cap>
+                <cap if="caps,shift">h</cap>
+            </key>
+            <key>
+                <cap>j</cap>
+                <cap if="caps">J</cap>
+                <cap if="shift">J</cap>
+                <cap if="caps,shift">j</cap>
+            </key>
+            <key>
+                <cap>k</cap>
+                <cap if="caps">K</cap>
+                <cap if="shift">K</cap>
+                <cap if="caps,shift">k</cap>
+            </key>
+            <key>
+                <cap>l</cap>
+                <cap if="caps">L</cap>
+                <cap if="shift">L</cap>
+                <cap if="caps,shift">l</cap>
+            </key>
+            <key>
+                <cap>;</cap>
+                <cap if="shift">:</cap>
+            </key>
+            <key>
+                <cap>'</cap>
+                <cap if="shift">"</cap>
+            </key>
+            <key size="2.25">
+                <cap keysym="0xFF0D">Enter</cap>
+            </key>
+        </row>
+        <row>
+            <key size="2">
+                <cap modifier="shift" keysym="0xFFE1">Shift</cap>
+            </key>
+            <key>
+                <cap>z</cap>
+                <cap if="caps">Z</cap>
+                <cap if="shift">Z</cap>
+                <cap if="caps,shift">z</cap>
+            </key>
+            <key>
+                <cap>x</cap>
+                <cap if="caps">X</cap>
+                <cap if="shift">X</cap>
+                <cap if="caps,shift">x</cap>
+            </key>
+            <key>
+                <cap>c</cap>
+                <cap if="caps">C</cap>
+                <cap if="shift">C</cap>
+                <cap if="caps,shift">c</cap>
+            </key>
+            <key>
+                <cap>v</cap>
+                <cap if="caps">V</cap>
+                <cap if="shift">V</cap>
+                <cap if="caps,shift">v</cap>
+            </key>
+            <key>
+                <cap>b</cap>
+                <cap if="caps">B</cap>
+                <cap if="shift">B</cap>
+                <cap if="caps,shift">b</cap>
+            </key>
+            <key>
+                <cap>n</cap>
+                <cap if="caps">N</cap>
+                <cap if="shift">N</cap>
+                <cap if="caps,shift">n</cap>
+            </key>
+            <key>
+                <cap>m</cap>
+                <cap if="caps">M</cap>
+                <cap if="shift">M</cap>
+                <cap if="caps,shift">m</cap>
+            </key>
+            <key>
+                <cap>,</cap>
+                <cap if="shift">&lt;</cap>
+            </key>
+            <key>
+                <cap>.</cap>
+                <cap if="shift">&gt;</cap>
+            </key>
+            <key>
+                <cap>/</cap>
+                <cap if="shift">?</cap>
+            </key>
+            <key size="3">
+                <cap modifier="shift" keysym="0xFFE2">Shift</cap>
+            </key>
+        </row>
+        <row>
+            <key size="1.5">
+                <cap modifier="control" keysym="0xFFE3">Ctrl</cap>
+            </key>
+            <key size="1.5">
+                <cap modifier="super" keysym="0xFFEB">Super</cap>
+            </key>
+            <key size="1.5">
+                <cap modifier="alt" keysym="0xFFE9">Alt</cap>
+            </key>
+            <key size="6">
+                <cap> </cap>
+            </key>
+            <key size="1.5">
+                <cap modifier="alt" keysym="0xFFE3">Alt</cap>
+            </key>
+            <key size="1.5">
+                <cap modifier="super" keysym="0xFF67">Menu</cap>
+            </key>
+            <key size="1.5">
+                <cap modifier="control" keysym="0xFFE4">Ctrl</cap>
+            </key>
+        </row>
+    </column>
+    <column>
+        <row>
+            <gap size="0.25"/>
+        </row>
+    </column>
+    <column align="center">
+        <row>
+            <key size="1.75">
+                <cap keysym="0xFF63">Ins</cap>
+            </key>
+            <key size="1.75">
+                <cap keysym="0xFF50">Home</cap>
+            </key>
+            <key size="1.75">
+                <cap keysym="0xFF55">PgUp</cap>
+            </key>
+        </row>
+        <row>
+            <key size="1.75">
+                <cap keysym="0xFFFF">Del</cap>
+            </key>
+            <key size="1.75">
+                <cap keysym="0xFF57">End</cap>
+            </key>
+            <key size="1.75">
+                <cap keysym="0xFF56">PgDn</cap>
+            </key>
+        </row>
+        <row>
+            <gap/>
+        </row>
+        <row>
+            <key>
+                <cap keysym="0xFF52">↑</cap>
+            </key>
+        </row>
+        <row>
+            <key>
+                <cap keysym="0xFF51">←</cap>
+            </key>
+            <key>
+                <cap keysym="0xFF54">↓</cap>
+            </key>
+            <key>
+                <cap keysym="0xFF53">→</cap>
+            </key>
+        </row>
+    </column>
+</keyboard>
diff --git a/web/.gitignore b/web/.gitignore
deleted file mode 100644 (file)
index 92ffcee..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-# Build directories
-target/
diff --git a/web/COPYING b/web/COPYING
deleted file mode 100644 (file)
index dba13ed..0000000
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU 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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU 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 <http://www.gnu.org/licenses/>.
-
-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
-<http://www.gnu.org/licenses/>.
diff --git a/web/doc/example/guacamole.properties b/web/doc/example/guacamole.properties
deleted file mode 100644 (file)
index b7524a3..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#    Guacamole - Clientless Remote Desktop
-#    Copyright (C) 2010  Michael Jumper
-#
-#    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 <http://www.gnu.org/licenses/>.
-
-
-# Hostname and port of guacamole proxy
-guacd-hostname: localhost
-guacd-port:     4822
-
-# Session provider class (provides and configured guacamole session based on authentication information)
-session-provider: net.sourceforge.guacamole.net.authentication.basic.BasicGuacamoleSessionProvider
-
-# Auth provider class (authenticates user/pass combination, needed if using the provided login screen)
-auth-provider: net.sourceforge.guacamole.net.authentication.basic.BasicFileAuthenticationProvider
-basic-user-mapping: /path/to/user-mapping.xml
-
diff --git a/web/doc/example/user-mapping.xml b/web/doc/example/user-mapping.xml
deleted file mode 100644 (file)
index 3c2421e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<user-mapping>
-       
-       <!-- Per-user authentication and config information -->
-       <authorize username="USERNAME" password="PASSWORD">
-               <protocol>vnc</protocol>
-               <hostname>localhost</hostname>
-               <port>5900</port>
-               <password>VNCPASS</password>
-       </authorize>
-
-    <!-- Another user, but using md5 to hash the password
-         (example below uses the md5 hash of "PASSWORD") -->
-    <authorize 
-            username="USERNAME2"
-            password="319f4d26e3c536b5dd871bb2c52e3178"
-            encoding="md5">
-               <protocol>vnc</protocol>
-               <hostname>localhost</hostname>
-               <port>5901</port>
-               <password>VNCPASS</password>
-       </authorize>
-
-</user-mapping>
diff --git a/web/guacamole-common/pom.xml b/web/guacamole-common/pom.xml
deleted file mode 100644 (file)
index 70ee49b..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
-    <artifactId>guacamole-common</artifactId>
-    <packaging>jar</packaging>
-    <version>0.3.0rc1</version>
-    <name>guacamole-common</name>
-    <url>http://guacamole.sourceforge.net/</url>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <extensions>
-            <!-- Required for SSH deploy -->
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-            </extension>
-        </extensions>
-
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>guac-dev</id>
-            <url>http://guac-dev.org/repo</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>guac-dev</id>
-            <url>scpexe://guac-dev.org/var/www/repo</url>
-        </repository>
-    </distributionManagement>
-
-</project>
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/Client.java
deleted file mode 100644 (file)
index e57d479..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-
-package net.sourceforge.guacamole;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import net.sourceforge.guacamole.GuacamoleException;
-
-public abstract class Client {
-
-    public abstract void write(char[] chunk, int off, int len) throws GuacamoleException;
-    public abstract char[] read() throws GuacamoleException;
-    public abstract void disconnect() throws GuacamoleException;
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleClient.java
deleted file mode 100644 (file)
index f0748d8..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-
-package net.sourceforge.guacamole;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.InputStreamReader;
-
-import java.io.OutputStream;
-import java.io.Writer;
-import java.io.OutputStreamWriter;
-
-import net.sourceforge.guacamole.GuacamoleException;
-
-public class GuacamoleClient extends Client {
-
-    private Socket sock;
-    private Reader input;
-    private Writer output;
-
-    public GuacamoleClient(String hostname, int port) throws GuacamoleException {
-
-        try {
-            sock = new Socket(InetAddress.getByName(hostname), port);
-            input = new InputStreamReader(sock.getInputStream());
-            output = new OutputStreamWriter(sock.getOutputStream());
-        }
-        catch (IOException e) {
-            throw new GuacamoleException(e);
-        }
-
-    }
-
-    public void write(char[] chunk, int off, int len) throws GuacamoleException {
-        try {
-            output.write(chunk, off, len);
-            output.flush();
-        }
-        catch (IOException e) {
-            throw new GuacamoleException(e);
-        }
-    }
-
-    public void disconnect() throws GuacamoleException {
-        try {
-            sock.close();
-        }
-        catch (IOException e) {
-            throw new GuacamoleException(e);
-        }
-    }
-
-    private int usedLength = 0;
-    private char[] buffer = new char[20000];
-
-    public char[] read() throws GuacamoleException {
-
-        try {
-
-            // While we're blocking, or input is available
-            for (;;) {
-
-                // If past threshold, resize buffer before reading
-                if (usedLength > buffer.length/2) {
-                    char[] biggerBuffer = new char[buffer.length*2];
-                    System.arraycopy(buffer, 0, biggerBuffer, 0, usedLength);
-                    buffer = biggerBuffer;
-                }
-
-                // Attempt to fill buffer
-                int numRead = input.read(buffer, usedLength, buffer.length - usedLength);
-                if (numRead == -1)
-                    return null;
-
-                int prevLength = usedLength;
-                usedLength += numRead;
-
-                for (int i=usedLength-1; i>=prevLength; i--) {
-
-                    char readChar = buffer[i];
-
-                    // If end of instruction, return it.
-                    if (readChar == ';') {
-
-                        // Get instruction
-                        char[] chunk = new char[i+1];
-                        System.arraycopy(buffer, 0, chunk, 0, i+1);
-
-                        // Reset buffer
-                        usedLength -= i+1;
-                        System.arraycopy(buffer, i+1, buffer, 0, usedLength);
-
-                        // Return instruction string
-                        return chunk;
-                    }
-
-                }
-
-            } // End read loop
-
-        }
-        catch (IOException e) {
-            throw new GuacamoleException(e);
-        }
-
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleException.java
deleted file mode 100644 (file)
index 3a09c5a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package net.sourceforge.guacamole;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-public class GuacamoleException extends Exception {
-
-    public GuacamoleException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public GuacamoleException(String message) {
-        super(message);
-    }
-
-    public GuacamoleException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/Configuration.java
deleted file mode 100644 (file)
index 6e78eb2..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-
-package net.sourceforge.guacamole.net;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import javax.servlet.ServletContext;
-import net.sourceforge.guacamole.GuacamoleException;
-
-public abstract class Configuration {
-
-    protected String humanReadableList(Object... values) {
-
-        String list = "";
-        for (int i=0; i<values.length; i++) {
-
-            if (i >= 1)
-                list += ", ";
-
-            if (i == values.length -1)
-                list += " or ";
-
-            list += "\"" + values[i] + "\"";
-        }
-
-        return list;
-
-    }
-
-    protected String readParameter(String name) throws GuacamoleException {
-        String value = GuacamoleProperties.getProperty(name);
-        return value;
-    }
-
-    protected String readParameter(String name, String defaultValue, String... allowedValues) throws GuacamoleException {
-
-        String value = GuacamoleProperties.getProperty(name);
-
-        // Use default if not specified
-        if (value == null) {
-            if (defaultValue == null)
-                throw new GuacamoleException("Parameter \"" + name + "\" is required.");
-
-            return defaultValue;
-        }
-
-        // If not restricted to certain values, just return whatever is given.
-        if (allowedValues.length == 0)
-            return value;
-
-        // If restricted, only return value within given list
-        for (String allowedValue : allowedValues)
-            if (value.equals(allowedValue))
-                return value;
-
-        throw new GuacamoleException("Parameter \"" + name + "\" must be " + humanReadableList((Object) allowedValues));
-    }
-
-    protected boolean readBooleanParameter(String name, Boolean defaultValue) throws GuacamoleException {
-
-        String value = GuacamoleProperties.getProperty(name);
-
-        // Use default if not specified
-        if (value == null) {
-            if (defaultValue == null)
-                throw new GuacamoleException("Parameter \"" + name + "\" is required.");
-
-            return defaultValue;
-        }
-
-        value = value.trim();
-        if (value.equals("true"))
-            return true;
-
-        if (value.equals("false"))
-            return false;
-
-        throw new GuacamoleException("Parameter \"" + name + "\" must be \"true\" or \"false\".");
-
-    }
-
-    protected int readIntParameter(String name, Integer defaultValue, Integer... allowedValues) throws GuacamoleException {
-
-        String parmString = GuacamoleProperties.getProperty(name);
-
-        // Use default if not specified
-        if (parmString== null) {
-            if (defaultValue == null)
-                throw new GuacamoleException("Parameter \"" + name + "\" is required.");
-
-            return defaultValue;
-        }
-
-        try {
-            int value = Integer.parseInt(parmString);
-
-            // If not restricted to certain values, just return whatever is given.
-            if (allowedValues.length == 0)
-                return value;
-
-            // If restricted, only return value within given list
-            for (int allowedValue : allowedValues)
-                if (value == allowedValue)
-                    return value;
-
-            throw new GuacamoleException("Parameter \"" + name + "\" must be " + humanReadableList((Object) allowedValues));
-        }
-        catch (NumberFormatException e) {
-            throw new GuacamoleException("Parameter \"" + name + "\" must be an integer.", e);
-        }
-
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleConfiguration.java
deleted file mode 100644 (file)
index a6bfeeb..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-
-package net.sourceforge.guacamole.net;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import net.sourceforge.guacamole.net.authentication.GuacamoleSessionProvider;
-import java.lang.reflect.InvocationTargetException;
-import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-
-public class GuacamoleConfiguration extends Configuration {
-
-    private String guacd_hostname;
-    private int guacd_port;
-    private GuacamoleSessionProvider sessionProvider;
-
-    public GuacamoleConfiguration() throws GuacamoleException {
-
-        guacd_hostname       = readParameter("guacd-hostname");
-        guacd_port           = readIntParameter("guacd-port", null);
-
-        // Get session provider instance
-        try {
-            String sessionProviderClassName = readParameter("session-provider");
-            Object obj = Class.forName(sessionProviderClassName).getConstructor().newInstance();
-            if (!(obj instanceof GuacamoleSessionProvider))
-                throw new GuacamoleException("Specified session provider class is not a GuacamoleSessionProvider");
-
-            sessionProvider = (GuacamoleSessionProvider) obj;
-        }
-        catch (ClassNotFoundException e) {
-            throw new GuacamoleException("Session provider class not found", e);
-        }
-        catch (NoSuchMethodException e) {
-            throw new GuacamoleException("Default constructor for session provider not present", e);
-        }
-        catch (SecurityException e) {
-            throw new GuacamoleException("Creation of session provider disallowed; check your security settings", e);
-        }
-        catch (InstantiationException e) {
-            throw new GuacamoleException("Unable to instantiate session provider", e);
-        }
-        catch (IllegalAccessException e) {
-            throw new GuacamoleException("Unable to access default constructor of session provider", e);
-        }
-        catch (InvocationTargetException e) {
-            throw new GuacamoleException("Internal error in constructor of session provider", e.getTargetException());
-        }
-
-    }
-
-    public int getProxyPort() {
-        return guacd_port;
-    }
-
-    public String getProxyHostname() {
-        return guacd_hostname;
-    }
-
-    public GuacamoleSession createSession(HttpSession session) throws GuacamoleException {
-        return sessionProvider.createSession(session);
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleProperties.java
deleted file mode 100644 (file)
index 6c4340d..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-
-package net.sourceforge.guacamole.net;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import net.sourceforge.guacamole.GuacamoleException;
-
-public class GuacamoleProperties {
-
-    private static final Properties properties;
-    private static GuacamoleException exception;
-
-    static {
-
-        properties = new Properties();
-
-        try {
-
-            InputStream stream = GuacamoleProperties.class.getResourceAsStream("/guacamole.properties");
-            if (stream == null)
-                throw new IOException("Resource /guacamole.properties not found.");
-
-            properties.load(stream);
-        }
-        catch (IOException e) {
-            exception = new GuacamoleException("Error reading guacamole.properties", e);
-        }
-
-    }
-
-    public static String getProperty(String name) throws GuacamoleException {
-        if (exception != null) throw exception;
-        return properties.getProperty(name);
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleServlet.java
deleted file mode 100644 (file)
index a1e7131..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-
-package net.sourceforge.guacamole.net;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import java.io.IOException;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-
-public abstract class GuacamoleServlet extends HttpServlet  {
-
-    private GuacamoleConfiguration config;
-
-    @Override
-    public void init() throws ServletException {
-        try {
-            this.config = new GuacamoleConfiguration();
-        }
-        catch (GuacamoleException e) {
-            throw new ServletException(e);
-        }
-    }
-
-    @Override
-    protected final void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        try {
-            handleRequest(req, resp);
-        }
-        catch (GuacamoleException e) {
-            throw new ServletException(e);
-        }
-    }
-
-    @Override
-    protected final void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        try {
-            handleRequest(req, resp);
-        }
-        catch (GuacamoleException e) {
-            throw new ServletException(e);
-        }
-    }
-
-    private final void handleRequest(HttpServletRequest request, HttpServletResponse response) throws GuacamoleException {
-
-        HttpSession httpSession = request.getSession(shouldCreateSession());
-
-        if (httpSession != null) {
-            GuacamoleSession session = config.createSession(httpSession);
-            handleRequest(session, request, response);
-        }
-        else
-            throw new GuacamoleException("No session");
-    }
-
-    protected abstract void handleRequest(GuacamoleSession session, HttpServletRequest request, HttpServletResponse response) throws GuacamoleException;
-
-    protected boolean shouldCreateSession() {
-        return false;
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/GuacamoleSession.java
deleted file mode 100644 (file)
index 2eb0132..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-
-package net.sourceforge.guacamole.net;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import java.util.concurrent.locks.ReentrantLock;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
-import net.sourceforge.guacamole.Client;
-import net.sourceforge.guacamole.GuacamoleClient;
-import net.sourceforge.guacamole.GuacamoleException;
-
-public class GuacamoleSession {
-
-    private GuacamoleConfiguration config;
-    private final HttpSession session;
-    private SessionClient client;
-    private ReentrantLock instructionStreamLock;
-
-    private String protocol;
-    private String hostname;
-    private int port;
-    private String password;
-
-    public class SessionClient extends Client implements HttpSessionBindingListener {
-
-        private Client client;
-        private ReentrantLock authorizedLock;
-
-        public SessionClient(Client client) {
-            this.client = client;
-
-            authorizedLock = new ReentrantLock();
-            authorizedLock.lock();
-        }
-
-        public void authorize() {
-            authorizedLock.unlock();
-        }
-
-        public void waitForAuthorization() {
-            if (authorizedLock.isLocked()) {
-                try {
-                    authorizedLock.lock();
-                    authorizedLock.unlock();
-                }
-                catch (Throwable t) {
-                    throw new Error("Internal error waiting for authorization", t);
-                }
-            }
-        }
-
-        public void valueBound(HttpSessionBindingEvent event) {
-            // Do nothing
-        }
-
-        public void valueUnbound(HttpSessionBindingEvent event) {
-            try {
-                disconnect();
-            }
-            catch (GuacamoleException e) {
-                // Ignore
-            }
-        }
-
-        public void write(char[] data, int off, int len) throws GuacamoleException {
-            client.write(data, off, len);
-        }
-
-        public char[] read() throws GuacamoleException {
-            return client.read();
-        }
-
-        public void disconnect() throws GuacamoleException {
-            client.disconnect();
-        }
-
-    }
-
-    public GuacamoleSession(HttpSession session) throws GuacamoleException {
-
-        if (session == null)
-            throw new GuacamoleException("User has no session.");
-
-        this.session = session;
-        synchronized (session) {
-
-            // Read configuration parameters
-            config = new GuacamoleConfiguration();
-
-            client = (SessionClient) session.getAttribute("CLIENT");
-            instructionStreamLock = (ReentrantLock) session.getAttribute("INSTRUCTION_STREAM_LOCK");
-        }
-    }
-
-    public void connect() throws GuacamoleException {
-        synchronized (session) {
-
-            if (client != null)
-                client.disconnect();
-
-
-            client = new SessionClient(
-                    new GuacamoleClient (
-                        config.getProxyHostname(),
-                        config.getProxyPort()
-                    )
-            );
-
-            session.setAttribute("CLIENT", client);
-
-            instructionStreamLock = new ReentrantLock();
-            session.setAttribute("INSTRUCTION_STREAM_LOCK", instructionStreamLock);
-
-        }
-    }
-
-    public boolean isConnected() {
-        synchronized (session) {
-            return client != null;
-        }
-    }
-
-    public GuacamoleConfiguration getConfiguration() {
-        return config;
-    }
-
-    public SessionClient getClient() {
-        synchronized (session) {
-            return client;
-        }
-    }
-
-    public void invalidate() {
-        session.invalidate();
-    }
-
-    public void disconnect() throws GuacamoleException {
-        if (client != null) {
-            client.disconnect();
-
-            session.removeAttribute("CLIENT");
-            client = null;
-        }
-    }
-
-    public ReentrantLock getInstructionStreamLock() {
-        return instructionStreamLock;
-    }
-
-    public void setConnection(String protocol, String hostname, int port) {
-        this.protocol = protocol;
-        this.hostname = hostname;
-        this.port = port;
-    }
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public String getHostname() {
-        return hostname;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getConnectMessage() throws GuacamoleException {
-
-        if (getProtocol() == null)
-            throw new GuacamoleException("Protocol not specified");
-
-        if (getHostname() == null)
-            throw new GuacamoleException("Hostname not specified");
-
-        if (getPassword() == null)
-            return "connect:" + getProtocol() + "," + getHostname() + "," + getPort() + ";";
-        else
-            return "connect:" + getProtocol() + "," + getHostname() + "," + getPort() + "," + getPassword() + ";";
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/GuacamoleSessionProvider.java
deleted file mode 100644 (file)
index bbe82a2..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-
-package net.sourceforge.guacamole.net.authentication;
-
-import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSession;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-public interface GuacamoleSessionProvider {
-
-    public GuacamoleSession createSession(HttpSession session) throws GuacamoleException;
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/authentication/NullGuacamoleSessionProvider.java
deleted file mode 100644 (file)
index a46d0fe..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package net.sourceforge.guacamole.net.authentication;
-
-import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSession;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-public class NullGuacamoleSessionProvider implements GuacamoleSessionProvider {
-
-    public GuacamoleSession createSession(HttpSession session) throws GuacamoleException {
-        throw new GuacamoleException("Null provider will not create sessions");
-    }
-
-}
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Connect.java
deleted file mode 100644 (file)
index 79aa94d..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.sourceforge.guacamole.net.tunnel;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import net.sourceforge.guacamole.GuacamoleException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.guacamole.net.GuacamoleServlet;
-
-import net.sourceforge.guacamole.net.GuacamoleSession;
-
-public class Connect extends GuacamoleServlet {
-
-    @Override
-    protected boolean shouldCreateSession() {
-        return true;
-    }
-
-    @Override
-    protected void handleRequest(GuacamoleSession session, HttpServletRequest request, HttpServletResponse response) throws GuacamoleException {
-
-        // Disconnect if already connected
-        if (session.isConnected())
-            session.disconnect();
-
-        // Obtain new connection
-        session.connect();
-
-        // Send data
-        try {
-            char[] connect = session.getConnectMessage().toCharArray();
-            session.getClient().write(connect, 0, connect.length);
-            session.getClient().authorize();
-        }
-        catch (GuacamoleException e) {
-            throw new GuacamoleException("Error sending data to server: " + e.getMessage(), e);
-        }
-
-    }
-
-}
-
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Inbound.java
deleted file mode 100644 (file)
index 415d639..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.sourceforge.guacamole.net.tunnel;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import net.sourceforge.guacamole.GuacamoleException;
-
-import java.io.Reader;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.guacamole.net.GuacamoleServlet;
-
-import net.sourceforge.guacamole.net.GuacamoleSession;
-
-public class Inbound extends GuacamoleServlet {
-
-    @Override
-    protected void handleRequest(GuacamoleSession session, HttpServletRequest request, HttpServletResponse response) throws GuacamoleException {
-        
-        session.getClient().waitForAuthorization();
-
-        // Send data
-        try {
-
-            Reader input = request.getReader();
-            char[] buffer = new char[8192];
-
-            int length;
-            while ((length = input.read(buffer, 0, buffer.length)) != -1)
-                session.getClient().write(buffer, 0, length);
-
-        }
-        catch (IOException e) {
-            throw new GuacamoleException("I/O Error sending data to server: " + e.getMessage(), e);
-        }
-        catch (GuacamoleException e) {
-            throw new GuacamoleException("Error sending data to server: " + e.getMessage(), e);
-        }
-
-    }
-
-}
-
diff --git a/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java b/web/guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/Outbound.java
deleted file mode 100644 (file)
index 76aa34c..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-package net.sourceforge.guacamole.net.tunnel;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import java.io.Writer;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.concurrent.locks.ReentrantLock;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import net.sourceforge.guacamole.Client;
-import net.sourceforge.guacamole.net.GuacamoleServlet;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSession;
-
-
-public class Outbound extends GuacamoleServlet {
-
-    @Override
-    protected void handleRequest(GuacamoleSession session, HttpServletRequest request, HttpServletResponse response) throws GuacamoleException {
-
-        session.getClient().waitForAuthorization();
-
-        ReentrantLock instructionStreamLock = session.getInstructionStreamLock();
-        instructionStreamLock.lock();
-
-        try {
-
-            response.setContentType("text/plain");
-            Writer out = response.getWriter();
-
-            try {
-
-                // Query new update from server
-                Client client = session.getClient();
-
-                // For all messages, until another stream is ready (we send at least one message)
-                char[] message;
-                while ((message = client.read()) != null) {
-
-                    // Get message output bytes
-                    out.write(message, 0, message.length);
-                    out.flush();
-                    response.flushBuffer();
-
-                    // No more messages another stream can take over
-                    if (instructionStreamLock.hasQueuedThreads())
-                        break;
-
-                }
-
-                if (message == null) {
-                    session.disconnect();
-                    throw new GuacamoleException("Disconnected.");
-                }
-
-            }
-            catch (GuacamoleException e) {
-                out.write("error:" + e.getMessage() + ";");
-                out.flush();
-                response.flushBuffer();
-            }
-
-            // End-of-instructions marker
-            out.write(';');
-            out.flush();
-            response.flushBuffer();
-
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new GuacamoleException("UTF-8 not supported by Java.", e);
-        }
-        catch (IOException e) {
-            throw new GuacamoleException("I/O error writing to servlet output stream.", e);
-        }
-        finally {
-            instructionStreamLock.unlock();
-        }
-
-    }
-
-}
-
diff --git a/web/guacamole-default-webapp/pom.xml b/web/guacamole-default-webapp/pom.xml
deleted file mode 100644 (file)
index b69fafe..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>net.sourceforge.guacamole</groupId>
-    <artifactId>guacamole-default-webapp</artifactId>
-    <packaging>war</packaging>
-    <version>0.3.0rc1</version>
-    <name>guacamole-default-webapp</name>
-    <url>http://guacamole.sourceforge.net/</url>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <extensions>
-            <!-- Required for SSH deploy -->
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-            </extension>
-        </extensions>
-
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.guacamole</groupId>
-            <artifactId>guacamole-common</artifactId>
-            <version>0.3.0rc1</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>guac-dev</id>
-            <url>http://guac-dev.org/repo</url>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>guac-dev</id>
-            <url>scpexe://guac-dev.org/var/www/repo</url>
-        </repository>
-    </distributionManagement>
-
-</project>
diff --git a/web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java b/web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java
deleted file mode 100644 (file)
index 83fcfd3..0000000
+++ /dev/null
@@ -1,318 +0,0 @@
-
-package net.sourceforge.guacamole.net.authentication.basic;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import java.io.File;
-import java.io.IOException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleProperties;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
-public class BasicFileAuthenticationProvider implements BasicLogin.AuthenticationProvider {
-
-    private long mappingTime;
-    private Map<String, AuthInfo> mapping;
-
-    private File getUserMappingFile() throws GuacamoleException {
-
-        // Get user mapping filename
-        String filename = GuacamoleProperties.getProperty("basic-user-mapping");
-        if (filename == null)
-            return null;
-
-        return new File(filename);
-
-    }
-
-    public synchronized void init() throws GuacamoleException {
-
-        // Get user mapping file
-        File mapFile = getUserMappingFile();
-        if (mapFile == null)
-            throw new GuacamoleException("Missing \"basic-user-mapping\" parameter required for basic login.");
-
-        // Parse document
-        try {
-
-            BasicUserMappingContentHandler contentHandler = new BasicUserMappingContentHandler();
-
-            XMLReader parser = XMLReaderFactory.createXMLReader();
-            parser.setContentHandler(contentHandler);
-            parser.parse(mapFile.getAbsolutePath());
-
-            mappingTime = mapFile.lastModified();
-            mapping = contentHandler.getUserMapping();
-
-        }
-        catch (IOException e) {
-            throw new GuacamoleException("Error reading basic user mapping file.", e);
-        }
-        catch (SAXException e) {
-            throw new GuacamoleException("Error parsing basic user mapping XML.", e);
-        }
-
-    }
-
-    @Override
-    public BasicLogin.AuthorizedConfiguration getAuthorizedConfiguration(String username, String password) throws GuacamoleException {
-
-        // Check mapping file mod time
-        File userMappingFile = getUserMappingFile();
-        if (userMappingFile.exists() && mappingTime < userMappingFile.lastModified()) {
-
-            // If modified recently, gain exclusive access and recheck
-            synchronized (this) {
-                if (userMappingFile.exists() && mappingTime < userMappingFile.lastModified())
-                    init(); // If still not up to date, re-init
-            }
-
-        }
-
-        AuthInfo info = mapping.get(username);
-        if (info != null && info.validate(username, password))
-            return new BasicLogin.AuthorizedConfiguration(
-                info.getProtocol(),
-                info.getHostname(),
-                info.getPort(),
-                info.getPassword()
-            );
-
-        return null;
-
-    }
-
-    public static class AuthInfo {
-
-        public static enum Encoding {
-            PLAIN_TEXT,
-            MD5
-        }
-
-        private String auth_username;
-        private String auth_password;
-        private Encoding auth_encoding;
-
-        private String protocol;
-        private String hostname;
-        private int port;
-        private String password;
-
-        public AuthInfo(String auth_username, String auth_password, Encoding auth_encoding) {
-            this.auth_username = auth_username;
-            this.auth_password = auth_password;
-            this.auth_encoding = auth_encoding;
-        }
-
-        private static final char HEX_CHARS[] = {
-            '0', '1', '2', '3', '4', '5', '6', '7',
-            '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-        };
-
-        public static String getHexString(byte[] bytes) {
-
-            if (bytes == null)
-                return null;
-
-            StringBuilder hex = new StringBuilder(2 * bytes.length);
-            for (byte b : bytes) {
-                hex.append(HEX_CHARS[(b & 0xF0) >> 4])
-                   .append(HEX_CHARS[(b & 0x0F)     ]);
-            }
-
-            return hex.toString();
-
-        }
-
-
-        public boolean validate(String username, String password) {
-
-            // If username matches
-            if (username != null && password != null && username.equals(auth_username)) {
-
-                switch (auth_encoding) {
-
-                    case PLAIN_TEXT:
-
-                        // Compare plaintext
-                        return password.equals(auth_password);
-
-                    case MD5:
-
-                        // Compare hashed password
-                        try {
-                            MessageDigest digest = MessageDigest.getInstance("MD5");
-                            String hashedPassword = getHexString(digest.digest(password.getBytes()));
-                            return hashedPassword.equals(auth_password.toUpperCase());
-                        }
-                        catch (NoSuchAlgorithmException e) {
-                            throw new UnsupportedOperationException("Unexpected lack of MD5 support.", e);
-                        }
-
-                }
-
-            }
-
-            return false;
-
-        }
-
-        public String getHostname() {
-            return hostname;
-        }
-
-        public String getPassword() {
-            return password;
-        }
-
-        public int getPort() {
-            return port;
-        }
-
-        public String getProtocol() {
-            return protocol;
-        }
-
-    }
-
-
-    private static class BasicUserMappingContentHandler extends DefaultHandler {
-
-        private Map<String, AuthInfo> authMapping = new HashMap<String, AuthInfo>();
-
-        public Map<String, AuthInfo> getUserMapping() {
-            return Collections.unmodifiableMap(authMapping);
-        }
-
-        private AuthInfo current;
-
-        private enum AUTH_INFO_STATE {
-            PROTOCOL,
-            HOSTNAME,
-            PORT,
-            PASSWORD
-        };
-
-        private AUTH_INFO_STATE infoState;
-
-        @Override
-        public void endElement(String uri, String localName, String qName) throws SAXException {
-
-            if (localName.equals("authorize")) {
-
-                // Finalize mapping for this user
-                authMapping.put(
-                    current.auth_username,
-                    current
-                );
-
-            }
-
-            infoState = null;
-
-        }
-
-        @Override
-        public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-
-            if (localName.equals("authorize")) {
-
-                AuthInfo.Encoding encoding;
-                String encodingString = attributes.getValue("encoding");
-                if (encodingString == null)
-                    encoding = AuthInfo.Encoding.PLAIN_TEXT;
-                else if (encodingString.equals("plain"))
-                    encoding = AuthInfo.Encoding.PLAIN_TEXT;
-                else if (encodingString.equals("md5"))
-                    encoding = AuthInfo.Encoding.MD5;
-                else
-                    throw new SAXException("Invalid encoding type");
-
-
-                current = new AuthInfo(
-                    attributes.getValue("username"),
-                    attributes.getValue("password"),
-                    encoding
-                );
-
-                infoState = null;
-
-            }
-
-            else if (localName.equals("protocol"))
-                infoState = AUTH_INFO_STATE.PROTOCOL;
-
-            else if (localName.equals("hostname"))
-                infoState = AUTH_INFO_STATE.HOSTNAME;
-
-            else if (localName.equals("port"))
-                infoState = AUTH_INFO_STATE.PORT;
-
-            else if (localName.equals("password"))
-                infoState = AUTH_INFO_STATE.PASSWORD;
-
-            else
-                infoState = null;
-
-        }
-
-        @Override
-        public void characters(char[] ch, int start, int length) throws SAXException {
-
-            String str = new String(ch, start, length);
-
-            if (infoState == null)
-                return;
-
-            switch (infoState) {
-
-                case PROTOCOL:
-                    current.protocol = str;
-                    break;
-
-                case HOSTNAME:
-                    current.hostname = str;
-                    break;
-
-                case PORT:
-                    current.port = Integer.parseInt(str);
-                    break;
-
-                case PASSWORD:
-                    current.password = str;
-                    break;
-
-            }
-
-        }
-
-
-    }
-
-
-}
diff --git a/web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java b/web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleSessionProvider.java
deleted file mode 100644 (file)
index 959bf0e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package net.sourceforge.guacamole.net.authentication.basic;
-
-import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.GuacamoleSession;
-import net.sourceforge.guacamole.net.authentication.GuacamoleSessionProvider;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-public class BasicGuacamoleSessionProvider implements GuacamoleSessionProvider {
-
-    public GuacamoleSession createSession(HttpSession session) throws GuacamoleException {
-
-        // Retrieve authorized config data from session
-        BasicLogin.AuthorizedConfiguration config = (BasicLogin.AuthorizedConfiguration)
-                session.getAttribute("BASIC-LOGIN-AUTH");
-
-        // If no data, not authorized
-        if (config == null)
-            throw new GuacamoleException("Unauthorized");
-
-        // Configure session from authorized config info
-        GuacamoleSession guacSession = new GuacamoleSession(session);
-        guacSession.setConnection(config.getProtocol(), config.getHostname(), config.getPort());
-        if (config.getPassword() != null)
-            guacSession.setPassword(config.getPassword());
-
-        // Return authorized session
-        return guacSession;
-
-    }
-
-}
diff --git a/web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java b/web/guacamole-default-webapp/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java
deleted file mode 100644 (file)
index 43e8721..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-
-package net.sourceforge.guacamole.net.authentication.basic;
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.Configuration;
-
-public class BasicLogin extends HttpServlet {
-
-    private Config config;
-
-    @Override
-    public void init() throws ServletException {
-        try {
-            config = new Config();
-        }
-        catch (GuacamoleException e) {
-            throw new ServletException(e);
-        }
-    }
-
-
-    private class Config extends Configuration {
-
-        private AuthenticationProvider authProvider;
-
-        public Config() throws GuacamoleException {
-
-            // Get auth provider instance
-            try {
-                String authProviderClassName = readParameter("auth-provider");
-                Object obj = Class.forName(authProviderClassName).getConstructor().newInstance();
-                if (!(obj instanceof AuthenticationProvider))
-                    throw new GuacamoleException("Specified session provider class is not a GuacamoleSessionProvider");
-
-                authProvider = (AuthenticationProvider) obj;
-            }
-            catch (ClassNotFoundException e) {
-                throw new GuacamoleException("Session provider class not found", e);
-            }
-            catch (NoSuchMethodException e) {
-                throw new GuacamoleException("Default constructor for session provider not present", e);
-            }
-            catch (SecurityException e) {
-                throw new GuacamoleException("Creation of session provider disallowed; check your security settings", e);
-            }
-            catch (InstantiationException e) {
-                throw new GuacamoleException("Unable to instantiate session provider", e);
-            }
-            catch (IllegalAccessException e) {
-                throw new GuacamoleException("Unable to access default constructor of session provider", e);
-            }
-            catch (InvocationTargetException e) {
-                throw new GuacamoleException("Internal error in constructor of session provider", e.getTargetException());
-            }
-
-        }
-
-        public AuthenticationProvider getAuthenticationProvider() {
-            return authProvider;
-        }
-
-    }
-
-    public static interface AuthenticationProvider {
-        public AuthorizedConfiguration getAuthorizedConfiguration(String username, String password) throws GuacamoleException;
-    }
-
-    // Added to session when session validated
-    public static class AuthorizedConfiguration {
-
-        private String protocol;
-        private String hostname;
-        private int port;
-        private String password;
-
-        public AuthorizedConfiguration(String protocol, String hostname, int port, String password) {
-            this.protocol = protocol;
-            this.hostname = hostname;
-            this.port = port;
-            this.password = password;
-        }
-
-        public String getHostname() {
-            return hostname;
-        }
-
-        public String getPassword() {
-            return password;
-        }
-
-        public int getPort() {
-            return port;
-        }
-
-        public String getProtocol() {
-            return protocol;
-        }
-
-    }
-
-    @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-
-        // Retrieve username and password from parms
-        String username = req.getParameter("username");
-        String password = req.getParameter("password");
-
-        // Validate username and password
-        try {
-
-            AuthorizedConfiguration info = config.getAuthenticationProvider().getAuthorizedConfiguration(username, password);
-            if (info != null) {
-
-                // Store authorized configuration
-                HttpSession session = req.getSession(true);
-                session.setAttribute(
-                    "BASIC-LOGIN-AUTH",
-                    info
-                );
-
-                // Success
-                return;
-
-            }
-
-            // Report "forbidden" on any failure
-            resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Login invalid");
-        }
-        catch (GuacamoleException e) {
-            throw new ServletException("Error validating credentials", e);
-        }
-
-    }
-
-
-}
diff --git a/web/guacamole-default-webapp/src/main/webapp/META-INF/context.xml b/web/guacamole-default-webapp/src/main/webapp/META-INF/context.xml
deleted file mode 100644 (file)
index 5bee3dc..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path=""/>
diff --git a/web/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml b/web/guacamole-default-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644 (file)
index c7cbc9f..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Guacamole - Clientless Remote Desktop
-    Copyright (C) 2010  Michael Jumper
-
-    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 <http://www.gnu.org/licenses/>.
--->
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-    <!-- Basic config -->
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-    <session-config>
-        <session-timeout>
-                       30
-        </session-timeout>
-    </session-config>
-    <!-- Guacamole Tunnel Servlets -->
-    <servlet>
-        <description>Connect servlet.</description>
-        <servlet-name>Connect</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.tunnel.Connect</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Connect</servlet-name>
-        <url-pattern>/connect</url-pattern>
-    </servlet-mapping>
-    <servlet>
-        <description>Outbound servlet.</description>
-        <servlet-name>Outbound</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.tunnel.Outbound</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Outbound</servlet-name>
-        <url-pattern>/outbound</url-pattern>
-    </servlet-mapping>
-    <servlet>
-        <description>Input servlet.</description>
-        <servlet-name>Inbound</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.tunnel.Inbound</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Inbound</servlet-name>
-        <url-pattern>/inbound</url-pattern>
-    </servlet-mapping>
-    <!-- Basic Login Servlets -->
-    <servlet>
-        <servlet-name>BasicLogin</servlet-name>
-        <servlet-class>net.sourceforge.guacamole.net.authentication.basic.BasicLogin</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>BasicLogin</servlet-name>
-        <url-pattern>/login</url-pattern>
-    </servlet-mapping>
-</web-app>
diff --git a/web/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html b/web/guacamole-default-webapp/src/main/webapp/agpl-3.0-standalone.html
deleted file mode 100644 (file)
index bf47c6c..0000000
+++ /dev/null
@@ -1,688 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html><head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>GNU Affero General Public License - GNU Project - Free Software Foundation (FSF)</title>
-</head>
- <link rel="alternate" type="application/rdf+xml"
-       href="http://www.gnu.org/licenses/agpl-3.0.rdf" /> 
-<body>
-<h3 style="text-align: center;">GNU AFFERO GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 19 November 2007</p>
-
-<p>Copyright &copy; 2007 Free Software Foundation,
-Inc. &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;
- <br />
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<h3><a name="preamble"></a>Preamble</h3>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>The precise terms and conditions for copying, distribution and
-modification follow.</p>
-
-<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
-
-<h4><a name="section0"></a>0. Definitions.</h4>
-
-<p>&quot;This License&quot; refers to version 3 of the GNU Affero General Public
-License.</p>
-
-<p>&quot;Copyright&quot; also means copyright-like laws that apply to other kinds
-of works, such as semiconductor masks.</p>
-
-<p>&quot;The Program&quot; refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as &quot;you&quot;.  &quot;Licensees&quot; and
-&quot;recipients&quot; may be individuals or organizations.</p>
-
-<p>To &quot;modify&quot; 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 &quot;modified version&quot; of the
-earlier work or a work &quot;based on&quot; the earlier work.</p>
-
-<p>A &quot;covered work&quot; means either the unmodified Program or a work based
-on the Program.</p>
-
-<p>To &quot;propagate&quot; 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.</p>
-
-<p>To &quot;convey&quot; 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.</p>
-
-<p>An interactive user interface displays &quot;Appropriate Legal Notices&quot;
-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.</p>
-
-<h4><a name="section1"></a>1. Source Code.</h4>
-
-<p>The &quot;source code&quot; for a work means the preferred form of the work
-for making modifications to it.  &quot;Object code&quot; means any non-source
-form of a work.</p>
-
-<p>A &quot;Standard Interface&quot; 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.</p>
-
-<p>The &quot;System Libraries&quot; 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
-&quot;Major Component&quot;, 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.</p>
-
-<p>The &quot;Corresponding Source&quot; 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.</p>
-
-<p>The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.</p>
-
-<p>The Corresponding Source for a work in source code form is that
-same work.</p>
-
-<h4><a name="section2"></a>2. Basic Permissions.</h4>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.</p>
-
-<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
-
-<p>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:</p>
-
-<ul>
-
-<li>a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.</li>
-
-<li>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
-    &quot;keep intact all notices&quot;.</li>
-
-<li>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.</li>
-
-<li>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.</li>
-
-</ul>
-
-<p>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
-&quot;aggregate&quot; 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.</p>
-
-<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
-
-<p>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:</p>
-
-<ul>
-
-<li>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.</li>
-
-<li>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.</li>
-
-<li>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.</li>
-
-<li>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.</li>
-
-<li>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.</li>
-
-</ul>
-
-<p>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.</p>
-
-<p>A &quot;User Product&quot; is either (1) a &quot;consumer product&quot;, 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, &quot;normally used&quot; 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.</p>
-
-<p>&quot;Installation Information&quot; 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.</p>
-
-<p>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).</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section7"></a>7. Additional Terms.</h4>
-
-<p>&quot;Additional permissions&quot; 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.</p>
-
-<p>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.</p>
-
-<p>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:</p>
-
-<ul>
-
-<li>a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or</li>
-
-<li>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</li>
-
-<li>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</li>
-
-<li>d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or</li>
-
-<li>e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or</li>
-
-<li>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.</li>
-
-</ul>
-
-<p>All other non-permissive additional terms are considered &quot;further
-restrictions&quot; 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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section8"></a>8. Termination.</h4>
-
-<p>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).</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
-
-<p>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.</p>
-
-<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
-
-<p>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.</p>
-
-<p>An &quot;entity transaction&quot; 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.</p>
-
-<p>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.</p>
-
-<h4><a name="section11"></a>11. Patents.</h4>
-
-<p>A &quot;contributor&quot; 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 &quot;contributor version&quot;.</p>
-
-<p>A contributor's &quot;essential patent claims&quot; 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, &quot;control&quot; includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.</p>
-
-<p>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.</p>
-
-<p>In the following three paragraphs, a &quot;patent license&quot; 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 &quot;grant&quot; such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.</p>
-
-<p>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.  &quot;Knowingly relying&quot; 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.</p>
-
-<p>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.</p>
-
-<p>A patent license is &quot;discriminatory&quot; 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.</p>
-
-<p>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.</p>
-
-<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
-
-<p>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.</p>
-
-<h4><a name="section13"></a>13. Remote Network Interaction; Use with the GNU General Public License.</h4>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
-
-<p>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.</p>
-
-<p>Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero
-General Public License &quot;or any later version&quot; 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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
-
-<p>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 &quot;AS IS&quot; 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.</p>
-
-<h4><a name="section16"></a>16. Limitation of Liability.</h4>
-
-<p>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.</p>
-
-<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
-
-<p>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.</p>
-
-<p>END OF TERMS AND CONDITIONS</p>
-
-<h3><a name="howto"></a>How to Apply These Terms to Your New Programs</h3>
-
-<p>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.</p>
-
-<p>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 &quot;copyright&quot; line and a pointer to where the full notice is found.</p>
-
-<pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    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 &lt;http://www.gnu.org/licenses/&gt;.
-</pre>
-
-<p>Also add information on how to contact you by electronic and paper mail.</p>
-
-<p>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 &quot;Source&quot; 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.</p>
-
-<p>You should also get your employer (if you work as a programmer) or school,
-if any, to sign a &quot;copyright disclaimer&quot; for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-&lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
-
-</body></html>
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/css/guacamole.css
deleted file mode 100644 (file)
index 471c2fb..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-.guac-display.guac-loading {
-    border: 1px dotted gray;
-    background-image: url('../images/spinner92.gif');
-    background-position: center;
-    background-repeat: no-repeat;
-}
-
-.guac-display.guac-error {
-    border: 1px dotted red;
-    background-image: url('../images/noimage92.png');
-    background-position: center;
-    background-repeat: no-repeat;
-}
-
-.guac-hide-cursor {
-    cursor: url('../images/mouse/dot.gif'),url('../images/mouse/blank.cur'),default;
-}
-
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur
deleted file mode 100644 (file)
index dfcdea8..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.cur and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif
deleted file mode 100644 (file)
index ec5c17c..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/blank.gif and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif
deleted file mode 100644 (file)
index 9ac8a00..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/mouse/dot.gif and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png
deleted file mode 100644 (file)
index 657d85e..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/noimage92.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif
deleted file mode 100644 (file)
index 0dfe069..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/images/spinner92.gif and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/guacamole.js
deleted file mode 100644 (file)
index 020e88a..0000000
+++ /dev/null
@@ -1,601 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-function GuacamoleClient(display) {
-
-    var STATE_IDLE          = 0;
-    var STATE_CONNECTING    = 1;
-    var STATE_WAITING       = 2;
-    var STATE_CONNECTED     = 3;
-    var STATE_DISCONNECTING = 4;
-    var STATE_DISCONNECTED  = 5;
-
-    var currentState = STATE_IDLE;
-    var stateChangeHandler = null;
-
-    function setState(state) {
-        if (state != currentState) {
-            currentState = state;
-            if (stateChangeHandler)
-                stateChangeHandler(currentState);
-        }
-    }
-
-    this.setOnStateChangeHandler = function(handler) {
-        stateChangeHandler = handler;
-    }
-
-    function isConnected() {
-        return currentState == STATE_CONNECTED
-            || currentState == STATE_WAITING;
-    }
-
-    // Layers
-    var background = null;
-    var cursor = null;
-
-    var cursorImage = null;
-    var cursorHotspotX = 0;
-    var cursorHotspotY = 0;
-
-    // FIXME: Make object. Clean up.
-    var cursorRectX = 0;
-    var cursorRectY = 0;
-    var cursorRectW = 0;
-    var cursorRectH = 0;
-
-    var cursorHidden = 0;
-
-    function redrawCursor() {
-
-        // Hide hardware cursor
-        if (cursorHidden == 0) {
-            display.className += " guac-hide-cursor";
-            cursorHidden = 1;
-        }
-
-        // Erase old cursor
-        cursor.clearRect(cursorRectX, cursorRectY, cursorRectW, cursorRectH);
-
-        // Update rect
-        cursorRectX = mouse.getX() - cursorHotspotX;
-        cursorRectY = mouse.getY() - cursorHotspotY;
-        cursorRectW = cursorImage.width;
-        cursorRectH = cursorImage.height;
-
-        // Draw new cursor
-        cursor.drawImage(cursorRectX, cursorRectY, cursorImage);
-    }
-
-
-
-
-       /*****************************************/
-       /*** Keyboard                          ***/
-       /*****************************************/
-
-    var keyboard = new GuacamoleKeyboard(document);
-
-    this.disableKeyboard = function() {
-        keyboard.setKeyPressedHandler(null);
-        keyboard.setKeyReleasedHandler(null);
-    };
-
-    this.enableKeyboard = function() {
-        keyboard.setKeyPressedHandler(
-            function (keysym) {
-                sendKeyEvent(1, keysym);
-            }
-        );
-
-        keyboard.setKeyReleasedHandler(
-            function (keysym) {
-                sendKeyEvent(0, keysym);
-            }
-        );
-    };
-
-    // Enable keyboard by default
-    this.enableKeyboard();
-
-    function sendKeyEvent(pressed, keysym) {
-        // Do not send requests if not connected
-        if (!isConnected())
-            return;
-
-        sendMessage("key:" +  keysym + "," + pressed + ";");
-    }
-
-    this.pressKey = function(keysym) {
-        sendKeyEvent(1, keysym);
-    };
-
-    this.releaseKey = function(keysym) {
-        sendKeyEvent(0, keysym);
-    };
-
-
-       /*****************************************/
-       /*** Mouse                             ***/
-       /*****************************************/
-
-    var mouse = new GuacamoleMouse(display);
-    mouse.setButtonPressedHandler(
-        function(mouseState) {
-            sendMouseState(mouseState);
-        }
-    );
-
-    mouse.setButtonReleasedHandler(
-        function(mouseState) {
-            sendMouseState(mouseState);
-        }
-    );
-
-    mouse.setMovementHandler(
-        function(mouseState) {
-
-            // Draw client-side cursor
-            if (cursorImage != null) {
-                redrawCursor();
-            }
-
-            sendMouseState(mouseState);
-        }
-    );
-
-
-    function sendMouseState(mouseState) {
-
-        // Do not send requests if not connected
-        if (!isConnected())
-            return;
-
-        // Build mask
-        var buttonMask = 0;
-        if (mouseState.getLeft())   buttonMask |= 1;
-        if (mouseState.getMiddle()) buttonMask |= 2;
-        if (mouseState.getRight())  buttonMask |= 4;
-        if (mouseState.getUp())     buttonMask |= 8;
-        if (mouseState.getDown())   buttonMask |= 16;
-
-        // Send message
-        sendMessage("mouse:" + mouseState.getX() + "," + mouseState.getY() + "," + buttonMask + ";");
-    }
-
-    var sendingMessages = 0;
-    var outputMessageBuffer = "";
-
-    function sendMessage(message) {
-
-        // Add event to queue, restart send loop if finished.
-        outputMessageBuffer += message;
-        if (sendingMessages == 0)
-            sendPendingMessages();
-
-    }
-
-    function sendPendingMessages() {
-
-        if (outputMessageBuffer.length > 0) {
-
-            sendingMessages = 1;
-
-            var message_xmlhttprequest = new XMLHttpRequest();
-            message_xmlhttprequest.open("POST", "inbound");
-            message_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-            message_xmlhttprequest.setRequestHeader("Content-length", outputMessageBuffer.length);
-
-            // Once response received, send next queued event.
-            message_xmlhttprequest.onreadystatechange = function() {
-                if (message_xmlhttprequest.readyState == 4)
-                    sendPendingMessages();
-            }
-
-            message_xmlhttprequest.send(outputMessageBuffer);
-            outputMessageBuffer = ""; // Clear buffer
-
-        }
-        else
-            sendingMessages = 0;
-
-    }
-
-
-       /*****************************************/
-       /*** Clipboard                         ***/
-       /*****************************************/
-
-    this.setClipboard = function(data) {
-
-        // Do not send requests if not connected
-        if (!isConnected())
-            return;
-
-        sendMessage("clipboard:" + escapeGuacamoleString(data) + ";");
-    }
-
-
-    function desaturateFilter(data, width, height) {
-
-        for (var i=0; i<data.length; i+=4) {
-
-            // Get RGB values
-            var r = data[i];
-            var g = data[i+1];
-            var b = data[i+2];
-
-            // Desaturate
-            var v = Math.max(r, g, b) / 2;
-            data[i]   = v;
-            data[i+1] = v;
-            data[i+2] = v;
-
-        }
-
-    }
-
-
-    var errorHandler = null;
-    this.setErrorHandler = function(handler) {
-        errorHandler = handler;
-    };
-
-    var errorEncountered = 0;
-    function showError(error) {
-        // Only display first error (avoid infinite error loops)
-        if (errorEncountered == 0) {
-            errorEncountered = 1;
-
-            disconnect();
-
-            // In case nothing has been rendered yet, use error style
-            display.className += " guac-error";
-
-            // Show error by desaturating display
-            if (background)
-                background.filter(desaturateFilter);
-
-            if (errorHandler)
-                errorHandler(error);
-        }
-    }
-
-    function handleErrors(message) {
-        var errors = message.getErrors();
-        for (var errorIndex=0; errorIndex<errors.length; errorIndex++)
-            showError(errors[errorIndex].getMessage());
-    }
-
-    var clipboardHandler = null;
-    var requests = 0;
-
-    this.setClipboardHandler = function(handler) {
-        clipboardHandler = handler;
-    };
-
-
-    function handleResponse(xmlhttprequest) {
-
-        var nextRequest = null;
-
-        var instructionStart = 0;
-        var startIndex = 0;
-
-        function parseResponse() {
-
-            // Start next request as soon as possible
-            if (xmlhttprequest.readyState >= 2 && nextRequest == null)
-                nextRequest = makeRequest();
-
-            // Parse stream when data is received and when complete.
-            if (xmlhttprequest.readyState == 3 ||
-                xmlhttprequest.readyState == 4) {
-
-                // Halt on error during request
-                if (xmlhttprequest.status == 0) {
-                    showError("Request canceled by browser.");
-                    return;
-                }
-                else if (xmlhttprequest.status != 200) {
-                    showError("Error during request (HTTP " + xmlhttprequest.status + "): " + xmlhttprequest.statusText);
-                    return;
-                }
-
-                var current = xmlhttprequest.responseText;
-                var instructionEnd;
-                
-                while ((instructionEnd = current.indexOf(";", startIndex)) != -1) {
-
-                    // Start next search at next instruction
-                    startIndex = instructionEnd+1;
-
-                    var instruction = current.substr(instructionStart,
-                            instructionEnd - instructionStart);
-
-                    instructionStart = startIndex;
-
-                    var opcodeEnd = instruction.indexOf(":");
-
-                    var opcode;
-                    var parameters;
-                    if (opcodeEnd == -1) {
-                        opcode = instruction;
-                        parameters = new Array();
-                    }
-                    else {
-                        opcode = instruction.substr(0, opcodeEnd);
-                        parameters = instruction.substr(opcodeEnd+1).split(",");
-                    }
-
-                    // If we're done parsing, handle the next response.
-                    if (opcode.length == 0) {
-
-                        if (isConnected()) {
-                            delete xmlhttprequest;
-                            if (nextRequest)
-                                handleResponse(nextRequest);
-                        }
-
-                        break;
-                    }
-
-                    // Call instruction handler.
-                    doInstruction(opcode, parameters);
-                }
-
-                // Start search at end of string.
-                startIndex = current.length;
-
-                delete instruction;
-                delete parameters;
-
-            }
-
-        }
-
-        xmlhttprequest.onreadystatechange = parseResponse;
-        parseResponse();
-
-    }
-
-
-    function makeRequest() {
-
-        // Download self
-        var xmlhttprequest = new XMLHttpRequest();
-        xmlhttprequest.open("POST", "outbound");
-        xmlhttprequest.send(null); 
-
-        return xmlhttprequest;
-
-    }
-
-    function escapeGuacamoleString(str) {
-
-        var escapedString = "";
-
-        for (var i=0; i<str.length; i++) {
-
-            var c = str.charAt(i);
-            if (c == ",")
-                escapedString += "\\c";
-            else if (c == ";")
-                escapedString += "\\s";
-            else if (c == "\\")
-                escapedString += "\\\\";
-            else
-                escapedString += c;
-
-        }
-
-        return escapedString;
-
-    }
-
-    function unescapeGuacamoleString(str) {
-
-        var unescapedString = "";
-
-        for (var i=0; i<str.length; i++) {
-
-            var c = str.charAt(i);
-            if (c == "\\" && i<str.length-1) {
-
-                var escapeChar = str.charAt(++i);
-                if (escapeChar == "c")
-                    unescapedString += ",";
-                else if (escapeChar == "s")
-                    unescapedString += ";";
-                else if (escapeChar == "\\")
-                    unescapedString += "\\";
-                else
-                    unescapedString += "\\" + escapeChar;
-
-            }
-            else
-                unescapedString += c;
-
-        }
-
-        return unescapedString;
-
-    }
-
-    var instructionHandlers = {
-
-        "error": function(parameters) {
-            showError(unescapeGuacamoleString(parameters[0]));
-        },
-
-        "name": function(parameters) {
-            document.title = unescapeGuacamoleString(parameters[0]);
-        },
-
-        "clipboard": function(parameters) {
-            clipboardHandler(unescapeGuacamoleString(parameters[0]));
-        },
-
-        "size": function(parameters) {
-
-            var width = parseInt(parameters[0]);
-            var height = parseInt(parameters[1]);
-
-            // Update (set) display size
-            if (display && (background == null || cursor == null)) {
-                display.style.width = width + "px";
-                display.style.height = height + "px";
-
-                background = new Layer(width, height);
-                cursor = new Layer(width, height);
-
-                display.appendChild(background);
-                display.appendChild(cursor);
-            }
-
-        },
-
-        "rect": function(parameters) {
-
-            var x = parseInt(parameters[0]);
-            var y = parseInt(parameters[1]);
-            var w = parseInt(parameters[2]);
-            var h = parseInt(parameters[3]);
-            var color = parameters[4];
-
-            background.drawRect(
-                x,
-                y,
-                w,
-                h,
-                color
-            );
-
-        },
-
-        "png": function(parameters) {
-
-            var x = parseInt(parameters[0]);
-            var y = parseInt(parameters[1]);
-            var data = parameters[2];
-
-            background.draw(
-                x,
-                y,
-                "data:image/png;base64," + data
-            );
-
-            // If received first update, no longer waiting.
-            if (currentState == STATE_WAITING)
-                setState(STATE_CONNECTED);
-
-        },
-
-        "copy": function(parameters) {
-
-            var srcX = parseInt(parameters[0]);
-            var srcY = parseInt(parameters[1]);
-            var srcWidth = parseInt(parameters[2]);
-            var srcHeight = parseInt(parameters[3]);
-            var dstX = parseInt(parameters[4]);
-            var dstY = parseInt(parameters[5]);
-
-            background.copyRect(
-                srcX,
-                srcY,
-                srcWidth, 
-                srcHeight, 
-                dstX,
-                dstY 
-            );
-
-        },
-
-        "cursor": function(parameters) {
-
-            var x = parseInt(parameters[0]);
-            var y = parseInt(parameters[1]);
-            var data = parameters[2];
-
-            // Start cursor image load
-            var image = new Image();
-            image.onload = function() {
-                cursorImage = image;
-                cursorHotspotX = x;
-                cursorHotspotY = y;
-                redrawCursor();
-            };
-            image.src = "data:image/png;base64," + data
-
-        }
-      
-    };
-
-
-    function doInstruction(opcode, parameters) {
-
-        var handler = instructionHandlers[opcode];
-        if (handler)
-            handler(parameters);
-
-    }
-        
-
-    this.connect = function() {
-
-        setState(STATE_CONNECTING);
-
-        // Start tunnel and connect synchronously
-        var connect_xmlhttprequest = new XMLHttpRequest();
-        connect_xmlhttprequest.open("POST", "connect", false);
-        connect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-        connect_xmlhttprequest.setRequestHeader("Content-length", 0);
-        connect_xmlhttprequest.send(null);
-
-        // Start reading data
-        setState(STATE_WAITING);
-        handleResponse(makeRequest());
-
-    };
-
-    
-    function disconnect() {
-
-        // Only attempt disconnection not disconnected.
-        if (currentState != STATE_DISCONNECTED
-                && currentState != STATE_DISCONNECTING) {
-
-            var message = "disconnect;";
-            setState(STATE_DISCONNECTING);
-
-            // Send disconnect message (synchronously... as necessary until handoff is implemented)
-            var disconnect_xmlhttprequest = new XMLHttpRequest();
-            disconnect_xmlhttprequest.open("POST", "inbound", false);
-            disconnect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-            disconnect_xmlhttprequest.setRequestHeader("Content-length", message.length);
-            disconnect_xmlhttprequest.send(message);
-
-            setState(STATE_DISCONNECTED);
-        }
-
-    }
-
-    this.disconnect = disconnect;
-
-}
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keyboard.js
deleted file mode 100644 (file)
index b5e6e93..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-function GuacamoleKeyboard(element) {
-
-       /*****************************************/
-       /*** Keyboard Handler                  ***/
-       /*****************************************/
-
-       // Single key state/modifier buffer
-       var modShift = 0;
-       var modCtrl = 0;
-       var modAlt = 0;
-
-    var keydownChar = new Array();
-
-
-    // ID of routine repeating keystrokes. -1 = not repeating.
-    var repeatKeyTimeoutId = -1;
-    var repeatKeyIntervalId = -1;
-
-       // Starts repeating keystrokes
-       function startRepeat(keySym) {
-               repeatKeyIntervalId = setInterval(function() {
-            sendKeyReleased(keySym);
-            sendKeyPressed(keySym);
-        }, 50);
-       }
-
-       // Stops repeating keystrokes
-       function stopRepeat() {
-               if (repeatKeyTimeoutId != -1) clearInterval(repeatKeyTimeoutId);
-               if (repeatKeyIntervalId != -1) clearInterval(repeatKeyIntervalId);
-       }
-
-
-    function getKeySymFromKeyIdentifier(shifted, keyIdentifier) {
-
-            var unicodePrefixLocation = keyIdentifier.indexOf("U+");
-            if (unicodePrefixLocation >= 0) {
-
-                var hex = keyIdentifier.substring(unicodePrefixLocation+2);
-                var codepoint = parseInt(hex, 16);
-                var typedCharacter;
-
-                // Convert case if shifted
-                if (shifted == 0)
-                    typedCharacter = String.fromCharCode(codepoint).toLowerCase();
-                else
-                    typedCharacter = String.fromCharCode(codepoint).toUpperCase();
-
-                // Get codepoint
-                codepoint = typedCharacter.charCodeAt(0);
-
-                return getKeySymFromCharCode(codepoint);
-
-            }
-
-            return null;
-
-    }
-
-    function getKeySymFromCharCode(keyCode) {
-
-        if (keyCode >= 0x0000 && keyCode <= 0x00FF)
-            return keyCode;
-
-        if (keyCode >= 0x0100 && keyCode <= 0x10FFFF)
-            return 0x01000000 | keyCode;
-
-        return null;
-
-    }
-
-    function getKeySymFromKeyCode(keyCode) {
-
-        var keysym = null;
-               if (modShift == 0) keysym = unshiftedKeySym[keyCode];
-               else {
-            keysym = shiftedKeySym[keyCode];
-            if (keysym == null) keysym = unshiftedKeySym[keyCode];
-        }
-
-        return keysym;
-
-    }
-
-
-       // Sends a single keystroke over the network
-       function sendKeyPressed(keysym) {
-               if (keysym != null && keyPressedHandler)
-                       keyPressedHandler(keysym);
-       }
-
-       // Sends a single keystroke over the network
-       function sendKeyReleased(keysym) {
-               if (keysym != null)
-                       keyReleasedHandler(keysym);
-       }
-
-
-    var KEYDOWN = 1;
-    var KEYPRESS = 2;
-
-    var keySymSource = null;
-
-       // When key pressed
-    var keydownCode = null;
-       element.onkeydown = function(e) {
-
-        // Only intercept if handler set
-        if (!keyPressedHandler) return true;
-
-               var keynum;
-               if (window.event) keynum = window.event.keyCode;
-               else if (e.which) keynum = e.which;
-
-               // Ctrl/Alt/Shift
-               if (keynum == 16)
-                       modShift = 1;
-               else if (keynum == 17)
-                       modCtrl = 1;
-               else if (keynum == 18)
-                       modAlt = 1;
-
-        var keysym = getKeySymFromKeyCode(keynum);
-        if (keysym) {
-            // Get keysyms and events from KEYDOWN
-            keySymSource = KEYDOWN;
-        }
-
-        // If modifier keys are held down, and we have keyIdentifier
-        else if ((modCtrl == 1 || modAlt == 1) && e.keyIdentifier) {
-
-            // Get keysym from keyIdentifier
-            keysym = getKeySymFromKeyIdentifier(modShift, e.keyIdentifier);
-
-            // Get keysyms and events from KEYDOWN
-            keySymSource = KEYDOWN;
-
-        }
-
-        else
-            // Get keysyms and events from KEYPRESS
-            keySymSource = KEYPRESS;
-
-        keydownCode = keynum;
-
-        // Ignore key if we don't need to use KEYPRESS.
-        // Send key event here
-        if (keySymSource == KEYDOWN) {
-
-            if (keydownChar[keynum] != keysym) {
-
-                // Send event
-                keydownChar[keynum] = keysym;
-                sendKeyPressed(keysym);
-
-                // Clear old key repeat, if any.
-                stopRepeat();
-
-                // Start repeating (if not a modifier key) after a short delay
-                if (keynum != 16 && keynum != 17 && keynum != 18)
-                    repeatKeyTimeoutId = setTimeout(function() { startRepeat(keysym); }, 500);
-            }
-
-            return false;
-        }
-
-       };
-
-       // When key pressed
-    element.onkeypress = function(e) {
-
-        // Only intercept if handler set
-        if (!keyPressedHandler) return true;
-
-        if (keySymSource != KEYPRESS) return false;
-
-               var keynum;
-               if (window.event) keynum = window.event.keyCode;
-               else if (e.which) keynum = e.which;
-
-        var keysym = getKeySymFromCharCode(keynum);
-        if (keysym && keydownChar[keynum] != keysym) {
-
-            // If this button already pressed, release first
-            var lastKeyDownChar = keydownChar[keydownCode];
-            if (lastKeyDownChar)
-                sendKeyReleased(lastKeyDownChar);
-
-            keydownChar[keydownCode] = keysym;
-
-            // Clear old key repeat, if any.
-            stopRepeat();
-
-            // Send key event
-            sendKeyPressed(keysym);
-
-            // Start repeating (if not a modifier key) after a short delay
-            repeatKeyTimeoutId = setTimeout(function() { startRepeat(keysym); }, 500);
-        }
-
-        return false;
-       };
-
-       // When key released
-       element.onkeyup = function(e) {
-
-        // Only intercept if handler set
-        if (!keyReleasedHandler) return true;
-
-               var keynum;
-               if (window.event) keynum = window.event.keyCode;
-               else if (e.which) keynum = e.which;
-               
-               // Ctrl/Alt/Shift
-               if (keynum == 16)
-                       modShift = 0;
-               else if (keynum == 17)
-                       modCtrl = 0;
-               else if (keynum == 18)
-                       modAlt = 0;
-        else
-            stopRepeat();
-
-        // Get corresponding character
-        var lastKeyDownChar = keydownChar[keynum];
-
-        // Clear character record
-        keydownChar[keynum] = null;
-
-        // Send release event
-        sendKeyReleased(lastKeyDownChar);
-
-               return false;
-       };
-
-       // When focus is lost, clear modifiers.
-       var docOnblur = element.onblur;
-       element.onblur = function() {
-               modAlt = 0;
-               modCtrl = 0;
-               modShift = 0;
-               if (docOnblur != null) docOnblur();
-       };
-
-       var keyPressedHandler = null;
-       var keyReleasedHandler = null;
-
-       this.setKeyPressedHandler = function(kh) { keyPressedHandler = kh; };
-       this.setKeyReleasedHandler = function(kh) { keyReleasedHandler = kh; };
-
-}
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/keymap.js
deleted file mode 100644 (file)
index 016bf59..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-
-// Keymap
-
-var unshiftedKeySym = new Array();
-unshiftedKeySym[8]   = 0xFF08; // backspace
-unshiftedKeySym[9]   = 0xFF09; // tab
-unshiftedKeySym[13]  = 0xFF0D; // enter
-unshiftedKeySym[16]  = 0xFFE1; // shift
-unshiftedKeySym[17]  = 0xFFE3; // ctrl
-unshiftedKeySym[18]  = 0xFFE9; // alt
-unshiftedKeySym[19]  = 0xFF13; // pause/break
-unshiftedKeySym[20]  = 0xFFE5; // caps lock
-unshiftedKeySym[27]  = 0xFF1B; // escape
-unshiftedKeySym[33]  = 0xFF55; // page up
-unshiftedKeySym[34]  = 0xFF56; // page down
-unshiftedKeySym[35]  = 0xFF57; // end
-unshiftedKeySym[36]  = 0xFF50; // home
-unshiftedKeySym[37]  = 0xFF51; // left arrow
-unshiftedKeySym[38]  = 0xFF52; // up arrow
-unshiftedKeySym[39]  = 0xFF53; // right arrow
-unshiftedKeySym[40]  = 0xFF54; // down arrow
-unshiftedKeySym[45]  = 0xFF63; // insert
-unshiftedKeySym[46]  = 0xFFFF; // delete
-unshiftedKeySym[91]  = 0xFFEB; // left window key (super_l)
-unshiftedKeySym[92]  = 0xFF67; // right window key (menu key?)
-unshiftedKeySym[93]  = null; // select key
-unshiftedKeySym[112] = 0xFFBE; // f1
-unshiftedKeySym[113] = 0xFFBF; // f2
-unshiftedKeySym[114] = 0xFFC0; // f3
-unshiftedKeySym[115] = 0xFFC1; // f4
-unshiftedKeySym[116] = 0xFFC2; // f5
-unshiftedKeySym[117] = 0xFFC3; // f6
-unshiftedKeySym[118] = 0xFFC4; // f7
-unshiftedKeySym[119] = 0xFFC5; // f8
-unshiftedKeySym[120] = 0xFFC6; // f9
-unshiftedKeySym[121] = 0xFFC7; // f10
-unshiftedKeySym[122] = 0xFFC8; // f11
-unshiftedKeySym[123] = 0xFFC9; // f12
-unshiftedKeySym[144] = 0xFF7F; // num lock
-unshiftedKeySym[145] = 0xFF14; // scroll lock
-
-// Shifted versions, IF DIFFERENT FROM UNSHIFTED!
-// If any of these are null, the unshifted one will be used.
-var shiftedKeySym  = new Array();
-shiftedKeySym[18]  = 0xFFE7; // alt
-
-// Constants for keysyms for special keys
-var KEYSYM_CTRL = 65507;
-var KEYSYM_ALT = 65513;
-var KEYSYM_DELETE = 65535;
-var KEYSYM_SHIFT = 65505;
-
-
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/layer.js
deleted file mode 100644 (file)
index 79080fe..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-function Layer(width, height) {
-
-    // Off-screen buffer
-    var display = document.createElement("canvas");
-
-    display.style.position = "absolute";
-    display.style.left = "0px";
-    display.style.right = "0px";
-
-    display.width = width;
-    display.height = height;
-
-    var displayContext = display.getContext("2d");
-
-    var nextUpdateToDraw = 0;
-    var currentUpdate = 0;
-    var updates = new Array();
-
-    // Given an update ID, either call the provided update callback, or
-    // schedule the update for later.
-    function setUpdate(updateId, update) {
-
-        // If this update is the next to draw...
-        if (updateId == nextUpdateToDraw) {
-
-            // Call provided update handler.
-            update();
-
-            // Draw all pending updates.
-            var updateCallback;
-            while (updateCallback = updates[++nextUpdateToDraw]) {
-                updateCallback();
-                delete updates[nextUpdateToDraw];
-            }
-
-        }
-
-        // If not next to draw, set callback and wait.
-        else
-            updates[updateId] = update;
-
-    }
-
-    display.drawImage = function(x, y, image) {
-        var updateId = currentUpdate++;
-
-        setUpdate(updateId, function() {
-            displayContext.drawImage(image, x, y);
-        });
-
-    }
-
-
-    display.draw = function(x, y, url) {
-        var updateId = currentUpdate++;
-
-        var image = new Image();
-        image.onload = function() {
-            setUpdate(updateId, function() {
-                displayContext.drawImage(image, x, y);
-            });
-        };
-        image.src = url;
-    };
-
-
-    display.copyRect = function(srcx, srcy, w, h, x, y) {
-        var updateId = currentUpdate++;
-    
-        setUpdate(updateId, function() {
-            displayContext.drawImage(display, srcx, srcy, w, h, x, y, w, h);
-        });
-
-    };
-
-    display.drawRect = function(x, y, w, h, color) {
-        var updateId = currentUpdate++;
-
-        setUpdate(updateId, function() {
-            displayContext.fillStyle = color;
-            displayContext.fillRect(x, y, w, h);
-        });
-
-    };
-
-    display.clearRect = function(x, y, w, h) {
-        var updateId = currentUpdate++;
-
-        setUpdate(updateId, function() {
-            displayContext.clearRect(x, y, w, h);
-        });
-
-    };
-
-    display.filter = function(filter) {
-        var updateId = currentUpdate++;
-
-        setUpdate(updateId, function() {
-            var imageData = displayContext.getImageData(0, 0, width, height);
-            filter(imageData.data, width, height);
-            displayContext.putImageData(imageData, 0, 0);
-        });
-
-    };
-
-    return display;
-
-}
-
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/mouse.js
deleted file mode 100644 (file)
index 3a1234a..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-
-function GuacamoleMouse(element) {
-
-       /*****************************************/
-       /*** Mouse Handler                     ***/
-       /*****************************************/
-
-
-    var mouseIndex = 0;
-
-    var mouseLeftButton   = 0;
-    var mouseMiddleButton = 0;
-    var mouseRightButton  = 0;
-
-    var mouseX = 0;
-    var mouseY = 0;
-
-    var absoluteMouseX = 0;
-    var absoluteMouseY = 0;
-
-
-    function getMouseState(up, down) {
-        var mouseState = new MouseEvent(mouseX, mouseY,
-                mouseLeftButton, mouseMiddleButton, mouseRightButton, up, down);
-
-        return mouseState;
-    }
-
-
-    // Block context menu so right-click gets sent properly
-    element.oncontextmenu = function(e) {return false;};
-
-    element.onmousemove = function(e) {
-
-        e.stopPropagation();
-
-        absoluteMouseX = e.pageX;
-        absoluteMouseY = e.pageY;
-
-        mouseX = absoluteMouseX - element.offsetLeft;
-        mouseY = absoluteMouseY - element.offsetTop;
-
-        // This is all JUST so we can get the mouse position within the element
-        var parent = element.offsetParent;
-        while (parent) {
-            if (parent.offsetLeft && parent.offsetTop) {
-                mouseX -= parent.offsetLeft;
-                mouseY -= parent.offsetTop;
-            }
-            parent = parent.offsetParent;
-        }
-
-        movementHandler(getMouseState(0, 0));
-    };
-
-
-    element.onmousedown = function(e) {
-
-        e.stopPropagation();
-
-        switch (e.button) {
-            case 0:
-                mouseLeftButton = 1;
-                break;
-            case 1:
-                mouseMiddleButton = 1;
-                break;
-            case 2:
-                mouseRightButton = 1;
-                break;
-        }
-
-        buttonPressedHandler(getMouseState(0, 0));
-    };
-
-
-    element.onmouseup = function(e) {
-
-        e.stopPropagation();
-
-        switch (e.button) {
-            case 0:
-                mouseLeftButton = 0;
-                break;
-            case 1:
-                mouseMiddleButton = 0;
-                break;
-            case 2:
-                mouseRightButton = 0;
-                break;
-        }
-
-        buttonReleasedHandler(getMouseState(0, 0));
-    };
-
-    // Override selection on mouse event element.
-    element.onselectstart = function() {
-        return false;
-    };
-
-    // Scroll wheel support
-    function handleScroll(e) {
-
-        var delta = 0;
-        if (e.detail)
-            delta = e.detail;
-        else if (e.wheelDelta)
-            delta = -event.wheelDelta;
-
-        // Up
-        if (delta < 0) {
-            buttonPressedHandler(getMouseState(1, 0));
-            buttonReleasedHandler(getMouseState(0, 0));
-        }
-
-        // Down
-        if (delta > 0) {
-            buttonPressedHandler(getMouseState(0, 1));
-            buttonReleasedHandler(getMouseState(0, 0));
-        }
-
-        if (e.preventDefault)
-            e.preventDefault();
-
-        e.returnValue = false;
-    }
-
-    element.addEventListener('DOMMouseScroll', handleScroll, false);
-
-    element.onmousewheel = function(e) {
-        handleScroll(e);
-    }
-
-    function MouseEvent(x, y, left, middle, right, up, down) {
-
-        this.getX = function() {
-            return x;
-        };
-
-        this.getY = function() {
-            return y;
-        };
-
-        this.getLeft = function() {
-            return left;
-        };
-
-        this.getMiddle = function() {
-            return middle;
-        };
-
-        this.getRight = function() {
-            return right;
-        };
-
-        this.getUp = function() {
-            return up;
-        };
-
-        this.getDown = function() {
-            return down;
-        };
-
-        this.toString = function() {
-            return (mouseIndex++) + "," + x + "," + y + "," + left + "," + middle + "," + right + "," + up + "," + down;
-        };
-
-    }
-
-
-       var buttonPressedHandler = null;
-       var buttonReleasedHandler = null;
-       var movementHandler = null;
-
-       this.setButtonPressedHandler  = function(mh) {buttonPressedHandler = mh;};
-       this.setButtonReleasedHandler = function(mh) {buttonReleasedHandler = mh;};
-       this.setMovementHandler = function(mh) {movementHandler = mh;};
-
-
-    this.getX = function() {return mouseX;};
-    this.getY = function() {return mouseY;};
-    this.getLeftButton = function() {return mouseLeftButton;};
-    this.getMiddleButton = function() {return mouseMiddleButton;};
-    this.getRightButton = function() {return mouseRightButton;};
-
-}
diff --git a/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js b/web/guacamole-default-webapp/src/main/webapp/guac-web-lib/javascript/oskeyboard.js
deleted file mode 100644 (file)
index 872bac2..0000000
+++ /dev/null
@@ -1,487 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-
-function GuacamoleOnScreenKeyboard(url) {
-
-    var tabIndex = 1;
-    var allKeys = new Array();
-    var modifierState = new function() {};
-
-    function getKeySize(size) {
-        return (5*size) + "ex";
-    }
-
-    function getCapSize(size) {
-        return (5*size - 0.5) + "ex";
-    }
-
-    function clearModifiers() {
-
-        // Send key release events for all pressed modifiers
-        for (var k=0; k<allKeys.length; k++) {
-
-            var key = allKeys[k];
-            var cap = key.getCap();
-            var modifier = cap.getModifier();
-
-            if (modifier && isModifierActive(modifier) && !cap.isSticky() && key.isPressed())
-                key.release();
-
-        }
-
-    }
-
-    function setModifierReleased(modifier) {
-        if (isModifierActive(modifier))
-            modifierState[modifier]--;
-    }
-
-    function setModifierPressed(modifier) {
-        if (modifierState[modifier] == null)
-            modifierState[modifier] = 1;
-        else
-            modifierState[modifier]++;
-    }
-
-    function isModifierActive(modifier) {
-        if (modifierState[modifier] > 0)
-            return true;
-
-        return false;
-    }
-
-    function toggleModifierPressed(modifier) {
-        if (isModifierActive(modifier))
-            setModifierReleased(modifier);
-        else
-            setModifierPressed(modifier);
-    }
-
-    function refreshAllKeysState() {
-        for (var k=0; k<allKeys.length; k++)
-            allKeys[k].refreshState();
-    }
-
-    function Key(key) {
-
-        function Cap(cap) {
-
-            // Displayed text
-            var displayText = cap.textContent;
-            
-            // Keysym
-            var keysym = null;
-            if (cap.attributes["keysym"])
-                keysym = parseInt(cap.attributes["keysym"].value);
-
-            // If keysym not specified, get keysym from display text.
-            else if (displayText.length == 1) {
-
-                var charCode = displayText.charCodeAt(0);
-
-                if (charCode >= 0x0000 && charCode <= 0x00FF)
-                    keysym = charCode;
-
-                else if (charCode >= 0x0100 && charCode <= 0x10FFFF)
-                    keysym = 0x01000000 | charCode;
-            }
-
-            // Required modifiers for this keycap
-            var reqMod = null;
-            if (cap.attributes["if"])
-                reqMod = cap.attributes["if"].value.split(",");
-
-
-            // Modifier represented by this keycap
-            var modifier = null;
-            if (cap.attributes["modifier"])
-                modifier = cap.attributes["modifier"].value;
-            
-
-            // Whether this key is sticky (toggles)
-            // Currently only valid for modifiers.
-            var sticky = false;
-            if (cap.attributes["sticky"] && cap.attributes["sticky"].value == "true")
-                sticky = true;
-
-            this.getDisplayText = function() {
-                return cap.textContent;
-            };
-
-            this.getKeySym = function() {
-                return keysym;
-            };
-
-            this.getRequiredModifiers = function() {
-                return reqMod;
-            };
-
-            this.getModifier = function() {
-                return modifier;
-            };
-
-            this.isSticky = function() {
-                return sticky;
-            };
-
-        }
-
-        var size = null;
-        if (key.attributes["size"])
-            size = parseFloat(key.attributes["size"].value);
-
-        var caps = key.getElementsByTagName("cap");
-        var keycaps = new Array();
-        for (var i=0; i<caps.length; i++)
-            keycaps.push(new Cap(caps[i]));
-
-        var rowKey = document.createElement("div");
-        rowKey.className = "key";
-
-        var keyCap = document.createElement("div");
-        keyCap.className = "cap";
-        rowKey.appendChild(keyCap);
-
-
-        var STATE_RELEASED = 0;
-        var STATE_PRESSED = 1;
-        var state = STATE_RELEASED;
-
-        rowKey.isPressed = function() {
-            return state == STATE_PRESSED;
-        }
-
-        var currentCap = null;
-        function refreshState(modifier) {
-
-            // Find current cap
-            currentCap = null;
-            for (var j=0; j<keycaps.length; j++) {
-
-                var keycap = keycaps[j];
-                var required = keycap.getRequiredModifiers();
-
-                var matches = true;
-
-                // If modifiers required, make sure all modifiers are active
-                if (required) {
-
-                    for (var k=0; k<required.length; k++) {
-                        if (!isModifierActive(required[k])) {
-                            matches = false;
-                            break;
-                        }
-                    }
-
-                }
-
-                if (matches)
-                    currentCap = keycap;
-
-            }
-
-            rowKey.className = "key";
-
-            if (currentCap.getModifier())
-                rowKey.className += " modifier";
-
-            if (currentCap.isSticky())
-                rowKey.className += " sticky";
-
-            if (isModifierActive(currentCap.getModifier()))
-                rowKey.className += " active";
-
-            if (state == STATE_PRESSED)
-                rowKey.className += " pressed";
-
-            keyCap.textContent = currentCap.getDisplayText();
-        }
-        rowKey.refreshState = refreshState;
-
-        rowKey.getCap = function() {
-            return currentCap;
-        };
-
-        refreshState();
-
-        // Set size
-        if (size) {
-            rowKey.style.width = getKeySize(size);
-            keyCap.style.width = getCapSize(size);
-        }
-
-
-
-        // Set pressed, if released
-        function press() {
-
-            if (state == STATE_RELEASED) {
-
-                state = STATE_PRESSED;
-
-                var keysym = currentCap.getKeySym();
-                var modifier = currentCap.getModifier();
-                var sticky = currentCap.isSticky();
-
-                if (keyPressedHandler && keysym)
-                    keyPressedHandler(keysym);
-
-                if (modifier) {
-
-                    // If sticky modifier, toggle
-                    if (sticky) 
-                        toggleModifierPressed(modifier);
-
-                    // Otherwise, just set on.
-                    else 
-                        setModifierPressed(modifier);
-
-                    refreshAllKeysState();
-                }
-                else
-                    refreshState();
-            }
-
-        }
-        rowKey.press = press;
-
-
-        // Set released, if pressed 
-        function release() {
-
-            if (state == STATE_PRESSED) {
-
-                state = STATE_RELEASED;
-
-                var keysym = currentCap.getKeySym();
-                var modifier = currentCap.getModifier();
-                var sticky = currentCap.isSticky();
-
-                if (keyReleasedHandler && keysym)
-                    keyReleasedHandler(keysym);
-
-                if (modifier) {
-
-                    // If not sticky modifier, release modifier
-                    if (!sticky) {
-                        setModifierReleased(modifier);
-                        refreshAllKeysState();
-                    }
-                    else
-                        refreshState();
-
-                }
-                else {
-                    refreshState();
-
-                    // If not a modifier, also release all pressed modifiers
-                    clearModifiers();
-                }
-
-            }
-
-        }
-        rowKey.release = release;
-
-        // Toggle press/release states
-        function toggle() {
-            if (state == STATE_PRESSED)
-                release();
-            else
-                press();
-        }
-
-
-        // Send key press on mousedown
-        rowKey.onmousedown = function(e) {
-
-            e.stopPropagation();
-
-            var modifier = currentCap.getModifier();
-            var sticky = currentCap.isSticky();
-
-            // Toggle non-sticky modifiers
-            if (modifier && !sticky)
-                toggle();
-
-            // Press all others
-            else
-                press();
-
-            return false;
-        };
-
-        // Send key release on mouseup/out
-        rowKey.onmouseout =
-        rowKey.onmouseout =
-        rowKey.onmouseup = function(e) {
-
-            e.stopPropagation();
-
-            var modifier = currentCap.getModifier();
-            var sticky = currentCap.isSticky();
-
-            // Release non-modifiers and sticky modifiers
-            if (!modifier || sticky)
-                release();
-
-            return false;
-        };
-
-        rowKey.onselectstart = function() { return false; };
-
-        return rowKey;
-
-    }
-
-    function Gap(gap) {
-
-        var keyboardGap = document.createElement("div");
-        keyboardGap.className = "gap";
-        keyboardGap.textContent = " ";
-
-        var size = null;
-        if (gap.attributes["size"])
-            size = parseFloat(gap.attributes["size"].value);
-
-        if (size) {
-            keyboardGap.style.width = getKeySize(size);
-            keyboardGap.style.height = getKeySize(size);
-        }
-
-        return keyboardGap;
-
-    }
-
-    function Row(row) {
-
-        var keyboardRow = document.createElement("div");
-        keyboardRow.className = "row";
-
-        var children = row.childNodes;
-        for (var j=0; j<children.length; j++) {
-            var child = children[j];
-
-            // <row> can contain <key> or <column>
-            if (child.tagName == "key") {
-                var key = new Key(child);
-                keyboardRow.appendChild(key);
-                allKeys.push(key);
-            }
-            else if (child.tagName == "gap") {
-                var gap = new Gap(child);
-                keyboardRow.appendChild(gap);
-            }
-            else if (child.tagName == "column") {
-                var col = new Column(child);
-                keyboardRow.appendChild(col);
-            }
-
-        }
-
-        return keyboardRow;
-
-    }
-
-    function Column(col) {
-
-        var keyboardCol = document.createElement("div");
-        keyboardCol.className = "col";
-
-        var align = null;
-        if (col.attributes["align"])
-            align = col.attributes["align"].value;
-
-        var children = col.childNodes;
-        for (var j=0; j<children.length; j++) {
-            var child = children[j];
-
-            // <column> can only contain <row> 
-            if (child.tagName == "row") {
-                var row = new Row(child);
-                keyboardCol.appendChild(row);
-            }
-
-        }
-
-        if (align)
-            keyboardCol.style.textAlign = align;
-
-        return keyboardCol;
-
-    }
-
-
-
-    // Create keyboard
-    var keyboard = document.createElement("div");
-    keyboard.className = "keyboard";
-
-
-    // Retrieve keyboard XML
-    var xmlhttprequest = new XMLHttpRequest();
-    xmlhttprequest.open("GET", url, false);
-    xmlhttprequest.send(null);
-
-    var xml = xmlhttprequest.responseXML;
-
-    if (xml) {
-
-        // Parse document
-        var root = xml.documentElement;
-        if (root) {
-
-            var children = root.childNodes;
-            for (var i=0; i<children.length; i++) {
-                var child = children[i];
-
-                // <keyboard> can contain <row> or <column>
-                if (child.tagName == "row") {
-                    keyboard.appendChild(new Row(child));
-                }
-                else if (child.tagName == "column") {
-                    keyboard.appendChild(new Column(child));
-                }
-
-            }
-
-        }
-
-    }
-
-    var keyPressedHandler = null;
-    var keyReleasedHandler = null;
-
-    keyboard.setKeyPressedHandler = function(kh) { keyPressedHandler = kh; };
-    keyboard.setKeyReleasedHandler = function(kh) { keyReleasedHandler = kh; };
-
-    // Do not allow selection or mouse movement to propagate/register.
-    keyboard.onselectstart =
-    keyboard.onmousemove   =
-    keyboard.onmouseup     =
-    keyboard.onmousedown   =
-    function(e) {
-        e.stopPropagation();
-        return false;
-    };
-
-    return keyboard;
-}
-
diff --git a/web/guacamole-default-webapp/src/main/webapp/guacamole.css b/web/guacamole-default-webapp/src/main/webapp/guacamole.css
deleted file mode 100644 (file)
index 3e5b541..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-body {
-    background: black;
-    font-family: sans-serif;
-    padding: 0;
-    margin: 0;
-}
-
-div#login-ui {
-    background: silver;
-    height: 100%;
-    width: 100%;
-    position: fixed;
-    left: 0;
-    top: 0;
-    display: table;
-}
-
-p#login-error {
-    text-align: center;
-    background: #FDD;
-    color: red;
-    margin: 0.2em;
-}
-
-div#login-logo {
-    position: relative;
-    bottom: 0;
-    display: inline-block;
-    vertical-align: middle;
-}
-
-div#login-dialog-middle {
-    width: 100%;
-    display: table-cell;
-    vertical-align: middle;
-    text-align: center;
-}
-
-div#login-dialog {
-
-    background: white;
-    vertical-align: middle;
-
-    padding: 1em;
-    border: 0.2em solid black;
-
-    -khtml-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    -moz-border-radius: 0.5em;
-    border-radius: 0.5em;
-
-    max-width: 75%;
-    text-align: left;
-
-    display: inline-block;
-}
-
-div#login-dialog h1 {
-    margin-top: 0;
-    margin-bottom: 0em;
-    text-align: center;
-}
-
-div#login-dialog #buttons {
-    padding-top: 0.5em;
-    text-align: center;
-}
-
-div#login-dialog #login-fields {
-    border-top: 1px solid silver;
-    border-bottom: 1px solid silver;
-    padding-top: 0.5em;
-    padding-bottom: 0.5em;
-}
-
-div.errorDialogOuter {
-    display: table;
-    height: 100%;
-    width: 100%;
-    position: fixed;
-    left: 0;
-    top: 0;
-
-    visibility: hidden;
-}
-
-div.errorDialogMiddle {
-    width: 100%;
-    text-align: center;
-    display: table-cell;
-    vertical-align: middle;
-}
-
-div.errorDialog {
-
-    background: #D44;
-    border: 1px solid black;
-    padding: 1em;
-
-    -khtml-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    -moz-border-radius: 0.5em;
-    border-radius: 0.5em;
-
-    -moz-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-    -webkit-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-    -khtml-box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-    box-shadow: 0 0.25em 0.75em black, inset 0.1em 0.1em 0.5em #F99, inset -0.1em -0.1em 0.75em #800;
-
-    max-width: 75%;
-    text-align: left;
-
-    display: inline-block;
-}
-
-div.errorDialog h1 {
-    margin: 0;
-    margin-bottom: 0.25em;
-    text-align: center;
-    text-shadow: 0 0 0.25em white;
-}
-
-div.errorDialog div.buttons {
-    margin: 0;
-    margin-top: 0.5em;
-    text-align: center;
-}
-
-div.errorDialog p {
-    margin: 0;
-}
-
-
-#menu {
-    margin-left: auto;
-    margin-right: auto;
-    margin-bottom: 1em;
-    font-size: 0.8em;
-    background: #FEA;
-    border: 1px solid black;
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    z-index: 1;
-}
-
-#menu.connected {
-    opacity: 0.5;
-}
-
-#menu.connected:hover {
-    opacity: 1;
-}
-
-#menu.error {
-    background: #D44;
-}
-
-.error #state {
-    font-weight: bold;
-}
-
-img {
-    border: none;
-}
-
-img#license {
-    border: none;
-    float: right;
-    margin: 2px;
-}
-
-div#display {
-    position: relative;
-    width: 640px;
-    height: 480px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-#menu img {
-    vertical-align: middle;
-}
-
-#menu button {
-    vertical-align: middle;
-}
-
-#menu span {
-    vertical-align: middle;
-}
-
-div#clipboardDiv {
-    display: none;
-    position: absolute;
-    background: #FA5;
-    padding: 1em;
-
-    border: 1px solid black;
-    -khtml-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    -moz-border-radius: 0.5em;
-    border-radius: 0.5em;
-
-    width: 50em;
-}
-
-div#clipboardDiv h2 {
-    margin: 0;
-    font-size: 1em;
-}
-
-div#clipboardDiv textarea {
-    width: 100%;
-}
-
diff --git a/web/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png b/web/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png
deleted file mode 100644 (file)
index 37f0158..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/images/agpl-logo.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/images/checker.png b/web/guacamole-default-webapp/src/main/webapp/images/checker.png
deleted file mode 100644 (file)
index 06f8903..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/images/checker.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png b/web/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png
deleted file mode 100644 (file)
index 02897db..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/images/guacamole-64-icon.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png b/web/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png
deleted file mode 100644 (file)
index 02897db..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/images/guacamole-icon-64.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png b/web/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png
deleted file mode 100644 (file)
index 3652598..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/images/guacamole-logo.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/images/login-logo.png b/web/guacamole-default-webapp/src/main/webapp/images/login-logo.png
deleted file mode 100644 (file)
index d20a2e7..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/images/login-logo.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png b/web/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png
deleted file mode 100644 (file)
index 2245bfd..0000000
Binary files a/web/guacamole-default-webapp/src/main/webapp/images/noguacamole-logo.png and /dev/null differ
diff --git a/web/guacamole-default-webapp/src/main/webapp/index.html b/web/guacamole-default-webapp/src/main/webapp/index.html
deleted file mode 100644 (file)
index 8c3e816..0000000
+++ /dev/null
@@ -1,335 +0,0 @@
-<!DOCTYPE HTML>
-
-<!--
-    Guacamole - Clientless Remote Desktop
-    Copyright (C) 2010  Michael Jumper
-
-    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 <http://www.gnu.org/licenses/>.
--->
-
-<html>
-
-    <head>
-        <link rel="icon" type="image/png" href="images/guacamole-icon-64.png"/>
-        <link rel="stylesheet" type="text/css" href="guacamole.css"/>
-        <link rel="stylesheet" type="text/css" href="guac-web-lib/css/guacamole.css"/>
-        <link rel="stylesheet" type="text/css" href="keyboard.css"/>
-        <title>Guacamole</title>
-    </head>
-
-    <body>
-
-        <div id="login-ui">
-            <div id="login-dialog-middle">
-
-                <div id="login-logo">
-                    <img src="images/login-logo.png" alt="\_GUAC_/"/>
-                </div>
-
-                <div id="login-dialog">
-
-                    <h1>Guacamole Login</h1>
-
-                    <p id="login-error"></p>
-
-                    <form id="login-form" action="login" method="post">
-                        <table id="login-fields">
-                            <tr>
-                                <th>Username</th>
-                                <td><input type="text" name="username" id="username"/></td>
-                            </tr>
-                            <tr>
-                                <th>Password</th>
-                                <td><input type="password" name="password" id="password"/></td>
-                            </tr>
-                        </table>
-
-                        <div id="buttons">
-                            <input type="submit" name="login" id="login" value="Login"/>
-                        </div>
-                    </form>
-                </div>
-
-            </div>
-        </div>
-
-        <!-- Main UI - hidden until login succeeds -->
-        <div id="main-guacamole-ui" style="display: none">
-
-            <!-- Menu -->
-            <div id="menu">
-
-                <!-- Clipboard -->
-                <button id="showClipboard">Show Clipboard</button>
-                <div id="clipboardDiv">
-                    <h2>Clipboard</h2>
-                    <p>
-                    Text copied/cut within Guacamole will appear here. Changes to the text will affect the remote clipboard, and will be pastable within the remote desktop. Use the textbox below as an interface between the client and server clipboards.
-                    </p>
-                    <textarea rows="10" cols="40" id="clipboard"></textarea>
-                </div>
-
-                <button id="showKeyboard">Show Keyboard</button>
-                <button id="CtrlAltDelete">Ctrl-Alt-Delete</button>
-
-                <!-- Logo and status -->
-                <img id="logo" src="images/guacamole-logo.png" alt="Guacamole" title="__GUAC_VERSION"/>
-                <span id="state"></span>
-
-                <a href="agpl-3.0-standalone.html"><img id="license" src="images/agpl-logo.png" alt="AGPLv3"/></a>
-            </div>
-
-
-            <!-- Display -->
-            <div id="display" class="guac-display guac-loading">
-                <!-- On-screen keyboard -->
-                <div id="keyboardContainer"></div>
-            </div>
-
-
-            <!-- Error Dialog-->
-            <div id="errorDialog" class="errorDialogOuter">
-                <div class="errorDialogMiddle">
-                    <div class="errorDialog">
-                        <h1>Error</h1>
-                        <p id="errorText"></p>
-                        <div class="buttons"><button id="reconnect">Reconnect</button></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-        <!-- Scripts -->
-        <script type="text/javascript" src="guac-web-lib/javascript/keymap.js"></script>
-        <script type="text/javascript" src="guac-web-lib/javascript/keyboard.js"></script>
-        <script type="text/javascript" src="guac-web-lib/javascript/mouse.js"></script>
-        <script type="text/javascript" src="guac-web-lib/javascript/layer.js"></script>
-        <script type="text/javascript" src="guac-web-lib/javascript/guacamole.js"></script>
-        <script type="text/javascript" src="guac-web-lib/javascript/oskeyboard.js"></script>
-
-        <!-- Init -->
-        <script type="text/javascript"> /* <![CDATA[ */
-
-            var loginForm = document.getElementById("login-form");
-            var loginUI = document.getElementById("login-ui");
-
-            loginForm.onsubmit = function() {
-
-                var username = document.getElementById("username");
-                var password = document.getElementById("password");
-
-                var data =
-                       "username=" + encodeURIComponent(username.value)
-                    + "&password=" + encodeURIComponent(password.value)
-
-                var xmlhttprequest = new XMLHttpRequest();
-                xmlhttprequest.open("POST", "login", false);
-                xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-                xmlhttprequest.setRequestHeader("Content-length", data.length);
-                xmlhttprequest.send(data);
-
-                if (xmlhttprequest.status == 200) {
-                    loginUI.style.display = "none";
-                    startGuacamole();
-                }
-                else {
-
-                    var loginError = document.getElementById("login-error");
-
-                    // Display error, reset and refocus password field
-                    loginError.textContent = "Invalid login. Please try again.";
-                    password.value = "";
-                    password.focus();
-
-                }
-
-                return false;
-
-            }
-
-            // Shows guacamole interface and initiates connection to guacamole
-            function startGuacamole() {
-
-                document.getElementById("main-guacamole-ui").style.display = "block";
-
-                var menu = document.getElementById("menu");
-                var display = document.getElementById("display");
-                var logo = document.getElementById("logo");
-
-                var errorDialog = document.getElementById("errorDialog");
-                var errorDialogText = document.getElementById("errorText");
-
-                // Position display correctly
-                window.onresize = function() {
-                    display.style.top = menu.offsetHeight + "px";
-                };
-
-                window.onresize();
-
-                // Instantiate client
-                var guac = new GuacamoleClient(display);
-
-                var state = document.getElementById("state");
-                guac.setOnStateChangeHandler(function(clientState) {
-
-                        switch (clientState) {
-                            case 0:
-                                state.textContent = "Idle."
-                                break;
-                            case 1:
-                                state.textContent = "Connecting...";
-                                break;
-                            case 2:
-                                state.textContent = "Connected, waiting for first update...";
-                                break;
-                            case 3:
-                                display.className = display.className.replace(/guac-loading/, '');
-                                menu.className = "connected";
-                                state.textContent = "Connected.";
-                                break;
-                            case 4:
-                                state.textContent = "Disconnecting...";
-                                break;
-                            case 5:
-                                state.textContent = "Disconnected.";
-                                break;
-                            default:
-                                state.textContent = "Unknown";
-                        }
-                });
-
-                // Cache error image (might not be available when error occurs)
-                var guacErrorImage = new Image();
-                guacErrorImage.src = "images/noguacamole-logo.png";
-
-                guac.setErrorHandler(function(error) {
-                    menu.className = "error";
-                    logo.src = guacErrorImage.src;
-                    errorDialogText.textContent = error;
-                    errorDialog.style.visibility = "visible";
-                });
-
-                // Reconnect button
-                var reconnect = document.getElementById("reconnect");
-                reconnect.onclick = function() {
-                    window.location.reload();
-                };
-
-                // Connect
-                guac.connect();
-
-                // Disconnect on close
-                window.onunload = function() {
-                    guac.disconnect();
-                }
-
-                // Handle clipboard events
-                var clipboardElement = document.getElementById("clipboard");
-                clipboardElement.onchange = function() {
-
-                    var text = clipboardElement.value;
-                    guac.setClipboard(text);
-
-                };
-
-                // Ignore keypresses when clipboard is focused
-                clipboardElement.onfocus = function() {
-                    guac.disableKeyboard();
-                };
-
-                // Capture keypresses when clipboard is not focused
-                clipboardElement.onblur = function() {
-                    guac.enableKeyboard();
-                };
-
-                // Server copy handler
-                guac.setClipboardHandler(
-                    function(data) {
-                        clipboardElement.value = data;
-                    }
-                );
-
-
-                // Show/Hide clipboard
-                var clipboardDiv = document.getElementById("clipboardDiv");
-                var showClipboard = document.getElementById("showClipboard");
-                showClipboard.onclick = function() {
-
-                    var displayed = clipboardDiv.style.display;
-                    if (displayed != "block") {
-                        clipboardDiv.style.display = "block";
-                        showClipboard.innerHTML = "Hide Clipboard";
-                    }
-                    else {
-                        clipboardDiv.style.display = "none";
-                        showClipboard.innerHTML = "Show Clipboard";
-                        clipboardElement.onchange();
-                    }
-
-                };
-
-
-                // Show/Hide keyboard
-                var keyboardContainer = document.getElementById("keyboardContainer");
-                var showKeyboard = document.getElementById("showKeyboard");
-                showKeyboard.onclick = function() {
-
-                    var displayed = keyboardContainer.style.display;
-                    if (displayed != "block") {
-                        keyboardContainer.style.display = "block";
-                        showKeyboard.textContent = "Hide Keyboard";
-                    }
-                    else {
-                        keyboardContainer.style.display = "none";
-                        showKeyboard.textContent = "Show Keyboard";
-                    }
-
-                };
-
-                // On-screen keyboard
-                var osKeyboard = new GuacamoleOnScreenKeyboard("layouts/en-us-qwerty.xml");
-                keyboardContainer.appendChild(osKeyboard);
-
-                osKeyboard.setKeyPressedHandler(
-                        function(keysym) {
-                            guac.pressKey(keysym);
-                        }
-                );
-
-                osKeyboard.setKeyReleasedHandler(
-                        function(keysym) {
-                            guac.releaseKey(keysym);
-                        }
-                );
-
-                // Send Ctrl-Alt-Delete
-                var CtrlAltDelete = document.getElementById("CtrlAltDelete");
-
-                CtrlAltDelete.onclick = function() {
-                    guac.pressKey(KEYSYM_CTRL);
-                    guac.pressKey(KEYSYM_ALT);
-                    guac.pressKey(KEYSYM_DELETE);
-                    guac.releaseKey(KEYSYM_DELETE);
-                    guac.releaseKey(KEYSYM_ALT);
-                    guac.releaseKey(KEYSYM_CTRL);
-                }
-
-            }
-
-            /* ]]> */ </script>
-
-    </body>
-
-</html>
diff --git a/web/guacamole-default-webapp/src/main/webapp/keyboard.css b/web/guacamole-default-webapp/src/main/webapp/keyboard.css
deleted file mode 100644 (file)
index 690c14f..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-
-/*
- *  Guacamole - Clientless Remote Desktop
- *  Copyright (C) 2010  Michael Jumper
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-div#keyboardContainer {
-    position: fixed;
-    left: 0px;
-    bottom: 0px;
-    text-align: center;
-    width: 100%;
-    display: none;
-    z-index: 1;
-}
-
-div.keyboard {
-
-    font-size: 10pt;
-    white-space: pre;
-
-    border: 1px solid black;
-    -moz-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    -khtml-border-radius: 0.5em;
-    border-radius: 0.5em;
-    background: #222;
-
-    cursor: default;
-
-    opacity: 0.85;
-
-    padding: 0.25em;
-    margin: 0.25em;
-
-    display: inline-block;
-    text-align: left;
-}
-
-div.key {
-
-    margin: 0;
-    padding: 0;
-
-    width: 5ex;
-    height: 5ex;
-
-    display: inline-block;
-    text-align: center;
-}
-
-div.cap {
-
-    border: 1px solid #888;
-    -moz-border-radius: 0.25em;
-    -webkit-border-radius: 0.25em;
-    -khtml-border-radius: 0.25em;
-    border-radius: 0.25em;
-    background: #444;
-
-    margin: 0;
-    padding: 0;
-
-    color: white;
-    text-shadow: 0 0.1em 0.1em black;
-
-    width: 4.5ex;
-    height: 4.5ex;
-    line-height: 4.5ex;
-    white-space: pre;
-
-    display: inline-block;
-    text-align: center;
-}
-
-div.key:hover div.cap {
-    background: #666;
-    border-color: #666;
-    cursor: pointer;
-}
-
-div.key.pressed div.cap {
-    background: #822;
-    border-color: #D44;
-}
-
-div.key.sticky.active div.cap {
-    background: #882;
-    border-color: #DD4;
-}
-
-div.gap {
-    margin: 0;
-    padding: 0;
-
-    width: 5ex;
-    height: 5ex;
-
-    display: inline-block;
-}
-
-div.row {
-    vertical-align: top;
-}
-
-div.col {
-    display: inline-block;
-    vertical-align: top;
-}
-
diff --git a/web/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml b/web/guacamole-default-webapp/src/main/webapp/layouts/en-us-qwerty.xml
deleted file mode 100644 (file)
index 2223de9..0000000
+++ /dev/null
@@ -1,409 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Guacamole - Clientless Remote Desktop
-    Copyright (C) 2010  Michael Jumper
-
-    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 <http://www.gnu.org/licenses/>.
--->
-
-<keyboard lang="en_US" layout="qwerty">
-    <row>
-        <key>
-            <cap keysym="0xFF1B">Esc</cap>
-        </key>
-        <gap size="0.25"/>
-        <key>
-            <cap keysym="0xFFBE">F1</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFBF">F2</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC0">F3</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC1">F4</cap>
-        </key>
-        <gap size="0.25"/>
-        <key>
-            <cap keysym="0xFFC2">F5</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC3">F6</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC4">F7</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC5">F8</cap>
-        </key>
-        <gap size="0.25"/>
-        <key>
-            <cap keysym="0xFFC6">F9</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC7">F10</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC8">F11</cap>
-        </key>
-        <key>
-            <cap keysym="0xFFC9">F12</cap>
-        </key>
-    </row>
-    <row>
-        <gap size="0.25"/>
-    </row>
-    <column>
-        <row>
-            <key>
-                <cap>`</cap>
-                <cap if="shift">~</cap>
-            </key>
-            <key>
-                <cap>1</cap>
-                <cap if="shift">!</cap>
-            </key>
-            <key>
-                <cap>2</cap>
-                <cap if="shift">@</cap>
-            </key>
-            <key>
-                <cap>3</cap>
-                <cap if="shift">#</cap>
-            </key>
-            <key>
-                <cap>4</cap>
-                <cap if="shift">$</cap>
-            </key>
-            <key>
-                <cap>5</cap>
-                <cap if="shift">%</cap>
-            </key>
-            <key>
-                <cap>6</cap>
-                <cap if="shift">^</cap>
-            </key>
-            <key>
-                <cap>7</cap>
-                <cap if="shift">&amp;</cap>
-            </key>
-            <key>
-                <cap>8</cap>
-                <cap if="shift">*</cap>
-            </key>
-            <key>
-                <cap>9</cap>
-                <cap if="shift">(</cap>
-            </key>
-            <key>
-                <cap>0</cap>
-                <cap if="shift">)</cap>
-            </key>
-            <key>
-                <cap>-</cap>
-                <cap if="shift">_</cap>
-            </key>
-            <key>
-                <cap>=</cap>
-                <cap if="shift">+</cap>
-            </key>
-            <key size="2">
-                <cap keysym="0xFF08">Back</cap>
-            </key>
-        </row>
-
-        <row>
-            <key size="1.5">
-                <cap keysym="0xFF09">Tab</cap>
-            </key>
-            <key>
-                <cap>q</cap>
-                <cap if="caps">Q</cap>
-                <cap if="shift">Q</cap>
-                <cap if="caps,shift">q</cap>
-            </key>
-            <key>
-                <cap>w</cap>
-                <cap if="caps">W</cap>
-                <cap if="shift">W</cap>
-                <cap if="caps,shift">w</cap>
-            </key>
-            <key>
-                <cap>e</cap>
-                <cap if="caps">E</cap>
-                <cap if="shift">E</cap>
-                <cap if="caps,shift">e</cap>
-            </key>
-            <key>
-                <cap>r</cap>
-                <cap if="caps">R</cap>
-                <cap if="shift">R</cap>
-                <cap if="caps,shift">r</cap>
-            </key>
-            <key>
-                <cap>t</cap>
-                <cap if="caps">T</cap>
-                <cap if="shift">T</cap>
-                <cap if="caps,shift">t</cap>
-            </key>
-            <key>
-                <cap>y</cap>
-                <cap if="caps">Y</cap>
-                <cap if="shift">Y</cap>
-                <cap if="caps,shift">y</cap>
-            </key>
-            <key>
-                <cap>u</cap>
-                <cap if="caps">U</cap>
-                <cap if="shift">U</cap>
-                <cap if="caps,shift">u</cap>
-            </key>
-            <key>
-                <cap>i</cap>
-                <cap if="caps">I</cap>
-                <cap if="shift">I</cap>
-                <cap if="caps,shift">i</cap>
-            </key>
-            <key>
-                <cap>o</cap>
-                <cap if="caps">O</cap>
-                <cap if="shift">O</cap>
-                <cap if="caps,shift">o</cap>
-            </key>
-            <key>
-                <cap>p</cap>
-                <cap if="caps">P</cap>
-                <cap if="shift">P</cap>
-                <cap if="caps,shift">p</cap>
-            </key>
-            <key>
-                <cap>[</cap>
-                <cap if="shift">{</cap>
-            </key>
-            <key>
-                <cap>]</cap>
-                <cap if="shift">}</cap>
-            </key>
-            <key size="1.5">
-                <cap>\</cap>
-                <cap if="shift">|</cap>
-            </key>
-        </row>
-        <row>
-            <key size="1.75">
-                <cap modifier="caps" keysym="0xFFE5" sticky="true">Caps</cap>
-            </key>
-            <key>
-                <cap>a</cap>
-                <cap if="caps">A</cap>
-                <cap if="shift">A</cap>
-                <cap if="caps,shift">a</cap>
-            </key>
-            <key>
-                <cap>s</cap>
-                <cap if="caps">S</cap>
-                <cap if="shift">S</cap>
-                <cap if="caps,shift">s</cap>
-            </key>
-            <key>
-                <cap>d</cap>
-                <cap if="caps">D</cap>
-                <cap if="shift">D</cap>
-                <cap if="caps,shift">d</cap>
-            </key>
-            <key>
-                <cap>f</cap>
-                <cap if="caps">F</cap>
-                <cap if="shift">F</cap>
-                <cap if="caps,shift">f</cap>
-            </key>
-            <key>
-                <cap>g</cap>
-                <cap if="caps">G</cap>
-                <cap if="shift">G</cap>
-                <cap if="caps,shift">g</cap>
-            </key>
-            <key>
-                <cap>h</cap>
-                <cap if="caps">H</cap>
-                <cap if="shift">H</cap>
-                <cap if="caps,shift">h</cap>
-            </key>
-            <key>
-                <cap>j</cap>
-                <cap if="caps">J</cap>
-                <cap if="shift">J</cap>
-                <cap if="caps,shift">j</cap>
-            </key>
-            <key>
-                <cap>k</cap>
-                <cap if="caps">K</cap>
-                <cap if="shift">K</cap>
-                <cap if="caps,shift">k</cap>
-            </key>
-            <key>
-                <cap>l</cap>
-                <cap if="caps">L</cap>
-                <cap if="shift">L</cap>
-                <cap if="caps,shift">l</cap>
-            </key>
-            <key>
-                <cap>;</cap>
-                <cap if="shift">:</cap>
-            </key>
-            <key>
-                <cap>'</cap>
-                <cap if="shift">"</cap>
-            </key>
-            <key size="2.25">
-                <cap keysym="0xFF0D">Enter</cap>
-            </key>
-        </row>
-        <row>
-            <key size="2">
-                <cap modifier="shift" keysym="0xFFE1">Shift</cap>
-            </key>
-            <key>
-                <cap>z</cap>
-                <cap if="caps">Z</cap>
-                <cap if="shift">Z</cap>
-                <cap if="caps,shift">z</cap>
-            </key>
-            <key>
-                <cap>x</cap>
-                <cap if="caps">X</cap>
-                <cap if="shift">X</cap>
-                <cap if="caps,shift">x</cap>
-            </key>
-            <key>
-                <cap>c</cap>
-                <cap if="caps">C</cap>
-                <cap if="shift">C</cap>
-                <cap if="caps,shift">c</cap>
-            </key>
-            <key>
-                <cap>v</cap>
-                <cap if="caps">V</cap>
-                <cap if="shift">V</cap>
-                <cap if="caps,shift">v</cap>
-            </key>
-            <key>
-                <cap>b</cap>
-                <cap if="caps">B</cap>
-                <cap if="shift">B</cap>
-                <cap if="caps,shift">b</cap>
-            </key>
-            <key>
-                <cap>n</cap>
-                <cap if="caps">N</cap>
-                <cap if="shift">N</cap>
-                <cap if="caps,shift">n</cap>
-            </key>
-            <key>
-                <cap>m</cap>
-                <cap if="caps">M</cap>
-                <cap if="shift">M</cap>
-                <cap if="caps,shift">m</cap>
-            </key>
-            <key>
-                <cap>,</cap>
-                <cap if="shift">&lt;</cap>
-            </key>
-            <key>
-                <cap>.</cap>
-                <cap if="shift">&gt;</cap>
-            </key>
-            <key>
-                <cap>/</cap>
-                <cap if="shift">?</cap>
-            </key>
-            <key size="3">
-                <cap modifier="shift" keysym="0xFFE2">Shift</cap>
-            </key>
-        </row>
-        <row>
-            <key size="1.5">
-                <cap modifier="control" keysym="0xFFE3">Ctrl</cap>
-            </key>
-            <key size="1.5">
-                <cap modifier="super" keysym="0xFFEB">Super</cap>
-            </key>
-            <key size="1.5">
-                <cap modifier="alt" keysym="0xFFE9">Alt</cap>
-            </key>
-            <key size="6">
-                <cap> </cap>
-            </key>
-            <key size="1.5">
-                <cap modifier="alt" keysym="0xFFE3">Alt</cap>
-            </key>
-            <key size="1.5">
-                <cap modifier="super" keysym="0xFF67">Menu</cap>
-            </key>
-            <key size="1.5">
-                <cap modifier="control" keysym="0xFFE4">Ctrl</cap>
-            </key>
-        </row>
-    </column>
-    <column>
-        <row>
-            <gap size="0.25"/>
-        </row>
-    </column>
-    <column align="center">
-        <row>
-            <key size="1.75">
-                <cap keysym="0xFF63">Ins</cap>
-            </key>
-            <key size="1.75">
-                <cap keysym="0xFF50">Home</cap>
-            </key>
-            <key size="1.75">
-                <cap keysym="0xFF55">PgUp</cap>
-            </key>
-        </row>
-        <row>
-            <key size="1.75">
-                <cap keysym="0xFFFF">Del</cap>
-            </key>
-            <key size="1.75">
-                <cap keysym="0xFF57">End</cap>
-            </key>
-            <key size="1.75">
-                <cap keysym="0xFF56">PgDn</cap>
-            </key>
-        </row>
-        <row>
-            <gap/>
-        </row>
-        <row>
-            <key>
-                <cap keysym="0xFF52">↑</cap>
-            </key>
-        </row>
-        <row>
-            <key>
-                <cap keysym="0xFF51">←</cap>
-            </key>
-            <key>
-                <cap keysym="0xFF54">↓</cap>
-            </key>
-            <key>
-                <cap keysym="0xFF53">→</cap>
-            </key>
-        </row>
-    </column>
-</keyboard>