From 907a17fb45be2ef7c2e6ca5e271e4654a961de75 Mon Sep 17 00:00:00 2001 From: hjkhjk54 Date: Tue, 13 Dec 2011 22:13:19 +0000 Subject: [PATCH] updates for license info for semantic web service code integration. Removing VIVO license line from files with MIT license. NIHVIVO-3496 --- config/licenser/known_exceptions.txt | 4 ++-- doc/3rd-party-licenses.txt | 4 +++- .../mannlib/semservices/util/ObjectUtils.java | 2 -- .../util/XMLGregorianCalendarConverter.java | 2 -- .../BeanToJsonSerializer.java | 15 --------------- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/config/licenser/known_exceptions.txt b/config/licenser/known_exceptions.txt index ee462919..12b3999d 100644 --- a/config/licenser/known_exceptions.txt +++ b/config/licenser/known_exceptions.txt @@ -37,7 +37,7 @@ productMods/js/visualization/entitycomparison/jquery_plugins/* # PROBLEM: Can't find any info on licensing. productMods/js/jquery_plugins/jquery.truncator.js -# PROBLEM: Modified from original source and no info on licensing. -# Copyrighted Revolution Health Group 2006. +# See /doc/3rd-party-licenses.txt for LICENSE file +src/edu/cornell/mannlib/semservices/util/ObjectUtils.java src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/BeanToJsonSerializer.java \ No newline at end of file diff --git a/doc/3rd-party-licenses.txt b/doc/3rd-party-licenses.txt index 1a224e80..594ed8bc 100644 --- a/doc/3rd-party-licenses.txt +++ b/doc/3rd-party-licenses.txt @@ -137,18 +137,20 @@ jai_core MIT --- +BeanToJsonSerializer.java (licenses/mit.LICENSE.txt) blueprintcss (licenses/blueprintcss.LICENSE.txt) html5js (licenses/mit.LICENSE.txt) icu4j (licenses/icu.LICENSE.txt) jsoup (licenses/jsoup.LICENSE.txt) jquery (licenses/mit.LICENSE.txt) jquery-plugins (licenses/mit.LICENSE.txt) +ObjectUtils.java (licenses/mit.LICENSE.txt) prototype (licenses/mit.LICENSE.txt) raphael (licenses/mit.LICENSE.txt) selectivizr (licenses/mit.LICENSE.txt) slf4j-api (licenses/mit.LICENSE.txt) slf4j-log4j12 (licenses/mit.LICENSE.txt) - +XMLGregorianCalendarConverter.java (licenses/mit.LICENSE.txt) MPL 1.1 ------- diff --git a/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java b/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java index bf53dce2..9cea3a73 100644 --- a/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java +++ b/src/edu/cornell/mannlib/semservices/util/ObjectUtils.java @@ -1,5 +1,3 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - /* * $Id$ * CONFIDENTIAL AND PROPRIETARY. © 2007 Revolution Health Group LLC. All rights reserved. diff --git a/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java b/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java index 2caaf4ce..180bd4f9 100644 --- a/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java +++ b/src/edu/cornell/mannlib/semservices/util/XMLGregorianCalendarConverter.java @@ -1,5 +1,3 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - /* * $Id: XMLGregorianCalendarConverter.java 28642 2006-10-25 13:41:54Z jdamick $ diff --git a/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/BeanToJsonSerializer.java b/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/BeanToJsonSerializer.java index 14e7b5db..8c26e5d4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/BeanToJsonSerializer.java +++ b/src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/BeanToJsonSerializer.java @@ -1,18 +1,3 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -/* - - * $Id: BeanToJsonSerializer.java 66350 2007-08-20 21:11:41Z xluan $ - * - * Copyright 2006- Revolution Health Group. All rights reserved. - * - * This software is the confidential and proprietary information - * of Revolution Health Group. (Confidential Information). - * You shall not disclose such Confidential Information and shall - * use it only in accordance with the terms of the license - * agreement you entered into with Revolution Health Group. - * - */ package edu.cornell.mannlib.vitro.webapp.utils.ConceptSearchService; import java.beans.PropertyDescriptor;