Index: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	(revision 1)
+++ trunk/Makefile.am	(revision 12)
@@ -1,3 +1,3 @@
-# $Id: Makefile.am 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 #
 # FedStage DRMAA for PBS Pro
@@ -24,3 +24,3 @@
  m4/missing-dev-prog.sh
 
-SUBDIRS = drmaa_utils pbs_drmaa  doc
+SUBDIRS = drmaa_utils pbs_drmaa
Index: trunk/test/example.c
===================================================================
--- trunk/test/example.c	(revision 1)
+++ trunk/test/example.c	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: example.c 2 2009-10-12 09:51:22Z mamonski $ */
+/* $Id$ */
 /*
  *  DRMAA library for Torque/PBS
Index: trunk/m4/ax_gperf.m4
===================================================================
--- trunk/m4/ax_gperf.m4	(revision 1)
+++ trunk/m4/ax_gperf.m4	(revision 12)
@@ -1,3 +1,3 @@
-# $Id: ax_gperf.m4 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 #
 # SYNOPSIS
@@ -22,5 +22,5 @@
 # LICENSE
 #
-#   Written by Åukasz CieÅnik <lukasz.ciesnik@fedstage.com>
+#   Written by Åukasz CieÅnik <lukasz.ciesnik@gmail.com>
 #   and placed under Public Domain
 #
Index: trunk/m4/ax_gcc_warnings.m4
===================================================================
--- trunk/m4/ax_gcc_warnings.m4	(revision 1)
+++ trunk/m4/ax_gcc_warnings.m4	(revision 12)
@@ -1,3 +1,3 @@
-# $Id: ax_gcc_warnings.m4 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 #
 # SYNOPSIS
@@ -7,5 +7,5 @@
 # DESCRIPTION
 #
-#   Check for LSF libraries and headers.
+#   Check for supported gcc options.
 #
 #   This macro calls::
@@ -20,5 +20,5 @@
 # LICENSE
 #
-#   Written by Åukasz CieÅnik <lukasz.ciesnik@fedstage.com>
+#   Written by Åukasz CieÅnik <lukasz.ciesnik@gmail.com>
 #   and placed under Public Domain.
 #
Index: trunk/m4/ax_pbs.m4
===================================================================
--- trunk/m4/ax_pbs.m4	(revision 1)
+++ trunk/m4/ax_pbs.m4	(revision 12)
@@ -1,3 +1,3 @@
-# $Id: ax_pbs.m4 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 #
 # SYNOPSIS
@@ -21,5 +21,5 @@
 # LICENSE
 #
-#   Written by Åukasz CieÅnik <lukasz.ciesnik@fedstage.com>
+#   Written by Åukasz CieÅnik <lukasz.ciesnik@gmail.com>
 #   and placed under Public Domain
 #
Index: trunk/m4/ax_docutils.m4
===================================================================
--- trunk/m4/ax_docutils.m4	(revision 1)
+++ trunk/m4/ax_docutils.m4	(revision 12)
@@ -1,3 +1,3 @@
-# $Id: ax_docutils.m4 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 #
 # SYNOPSIS
Index: trunk/m4/acx_pthread.m4
===================================================================
--- trunk/m4/acx_pthread.m4	(revision 1)
+++ trunk/m4/acx_pthread.m4	(revision 12)
@@ -1,3 +1,3 @@
-dnl $Id: acx_pthread.m4 529 2007-12-20 21:04:22Z lukasz $
+dnl $Id$
 
 dnl
Index: trunk/LICENSE
===================================================================
--- trunk/LICENSE	(revision 12)
+++ trunk/LICENSE	(revision 12)
@@ -0,0 +1,675 @@
+                      GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    
+	d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Index: trunk/autoclean.sh
===================================================================
--- trunk/autoclean.sh	(revision 1)
+++ trunk/autoclean.sh	(revision 12)
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $Id: autoclean.sh 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 
 echo "Removing all generated files. ($PWD)"
Index: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	(revision 1)
+++ trunk/AUTHORS	(revision 12)
@@ -1,7 +1,11 @@
-$Id: AUTHORS 746 2008-03-06 15:07:58Z lukasz $
+$Id$
 
 Author:
-	Åukasz CieÅnik <lukasz.ciesnik@fedstage.com>
+	Åukasz CieÅnik <lukasz.ciesnik@gmail.com>
+
+Contributors (also current maintainers):
+       MichaÅ MatÅoka <michal.matloka@student.put.poznan.pl>
+       Mariusz MamoÅski <mamonski@man.poznan.pl>
 
 Send bug reports to:
-	drmaa-pbspro-users@lists.fedstage.com
+       Mariusz MamoÅski <mamonski@man.poznan.pl>
Index: trunk/pbs_drmaa/pbs_drmaa.h
===================================================================
--- trunk/pbs_drmaa/pbs_drmaa.h	(revision 1)
+++ trunk/pbs_drmaa/pbs_drmaa.h	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: pbs_drmaa.h 2 2009-10-12 09:51:22Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/pbs_attrib.h
===================================================================
--- trunk/pbs_drmaa/pbs_attrib.h	(revision 4)
+++ trunk/pbs_drmaa/pbs_attrib.h	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: pbs_attrib.h 256 2010-08-10 16:31:35Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/log_reader.c
===================================================================
--- trunk/pbs_drmaa/log_reader.c	(revision 8)
+++ trunk/pbs_drmaa/log_reader.c	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: log_reader.c 323 2010-09-21 21:31:29Z mmatloka $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/submit.c
===================================================================
--- trunk/pbs_drmaa/submit.c	(revision 10)
+++ trunk/pbs_drmaa/submit.c	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: submit.c 386 2011-01-06 18:13:33Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -46,5 +46,5 @@
 		__attribute__ ((unused))
 #	endif
-	= "$Id: submit.c 386 2011-01-06 18:13:33Z mamonski $";
+	= "$Id$";
 #endif
 
@@ -546,6 +546,5 @@
 			else
 			{
-                                fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE, "Invalid native specification: %s (Invalid resource specification: %s)", resources, arg);
-
+				fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE, "Invalid native specification: %s (Invalid resource specification: %s)", resources, arg);
 			}
 		}
@@ -569,5 +568,5 @@
 	TRY
 	  {
-		for (arg = strtok_r(add_attr_copy, ",", &ctxt); arg; arg = strtok_r(NULL, ":",&ctxt) )
+		for (arg = strtok_r(add_attr_copy, ";", &ctxt); arg; arg = strtok_r(NULL, ";",&ctxt) )
 		{
 			name = fsd_strdup(strtok_r(arg, "=", &ctxt2));
@@ -606,19 +605,33 @@
 
 		TRY
-		 {
+		  {
 			for (arg = strtok_r(native_spec_copy, " \t", &ctxt); arg; arg = strtok_r(NULL, " \t",&ctxt) ) {
-				if (!opt) {
-					if ( (arg[0] != '-') || ((strlen(arg) != 2) &&  arg[2] != ' ' && arg[1] !='-' ) )
+				if (!opt)
+				  {
+					if ( (arg[0] != '-') || (strlen(arg) != 2) )
 						fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
-								"Invalid native specification: %s",
-								native_specification);
-					if(arg[1] == '-') {
-						parse_additional_attr(pbs_attr, arg+2);
+							"Invalid native specification: -o(ption) expected (arg=%s native=%s).",
+							arg, native_specification);
+
+						case 'h' :
+							pbs_attr->set_attr( pbs_attr, "Hold_Types" , arg );
+							break;
+
+					opt = arg[1];
+
+					/* handle NO-arg options */
+
+					switch (opt) {
+						case 'h' :
+							pbs_attr->set_attr( pbs_attr, "Hold_Types" , "u" );
+							break;
+						default :
+							continue; /*no NO-ARG option */
 					}
-					else {
-						opt = arg[1];
-					}
-					
-				} else {
+
+					opt = 0;
+				  }
+				else
+				  {
 					switch (opt) {
 						
@@ -644,7 +657,4 @@
 							pbs_attr->set_attr( pbs_attr, "Execution_Time" , arg );
 							break;
-						case 'h' :
-							pbs_attr->set_attr( pbs_attr, "Hold_Types" , arg );
-							break;
 						case 'A' :
 							pbs_attr->set_attr( pbs_attr, "Account_Name" , arg );
@@ -672,5 +682,4 @@
 							break;
 						case 'v' :
-						case 'V' :
 							pbs_attr->set_attr( pbs_attr, "Variable_List" , arg );
 							break;
@@ -687,5 +696,4 @@
 									native_specification, opt);
 					}
-
 					opt = 0;
 				}
Index: trunk/pbs_drmaa/log_reader.h
===================================================================
--- trunk/pbs_drmaa/log_reader.h	(revision 8)
+++ trunk/pbs_drmaa/log_reader.h	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: log_reader.h 323 2010-09-21 21:31:29Z mmatloka $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/submit.h
===================================================================
--- trunk/pbs_drmaa/submit.h	(revision 1)
+++ trunk/pbs_drmaa/submit.h	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: submit.h 338 2010-09-28 14:48:45Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/pbs_attrib.gperf
===================================================================
--- trunk/pbs_drmaa/pbs_attrib.gperf	(revision 4)
+++ trunk/pbs_drmaa/pbs_attrib.gperf	(revision 12)
@@ -1,4 +1,4 @@
 %{
-/* $Id: pbs_attrib.gperf 2677 2009-09-08 14:32:22Z mmamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -31,5 +31,5 @@
 		__attribute__ ((unused))
 #	endif
-	= "$Id: pbs_attrib.gperf 2677 2009-09-08 14:32:22Z mmamonski $";
+	= "$Id$";
 #endif
 
Index: trunk/pbs_drmaa/job.c
===================================================================
--- trunk/pbs_drmaa/job.c	(revision 10)
+++ trunk/pbs_drmaa/job.c	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: job.c 370 2010-11-16 09:51:00Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -43,5 +43,5 @@
 		__attribute__ ((unused))
 #	endif
-	= "$Id: job.c 370 2010-11-16 09:51:00Z mamonski $";
+	= "$Id$";
 #endif
 
@@ -385,6 +385,5 @@
 		int hours, minutes, seconds;
 		long mem;
-		if( cpu_usage && sscanf( cpu_usage, "%d:%d:%d",
-				&hours, &minutes, &seconds ) == 3 )
+		if( cpu_usage && sscanf( cpu_usage, "%d:%d:%d", &hours, &minutes, &seconds ) == 3 )
 		 {
 			self->cpu_usage = 60*( 60*hours + minutes ) + seconds;
@@ -401,6 +400,5 @@
 			fsd_log_debug(( "vmem_usage: %s=%ldB", vmem_usage, self->vmem_usage ));
 		 }
-		if( walltime && sscanf( walltime, "%d:%d:%d",
-					&hours, &minutes, &seconds ) == 3 )
+		if( walltime && sscanf( walltime, "%d:%d:%d", &hours, &minutes, &seconds ) == 3 )
 		 {
 			self->walltime = 60*( 60*hours + minutes ) + seconds;
@@ -414,5 +412,5 @@
 {
 	pbsdrmaa_session_t *pbssession = (pbsdrmaa_session_t*)self->session;
-	
+
 	if( pbssession->pbs_home == NULL )
 		pbsdrmaa_job_on_missing_standard( self );	
@@ -429,5 +427,5 @@
 
 	fsd_log_enter(( "({job_id=%s})", self->job_id ));
-	fsd_log_warning(( "self %s missing from DRM queue", self->job_id ));
+	fsd_log_warning(( "Job %s missing from DRM queue", self->job_id ));
 
 	switch( session->missing_jobs )
@@ -465,4 +463,6 @@
 	}
 
+	fsd_cond_broadcast( &self->status_cond);
+
 	fsd_log_return(( "; job_ps=%s, exit_status=%d",
 				drmaa_job_ps_to_str(self->state), self->exit_status ));
@@ -476,5 +476,5 @@
 	
 	fsd_log_enter(( "({job_id=%s})", self->job_id ));
-	fsd_log_warning(( "self %s missing from DRM queue", self->job_id ));
+	fsd_log_info(( "Job %s missing from DRM queue", self->job_id ));
 	
 	TRY
Index: trunk/pbs_drmaa/util.c
===================================================================
--- trunk/pbs_drmaa/util.c	(revision 8)
+++ trunk/pbs_drmaa/util.c	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: util.c 323 2010-09-21 21:31:29Z mmatloka $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -41,5 +41,5 @@
 		__attribute__ ((unused))
 #	endif
-	= "$Id: util.c 323 2010-09-21 21:31:29Z mmatloka $";
+	= "$Id$";
 #endif
 
Index: trunk/pbs_drmaa/job.h
===================================================================
--- trunk/pbs_drmaa/job.h	(revision 8)
+++ trunk/pbs_drmaa/job.h	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: job.h 2 2009-10-12 09:51:22Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/util.h
===================================================================
--- trunk/pbs_drmaa/util.h	(revision 8)
+++ trunk/pbs_drmaa/util.h	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: util.h 323 2010-09-21 21:31:29Z mmatloka $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/session.c
===================================================================
--- trunk/pbs_drmaa/session.c	(revision 10)
+++ trunk/pbs_drmaa/session.c	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: session.c 385 2011-01-04 18:24:05Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -53,5 +53,5 @@
 		__attribute__ ((unused))
 #	endif
-	= "$Id: session.c 385 2011-01-04 18:24:05Z mamonski $";
+	= "$Id$";
 #endif
 
@@ -213,8 +213,7 @@
 	fsd_conf_option_t *pbs_home;
 	pbs_home = fsd_conf_dict_get(self->configuration, "pbs_home" );
-	if( pbs_home )
-	 {
-		if( pbs_home->type == FSD_CONF_STRING )
-		 {
+
+	if( pbs_home && pbs_home->type == FSD_CONF_STRING )
+	  {
 			struct stat statbuf;
 			char * volatile log_path;
@@ -222,5 +221,5 @@
 			
 			pbsself->pbs_home = pbs_home->val.string;
-			fsd_log_debug(("pbs_home: %s",pbsself->pbs_home));
+			fsd_log_info(("pbs_home: %s",pbsself->pbs_home));
 			pbsself->super_wait_thread = pbsself->super.wait_thread;
 			pbsself->super.wait_thread = pbsdrmaa_session_wait_thread;		
@@ -230,31 +229,21 @@
 			localtime_r(&pbsself->log_file_initial_time,&tm);
 
-			if((log_path = fsd_asprintf("%s/server_logs/%04d%02d%02d",
-    		  		pbsself->pbs_home,	 
-  		    		tm.tm_year + 1900,
-   		    		tm.tm_mon + 1,
-					tm.tm_mday)) == NULL) {
-				fsd_exc_raise_fmt(FSD_ERRNO_INTERNAL_ERROR,"WT - Memory allocation wasn't possible");
-			}
-
-			if(stat(log_path,&statbuf) == -1) {
+			log_path = fsd_asprintf("%s/server_logs/%04d%02d%02d",
+					pbsself->pbs_home,
+					tm.tm_year + 1900,
+					tm.tm_mon + 1,
+					tm.tm_mday);
+
+			if(stat(log_path,&statbuf) == -1)
+			  {
 				char errbuf[256] = "InternalError";
-				(void)strerror_r(errno, errbuf, 256);
+				(void)strerror_r(errno, errbuf, sizeof(errbuf));
 				fsd_exc_raise_fmt(FSD_ERRNO_INTERNAL_ERROR,"stat error: %s",errbuf);
-			}
+			  }
 	
 			fsd_log_debug(("Log file %s size %d",log_path,(int) statbuf.st_size));
 			pbsself->log_file_initial_size = statbuf.st_size;
 			fsd_free(log_path);
-		 }
-		else
-		{
-			pbsself->super.enable_wait_thread = false;
-			pbsself->wait_thread_log = false;
-			fsd_log_debug(("pbs_home not configured. Running standard wait_thread (pooling)."));
-		}
-	 }
-
-
+	  }
 
 	pbsself->super_apply_configuration(self); /* call method from the superclass */
@@ -277,5 +266,5 @@
 		conn_lock = fsd_mutex_lock( &self->drm_connection_mutex );
 retry:
-
+/* TODO: query only for user's jobs pbs_selstat + ATTR_u */
 #ifdef PBS_PROFESSIONAL
 		status = pbs_statjob( pbsself->pbs_conn, NULL, NULL, NULL );
@@ -494,5 +483,5 @@
 			fsd_log_warning(( "no default queue set on PBS server" ));
 		else if( keep_completed == NULL && self->pbs_home == NULL )
-			fsd_log_warning(( "PBS server is not configured to keep completed jobs\n"
+			fsd_log_warning(( "Torque server is not configured to keep completed jobs\n"
 						"in Torque: set keep_completed parameter of default queue\n"
 						"  $ qmgr -c 'set queue batch keep_completed = 60'\n"
@@ -513,5 +502,10 @@
 	 }
 	END_TRY
+
+	return result;
 #endif
+	fsd_log_warning(( "PBS Professional does not keep information about the completed jobs\n"
+				" You must configure DRMAA to utilize log files in order to always get valid job exit status"
+				));
 	return false;
 }
Index: trunk/pbs_drmaa/drmaa.c
===================================================================
--- trunk/pbs_drmaa/drmaa.c	(revision 1)
+++ trunk/pbs_drmaa/drmaa.c	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: drmaa.c 353 2010-10-18 13:45:14Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/pbs_drmaa/pbs_drmaa.conf.example
===================================================================
--- trunk/pbs_drmaa/pbs_drmaa.conf.example	(revision 1)
+++ trunk/pbs_drmaa/pbs_drmaa.conf.example	(revision 12)
@@ -1,3 +1,3 @@
-# $Id: pbs_drmaa.conf.example 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 # pbs_drmaa.conf - Sample pbs_drmaa configuration file.
 
Index: trunk/pbs_drmaa/Makefile.am
===================================================================
--- trunk/pbs_drmaa/Makefile.am	(revision 7)
+++ trunk/pbs_drmaa/Makefile.am	(revision 12)
@@ -1,3 +1,3 @@
-# $Id: Makefile.am 2420 2009-06-24 14:40:21Z lukasz $
+# $Id$
 # 
 # FedStage DRMAA for PBS Professional
Index: trunk/pbs_drmaa/session.h
===================================================================
--- trunk/pbs_drmaa/session.h	(revision 7)
+++ trunk/pbs_drmaa/session.h	(revision 12)
@@ -1,3 +1,3 @@
-/* $Id: session.h 323 2010-09-21 21:31:29Z mmatloka $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
Index: trunk/README
===================================================================
--- trunk/README	(revision 5)
+++ trunk/README	(revision 12)
@@ -1,1196 +1,4 @@
-=================================
-DRMAA for Torque/PBS Professional
-=================================
+The manual for the DRMAA for Torque/PBS Pro (since version 1.0.7) is available 
+at the project wiki: 
 
-:Authors:       Åukasz CieÅnik <lukasz.ciesnik@fedstage.com>, 
-				MichaÅ MatÅoka <michal.matloka@student.put.poznan.pl>, 
-				Mariusz Mamonski <mamonski@man.poznan.pl>
-:Contact:       Mariusz Mamonski <mamonski@man.poznan.pl>
-:Date:          $Date: 2010-07-07 17:05:39 +0200 (Wed, 07 Jul 2010) $
-:Version:       1.0.3
-:Revision:      $Revision: 386 $
-:Copyright:     Copyright (C) 2006-2008 FedStage Systems
-
-:Abstract:  This document describes installation, configuration and usage
-  of `DRMAA for Torque/PBS Pro`_ library (PBS DRMAA for short).
-
-.. meta::
-  :http-equiv=Content-Language: en
-  :http-equiv=Content-Type: application/xhtml+xml; charset=UTF-8
-  :description lang=en: DRMAA implementation for PBS systems.
-  :keywords: DRMAA, PBS, Torque, PBS Professional, PBS Pro, Portable Batch System
-
-.. contents::
-
-.. default-role:: literal
-
-
-Introduction
-============
-
-DRMAA for Torque/PBS Pro is implementation of `Open Grid Forum`_ DRMAA_
-(Distributed Resource Management Application API) specification_ for
-submission and control jobs to PBS_ systems: `PBS Professional`_, Torque_
-and OpenPBS_.  Using DRMAA, grid applications builders, portal developers
-and ISVs can use the same high-level API to link their software with
-different cluster/resource management systems.
-
-This software also enables the integration of `SMOA Computing`_
-with the underlying Torque/PBS Pro system for remote multi-user job submission
-and control over Web Services.
-
-This manual can be found in HTML and PDF formats in ``doc`` directory.
-
-
-Installation
-============
-
-To compile the library just go to main source directory and type::
-
-  $ ./configure [--prefix=/installation/directory] && make
-
-If you had installed PBS in a non standard directory pass it
-in ``--with-pbs`` configure parameter.  There are no unusual requirements
-for basic usage of library: ANSI C compiler and standard make should
-suffice (if linking against PBS Professional you will need also the OpenSSL library).  
-If you have taken sources directly from SVN repository you would 
-need additional `developer tools`_. For further information regarding GNU 
-build system see the INSTALL file.
-
-For Torque_ it is advised to configure queues so jobs are leaved after
-the completion.  To achieve this simply type the following command for
-all queues which are intended to use with PBS DRMAA::
-
-  # qmgr -c "set queue QUEUE_NAME keep_completed = 60"
-
-The value of the ``keep_completed`` parameter denotes a number of
-seconds jobs will have to wait in the queue after the completion (and
-should be greater then ``pool_delay`` value in PBS DRMAA configuration_).
-It enables the DRMAA library to retrieve the information about finished
-jobs.
-
-Alternatively you can configure the DRMAA library to use Torque server daemon logs
-as information source for terminated jobs (consult next section for details) 
-
-Configuration
-=============
-
-During DRMAA session initialization (``drmaa_init``) library tries to read
-its configuration parameters from locations:
-``/etc/pbs_drmaa.conf``, ``~/.pbs_drmaa.conf`` and from file given in
-``PBS_DRMAA_CONF`` environment variable (if set to non-empty string).
-If multiple configuration sources are present then all configurations
-are merged with values from user-defined files taking precedence
-(in following order: ``$PBS_DRMAA_CONF``, ``~/.pbs_drmaa.conf``,
-``/etc/pbs_drmaa.conf``).
-
-Currently recognized configuration parameters are:
-
-  pool_delay
-    Amount of time (in seconds) between successive checks of unfinished job(s).
-
-     Type: integer, Default: 5
-
-  wait_thread
-    Value 1 enables single "wait thread" for updating jobs status. 
-    With ``pbs_home`` set enables wait_thread which reads PBS log files (instead of polling PBS daemons).
-     
-     Type: integer, Default: 0
-
-  pbs_home
-    Path to Torque/PBS Pro spool directory that contains server logs (e.g.: /var/spool/pbs).
-    
-     Type: string, Default: not set
-     
-  job_categories
-    Dictionary of job categories.  It's keys are job categories names
-    mapped to `native specification`_ strings.  Attributes set by
-    job category can be overridden by corresponding DRMAA attributes
-    or native specification.  Special category name ``default``
-    is used when ``drmaa_job_category`` job attribute was not set.
-
-  cache_job_state
-    According to the DRMAA specification every `drmaa_job_ps()` call should
-    query DRM system for job state.  With this option one may optimize
-    communication with DRM.  If set to positive integer `drmaa_job_ps()`
-    returns remembered job state without communicating with DRM for
-    `cache_job_state` seconds since last update.  By default library
-    conforms to specification (no caching will be performed).
-
-    Type: integer, default: 0
-
-
-.. table::
-  Different modes of operation
-
-  =========== ========= =========== ======================= ===================================
-  wait_thread pbs_home     mode     keep_completed needed         comments
-  =========== ========= =========== ======================= ===================================
-       0       not set   polling           yes              default configuration
-       1       not set   polling           yes              more effective than above
-       1         set     triggered         no               read access to server logs needed
-  =========== ========= =========== ======================= ===================================
-  
-
-Configuration file syntax
--------------------------
-
-Configuration file is in form a dictionary.
-Dictionary is set of zero or more key-value pairs.
-Key is a string while value could be a string, an integer
-or another dictionary.
-::
-
-  configuration: dictionary | dictionary_body
-  dictionary: '{' dictionary_body '}'
-  dictionary_body: (string ':' value ',')*
-  value: integer | string | dictionary
-  string: unquoted-string | single-quoted-string | double-quoted-string
-  unquoted-string: [^ \t\n\r:,0-9][^ \t\n\r:,]*
-  single-quoted-string: '[^']*'
-  double-quoted-string: "[^"]*"
-  integer: [0-9]+
-
-Configuration file example
---------------------------
-
-::
-  
-  # pbs_drmaa.conf - Sample pbs_drmaa configuration file.
-  
-  wait_thread: 0,
-
-  #pool_delay: 5,
-
-  job_categories: {
-	#default: "-k n", # delete output files from execution hosts
-	longterm: "-p -100 -l nice=5",
-	amd64: "-l arch=amd64",
-	python: "-l software=python",
-	java: "-l software=java,vmem=500mb -v PATH=/opt/sun-jdk-1.6:/usr/bin:/bin",
-	#test: "-u test -q testing",
-  },
-  
-
-Native specification
-====================
-
-DRMAA interface allows to pass DRM dependant job submission options.
-Those options may be specified by settings ``drmaa_native_specification``. ``drmaa_native_specification``
-accepts space delimited ``qsub``. ``qsub``
-options which does not set job attributes (`-b`, `-z`, `-C`) as
-well as meant for submission of interactive jobs (`-I`, `-X`) or
-to specify directories (`-d`, `-D`) are *not* supported.
-Also instead of `-W` option following long options are accepted
-within native specification: `--depend`, `--group-list`, `--stagein`
-and `--stageout`.  For detailed description of each option see PBS
-documentation.
-
-Attributes set in native specification overrides corresponding DRMAA job
-attributes.
-
-.. table::
-  Native specification strings with corresponding DRMAA attributes.
-
-  ===================== =============== ============ ====================
-  DRMAA attribute       PBS attribute   PBS resource native specification
-  ===================== =============== ============ ====================
-                      Attributes which get overridden                   
-  -----------------------------------------------------------------------
-  drmaa_job_name        Job_Name                     `-N` job name       
-  drmaa_output_path     Output_Path                  `-o` output path    
-  drmaa_error_path      Error_Path                   `-e` error path     
-  drmaa_join_files      Join_Path                    `-j` join options   
-  drmaa_block_email     Mail_Points                  `-m` mail options   
-  drmaa_start_time      Execution_Time               `-a` start time     
-  drmaa_js_state        Hold_Types                   `-h`                
-  ..                    Account_Name                 `-A` account string 
-  ..                    Checkpoint                   `-c` interval       
-  ..                    Keep_Files                   `-k` keep           
-  ..                    Priority                     `-p` priority       
-  ..                    destination                  `-q` queue          
-  ..                    Rerunable                    `-r` y/n            
-  ..                    Shell_Path_List              `-S` path list      
-  ..                    User_List                    `-u` user list      
-  ..                    group_list                   `--group_list=`\groups 
-  drmaa_v_env           Variable_List                `-v` variable list  
-  ..                    Variable_List                `-V`                
-  drmaa_v_email         Mail_Users                   `-M` user list      
-  drmaa_duration_hlimit Resource_List   cput         `-l cput=`\limit    
-  drmaa_wct_hlimit      Resource_List   walltime     `-l walltime=`\limit
-  ..                    Resource_List                `-l` resources      
-  ..                    depend                       `--depend=`\dependency
-  ..                    stagein                      `--stagein=`\stagein 
-  ..                    stageout                     `--stageout=`\stageout
-  ===================== =============== ============ ====================
-
-
-Release notes
-=============
-
-Changes in 1.0.5 release
-------------------------
- * make drmaa tolerant to torque restarts
- * now one can use '-lmem' in native specification attribute
-
-Changes in 1.0.4 release
-------------------------
- * fix "mtime" date parsing ('triggered' mode)
- * fix "submit_args" attribute bug (PBS Professional only)
-
-Changes in 1.0.3 release
-------------------------
-
- * new implementation of the "wait thread" which reads PBS log files (increased scalability)
- * support for native specification attribute
- * memleak fixes
- * testsuite passed on PBS Pro 10
- * exit codes 126-127 cause the drmaa_wifaborted() to return true
- * other bug fixes
-
-Changes in 1.0.2 release
-------------------------
-
- * automatic reconnect on PBS connection errors 
- * static linkage with DRMAA utilities
- * other bug fixes
- 
-Changes in 1.0.1 release
-------------------------
-
- * number of attributes implemented:
-
-   - ``drmaa_start_time``
-   - ``drmaa_duration_hlimit``
-   - ``drmaa_wct_hlimit``
-   - ``drmaa_native_specification``
-   - ``drmaa_job_category``
-
- * configuration file(s)
- * separate wait thread
- * lot of bug fixes
- * more robust code
- * separated DRMAA utilities library
- * Python driven test-suite
-
-
-Known bugs and limitations
---------------------------
-
-Library covers nearly all DRMAA 1.0 specification_ with exceptions
-listed below.  It passes the `official DRMAA test-suite`_ except of tests
-which require job termination status.  All mandatory and some optional
-job attributes (namely: transfer files, wall clock time hard limit,
-job run duration hard limit) are implemented.
-
-Known limitations imposed by PBS API:
-
- * With `PBS Pro`_ (and OpenPBS_) retrieving of job termination status is
-   impossible.  For this DRM finished jobs are marked as done with 0
-   return code unless job was terminated through library when they are
-   treated as aborted and killed after receiving SIGTERM.
-
- * Library accepts job identifiers only of those jobs which
-   were submitted under current session (specification says it should
-   also accept job identifiers from previous sessions and even of
-   jobs submitted in former execution of DRMAA enabled application).
-   This could only be partially fixed as job state needs to be kept by
-   library in order to cope with PBS shortcomings.
-
- * Job termination (when job is running) is realized by PBS
-   by sending SIGTERM and/or SIGKILL therefore retrieving
-   those signals cannot be distinguished from abort using
-   ``drmaa_control(DRMAA_CONTROL_TERMINATE)``.  Then job termination
-   state is marked as "aborted" and "signaled" whatever is the state.
-
- * ``drmaa_wcoredump()`` always returns ``false``.
-
- * Waiting functions (``drmaa_wait()`` and ``drmaa_synchronize()``)
-   must pool DRM to find out whether job finished.
-
-
-Test-suite
-----------
-
-The DRMAA for Torque/PBS Pro library was successfully tested with
-`PBS Pro`_ 10 (10.0.0.82981) and Torque_ 2.5.1 on Linux OS.  Following
-table presents results of tests from
-`Official DRMAA test-suite`_ (originally developed for Sun Grid Engine).
-
-.. table::
-  Mode - Polling
-
-  =============================================== =========== ============ 
-                  Test name                        PBS Pro 10  Torque 2.5.1 
-  =============================================== =========== ============ 
-  test_mt_exit_during_submit                        passed       passed           
-  test_mt_exit_during_submit_or_wait                passed       passed           
-  test_mt_submit_before_init_wait                   passed       passed            
-  test_mt_submit_mt_wait                            passed       passed            
-  test_mt_submit_wait                               passed       passed            
-  test_st_attribute_change                          passed       passed            
-  test_st_bulk_singlesubmit_wait_individual         passed       passed            
-  test_st_bulk_submit_in_hold_session_delete        passed       passed            
-  test_st_bulk_submit_in_hold_session_release       passed       passed            
-  test_st_bulk_submit_in_hold_single_delete         passed       passed            
-  test_st_bulk_submit_in_hold_single_release        passed       passed            
-  test_st_bulk_submit_wait                          passed       passed            
-  test_st_contact                                   passed       passed            
-  test_st_drm_system                                passed       passed            
-  test_st_drmaa_impl                                passed       passed            
-  test_st_empty_session_control                     passed       passed            
-  test_st_empty_session_synchronize_dispose         passed       passed            
-  test_st_empty_session_synchronize_nodispose       passed       passed            
-  test_st_empty_session_wait                        passed       passed            
-  test_st_error_file_failure                      FAILED [1]_    passed       
-  test_st_exit_status                             FAILED [1]_    passed       
-  test_st_input_file_failure                      FAILED [1]_    passed       
-  test_st_mult_exit                                 passed       passed        
-  test_st_mult_init                                 passed       passed         
-  test_st_output_file_failure                     FAILED [1]_    passed      
-  test_st_submit_in_hold_delete                     passed       passed         
-  test_st_submit_in_hold_release                    passed       passed         
-  test_st_submit_kill_sig                         FAILED [1]_    passed       
-  test_st_submit_polling_synchronize_timeout        passed       passed        
-  test_st_submit_polling_synchronize_zerotimeout    passed       passed        
-  test_st_submit_polling_wait_timeout               passed       passed        
-  test_st_submit_polling_wait_zerotimeout           passed       passed       
-  test_st_submit_suspend_resume_wait                passed       passed       
-  test_st_submit_wait                               passed       passed       
-  test_st_submitmixture_sync_all_dispose            passed       passed      
-  test_st_submitmixture_sync_all_nodispose          passed       passed       
-  test_st_submitmixture_sync_allids_dispose         passed       passed      
-  test_st_submitmixture_sync_allids_nodispose       passed       passed     
-  test_st_supported_attr                            passed       passed    
-  test_st_supported_vattr                           passed       passed    
-  test_st_usage_check                               passed       passed    
-  test_st_version                                   passed       passed    
-  =============================================== =========== ============ 
-
-.. [1] Due to unavailability of job termination status.
-
-.. table::
-  Mode - Triggered
-
-  =============================================== =========== ============ 
-                  Test name                        PBS Pro 10  Torque 2.5.1 
-  =============================================== =========== ============ 
-  test_mt_exit_during_submit                        passed       passed           
-  test_mt_exit_during_submit_or_wait                passed       passed           
-  test_mt_submit_before_init_wait                   passed       passed            
-  test_mt_submit_mt_wait                            passed       passed            
-  test_mt_submit_wait                               passed       passed            
-  test_st_attribute_change                          passed       passed            
-  test_st_bulk_singlesubmit_wait_individual         passed       passed            
-  test_st_bulk_submit_in_hold_session_delete        passed       passed            
-  test_st_bulk_submit_in_hold_session_release       passed       passed            
-  test_st_bulk_submit_in_hold_single_delete         passed       passed            
-  test_st_bulk_submit_in_hold_single_release        passed       passed            
-  test_st_bulk_submit_wait                          passed       passed            
-  test_st_contact                                   passed       passed            
-  test_st_drm_system                                passed       passed            
-  test_st_drmaa_impl                                passed       passed            
-  test_st_empty_session_control                     passed       passed            
-  test_st_empty_session_synchronize_dispose         passed       passed            
-  test_st_empty_session_synchronize_nodispose       passed       passed            
-  test_st_empty_session_wait                        passed       passed            
-  test_st_error_file_failure                        passed       passed         
-  test_st_exit_status                               passed       passed        
-  test_st_input_file_failure                        passed       passed        
-  test_st_mult_exit                                 passed       passed        
-  test_st_mult_init                                 passed       passed         
-  test_st_output_file_failure                       passed       passed        
-  test_st_submit_in_hold_delete                     passed       passed         
-  test_st_submit_in_hold_release                    passed       passed         
-  test_st_submit_kill_sig                           passed       passed        
-  test_st_submit_polling_synchronize_timeout        passed       passed        
-  test_st_submit_polling_synchronize_zerotimeout    passed       passed        
-  test_st_submit_polling_wait_timeout               passed       passed        
-  test_st_submit_polling_wait_zerotimeout           passed       passed       
-  test_st_submit_suspend_resume_wait                passed       passed       
-  test_st_submit_wait                               passed       passed       
-  test_st_submitmixture_sync_all_dispose            passed       passed      
-  test_st_submitmixture_sync_all_nodispose          passed       passed       
-  test_st_submitmixture_sync_allids_dispose         passed       passed      
-  test_st_submitmixture_sync_allids_nodispose       passed       passed     
-  test_st_supported_attr                            passed       passed    
-  test_st_supported_vattr                           passed       passed    
-  test_st_usage_check                               passed       passed    
-  test_st_version                                   passed       passed    
-  =============================================== =========== ============ 
-
-Developers
-==========
-
-Core functionality of DRMAA is put into ``drmaa_utils`` library.
-This library was created in order to keep consistent common functionality
-of `DRMAA for Torque/PBS Pro`_ and other DRMAA libraries.  As it is
-independent from any particular DRM you may found this library useful for
-developing other DRMAAs.
-
-Developer tools
----------------
-Although not needed for library user the following tools may be required
-if you intend to develop DRMAA for Torque/PBS Pro library or run tests:
-
- * GNU autotools (autoconf, automake, libtool),
- * Bison_ parser generator,
- * gperf_ perfect hash function generator,
- * Python_ (with development files) for Docutils_ and running test-suite
-   (at least 2.5 version but not Python 3.* which will introduce
-   incompatibilities),
- * Pyrex_ a Language for writing Python extension modules (>=0.9.6),
- * Docutils_ for processing this ``README``,
- * LaTeX_ for creating documentation in PDF format,
- * Doxygen_ for generating code documentation.
-
-.. _Bison:     http://www.gnu.org/software/bison/
-.. _gperf:     http://www.gnu.org/software/gperf/
-.. _Python:    http://www.python.org/
-.. _Pyrex:     http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
-.. _Docutils:  http://docutils.sourceforge.net/
-.. _LaTeX:     http://www.latex-project.org/
-.. _Doxygen:   http://www.stack.nl/~dimitri/doxygen/
-
-
-
-Contact
-=======
-
-The DRMAA library for Torque and PBSPro is curently maintained by `Poznan Supercomputing and Networking Center`_. Please send 
-your comments, questions and bug reports to: 
-
-   Mariusz Mamonski <mamonski@man.poznan.pl>
-
-
-
-
-.. _DRMAA: http://drmaa.org/
-.. _Open Grid Forum: http://www.gridforum.org/
-.. _specification: http://www.ogf.org/documents/GFD.22.pdf
-.. _Official DRMAA test-suite: http://www.drmaa.org/wiki/index.php?pagename=DrmaaTestsuite
-.. _FedStage DRMAA for PBS Pro:
-  http://www.fedstage.com/wiki/FedStage_DRMAA_for_PBS_Pro
-.. _PBS DRMAA: http://www.fedstage.com/wiki/FedStage_DRMAA_for_PBS_Pro
-.. _FedStage Computing: http://www.fedstage.com/wiki/FedStage_Computing
-.. _PBS: http://en.wikipedia.org/wiki/Portable_Batch_System
-.. _PBS Professional: http://www.pbsgridworks.com/
-.. _PBS Pro: http://www.pbsgridworks.com/
-.. _Torque: http://www.clusterresources.com/pages/products/torque-resource-manager.php
-.. _OpenPBS: http://www.openpbs.org/
-.. _Poznan Supercomputing and Networking Center: http://www.man.poznan.pl/online/en/
-
-
-License
-=======
-
-Copyright (C) 2006-2008 FedStage Systems
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the `GNU General Public License`_ as published
-by the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the `GNU General Public License`_
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-GNU General Public License
---------------------------
-Version 3, 29 June 2007
-
-| Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-| Everyone is permitted to copy and distribute verbatim copies
-| of this license document, but changing it is not allowed.
-
-Preamble
-........
-
-The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-TERMS AND CONDITIONS
-....................
-
-0.  Definitions.
-    
-    "This License" refers to version 3 of the GNU General Public License.
-    
-    "Copyright" also means copyright-like laws that apply to other kinds of
-    works, such as semiconductor masks.
-    
-    "The Program" refers to any copyrightable work licensed under this
-    License.  Each licensee is addressed as "you".  "Licensees" and
-    "recipients" may be individuals or organizations.
-    
-    To "modify" a work means to copy from or adapt all or part of the work
-    in a fashion requiring copyright permission, other than the making of an
-    exact copy.  The resulting work is called a "modified version" of the
-    earlier work or a work "based on" the earlier work.
-    
-    A "covered work" means either the unmodified Program or a work based
-    on the Program.
-    
-    To "propagate" a work means to do anything with it that, without
-    permission, would make you directly or secondarily liable for
-    infringement under applicable copyright law, except executing it on a
-    computer or modifying a private copy.  Propagation includes copying,
-    distribution (with or without modification), making available to the
-    public, and in some countries other activities as well.
-    
-    To "convey" a work means any kind of propagation that enables other
-    parties to make or receive copies.  Mere interaction with a user through
-    a computer network, with no transfer of a copy, is not conveying.
-    
-    An interactive user interface displays "Appropriate Legal Notices"
-    to the extent that it includes a convenient and prominently visible
-    feature that (1) displays an appropriate copyright notice, and (2)
-    tells the user that there is no warranty for the work (except to the
-    extent that warranties are provided), that licensees may convey the
-    work under this License, and how to view a copy of this License.  If
-    the interface presents a list of user commands or options, such as a
-    menu, a prominent item in the list meets this criterion.
-    
-1.  Source Code.
-    
-    The "source code" for a work means the preferred form of the work
-    for making modifications to it.  "Object code" means any non-source
-    form of a work.
-    
-    A "Standard Interface" means an interface that either is an official
-    standard defined by a recognized standards body, or, in the case of
-    interfaces specified for a particular programming language, one that
-    is widely used among developers working in that language.
-    
-    The "System Libraries" of an executable work include anything, other
-    than the work as a whole, that (a) is included in the normal form of
-    packaging a Major Component, but which is not part of that Major
-    Component, and (b) serves only to enable use of the work with that
-    Major Component, or to implement a Standard Interface for which an
-    implementation is available to the public in source code form.  A
-    "Major Component", in this context, means a major essential component
-    (kernel, window system, and so on) of the specific operating system
-    (if any) on which the executable work runs, or a compiler used to
-    produce the work, or an object code interpreter used to run it.
-    
-    The "Corresponding Source" for a work in object code form means all
-    the source code needed to generate, install, and (for an executable
-    work) run the object code and to modify the work, including scripts to
-    control those activities.  However, it does not include the work's
-    System Libraries, or general-purpose tools or generally available free
-    programs which are used unmodified in performing those activities but
-    which are not part of the work.  For example, Corresponding Source
-    includes interface definition files associated with source files for
-    the work, and the source code for shared libraries and dynamically
-    linked subprograms that the work is specifically designed to require,
-    such as by intimate data communication or control flow between those
-    subprograms and other parts of the work.
-    
-    The Corresponding Source need not include anything that users
-    can regenerate automatically from other parts of the Corresponding
-    Source.
-    
-    The Corresponding Source for a work in source code form is that
-    same work.
-    
-2.  Basic Permissions.
-    
-    All rights granted under this License are granted for the term of
-    copyright on the Program, and are irrevocable provided the stated
-    conditions are met.  This License explicitly affirms your unlimited
-    permission to run the unmodified Program.  The output from running a
-    covered work is covered by this License only if the output, given its
-    content, constitutes a covered work.  This License acknowledges your
-    rights of fair use or other equivalent, as provided by copyright law.
-    
-    You may make, run and propagate covered works that you do not
-    convey, without conditions so long as your license otherwise remains
-    in force.  You may convey covered works to others for the sole purpose
-    of having them make modifications exclusively for you, or provide you
-    with facilities for running those works, provided that you comply with
-    the terms of this License in conveying all material for which you do
-    not control copyright.  Those thus making or running the covered works
-    for you must do so exclusively on your behalf, under your direction
-    and control, on terms that prohibit them from making any copies of
-    your copyrighted material outside their relationship with you.
-    
-    Conveying under any other circumstances is permitted solely under
-    the conditions stated below.  Sublicensing is not allowed; section 10
-    makes it unnecessary.
-    
-3.  Protecting Users' Legal Rights From Anti-Circumvention Law.
-    
-    No covered work shall be deemed part of an effective technological
-    measure under any applicable law fulfilling obligations under article
-    11 of the WIPO copyright treaty adopted on 20 December 1996, or
-    similar laws prohibiting or restricting circumvention of such
-    measures.
-    
-    When you convey a covered work, you waive any legal power to forbid
-    circumvention of technological measures to the extent such circumvention
-    is effected by exercising rights under this License with respect to
-    the covered work, and you disclaim any intention to limit operation or
-    modification of the work as a means of enforcing, against the work's
-    users, your or third parties' legal rights to forbid circumvention of
-    technological measures.
-    
-4.  Conveying Verbatim Copies.
-    
-    You may convey verbatim copies of the Program's source code as you
-    receive it, in any medium, provided that you conspicuously and
-    appropriately publish on each copy an appropriate copyright notice;
-    keep intact all notices stating that this License and any
-    non-permissive terms added in accord with section 7 apply to the code;
-    keep intact all notices of the absence of any warranty; and give all
-    recipients a copy of this License along with the Program.
-    
-    You may charge any price or no price for each copy that you convey,
-    and you may offer support or warranty protection for a fee.
-    
-5.  Conveying Modified Source Versions.
-    
-    You may convey a work based on the Program, or the modifications to
-    produce it from the Program, in the form of source code under the
-    terms of section 4, provided that you also meet all of these conditions:
-    
-     a) The work must carry prominent notices stating that you modified
-        it, and giving a relevant date.
-    
-     b) The work must carry prominent notices stating that it is
-        released under this License and any conditions added under section
-        7.  This requirement modifies the requirement in section 4 to
-        "keep intact all notices".
-    
-     c) You must license the entire work, as a whole, under this
-        License to anyone who comes into possession of a copy.  This
-        License will therefore apply, along with any applicable section 7
-        additional terms, to the whole of the work, and all its parts,
-        regardless of how they are packaged.  This License gives no
-        permission to license the work in any other way, but it does not
-        invalidate such permission if you have separately received it.
-    
-     d) If the work has interactive user interfaces, each must display
-        Appropriate Legal Notices; however, if the Program has interactive
-        interfaces that do not display Appropriate Legal Notices, your
-        work need not make them do so.
-    
-    A compilation of a covered work with other separate and independent
-    works, which are not by their nature extensions of the covered work,
-    and which are not combined with it such as to form a larger program,
-    in or on a volume of a storage or distribution medium, is called an
-    "aggregate" if the compilation and its resulting copyright are not
-    used to limit the access or legal rights of the compilation's users
-    beyond what the individual works permit.  Inclusion of a covered work
-    in an aggregate does not cause this License to apply to the other
-    parts of the aggregate.
-    
-6.  Conveying Non-Source Forms.
-    
-    You may convey a covered work in object code form under the terms
-    of sections 4 and 5, provided that you also convey the
-    machine-readable Corresponding Source under the terms of this License,
-    in one of these ways:
-    
-     a) Convey the object code in, or embodied in, a physical product
-        (including a physical distribution medium), accompanied by the
-        Corresponding Source fixed on a durable physical medium
-        customarily used for software interchange.
-    
-     b) Convey the object code in, or embodied in, a physical product
-        (including a physical distribution medium), accompanied by a
-        written offer, valid for at least three years and valid for as
-        long as you offer spare parts or customer support for that product
-        model, to give anyone who possesses the object code either (1) a
-        copy of the Corresponding Source for all the software in the
-        product that is covered by this License, on a durable physical
-        medium customarily used for software interchange, for a price no
-        more than your reasonable cost of physically performing this
-        conveying of source, or (2) access to copy the
-        Corresponding Source from a network server at no charge.
-    
-     c) Convey individual copies of the object code with a copy of the
-        written offer to provide the Corresponding Source.  This
-        alternative is allowed only occasionally and noncommercially, and
-        only if you received the object code with such an offer, in accord
-        with subsection 6b.
-    
-     d) Convey the object code by offering access from a designated
-        place (gratis or for a charge), and offer equivalent access to the
-        Corresponding Source in the same way through the same place at no
-        further charge.  You need not require recipients to copy the
-        Corresponding Source along with the object code.  If the place to
-        copy the object code is a network server, the Corresponding Source
-        may be on a different server (operated by you or a third party)
-        that supports equivalent copying facilities, provided you maintain
-        clear directions next to the object code saying where to find the
-        Corresponding Source.  Regardless of what server hosts the
-        Corresponding Source, you remain obligated to ensure that it is
-        available for as long as needed to satisfy these requirements.
-    
-     e) Convey the object code using peer-to-peer transmission, provided
-        you inform other peers where the object code and Corresponding
-        Source of the work are being offered to the general public at no
-        charge under subsection 6d.
-    
-    A separable portion of the object code, whose source code is excluded
-    from the Corresponding Source as a System Library, need not be
-    included in conveying the object code work.
-    
-    A "User Product" is either (1) a "consumer product", which means any
-    tangible personal property which is normally used for personal, family,
-    or household purposes, or (2) anything designed or sold for incorporation
-    into a dwelling.  In determining whether a product is a consumer product,
-    doubtful cases shall be resolved in favor of coverage.  For a particular
-    product received by a particular user, "normally used" refers to a
-    typical or common use of that class of product, regardless of the status
-    of the particular user or of the way in which the particular user
-    actually uses, or expects or is expected to use, the product.  A product
-    is a consumer product regardless of whether the product has substantial
-    commercial, industrial or non-consumer uses, unless such uses represent
-    the only significant mode of use of the product.
-    
-    "Installation Information" for a User Product means any methods,
-    procedures, authorization keys, or other information required to install
-    and execute modified versions of a covered work in that User Product from
-    a modified version of its Corresponding Source.  The information must
-    suffice to ensure that the continued functioning of the modified object
-    code is in no case prevented or interfered with solely because
-    modification has been made.
-    
-    If you convey an object code work under this section in, or with, or
-    specifically for use in, a User Product, and the conveying occurs as
-    part of a transaction in which the right of possession and use of the
-    User Product is transferred to the recipient in perpetuity or for a
-    fixed term (regardless of how the transaction is characterized), the
-    Corresponding Source conveyed under this section must be accompanied
-    by the Installation Information.  But this requirement does not apply
-    if neither you nor any third party retains the ability to install
-    modified object code on the User Product (for example, the work has
-    been installed in ROM).
-    
-    The requirement to provide Installation Information does not include a
-    requirement to continue to provide support service, warranty, or updates
-    for a work that has been modified or installed by the recipient, or for
-    the User Product in which it has been modified or installed.  Access to a
-    network may be denied when the modification itself materially and
-    adversely affects the operation of the network or violates the rules and
-    protocols for communication across the network.
-    
-    Corresponding Source conveyed, and Installation Information provided,
-    in accord with this section must be in a format that is publicly
-    documented (and with an implementation available to the public in
-    source code form), and must require no special password or key for
-    unpacking, reading or copying.
-    
-7.  Additional Terms.
-    
-    "Additional permissions" are terms that supplement the terms of this
-    License by making exceptions from one or more of its conditions.
-    Additional permissions that are applicable to the entire Program shall
-    be treated as though they were included in this License, to the extent
-    that they are valid under applicable law.  If additional permissions
-    apply only to part of the Program, that part may be used separately
-    under those permissions, but the entire Program remains governed by
-    this License without regard to the additional permissions.
-    
-    When you convey a copy of a covered work, you may at your option
-    remove any additional permissions from that copy, or from any part of
-    it.  (Additional permissions may be written to require their own
-    removal in certain cases when you modify the work.)  You may place
-    additional permissions on material, added by you to a covered work,
-    for which you have or can give appropriate copyright permission.
-    
-    Notwithstanding any other provision of this License, for material you
-    add to a covered work, you may (if authorized by the copyright holders of
-    that material) supplement the terms of this License with terms:
-    
-     a) Disclaiming warranty or limiting liability differently from the
-        terms of sections 15 and 16 of this License; or
-    
-     b) Requiring preservation of specified reasonable legal notices or
-        author attributions in that material or in the Appropriate Legal
-        Notices displayed by works containing it; or
-    
-     c) Prohibiting misrepresentation of the origin of that material, or
-        requiring that modified versions of such material be marked in
-        reasonable ways as different from the original version; or
-    
-     d) Limiting the use for publicity purposes of names of licensors or
-        authors of the material; or
-    
-     e) Declining to grant rights under trademark law for use of some
-        trade names, trademarks, or service marks; or
-    
-     f) Requiring indemnification of licensors and authors of that
-        material by anyone who conveys the material (or modified versions of
-        it) with contractual assumptions of liability to the recipient, for
-        any liability that these contractual assumptions directly impose on
-        those licensors and authors.
-    
-    All other non-permissive additional terms are considered "further
-    restrictions" within the meaning of section 10.  If the Program as you
-    received it, or any part of it, contains a notice stating that it is
-    governed by this License along with a term that is a further
-    restriction, you may remove that term.  If a license document contains
-    a further restriction but permits relicensing or conveying under this
-    License, you may add to a covered work material governed by the terms
-    of that license document, provided that the further restriction does
-    not survive such relicensing or conveying.
-    
-    If you add terms to a covered work in accord with this section, you
-    must place, in the relevant source files, a statement of the
-    additional terms that apply to those files, or a notice indicating
-    where to find the applicable terms.
-    
-    Additional terms, permissive or non-permissive, may be stated in the
-    form of a separately written license, or stated as exceptions;
-    the above requirements apply either way.
-    
-8.  Termination.
-    
-    You may not propagate or modify a covered work except as expressly
-    provided under this License.  Any attempt otherwise to propagate or
-    modify it is void, and will automatically terminate your rights under
-    this License (including any patent licenses granted under the third
-    paragraph of section 11).
-    
-    However, if you cease all violation of this License, then your
-    license from a particular copyright holder is reinstated (a)
-    provisionally, unless and until the copyright holder explicitly and
-    finally terminates your license, and (b) permanently, if the copyright
-    holder fails to notify you of the violation by some reasonable means
-    prior to 60 days after the cessation.
-    
-    Moreover, your license from a particular copyright holder is
-    reinstated permanently if the copyright holder notifies you of the
-    violation by some reasonable means, this is the first time you have
-    received notice of violation of this License (for any work) from that
-    copyright holder, and you cure the violation prior to 30 days after
-    your receipt of the notice.
-    
-    Termination of your rights under this section does not terminate the
-    licenses of parties who have received copies or rights from you under
-    this License.  If your rights have been terminated and not permanently
-    reinstated, you do not qualify to receive new licenses for the same
-    material under section 10.
-    
-9.  Acceptance Not Required for Having Copies.
-    
-    You are not required to accept this License in order to receive or
-    run a copy of the Program.  Ancillary propagation of a covered work
-    occurring solely as a consequence of using peer-to-peer transmission
-    to receive a copy likewise does not require acceptance.  However,
-    nothing other than this License grants you permission to propagate or
-    modify any covered work.  These actions infringe copyright if you do
-    not accept this License.  Therefore, by modifying or propagating a
-    covered work, you indicate your acceptance of this License to do so.
-    
-10. Automatic Licensing of Downstream Recipients.
-    
-    Each time you convey a covered work, the recipient automatically
-    receives a license from the original licensors, to run, modify and
-    propagate that work, subject to this License.  You are not responsible
-    for enforcing compliance by third parties with this License.
-    
-    An "entity transaction" is a transaction transferring control of an
-    organization, or substantially all assets of one, or subdividing an
-    organization, or merging organizations.  If propagation of a covered
-    work results from an entity transaction, each party to that
-    transaction who receives a copy of the work also receives whatever
-    licenses to the work the party's predecessor in interest had or could
-    give under the previous paragraph, plus a right to possession of the
-    Corresponding Source of the work from the predecessor in interest, if
-    the predecessor has it or can get it with reasonable efforts.
-    
-    You may not impose any further restrictions on the exercise of the
-    rights granted or affirmed under this License.  For example, you may
-    not impose a license fee, royalty, or other charge for exercise of
-    rights granted under this License, and you may not initiate litigation
-    (including a cross-claim or counterclaim in a lawsuit) alleging that
-    any patent claim is infringed by making, using, selling, offering for
-    sale, or importing the Program or any portion of it.
-    
-11. Patents.
-    
-    A "contributor" is a copyright holder who authorizes use under this
-    License of the Program or a work on which the Program is based.  The
-    work thus licensed is called the contributor's "contributor version".
-    
-    A contributor's "essential patent claims" are all patent claims
-    owned or controlled by the contributor, whether already acquired or
-    hereafter acquired, that would be infringed by some manner, permitted
-    by this License, of making, using, or selling its contributor version,
-    but do not include claims that would be infringed only as a
-    consequence of further modification of the contributor version.  For
-    purposes of this definition, "control" includes the right to grant
-    patent sublicenses in a manner consistent with the requirements of
-    this License.
-    
-    Each contributor grants you a non-exclusive, worldwide, royalty-free
-    patent license under the contributor's essential patent claims, to
-    make, use, sell, offer for sale, import and otherwise run, modify and
-    propagate the contents of its contributor version.
-    
-    In the following three paragraphs, a "patent license" is any express
-    agreement or commitment, however denominated, not to enforce a patent
-    (such as an express permission to practice a patent or covenant not to
-    sue for patent infringement).  To "grant" such a patent license to a
-    party means to make such an agreement or commitment not to enforce a
-    patent against the party.
-    
-    If you convey a covered work, knowingly relying on a patent license,
-    and the Corresponding Source of the work is not available for anyone
-    to copy, free of charge and under the terms of this License, through a
-    publicly available network server or other readily accessible means,
-    then you must either (1) cause the Corresponding Source to be so
-    available, or (2) arrange to deprive yourself of the benefit of the
-    patent license for this particular work, or (3) arrange, in a manner
-    consistent with the requirements of this License, to extend the patent
-    license to downstream recipients.  "Knowingly relying" means you have
-    actual knowledge that, but for the patent license, your conveying the
-    covered work in a country, or your recipient's use of the covered work
-    in a country, would infringe one or more identifiable patents in that
-    country that you have reason to believe are valid.
-    
-    If, pursuant to or in connection with a single transaction or
-    arrangement, you convey, or propagate by procuring conveyance of, a
-    covered work, and grant a patent license to some of the parties
-    receiving the covered work authorizing them to use, propagate, modify
-    or convey a specific copy of the covered work, then the patent license
-    you grant is automatically extended to all recipients of the covered
-    work and works based on it.
-    
-    A patent license is "discriminatory" if it does not include within
-    the scope of its coverage, prohibits the exercise of, or is
-    conditioned on the non-exercise of one or more of the rights that are
-    specifically granted under this License.  You may not convey a covered
-    work if you are a party to an arrangement with a third party that is
-    in the business of distributing software, under which you make payment
-    to the third party based on the extent of your activity of conveying
-    the work, and under which the third party grants, to any of the
-    parties who would receive the covered work from you, a discriminatory
-    patent license (a) in connection with copies of the covered work
-    conveyed by you (or copies made from those copies), or (b) primarily
-    for and in connection with specific products or compilations that
-    contain the covered work, unless you entered into that arrangement,
-    or that patent license was granted, prior to 28 March 2007.
-    
-    Nothing in this License shall be construed as excluding or limiting
-    any implied license or other defenses to infringement that may
-    otherwise be available to you under applicable patent law.
-    
-12. No Surrender of Others' Freedom.
-    
-    If conditions are imposed on you (whether by court order, agreement or
-    otherwise) that contradict the conditions of this License, they do not
-    excuse you from the conditions of this License.  If you cannot convey a
-    covered work so as to satisfy simultaneously your obligations under this
-    License and any other pertinent obligations, then as a consequence you may
-    not convey it at all.  For example, if you agree to terms that obligate you
-    to collect a royalty for further conveying from those to whom you convey
-    the Program, the only way you could satisfy both those terms and this
-    License would be to refrain entirely from conveying the Program.
-    
-13. Use with the GNU Affero General Public License.
-    
-    Notwithstanding any other provision of this License, you have
-    permission to link or combine any covered work with a work licensed
-    under version 3 of the GNU Affero General Public License into a single
-    combined work, and to convey the resulting work.  The terms of this
-    License will continue to apply to the part which is the covered work,
-    but the special requirements of the GNU Affero General Public License,
-    section 13, concerning interaction through a network will apply to the
-    combination as such.
-    
-14. Revised Versions of this License.
-    
-    The Free Software Foundation may publish revised and/or new versions of
-    the GNU General Public License from time to time.  Such new versions will
-    be similar in spirit to the present version, but may differ in detail to
-    address new problems or concerns.
-    
-    Each version is given a distinguishing version number.  If the
-    Program specifies that a certain numbered version of the GNU General
-    Public License "or any later version" applies to it, you have the
-    option of following the terms and conditions either of that numbered
-    version or of any later version published by the Free Software
-    Foundation.  If the Program does not specify a version number of the
-    GNU General Public License, you may choose any version ever published
-    by the Free Software Foundation.
-    
-    If the Program specifies that a proxy can decide which future
-    versions of the GNU General Public License can be used, that proxy's
-    public statement of acceptance of a version permanently authorizes you
-    to choose that version for the Program.
-    
-    Later license versions may give you additional or different
-    permissions.  However, no additional obligations are imposed on any
-    author or copyright holder as a result of your choosing to follow a
-    later version.
-    
-15. Disclaimer of Warranty.
-    
-    THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-    APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-    HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-    OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-    IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-    ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-    
-16. Limitation of Liability.
-    
-    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-    THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-    GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-    USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-    DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-    PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-    EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGES.
-    
-17. Interpretation of Sections 15 and 16.
-    
-    If the disclaimer of warranty and limitation of liability provided
-    above cannot be given local legal effect according to their terms,
-    reviewing courts shall apply local law that most closely approximates
-    an absolute waiver of all civil liability in connection with the
-    Program, unless a warranty or assumption of liability accompanies a
-    copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-.............................................
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-::
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode::
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands ``show w`` and ``show c`` should show the
-appropriate parts of the General Public License.  Of course, your
-program's commands might be different; for a GUI interface, you would
-use an "about box".
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-
-
-.. role:: raw-html(raw)
-  :format: html
-.. role:: raw-latex(raw)
-  :format: latex
-.. |--|   unicode:: U+02013 .. en dash
-  :trim:
-.. |---|  unicode:: U+02014 .. em dash
-.. |LaTeX| replace:: :raw-html:`LaTeX` :raw-latex:`\LaTeX{}`
-
-.. vim: ft=rest
-.. vim700: spell spelllang=en
+  http://apps.man.poznan.pl/trac/pbs-drmaa/wiki
Index: trunk/configure.ac
===================================================================
--- trunk/configure.ac	(revision 11)
+++ trunk/configure.ac	(revision 12)
@@ -1,8 +1,9 @@
 AC_INIT([DRMAA for PBS Pro], [1.0.7], [mamonski@man.poznan.pl], [pbs-drmaa])
 AC_PREREQ(2.59)
-AC_REVISION([$Id: configure.ac 2694 2009-09-12 17:17:35Z mmamonski $])
+AC_REVISION([$Id$])
 AC_COPYRIGHT([
-DRMAA for PBS Pro
+DRMAA for Torque/PBS Professional
 Copyright (C) 2006-2009  FedStage Systems
+Copyright (C) 2011  Poznan Supercomputing and Networking Center
 
 This program is free software: you can redistribute it and/or modify
@@ -39,5 +40,5 @@
 			[produce code suiteable for debugging and print logs at runtime]))
 AC_ARG_ENABLE(development, AC_HELP_STRING([--enable-development],
-			[enable development mode: make additional checks (suiteable for FedStage DRMAA for PBS Pro developers)]))
+			[enable development mode: make additional checks (suiteable for developers)]))
 
 # programs:
@@ -52,13 +53,4 @@
 # code generation tools:
 AX_GPERF
-
-# reStructuredText processing:
-AX_DOCUTILS()
-if test x$RST2HTML = x; then
-	RST2HTML="sh m4/missing-dev-prog.sh docutils"
-fi
-if test x$RST2LATEX = x; then
-	RST2LATEX="sh m4/missing-dev-prog.sh docutils"
-fi
 
 # check compiler / set basic flags:
@@ -177,5 +169,4 @@
 	Makefile
 	pbs_drmaa/Makefile
-	doc/Makefile
 ])
 AC_CONFIG_HEADERS([config.h])
