From 0e7dac3440b8642b039879ac892e9b04b626641d Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 5 Jun 2012 20:29:13 +0000 Subject: [PATCH] NIHVIVO-3772 Fix some license issues (at least temporarily) with the OpenSocial code. Ask Eric for how to resolve long-term. --- webapp/config/licenser/known_exceptions.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/webapp/config/licenser/known_exceptions.txt b/webapp/config/licenser/known_exceptions.txt index 665d8a46d..83df251b1 100644 --- a/webapp/config/licenser/known_exceptions.txt +++ b/webapp/config/licenser/known_exceptions.txt @@ -173,3 +173,11 @@ webapp/src/edu/cornell/mannlib/vitro/webapp/web/antisamy-vitro-1.4.4.xml # A kluge class derived from JarJar code. See /doc/3rd-party-licenses.txt for LICENSE file utilities/buildutils/src/com/tonicsystems/jarjar/KlugedDepFind.java + +# Part of the OpenSocial integration - What license should apply here? +webapp/src/edu/ucsf/vitro/opensocial/GadgetController.java +webapp/src/edu/ucsf/vitro/opensocial/GadgetSpec.java +webapp/src/edu/ucsf/vitro/opensocial/GadgetViewRequirements.java +webapp/src/edu/ucsf/vitro/opensocial/OpenSocialManager.java +webapp/src/edu/ucsf/vitro/opensocial/PreparedGadget.java +webapp/web/js/openSocial/shindig.js