From a0869570469287f5371e2a73989d3f26af5f50eb Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Sat, 14 Jun 2014 11:32:48 -0400 Subject: [PATCH] Fix licensing issues. --- webapp/config/licenser/known_exceptions.txt | 384 +++++++++--------- .../webapp/dao/jena/VClassGroupCache.java | 2 +- .../adapters/AbstractModelDecorator.java | 2 + .../adapters/AbstractOntModelDecorator.java | 2 + .../adapters/BulkUpdatingOntModel.java | 18 +- 5 files changed, 200 insertions(+), 208 deletions(-) diff --git a/webapp/config/licenser/known_exceptions.txt b/webapp/config/licenser/known_exceptions.txt index 6efdabf02..f846f0823 100644 --- a/webapp/config/licenser/known_exceptions.txt +++ b/webapp/config/licenser/known_exceptions.txt @@ -1,190 +1,194 @@ -# -# A list of files and directories that are known exceptions to the -# license-insertion process. -# -# Files will only be altered if they contain a "magic" license place-holder, -# but if they match one of the file-matchers and don't contain a place-holder, -# the process will write a warning. -# -# File-matchers are: -# '*.java', '*.jsp', '*.tld', '*.xsl', '*.xslt', '*.css', '*.js', 'build.xml' -# -# Known exceptions listed here produce no warnings. -# -# Any files added to this list should include a comment, so we know where they -# came from, or why they don't require a license statement. -# - -# The AI ingest files are exceptions -- until we decide otherwise. -utilities/ingest/**/* - -# PROBLEM: Can't find any info on licensing. -webapp/web/templates/freemarker/page/partials/doctype.html - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/src/edu/cornell/mannlib/vitro/webapp/web/ContentType.java - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/src/org/json/* - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/tiny_mce/* -webapp/web/js/tiny_mce/**/* - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/jquery.js -webapp/web/js/jquery-ui/* -webapp/web/js/jquery_plugins/* -webapp/web/js/jquery.fix.clone.js - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/dojo.js -webapp/web/src/AdapterRegistry.js -webapp/web/src/animation/* -webapp/web/src/animation.js -webapp/web/src/behavior.js -webapp/web/src/bootstrap1.js -webapp/web/src/bootstrap2.js -webapp/web/src/browser_debug.js -webapp/web/src/collections/* -webapp/web/src/compat/* -webapp/web/src/data/* -webapp/web/src/data.js -webapp/web/src/date.js -webapp/web/src/debug/* -webapp/web/src/debug.js -webapp/web/src/Deferred.js -webapp/web/src/dnd/* -webapp/web/src/doc.js -webapp/web/src/dom.js -webapp/web/src/event/* -webapp/web/src/event.js -webapp/web/src/experimental.js -webapp/web/src/flash.js -webapp/web/src/fx/* -webapp/web/src/graphics/* -webapp/web/src/hostenv_adobesvg.js -webapp/web/src/hostenv_browser.js -webapp/web/src/hostenv_dashboard.js -webapp/web/src/hostenv_jsc.js -webapp/web/src/hostenv_rhino.js -webapp/web/src/hostenv_spidermonkey.js -webapp/web/src/hostenv_svg.js -webapp/web/src/hostenv_wsh.js -webapp/web/src/html/* -webapp/web/src/html.js -webapp/web/src/i18n/* -webapp/web/src/iCalendar.js -webapp/web/src/io/* -webapp/web/src/io.js -webapp/web/src/json.js -webapp/web/src/lang/* -webapp/web/src/lang.js -webapp/web/src/lfx/* -webapp/web/src/loader.js -webapp/web/src/loader_xd.js -webapp/web/src/logging/* -webapp/web/src/math/* -webapp/web/src/math.js -webapp/web/src/profile.js -webapp/web/src/reflect/* -webapp/web/src/regexp.js -webapp/web/src/rpc/* -webapp/web/src/selection/* -webapp/web/src/storage/* -webapp/web/src/storage.js -webapp/web/src/string/* -webapp/web/src/string.js -webapp/web/src/style.js -webapp/web/src/svg.js -webapp/web/src/text/* -webapp/web/src/undo/* -webapp/web/src/uri/* -webapp/web/src/uuid/* -webapp/web/src/validate/* -webapp/web/src/validate.js -webapp/web/src/widget/* -webapp/web/src/widget/**/* -webapp/web/src/xml/* - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/WEB-INF/tlds/sparqltag.tld - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/WEB-INF/tlds/c.tld -webapp/web/WEB-INF/tlds/fn.tld - -# PROBLEM: Can't find any info on licensing. -webapp/web/WEB-INF/tlds/database.tld - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/WEB-INF/tlds/taglibs-mailer.tld - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/WEB-INF/tlds/taglibs-random.tld -webapp/web/WEB-INF/tlds/taglibs-string.tld - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/themes/enhanced/css/blueprint/grid.css -webapp/web/themes/enhanced/css/blueprint/ie.css - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/css/jquery_plugins/jquery.realperson.css - -# PROBLEM: Can't find any info on licensing. -webapp/web/themes/enhanced/css/blueprint/liquid.css - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/betterDateInput.js - -# PROBLEM: Can't find any info on licensing. -webapp/web/js/detect.js - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/toggle.js -webapp/web/js/toggle.js - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/html5.js - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/selectivizr.js - -# PROBLEM: Can't find any info on licensing. -webapp/web/js/jquery_plugins/supersleight.js - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/raphael/* - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/sparql/prototype.js - -# See /doc/3rd-party-licenses.txt for LICENSE file -webapp/web/js/amplify/amplify.store.min.js - -# Apache Solr search platform. See /doc/3rd-party-licenses.txt for LICENSE file -solr/**/* -solr/* - -# OWASP AntiSamy Project. See /doc/3rd-party-licenses.txt for LICENSE file -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 - -#Public Domain -webapp/web/js/json2.js - -# 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 +# +# A list of files and directories that are known exceptions to the +# license-insertion process. +# +# Files will only be altered if they contain a "magic" license place-holder, +# but if they match one of the file-matchers and don't contain a place-holder, +# the process will write a warning. +# +# File-matchers are: +# '*.java', '*.jsp', '*.tld', '*.xsl', '*.xslt', '*.css', '*.js', 'build.xml' +# +# Known exceptions listed here produce no warnings. +# +# Any files added to this list should include a comment, so we know where they +# came from, or why they don't require a license statement. +# + +# The AI ingest files are exceptions -- until we decide otherwise. +utilities/ingest/**/* + +# PROBLEM: Can't find any info on licensing. +webapp/web/templates/freemarker/page/partials/doctype.html + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/src/edu/cornell/mannlib/vitro/webapp/web/ContentType.java + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/src/org/json/* + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/tiny_mce/* +webapp/web/js/tiny_mce/**/* + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/jquery.js +webapp/web/js/jquery-ui/* +webapp/web/js/jquery_plugins/* +webapp/web/js/jquery.fix.clone.js + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/dojo.js +webapp/web/src/AdapterRegistry.js +webapp/web/src/animation/* +webapp/web/src/animation.js +webapp/web/src/behavior.js +webapp/web/src/bootstrap1.js +webapp/web/src/bootstrap2.js +webapp/web/src/browser_debug.js +webapp/web/src/collections/* +webapp/web/src/compat/* +webapp/web/src/data/* +webapp/web/src/data.js +webapp/web/src/date.js +webapp/web/src/debug/* +webapp/web/src/debug.js +webapp/web/src/Deferred.js +webapp/web/src/dnd/* +webapp/web/src/doc.js +webapp/web/src/dom.js +webapp/web/src/event/* +webapp/web/src/event.js +webapp/web/src/experimental.js +webapp/web/src/flash.js +webapp/web/src/fx/* +webapp/web/src/graphics/* +webapp/web/src/hostenv_adobesvg.js +webapp/web/src/hostenv_browser.js +webapp/web/src/hostenv_dashboard.js +webapp/web/src/hostenv_jsc.js +webapp/web/src/hostenv_rhino.js +webapp/web/src/hostenv_spidermonkey.js +webapp/web/src/hostenv_svg.js +webapp/web/src/hostenv_wsh.js +webapp/web/src/html/* +webapp/web/src/html.js +webapp/web/src/i18n/* +webapp/web/src/iCalendar.js +webapp/web/src/io/* +webapp/web/src/io.js +webapp/web/src/json.js +webapp/web/src/lang/* +webapp/web/src/lang.js +webapp/web/src/lfx/* +webapp/web/src/loader.js +webapp/web/src/loader_xd.js +webapp/web/src/logging/* +webapp/web/src/math/* +webapp/web/src/math.js +webapp/web/src/profile.js +webapp/web/src/reflect/* +webapp/web/src/regexp.js +webapp/web/src/rpc/* +webapp/web/src/selection/* +webapp/web/src/storage/* +webapp/web/src/storage.js +webapp/web/src/string/* +webapp/web/src/string.js +webapp/web/src/style.js +webapp/web/src/svg.js +webapp/web/src/text/* +webapp/web/src/undo/* +webapp/web/src/uri/* +webapp/web/src/uuid/* +webapp/web/src/validate/* +webapp/web/src/validate.js +webapp/web/src/widget/* +webapp/web/src/widget/**/* +webapp/web/src/xml/* + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/WEB-INF/tlds/sparqltag.tld + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/WEB-INF/tlds/c.tld +webapp/web/WEB-INF/tlds/fn.tld + +# PROBLEM: Can't find any info on licensing. +webapp/web/WEB-INF/tlds/database.tld + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/WEB-INF/tlds/taglibs-mailer.tld + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/WEB-INF/tlds/taglibs-random.tld +webapp/web/WEB-INF/tlds/taglibs-string.tld + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/themes/enhanced/css/blueprint/grid.css +webapp/web/themes/enhanced/css/blueprint/ie.css + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/css/jquery_plugins/jquery.realperson.css + +# PROBLEM: Can't find any info on licensing. +webapp/web/themes/enhanced/css/blueprint/liquid.css + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/betterDateInput.js + +# PROBLEM: Can't find any info on licensing. +webapp/web/js/detect.js + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/toggle.js +webapp/web/js/toggle.js + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/html5.js + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/selectivizr.js + +# PROBLEM: Can't find any info on licensing. +webapp/web/js/jquery_plugins/supersleight.js + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/raphael/* + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/sparql/prototype.js + +# See /doc/3rd-party-licenses.txt for LICENSE file +webapp/web/js/amplify/amplify.store.min.js + +# Apache Solr search platform. See /doc/3rd-party-licenses.txt for LICENSE file +solr/**/* +solr/* + +# OWASP AntiSamy Project. See /doc/3rd-party-licenses.txt for LICENSE file +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 + +#Public Domain +webapp/web/js/json2.js + +# 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 + +# This is a modified version of a Jena source file. +# It is required to make Jena 2.10.1 compatible with Pellet 2.3.1 +webapp/src/com/hp/hpl/jena/reasoner/BaseInfGraph.java \ No newline at end of file diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java index 96b52e44a..6853d8cf6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java @@ -188,7 +188,7 @@ public class VClassGroupCache implements IndexingEventListener { //try to rebuild a couple times since the search engine may not yet be up. int attempts = 0; - int maxTries = 3; + int maxTries = 5; SearchEngineException exception = null; while( attempts < maxTries ){ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java index 5212ff1fe..65f0489b8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; import java.io.InputStream; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java index f5ad49341..e9b0dce10 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java @@ -1,3 +1,5 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; import java.io.InputStream; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java index 467bd0728..81c8ae10e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java @@ -1,20 +1,4 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters;