Index: lams_bb_integration/.classpath
===================================================================
diff -u -ra225f60e82f4197c7a2bf6dbb7200709d1e852d7 -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/.classpath (.../.classpath) (revision a225f60e82f4197c7a2bf6dbb7200709d1e852d7)
+++ lams_bb_integration/.classpath (.../.classpath) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -7,14 +7,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Index: lams_bb_integration/LICENSE.TXT
===================================================================
diff -u
--- lams_bb_integration/LICENSE.TXT (revision 0)
+++ lams_bb_integration/LICENSE.TXT (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -0,0 +1,841 @@
+The LAMS2 and Blackboard v7 integration is licensed under the GNU
+General Public License Version 2. See below for details.
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) 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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. 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.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+ 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
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ , 1 April 1989
+ Ty Coon, President of Vice
+
+This 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.
+
+
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
Index: lams_bb_integration/WEB-INF/bb-manifest.xml
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -3,11 +3,11 @@
-
+
-
+
@@ -31,7 +31,6 @@
-
@@ -40,8 +39,8 @@
-
+
Index: lams_bb_integration/WEB-INF/web.xml
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/WEB-INF/web.xml (.../web.xml) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/WEB-INF/web.xml (.../web.xml) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -14,14 +14,14 @@
org.lamsfoundation.ld.integration.blackboard.LamsActionRequestServlet
-
+
Index: lams_bb_integration/build.xml
===================================================================
diff -u -ra225f60e82f4197c7a2bf6dbb7200709d1e852d7 -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/build.xml (.../build.xml) (revision a225f60e82f4197c7a2bf6dbb7200709d1e852d7)
+++ lams_bb_integration/build.xml (.../build.xml) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -1,7 +1,7 @@
-
+
Index: lams_bb_integration/lib/commons-codec-1.3.jar
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/lib/commons-discovery-0.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/lib/commons-logging-1.0.4.jar
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/lib/log4j-1.2.8.jar
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/readme.txt
===================================================================
diff -u
--- lams_bb_integration/readme.txt (revision 0)
+++ lams_bb_integration/readme.txt (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -0,0 +1,84 @@
+Blackboard - LAMS Integration Module
+====================================
+
+By Luke Foxton
+LAMS Foundation Copyright (C) 2007 (http://lamsfoundation.org)
+
+Contents
+================================================================================
+1. Requirements
+ 1.1 Minimum requirement to install the module
+ 1.2 Minimum requirement to build the module from source
+2. Installing the module in Blackboard
+3. Configuring the module in Blackboard
+4. Configuring the LAMS Server for Blackboard Integration
+
+
+1. Requirements
+================================================================================
+ 1.1 Minimum requirement to install the module
+ - Blackboard Learning System 7
+
+ 1.2 Minimum requirement to build the module from source
+ - Java 2 Platform, Standard Edition, v 1.5
+ - Ant 1.6
+
+2. Installing the module in Blackboard
+================================================================================
+ 1. Download lams2-bb-plugin-1.x.war
+ 2. Log into Blackboard as Administrator
+ 3. Click on
+ System Admin->Building Blocks->Install Building Block
+ 4. Click on Browse and select lams2-bb-plugin-1.x.war
+ 5. Submit
+ 6. Select "Available" in the Availability drop-down menu and click ok
+ 7. Configure the module (See "Configuring the module in Blackboard")
+
+
+3. Configuring the module in Blackboard
+================================================================================
+ 1. Once the LAMS2 integration Block is installed, Goto
+ System Admin->Building Blocks
+ 2. Click the "Properties" button in the LAMS Module row
+ 3. Fill in the LAMS server url, this is the url that points to the login
+ page for LAMS. The same as the server URL set during LAMS installation
+ 4. Set the LAMS server ID, this should be set the same on the LAMS server
+ (See "Configuring the LAMS Server for Blackboard Integration")
+ 5. Set the LAMS server secret key, also the same as on the LAMS server
+ (See "Configuring the LAMS Server for Blackboard Integration")
+ 6. Set the Blackboard request src, this is an arbitrary string that the
+ LAMS server uses when returning calls to Blackboard
+ 7. A User data callback URL is shown in this page, this URL provides LAMS
+ with dynamic user provisioning data. You will need this URL for LAMS
+ configuration
+
+
+4. Configuring the LAMS Server for Blackboard Integration
+================================================================================
+ 1. Login to LAMS as sysadmin
+ 2. Open the Sys Admin window, thne navigate to the "Maintain Integrated
+ Servers page.
+ 3. Click "Add New Server"
+ 4. Put in the same ID and key as blackboard
+ (See steps 3-4 of "Configuring the module in Blackboard")
+ 5. Enter a name and description for the integration
+ 6. Enter a prefix, all Blackboard users that use the LAMS module will be
+ created in LAMS with this prefix before the username.
+ 7. Enter the "User Information URL", this points to the servlet that
+ provides LAMS with Blackboard user information.
+ (See step 7 of "Configuring the module in Blackboard")
+ 8. You can optionally put a timout URL and choose an organisation to add
+ the integrated server to.
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/Constants.java
===================================================================
diff -u -ra225f60e82f4197c7a2bf6dbb7200709d1e852d7 -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/Constants.java (.../Constants.java) (revision a225f60e82f4197c7a2bf6dbb7200709d1e852d7)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/Constants.java (.../Constants.java) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -1,27 +1,31 @@
-/**
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- *
+/****************************************************************
+ * Copyright (C) 2007 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
* 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 2 of the License, or
- * (at your option) any later version.
- *
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
* 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
- *
+ *
* http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
*/
package org.lamsfoundation.ld.integration;
/**
- * @author Anthony Xiao
+ * Constants used for blackboard integration
+ *
+ * @author Luke Foxton
*/
public class Constants {
@@ -45,12 +49,6 @@
public static final String METHOD_MONITOR = "monitor";
public static final String METHOD_LEARNER = "learner";
- // Conf file constants
- //public static final String CONF_SERVER_ADDRRESS = "lamstwo.serverAddr";
- //public static final String CONF_SERVER_ID = "lamstwo.serverId";
- //public static final String CONF_SERVER_KEY = "lamstwo.serverKey";
- //public static final String CONF_REQUEST_SOURCE = "lamstwo.requestSrc";
-
// XML format constnats
public static final String ELEM_FOLDER = "Folder";
public static final String ELEM_LEARNING_DESIGN = "LearningDesign";
Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/BBDBManager.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsActionRequestServlet.java
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsActionRequestServlet.java (.../LamsActionRequestServlet.java) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsActionRequestServlet.java (.../LamsActionRequestServlet.java) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -24,32 +24,26 @@
package org.lamsfoundation.ld.integration.blackboard;
import java.io.IOException;
-import java.io.PrintWriter;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.lamsfoundation.ld.integration.Constants;
-import blackboard.persist.BbPersistenceManager;
-import blackboard.persist.Id;
import blackboard.platform.BbServiceManager;
-import blackboard.data.course.Course;
import blackboard.platform.context.ContextManager;
import blackboard.platform.context.Context;
-import blackboard.platform.plugin.PlugInException;
-import blackboard.platform.plugin.PlugInUtil;
import blackboard.platform.session.BbSession;
import blackboard.platform.session.BbSessionManagerService;
/**
+ * Handles requests to the LAMS server
+ *
* @author Luke Foxton
*/
public class LamsActionRequestServlet extends HttpServlet {
- /**
- *
- */
+
private static final long serialVersionUID = 1L;
/**
@@ -91,7 +85,6 @@
// get the session object to obtain the current user and course object
BbSessionManagerService sessionService = BbServiceManager.getSessionManagerService();
BbSession bbSession = sessionService.getSession( request );
- String username = bbSession.getUserName();
String redirect = LamsSecurityUtil.generateRequestURL(ctx, p_method);
@@ -101,8 +94,6 @@
//redirect1 += '&' + Constants.PARAM_LEARNING_SESSION_ID + '=' + p_learningSessionId;
}
- //response.sendRedirect(redirect1);
-
response.sendRedirect(response.encodeRedirectURL(redirect));
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsPluginUtil.java
===================================================================
diff -u -ra225f60e82f4197c7a2bf6dbb7200709d1e852d7 -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsPluginUtil.java (.../LamsPluginUtil.java) (revision a225f60e82f4197c7a2bf6dbb7200709d1e852d7)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsPluginUtil.java (.../LamsPluginUtil.java) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -29,7 +29,6 @@
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-
import blackboard.platform.plugin.PlugInException;
import blackboard.platform.plugin.PlugInUtil;
@@ -46,7 +45,7 @@
public class LamsPluginUtil {
public static final String VENDOR_ID = "lams";
- public static final String PLUGIN_HANDLE = "plglamscontent";
+ public static final String PLUGIN_HANDLE = "lamscontent";
public static final String CONTENT_HANDLE = "resource/x-lams-lamscontent";
public static final String FILE_PROPERTIES = "lams.properties";
@@ -121,18 +120,34 @@
}
}
+ /**
+ *
+ * @return the secret key from lams.properties
+ */
public static String getSecretKey(){
return getProperties().getProperty(PROP_LAMS_SECRET_KEY);
}
+ /**
+ *
+ * @return the secret url from lams.properties
+ */
public static String getServerUrl(){
return getProperties().getProperty(PROP_LAMS_URL);
}
+ /**
+ *
+ * @return the server id from lams.properties
+ */
public static String getServerId(){
return getProperties().getProperty(PROP_LAMS_SERVER_ID);
}
+ /**
+ *
+ * @return the request source from lams.properties
+ */
public static String getReqSrc(){
return getProperties().getProperty(PROP_REQ_SRC);
}
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -22,6 +22,8 @@
*/
package org.lamsfoundation.ld.integration.blackboard;
+import java.lang.IllegalStateException;
+import java.net.ConnectException;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -33,40 +35,38 @@
import java.rmi.RemoteException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-import java.util.Locale;
-import javax.xml.rpc.ServiceException;
import blackboard.platform.context.Context;
import org.apache.commons.codec.binary.Hex;
-import javax.servlet.ServletException;
-
-//import org.lamsfoundation.lams.util.CentralConstants;
import org.lamsfoundation.ld.integration.Constants;
-import org.lamsfoundation.ld.webservice.LessonManager;
-import org.lamsfoundation.ld.webservice.LessonManagerService;
-import org.lamsfoundation.ld.webservice.LessonManagerServiceLocator;
-
-
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import org.apache.log4j.Logger;
-
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
/**
+ * This class creates URLs, servlet calls and webservice calls
+ * for communication with LAMS
+ *
* @author Luke Foxton
*/
public class LamsSecurityUtil {
- //private static Connection _conn = null;
static Logger logger = Logger.getLogger(LamsSecurityUtil.class);
+
+ /**
+ * Generates login requests to LAMS for author, monitor and learner
+ *
+ * @param ctx the blackboard contect, contains session data
+ * @param method the mehtod to request of LAMS "author", "monitor", "learner"
+ * @return a url pointing to the LAMS lesson, monitor, author session
+ * @throws Exception
+ */
public static String generateRequestURL(Context ctx, String method) throws Exception
{
String serverAddr = getServerAddress();
@@ -82,17 +82,11 @@
String username = ctx.getUser().getUserName();
String hash = generateAuthenticationHash(timestamp, username, method, serverId);
String courseId = ctx.getCourse().getCourseId();
- String country = "US";
- String lang = "en";
-
- //ResourceLoader rl = new ResourceLoader();
- //String[] locale = ctx.getGuestSessionLocale().split("-");
+ String locale = ctx.getUser().getLocale();
+ String country = getCountry(locale);
+ String lang = getLanguage(locale);
- //String siteID = getCurrentContext();
-
- // TODO: Make locale settings work
-
String url;
try {
url = serverAddr + "/LoginRequest?"
@@ -109,11 +103,20 @@
throw new RuntimeException();
}
- System.out.println(url);
+ logger.info("LAMS Req: " + url);
+ //System.out.println(url);
return url;
}
+ /**
+ * Gets a list of learning designs for the current user from LAMS
+ *
+ * @param ctx the blackboard contect, contains session data
+ * @param mode the mode to call upon learning designes
+ * @return a string containing the LAMS workspace tree in tigra format
+ * @throws Exception
+ */
public static String getLearningDesigns(Context ctx, Integer mode) throws Exception
{
String serverAddr = getServerAddress();
@@ -129,9 +132,11 @@
String username = ctx.getUser().getUserName();
String hash = generateAuthenticationHash(timestamp, username, serverId);
String courseId = ctx.getCourse().getCourseId();
- String country = "US";
- String lang = "en";
+ String locale = ctx.getUser().getLocale();
+ String country = getCountry(locale);
+ String lang = getLanguage(locale);
+
// TODO: Make locale settings work
String learningDesigns = "[]"; // empty javascript array
try {
@@ -156,10 +161,13 @@
if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
logger.error("HTTP Response Code: " + httpConn.getResponseCode()
+ ", HTTP Response Message: " + httpConn.getResponseMessage());
+ return "error";
}
- InputStream is = url.openConnection().getInputStream();
+ //InputStream is = url.openConnection().getInputStream();
+ InputStream is = conn.getInputStream();
+
// parse xml response
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
@@ -174,114 +182,59 @@
// TODO better error handling
} catch (MalformedURLException e) {
+ logger.error("Unable to get LAMS learning designs, bad URL: '"
+ + serverAddr
+ + "', please check lams.properties", e);
e.printStackTrace();
+ return "error";
+ }catch (IllegalStateException e){
+ logger.error("LAMS Server timeout, did not get a response from the LAMS server. Please contact your systems administrator", e);
+ e.printStackTrace();
+ return "error";
+ }catch (ConnectException e){
+ logger.error("LAMS Server timeout, did not get a response from the LAMS server. Please contact your systems administrator", e);
+ e.printStackTrace();
+ return "error";
} catch (UnsupportedEncodingException e) {
+ logger.error(e);
e.printStackTrace();
+ return "error";
} catch (IOException e) {
+ logger.error(e);
e.printStackTrace();
+ return "error";
} catch (ParserConfigurationException e) {
+ logger.error(e);
e.printStackTrace();
+ return "error";
} catch (SAXException e) {
+ logger.error(e);
e.printStackTrace();
+ return "error";
}
-
return learningDesigns;
- }
+ }
-
-
-
-
-
- /* Scheduling is handled by blackboard
- public static Long scheduleLesson(Context ctx, long ldId, String title, String desc, String startDate) {
-
-
- String serverID = getServerID();
- String serverAddress = getServerAddress();
- String serverKey = getServerKey();
- String courseId = ctx.getCourse().getCourseId();
- String username = ctx.getUser().getUserName();
- String siteId = getReqSrc();
-
- if (serverID == null || serverAddress == null || serverKey == null ) {
- logger.error("Unable to retrieve learning designs from LAMS, one or more lams configuration properties is null");
- return null;
- }
-
- try {
-
- String datetime = new Date().toString();
- String hashValue = generateAuthenticationHash(serverID, serverKey, username, datetime);
-
- LessonManagerService service = new LessonManagerServiceLocator();
- LessonManager lessonManager = service.getLessonManagerService(new URL(serverAddress + "/services/LessonManagerService"));
- Long lessonId = lessonManager.scheduleLesson(serverID, datetime, hashValue, username, ldId, siteId, title, desc, startDate, "US", "en");
-
- return lessonId;
-
- } catch (MalformedURLException e) {
- logger.error("Unable to schedule LAMS lesson, bad URL: '"
- + serverAddress
- + "', please check sakai.properties");
- } catch (ServiceException e) {
- logger.error("Unable to schedule LAMS lesson, RPC Service Exception");
- e.printStackTrace();
- } catch (RemoteException e) {
- logger.error("Unable to schedule LAMS lesson, RMI Remote Exception");
- e.printStackTrace();
- }
- return null;
- }
- */
-
-
- /*
- String serverId = request.getParameter(CentralConstants.PARAM_SERVER_ID);
- String datetime = request.getParameter(CentralConstants.PARAM_DATE_TIME);
- String hashValue = request.getParameter(CentralConstants.PARAM_HASH_VALUE);
- String username = request.getParameter(CentralConstants.PARAM_USERNAME);
- String courseId = request.getParameter(CentralConstants.PARAM_COURSE_ID);
- String ldIdStr = request.getParameter(CentralConstants.PARAM_LEARNING_DESIGN_ID);
- String lsIdStr = request.getParameter(CentralConstants.PARAM_LESSON_ID);
- String country = request.getParameter(CentralConstants.PARAM_COUNTRY);
- String title = request.getParameter(CentralConstants.PARAM_TITLE);
- String desc = request.getParameter(CentralConstants.PARAM_DESC);
- String startDate = request.getParameter(CentralConstants.PARAM_STARTDATE);
- String lang = request.getParameter(CentralConstants.PARAM_LANG);
- String method = request.getParameter(CentralConstants.PARAM_METHOD);
-
- serverId,
- datetime,
- hashValue,
- username,
- ldId,
- courseId,
- title,
- desc,
- country,
- lang
-
- /lams//services/xml/LessonManager?serverId=lamsbb
- &datetime=1186617857718
- &username=administrator
- &hashValue=696e870fde732c1e14a6f79a2872f6eaff9be349
- &courseId=1
- &ldId=5
- &country=US
- &lang=en
- &method=start
- &title=test
- &desc=+%0D%0A
- */
-
+ /**
+ * Starts lessons in lams through a LAMS webservice
+ *
+ * @param ctx the blackboard contect, contains session data
+ * @param ldId the learning design id for which you wish to start a lesson
+ * @param title the title of the lesson
+ * @param desc the description of the lesson
+ * @return the learning session id
+ */
public static Long startLesson(Context ctx, long ldId, String title, String desc)
{
- String serverId = getServerID();
+ Long error = new Long(-1);
+ String serverId = getServerID();
String serverAddr = getServerAddress();
String serverKey = getServerKey();
String courseId = ctx.getCourse().getCourseId();
String username = ctx.getUser().getUserName();
+ String locale = ctx.getUser().getLocale();
+ String country = getCountry(locale);
+ String lang = getLanguage(locale);
if (serverId == null || serverAddr == null || serverKey == null ) {
logger.error("Unable to retrieve learning designs from LAMS, one or more lams configuration properties is null");
@@ -302,14 +255,16 @@
+ "&hashValue=" + hash
+ "&courseId=" + URLEncoder.encode(courseId, "utf8")
+ "&ldId=" + new Long(ldId).toString()
- + "&country=" + "US"
- + "&lang=" + "en"
+ + "&country=" + country
+ + "&lang=" + lang
+ "&method=" + "start"
+ "&title=" + URLEncoder.encode(title, "utf8").trim()
+ "&desc=" + URLEncoder.encode(desc, "utf8").trim();
- System.out.println("START LESSON: " + serviceURL);
+ logger.info("LAMS START LESSON Req: " + serviceURL);
+ //System.out.println("START LESSON: " + serviceURL);
+
URL url = new URL(serviceURL);
URLConnection conn = url.openConnection();
if (!(conn instanceof HttpURLConnection)) {
@@ -321,10 +276,13 @@
if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
logger.error("HTTP Response Code: " + httpConn.getResponseCode()
+ ", HTTP Response Message: " + httpConn.getResponseMessage());
+ return error;
}
- InputStream is = url.openConnection().getInputStream();
+ //InputStream is = url.openConnection().getInputStream();
+ InputStream is = conn.getInputStream();
+
// parse xml response
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
@@ -338,121 +296,76 @@
} catch (MalformedURLException e) {
logger.error("Unable to start LAMS lesson, bad URL: '"
+ serverAddr
- + "', please check lams.properties");
+ + "', please check lams.properties", e);
e.printStackTrace();
+ return error;
+ }catch (IllegalStateException e){
+ logger.error("LAMS Server timeout, did not get a response from the LAMS server. Please contact your systems administrator", e);
+ e.printStackTrace();
+ return error;
} catch (RemoteException e) {
- logger.error("Unable to start LAMS lesson, RMI Remote Exception");
+ logger.error("Unable to start LAMS lesson, RMI Remote Exception",e);
e.printStackTrace();
+ return error;
} catch (UnsupportedEncodingException e)
{
- logger.error("Unable to start LAMS lesson, Unsupported Encoding Exception");
+ logger.error("Unable to start LAMS lesson, Unsupported Encoding Exception",e);
e.printStackTrace();
+ return error;
}
- catch (Exception e)
+ catch (ConnectException e)
{
- logger.error("Unable to start LAMS lesson");
+ logger.error("LAMS Server timeout, did not get a response from the LAMS server. Please contact your systems administrator", e);
e.printStackTrace();
+ return error;
}
+ catch (Exception e) {
+ logger.error("Unable to start LAMS lesson. Please contact your system administrator.",e);
+ e.printStackTrace();
+ return error;
+ }
- return null;
}
-
- /*
- * TODO:
+ /**
+ * @return gets server address from the lams.properties file
*/
- public static boolean deleteLesson(Context ctx, long lsId) {
- String serverId = getServerID();
- String serverAddr = getServerAddress();
- String serverKey = getServerKey();
- String username = ctx.getUser().getUserName();
- if (serverId == null || serverAddr == null || serverKey == null ) {
- logger.error("Unable to retrieve learning designs from LAMS, one or more lams configuration properties is null");
- return false;
- }
-
- try {
-
- String timestamp = new Long(System.currentTimeMillis()).toString();
- String hash = generateAuthenticationHash(serverId, serverKey, username, timestamp);
-
- // Boolean deleted = deleteLesson(serverId, datetime, hashValue, username, lsId);
-
-
- String serviceURL = serverAddr + "/services/xml/LessonManager?"
- + "datetime=" + timestamp
- + "&username=" + URLEncoder.encode(username, "utf8")
- + "&serverId=" + URLEncoder.encode(serverId, "utf8")
- + "&serverKey=" + URLEncoder.encode(serverKey, "utf8")
- + "&hashValue=" + hash
- + "&lsId=" + new Long(lsId).toString()
- + "&method=" + "delete";
-
- URL url = new URL(serviceURL);
- URLConnection conn = url.openConnection();
- if (!(conn instanceof HttpURLConnection)) {
- logger.error("Unable to open connection to: " + serviceURL);
- }
-
- HttpURLConnection httpConn = (HttpURLConnection)conn;
-
- if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
- logger.error("HTTP Response Code: " + httpConn.getResponseCode()
- + ", HTTP Response Message: " + httpConn.getResponseMessage());
- }
-
- InputStream is = url.openConnection().getInputStream();
-
- // parse xml response
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document document = db.parse(is);
-
- return Boolean.parseBoolean(document.getElementById("lesson").getAttribute("deleted"));
-
- } catch (MalformedURLException e) {
- logger.error("Unable to delete LAMS lesson, bad URL: '"
- + serverAddr
- + "', please check lams.properties");
- } catch (RemoteException e) {
- logger.error("Unable to delete LAMS lesson, RMI Remote Exception");
- e.printStackTrace();
- } catch (UnsupportedEncodingException e)
- {
- logger.error("Unable to delet LAMS lesson, Unsupported Encoding Exception");
- e.printStackTrace();
- } catch (Exception e)
- {
- logger.error("Unable to delete LAMS lesson");
- e.printStackTrace();
- }
- return false;
- }
-
-
public static String getServerAddress()
{
return LamsPluginUtil.getProperties().getProperty(LamsPluginUtil.PROP_LAMS_URL);
}
+ /**
+ * @return gets server id from the lams.properties file
+ */
public static String getServerID()
{
return LamsPluginUtil.getProperties().getProperty(LamsPluginUtil.PROP_LAMS_SERVER_ID);
}
+ /**
+ * @return gets server key from the lams.properties file
+ */
public static String getServerKey()
{
return LamsPluginUtil.getProperties().getProperty(LamsPluginUtil.PROP_LAMS_SECRET_KEY);
}
+ /**
+ * @return gets request source from the lams.properties file
+ */
public static String getReqSrc()
{
return LamsPluginUtil.getProperties().getProperty(LamsPluginUtil.PROP_REQ_SRC);
}
-
+ /**
+ *
+ * @param node the node from which to do the recursive conversion
+ * @return the string converted to tigra format
+ */
public static String convertToTigraFormat(Node node) {
StringBuilder sb = new StringBuilder();
@@ -500,14 +413,13 @@
serverId.toLowerCase().trim() +
secretkey.toLowerCase().trim();
- System.out.println(plaintext);
- String hash = sha1(plaintext);
-
+ String hash = sha1(plaintext);
return hash;
}
//generate authentication hash code to validate parameters
+
public static String generateAuthenticationHash(String datetime, String login, String serverId) {
String secretkey = getServerKey();
@@ -516,7 +428,6 @@
serverId.toLowerCase().trim() +
secretkey;
- System.out.println(plaintext);
String hash = sha1(plaintext);
return hash;
@@ -555,4 +466,32 @@
}
}
+ /**
+ *
+ * @param localeStr the full balckboard locale string
+ * @return the language
+ */
+ public static String getLanguage(String localeStr)
+ {
+ if (localeStr==null)
+ return "xx";
+ String[] split = localeStr.split("_");
+ return split[0];
+ }
+
+ /**
+ *
+ * @param localeStr the full balckboard locale string
+ * @return the country
+ */
+ public static String getCountry(String localeStr)
+ {
+ if (localeStr==null)
+ return "XX";
+ String[] split = localeStr.split("_");
+ return split[1];
+ }
+
+
+
}
Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UserDataServlet.java
===================================================================
diff -u -ra225f60e82f4197c7a2bf6dbb7200709d1e852d7 -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UserDataServlet.java (.../UserDataServlet.java) (revision a225f60e82f4197c7a2bf6dbb7200709d1e852d7)
+++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/UserDataServlet.java (.../UserDataServlet.java) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -24,35 +24,28 @@
import java.io.PrintWriter;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-//import javax.servlet.ServletException;
-
import org.apache.commons.codec.binary.Hex;
-//import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator;
-//import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
-//import org.lamsfoundation.lams.util.HashUtil;
import org.lamsfoundation.ld.util.CSVUtil;
import org.lamsfoundation.ld.integration.Constants;
-
import blackboard.persist.BbPersistenceManager;
import blackboard.persist.user.UserDbLoader;
import blackboard.platform.BbServiceManager;
import blackboard.data.user.User;
import blackboard.platform.context.ContextManager;
-import blackboard.platform.context.Context;
import org.apache.log4j.Logger;
+import org.lamsfoundation.ld.integration.blackboard.LamsSecurityUtil;
/**
* @author Anthony Xiao
*/
public class UserDataServlet extends HttpServlet {
+ private static final long serialVersionUID = 2L;
static Logger logger = Logger.getLogger(UserDataServlet.class);
/**
@@ -69,11 +62,11 @@
throws ServletException, IOException{
ContextManager ctxMgr = null;
- Context ctx = null;
+
//get Blackboard context
try{
ctxMgr = (ContextManager) BbServiceManager.lookupService(ContextManager.class);
- ctx = ctxMgr.setContext(request);
+
//get Parameter values
@@ -120,26 +113,11 @@
PrintWriter out = response.getWriter();
- String loc_lang="en";
- String loc_cntry="US";
-
- /*
String locale = u.getLocale();
- String loc_lang;
- String loc_cntry;
- if (u.getLocale()==null)
- {
- loc_lang="en";
- loc_cntry="US";
- }
- else
- {
- String [] loc = locale.split("_");
- loc_lang=loc[0];
- loc_cntry=loc[1];
- }
- */
-
+ String loc_lang=LamsSecurityUtil.getLanguage(locale);
+ String loc_cntry=LamsSecurityUtil.getCountry(locale);
+
+
// The CSV list should be the format below
// ,<First name>,<Last name>,<Address>,<City>,<State>,
// <Postcode>,<Country>,<Day time number>,<Mobile number>,
@@ -160,24 +138,7 @@
loc_lang,
loc_cntry
};
- // DEBUGGING
- System.out.println(valList[0]);
- System.out.println(valList[1]);
- System.out.println(valList[2]);
- System.out.println(valList[3]);
- System.out.println(valList[4]);
- System.out.println(valList[5]);
- System.out.println(valList[6]);
- System.out.println(valList[7]);
- System.out.println(valList[8]);
- System.out.println(valList[9]);
- System.out.println(valList[10]);
- System.out.println(valList[11]);
- System.out.println(valList[12]);
- System.out.println(valList[13]);
- System.out.println("LUKE IS AWESOME: " + CSVUtil.write(valList));
-
-
+
out.println(CSVUtil.write(valList));
} catch (Exception e){
@@ -200,4 +161,6 @@
throw new RuntimeException(e);
}
}
+
+
}
Index: lams_bb_integration/src/org/lamsfoundation/ld/util/CSVUtil.java
===================================================================
diff -u -ra225f60e82f4197c7a2bf6dbb7200709d1e852d7 -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/src/org/lamsfoundation/ld/util/CSVUtil.java (.../CSVUtil.java) (revision a225f60e82f4197c7a2bf6dbb7200709d1e852d7)
+++ lams_bb_integration/src/org/lamsfoundation/ld/util/CSVUtil.java (.../CSVUtil.java) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -1,24 +1,25 @@
-/**
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- *
+/****************************************************************
+ * Copyright (C) 2007 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
* 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 2 of the License, or
- * (at your option) any later version.
- *
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
* 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
- *
+ *
* http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
*/
-
package org.lamsfoundation.ld.util;
import java.text.ParseException;
@@ -30,7 +31,7 @@
* The two methods write() and parse() will perform writing to and parse from
* the CSV format
*
- * @author <a href="mailto:anthony.xiao@lamsinternational.com">Anthony Xiao</a>
+ * @author <a href="mailto:lfoxton@melcoe.mq.edu.au">Luke Foxton</a>
*/
public class CSVUtil {
Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManager.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerService.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceLocator.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceSoapBindingStub.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_bb_integration/web/admin/config.jsp
===================================================================
diff -u -ra225f60e82f4197c7a2bf6dbb7200709d1e852d7 -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/web/admin/config.jsp (.../config.jsp) (revision a225f60e82f4197c7a2bf6dbb7200709d1e852d7)
+++ lams_bb_integration/web/admin/config.jsp (.../config.jsp) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -23,6 +23,10 @@
String lamsServerId = p.getProperty("LAMS_SERVER_ID", "");
String SecretKey = p.getProperty("LAMS_SERVER_SKEY", "");
String ReqSrc = p.getProperty("BB_REQ_SRC");
+
+ // add port to the url if the port is in the blackboard url.
+ int bbport = request.getServerPort();
+ String bbportstr = bbport != 0 ? ":" + bbport : "";
%>
<bbUI:docTemplate title="Configure LAMS">
@@ -48,7 +52,7 @@
<bbUI:step title="Callback URL" number="2">
<bbUI:instructions>
Copy and paste the user data callback URL into LAMS <BR>
- <B>USER DATA CALLBACK URL</B>: http://<%=request.getServerName()%><%=request.getContextPath()%>/UserData?uid=%username%&ts=%timestamp%&hash=%hash%
+ <B>USER DATA CALLBACK URL</B>: http://<%=request.getServerName()%><%=bbportstr%><%=request.getContextPath()%>/UserData?uid=%username%&ts=%timestamp%&hash=%hash%
</bbUI:instructions>
</bbUI:step>
<bbUI:stepSubmit title="Submit" number="3" />
Index: lams_bb_integration/web/images/favicon.ico
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/web/modules/create.jsp
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/web/modules/create.jsp (.../create.jsp) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/web/modules/create.jsp (.../create.jsp) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -8,7 +8,9 @@
<bbData:context id="ctx">
<bbUI:docTemplate title = "Add new LAMS">
-
+<head>
+ <link type="text/css" rel="stylesheet" href="css/bb.css" />
+</head>
<%
// SECURITY!
//AccessManagerService accessManager = (AccessManagerService) BbServiceManager.lookupService(AccessManagerService.class);
@@ -20,6 +22,13 @@
}
String authorUrl = LamsSecurityUtil.generateRequestURL(ctx, "author");
String learningDesigns = LamsSecurityUtil.getLearningDesigns(ctx, 2);
+
+ // Error checking
+ if (learningDesigns.equals("error"))
+ {
+ response.sendRedirect("lamsServerDown.jsp");
+ }
+
%>
<bbUI:breadcrumbBar handle="control_panel" isContent="true" >
@@ -55,11 +64,12 @@
<br>
</bbUI:dataElement>
</bbUI:step>
- <bbUI:step title="Open author, refresh or start the chosen lesson.">
+ <bbUI:step title="Open author, refresh the workspace or start the chosen lesson.">
<bbUI:dataElement>
- <input type="button" name="author" onClick="openAuthor();" value="Open Author">
- <input type="button" name="action" onClick="refreshSeqList();" value="Refresh Workspace">
- <input id="nextButton" type="submit" name="nextButton" onClick="openNext();" value="Next" disabled="true">
+ <input type="button" class="button"name="author" onClick="openAuthor();" value="Open Author">
+ <input type="button" class="button"name="action" onClick="refreshSeqList();" value="Refresh">
+ <input id="disabledNextButton" class="disabled" type="button" name="disabledNextButton" value="Next" disabled="true">
+ <input id="nextButton" class="button" type="hidden" name="nextButton" onClick="openNext();" value="Next">
</bbUI:dataElement>
<br>
</bbUI:step>
@@ -96,7 +106,12 @@
function selectSequence(id)
{
- document.getElementById("nextButton").disabled = false;
+ //document.workspace_form.nextButton.class= "button";
+ //document.getElementById("nextButton").disabled = false;
+ document.getElementById("nextButton").type = "submit";
+ document.getElementById("disabledNextButton").type = "hidden";
+
+ //document.getElementById("nextButton").class = "button";
document.getElementById("sequence_id").value=id;
}
//-->
Index: lams_bb_integration/web/modules/css/bb.css
===================================================================
diff -u
--- lams_bb_integration/web/modules/css/bb.css (revision 0)
+++ lams_bb_integration/web/modules/css/bb.css (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -0,0 +1,28 @@
+
+.disabled {
+ background: url('btnDisabled.gif') no-repeat 1px 1px;
+ color: #CCC;
+ border: 0px none;
+ padding:5px 20px 6px 20px;
+ text-decoration: none;
+ text-align:center;
+ font-size:10px;
+ width:100px;
+ font-weight: bold;
+ font-family: verdana, arial, helvetica, sans-serif;
+}
+
+.button {
+ background: url('btn.gif') no-repeat 1px 1px;
+ color: #333;
+ border: 0px none;
+ padding:5px 20px 6px 20px;
+ text-decoration: none;
+ text-align:center;
+ font-weight: bold;
+ font-size:10px;
+ width:100px;
+ font-family: verdana, arial, helvetica, sans-serif;
+}
+
+
Index: lams_bb_integration/web/modules/css/btn.gif
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/web/modules/css/btnDisabled.gif
===================================================================
diff -u
Binary files differ
Index: lams_bb_integration/web/modules/lamsServerDown.jsp
===================================================================
diff -u
--- lams_bb_integration/web/modules/lamsServerDown.jsp (revision 0)
+++ lams_bb_integration/web/modules/lamsServerDown.jsp (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -0,0 +1,10 @@
+<%@ taglib uri="/bbUI" prefix="bbUI"%>
+<%@ page import="java.io.PrintWriter"%>
+<%@ page isErrorPage = "true" %>
+
+<bbUI:receipt type="FAIL" title="LAMS Server Timeout">
+
+
+<h3>Did not get a response from the LAMS server. Please contact your systems administrator.</h3>
+
+</bbUI:receipt><br>
\ No newline at end of file
Index: lams_bb_integration/web/modules/learnermonitor.jsp
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -27,7 +27,6 @@
String course_idstr = request.getParameter("course_id");
-
BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager();
Id course_id = bbPm.generateId(Course.COURSE_DATA_TYPE, course_idstr);
User sessionUser = ctx.getUser();
@@ -56,30 +55,25 @@
pe.printStackTrace();
}
- boolean instructor=false;
- boolean student=false;
-
+
+ String instructorstr="hidden";
if (courseRole.equals(CourseMembership.Role.INSTRUCTOR)||courseRole.equals(CourseMembership.Role.TEACHING_ASSISTANT))
{
// instructor or assistant
// can choose to redirect to monitor or learner
- instructor=true;
+ instructorstr="button";
}
- else if (courseRole.equals(CourseMembership.Role.STUDENT))
+ else if (!courseRole.equals(CourseMembership.Role.STUDENT))
{
- // student
- // can only access learner pages
- student=true;
- }
- else
- {
+
response.sendRedirect("notAllowed.jsp");
}
-
%>
<bbUI:docTemplate>
-
+<head>
+ <link type="text/css" rel="stylesheet" href="css/bb.css" />
+</head>
<script language="JavaScript" type="text/javascript">
<!--
var learnerWin = null;
@@ -117,91 +111,28 @@
monitorWin.focus();
}
}
-
-
-
//-->
</script>
-<script language="JavaScript" type="text/javascript">
- <!--
- if (true)
- {
- openLearner();
- back();
- }
- //-->
-</script>
+
+<bbUI:breadcrumbBar handle="control_panel" isContent="true" >
+ <bbUI:breadcrumb>LAMS Options</bbUI:breadcrumb>
+</bbUI:breadcrumbBar>
+
+<bbUI:titleBar iconUrl ="/images/ci/icons/bookopen_u.gif">LAMS Options</bbUI:titleBar>
+
+
<form name="workspace_form" id="workspace_form" method="post">
- <input type="button" name="OpenMonitor" onClick="openMonitor();" value="Open Monitor">
- <input type="button" name="OpenLearner" onClick="openLearner();" value="Open Learner">
- <input type="button" name="Cancel" onClick="back();" value="Cancel">
-<form>
-
-
-
+ <br>
+ <b>Please Choose an Option</b>
+ <br><br>
+
+ <input type="<%=instructorstr%>" class="button" name="OpenMonitor" onClick="openMonitor();" value="Open Monitor">
+ <input type="button" class="button" name="OpenLearner" onClick="openLearner();" value="Open Lesson">
+ <input type="button" class="button" name="Cancel" onClick="back();" value="Cancel">
+</form>
+
</bbUI:docTemplate>
</bbData:context>
-
-<%!
-static public String getRoleString(String type, Object role) {
- // return a User Friendly String for the type Role passed in
- String uRole = "";
- if ( type.equals( "COURSE" ) ) {
- // get role based on coursemembershipRole (CourseMembership.Role)
- if( (CourseMembership.Role)role == CourseMembership.Role.COURSE_BUILDER ) {
- uRole="Course Builder";
- } else if ( (CourseMembership.Role)role == CourseMembership.Role.DEFAULT ){
- uRole="Student(Default)";
- } else if ( (CourseMembership.Role)role == CourseMembership.Role.GRADER ) {
- uRole="Grader";
- } else if ( (CourseMembership.Role)role == CourseMembership.Role.GUEST ) {
- uRole="Guest";
- } else if ( (CourseMembership.Role)role
- == CourseMembership.Role.INSTRUCTOR ) {
- uRole="Instructor";
- } else if ( (CourseMembership.Role)role == CourseMembership.Role.NONE) {
- uRole="No explicit role (NONE)";
- } else if ( (CourseMembership.Role)role == CourseMembership.Role.STUDENT) {
- uRole="Student";
- } else if ( (CourseMembership.Role)role
- == CourseMembership.Role.TEACHING_ASSISTANT ) {
- uRole="Teaching Assistant";
- } else {
- uRole = "Cannot Identify Course Membership Role";
- }
- } else if ( type.equals( "SYSTEM" ) ) {
- // get role based on SystemRole
- if( (User.SystemRole)role == User.SystemRole.ACCOUNT_ADMIN ) {
- uRole="Account Administrator";
- } else if ( (User.SystemRole)role == User.SystemRole.COURSE_CREATOR ) {
- uRole = "Course creator";
- } else if ( (User.SystemRole)role == User.SystemRole.COURSE_SUPPORT ) {
- uRole = "Course support";
- } else if ( (User.SystemRole)role == User.SystemRole.DEFAULT ) {
- uRole = "User";
- } else if ( (User.SystemRole)role == User.SystemRole.GUEST ) {
- uRole = "Guest";
- } else if ( (User.SystemRole)role == User.SystemRole.NONE ) {
- uRole = "No explicit role (NONE)";
- } else if ( (User.SystemRole)role == User.SystemRole.OBSERVER ) {
- uRole = "Observer";
- } else if ( (User.SystemRole)role == User.SystemRole.SYSTEM_ADMIN ) {
- uRole = "System Administrator";
- } else if ( (User.SystemRole)role == User.SystemRole.SYSTEM_SUPPORT ) {
- uRole = "System support";
- } else if ( (User.SystemRole)role == User.SystemRole.USER ) {
- uRole = "User";
- } else {
- uRole = "Cannot Identify User System Role";
- }
- } else {
- uRole = "TYPE not qualified in method.";
- }
-
- return uRole;
-}
-
-%>
Index: lams_bb_integration/web/modules/modify.jsp
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/web/modules/modify.jsp (.../modify.jsp) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/web/modules/modify.jsp (.../modify.jsp) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -78,9 +78,11 @@
<input type="radio" name="isTracked" value="true" <%=(courseDoc.getIsTracked())?"checked":""%>>Yes
<input type="radio" name="isTracked" value="false" <%=(courseDoc.getIsTracked())?"":"checked"%>>No
</bbUI:dataElement>
- <bbUI:dateAvailability formName="lams_form"
+ <bbUI:dataElement label="Choose date restrictions">
+ <bbUI:dateAvailability formName="lams_form"
startDateField="startDate" endDateField="endDate"
startDate="<%=startDate%>" endDate="<%=endDate%>"/>
+ </bbUI:dataElement>
</bbUI:step>
<bbUI:step title="Start lesson">
<br>
Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/web/modules/remove.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_bb_integration/web/modules/start_lesson.jsp
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/web/modules/start_lesson.jsp (.../start_lesson.jsp) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/web/modules/start_lesson.jsp (.../start_lesson.jsp) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -27,8 +27,17 @@
<bbData:context id="ctx">
<bbUI:docTemplate title = "Start a LAMS lesson." >
+ <head>
+ <link type="text/css" rel="stylesheet" href="css/bb.css" />
+ </head>
+
+ <bbUI:breadcrumbBar handle="control_panel" isContent="true" >
+ <bbUI:breadcrumb>Start LAMS Lesson</bbUI:breadcrumb>
+ </bbUI:breadcrumbBar>
- <form name="lesson_form" id="lesson_form" action="start_lesson_proc.jsp" method="post">
+ <bbUI:titleBar iconUrl ="/images/ci/icons/bookopen_u.gif">Start LAMS Lesson</bbUI:titleBar>
+
+ <form name="lesson_form" id="lesson_form" action="start_lesson_proc.jsp" method="post" onSubmit="return confirmSubmit();">
<input type="hidden" name="sequence_id" id="sequence_id" value="<%=sequenceID%>">
<input type="hidden" name="content_id" value="<%=request.getParameter("content_id")%>">
<input type="hidden" name="course_id" value="<%=request.getParameter("course_id")%>">
@@ -60,8 +69,8 @@
<bbUI:step title="Start lesson">
<br>
<bbUI:dataElement>
- <input type="submit" name="start" onClick="validateStartLesson();" value="Start Lesson">
- <input type="button" name="cancel" onClick="back();" value="Cancel">
+ <input class="button" type="submit" name="start" value="Start Lesson">
+ <input class="button" type="button" name="cancel" onClick="back();" value="Cancel">
</bbUI:dataElement>
</bbUI:step>
</form>
@@ -73,22 +82,21 @@
history.go(-1);
}
- function validateStartLesson()
+ function confirmSubmit()
{
- var title = trim(document.getElementById("title").value);
-
- // valdation
- if (title==null||title=="")
- {
- alert("Lesson must have a name.");
- return false;
- }
+ var title = rettrim(document.lesson_form.title.value);
+ if ((title == "")||(title == null))
+ {
+ alert("The title is empty. Please enter a title for the LAMS sequence.");
+ return false;
+ }
}
-
-
-
+ function rettrim(stringToTrim) {
+ return stringToTrim.replace(/^\s+|\s+$/g,"");
+ }
+
//-->
</script>
</bbUI:docTemplate>
Index: lams_bb_integration/web/modules/start_lesson_proc.jsp
===================================================================
diff -u -rd77a5e0e31a43d80a8f8418e6525de0500624fed -r8ea6dac2e1f9e39a41030dd5907592bc2aa04d17
--- lams_bb_integration/web/modules/start_lesson_proc.jsp (.../start_lesson_proc.jsp) (revision d77a5e0e31a43d80a8f8418e6525de0500624fed)
+++ lams_bb_integration/web/modules/start_lesson_proc.jsp (.../start_lesson_proc.jsp) (revision 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17)
@@ -6,7 +6,6 @@
<%@ page import="blackboard.data.content.ContentFile"%>
<%@ page import="blackboard.data.content.ContentFolder"%>
<%@ page import="blackboard.data.content.CourseDocument"%>
-
<%@ page import="blackboard.persist.Id"%>
<%@ page import="blackboard.persist.BbPersistenceManager"%>
<%@ page import="blackboard.persist.content.ContentDbPersister"%>
@@ -62,24 +61,8 @@
myContent.setIsAvailable(request.getParameter("isAvailable").equals("true")?true:false);
myContent.setIsTracked(request.getParameter("isTracked").equals("true")?true:false);
- //get descriptions entered
- //FormattedText.Type descType = FormattedText.Type.DEFAULT; //type of description (S|H|P)
- //switch(p_descType.charAt(0)){
- // case 'H':
- // descType = FormattedText.Type.HTML; break;
- // case 'S':
- // descType = FormattedText.Type.SMART_TEXT; break;
- // case 'P':
- // descType = FormattedText.Type.PLAIN_TEXT; break;
- //}
- //if(!myContent.getIsAvailable()){
- // p_descText = "<i>Item is not available.</i><br>" + p_descText;
- //}
- //FormattedText description = new FormattedText(p_descText,descType);
FormattedText fdescription = new FormattedText(description, FormattedText.Type.HTML);
-
-
-
+
// set core course data
myContent.setContentHandler( LamsPluginUtil.CONTENT_HANDLE );
myContent.setCourseId( courseId );
@@ -94,37 +77,33 @@
// tell lams to create the learning session using webservices
try{
long lsId = LamsSecurityUtil.startLesson(ctx, ldId, title, description);
- learningSessionId = Long.toString(lsId);
- } catch (Exception e){
+
+ //error checking
+ if (lsId == -1)
+ {
+ response.sendRedirect("lamsServerDown.jsp");
+ System.exit(1);
+ }
+
+ learningSessionId = Long.toString(lsId);
+
+
+ } catch (Exception e){
throw new ServletException(e.getMessage(), e);
}
+ // add port to the url if the port is in the blackboard url.
int bbport = request.getServerPort();
- String bbportstr;
- if (new Integer(bbport).equals(null) || bbport==0)
- {
- bbportstr = "";
- }
- else
- {
- bbportstr = ":" + bbport;
- }
+ String bbportstr = bbport != 0 ? ":" + bbport : "";
//String contentUrl = LamsSecurityUtil.generateRequestURL(ctx, "learner") + "&lsid=" + learningSessionId;
String contentUrl = "http://" + request.getServerName() +
bbportstr +
request.getContextPath() +
"/modules/learnermonitor.jsp?lsid=" + learningSessionId +
"&course_id=" + request.getParameter("course_id");
-
-
-
myContent.setUrl(contentUrl);
-
-
- //myContent.setPosition(0);
- //myContent.setLaunchInNewWindow(true);
-
+
//Parse start/end Date from the <bbUI:dateAvailability>
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar cstart = Calendar.getInstance();