Fix licensing issues.

This commit is contained in:
Jim Blake 2014-06-14 11:32:48 -04:00
parent 3e72fda9a6
commit a086957046
5 changed files with 200 additions and 208 deletions

View file

@ -1,190 +1,194 @@
# #
# A list of files and directories that are known exceptions to the # A list of files and directories that are known exceptions to the
# license-insertion process. # license-insertion process.
# #
# Files will only be altered if they contain a "magic" license place-holder, # 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, # but if they match one of the file-matchers and don't contain a place-holder,
# the process will write a warning. # the process will write a warning.
# #
# File-matchers are: # File-matchers are:
# '*.java', '*.jsp', '*.tld', '*.xsl', '*.xslt', '*.css', '*.js', 'build.xml' # '*.java', '*.jsp', '*.tld', '*.xsl', '*.xslt', '*.css', '*.js', 'build.xml'
# #
# Known exceptions listed here produce no warnings. # Known exceptions listed here produce no warnings.
# #
# Any files added to this list should include a comment, so we know where they # 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. # came from, or why they don't require a license statement.
# #
# The AI ingest files are exceptions -- until we decide otherwise. # The AI ingest files are exceptions -- until we decide otherwise.
utilities/ingest/**/* utilities/ingest/**/*
# PROBLEM: Can't find any info on licensing. # PROBLEM: Can't find any info on licensing.
webapp/web/templates/freemarker/page/partials/doctype.html webapp/web/templates/freemarker/page/partials/doctype.html
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/src/edu/cornell/mannlib/vitro/webapp/web/ContentType.java webapp/src/edu/cornell/mannlib/vitro/webapp/web/ContentType.java
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/src/org/json/* webapp/src/org/json/*
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java webapp/src/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/tiny_mce/* webapp/web/js/tiny_mce/*
webapp/web/js/tiny_mce/**/* webapp/web/js/tiny_mce/**/*
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/jquery.js webapp/web/js/jquery.js
webapp/web/js/jquery-ui/* webapp/web/js/jquery-ui/*
webapp/web/js/jquery_plugins/* webapp/web/js/jquery_plugins/*
webapp/web/js/jquery.fix.clone.js webapp/web/js/jquery.fix.clone.js
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/dojo.js webapp/web/dojo.js
webapp/web/src/AdapterRegistry.js webapp/web/src/AdapterRegistry.js
webapp/web/src/animation/* webapp/web/src/animation/*
webapp/web/src/animation.js webapp/web/src/animation.js
webapp/web/src/behavior.js webapp/web/src/behavior.js
webapp/web/src/bootstrap1.js webapp/web/src/bootstrap1.js
webapp/web/src/bootstrap2.js webapp/web/src/bootstrap2.js
webapp/web/src/browser_debug.js webapp/web/src/browser_debug.js
webapp/web/src/collections/* webapp/web/src/collections/*
webapp/web/src/compat/* webapp/web/src/compat/*
webapp/web/src/data/* webapp/web/src/data/*
webapp/web/src/data.js webapp/web/src/data.js
webapp/web/src/date.js webapp/web/src/date.js
webapp/web/src/debug/* webapp/web/src/debug/*
webapp/web/src/debug.js webapp/web/src/debug.js
webapp/web/src/Deferred.js webapp/web/src/Deferred.js
webapp/web/src/dnd/* webapp/web/src/dnd/*
webapp/web/src/doc.js webapp/web/src/doc.js
webapp/web/src/dom.js webapp/web/src/dom.js
webapp/web/src/event/* webapp/web/src/event/*
webapp/web/src/event.js webapp/web/src/event.js
webapp/web/src/experimental.js webapp/web/src/experimental.js
webapp/web/src/flash.js webapp/web/src/flash.js
webapp/web/src/fx/* webapp/web/src/fx/*
webapp/web/src/graphics/* webapp/web/src/graphics/*
webapp/web/src/hostenv_adobesvg.js webapp/web/src/hostenv_adobesvg.js
webapp/web/src/hostenv_browser.js webapp/web/src/hostenv_browser.js
webapp/web/src/hostenv_dashboard.js webapp/web/src/hostenv_dashboard.js
webapp/web/src/hostenv_jsc.js webapp/web/src/hostenv_jsc.js
webapp/web/src/hostenv_rhino.js webapp/web/src/hostenv_rhino.js
webapp/web/src/hostenv_spidermonkey.js webapp/web/src/hostenv_spidermonkey.js
webapp/web/src/hostenv_svg.js webapp/web/src/hostenv_svg.js
webapp/web/src/hostenv_wsh.js webapp/web/src/hostenv_wsh.js
webapp/web/src/html/* webapp/web/src/html/*
webapp/web/src/html.js webapp/web/src/html.js
webapp/web/src/i18n/* webapp/web/src/i18n/*
webapp/web/src/iCalendar.js webapp/web/src/iCalendar.js
webapp/web/src/io/* webapp/web/src/io/*
webapp/web/src/io.js webapp/web/src/io.js
webapp/web/src/json.js webapp/web/src/json.js
webapp/web/src/lang/* webapp/web/src/lang/*
webapp/web/src/lang.js webapp/web/src/lang.js
webapp/web/src/lfx/* webapp/web/src/lfx/*
webapp/web/src/loader.js webapp/web/src/loader.js
webapp/web/src/loader_xd.js webapp/web/src/loader_xd.js
webapp/web/src/logging/* webapp/web/src/logging/*
webapp/web/src/math/* webapp/web/src/math/*
webapp/web/src/math.js webapp/web/src/math.js
webapp/web/src/profile.js webapp/web/src/profile.js
webapp/web/src/reflect/* webapp/web/src/reflect/*
webapp/web/src/regexp.js webapp/web/src/regexp.js
webapp/web/src/rpc/* webapp/web/src/rpc/*
webapp/web/src/selection/* webapp/web/src/selection/*
webapp/web/src/storage/* webapp/web/src/storage/*
webapp/web/src/storage.js webapp/web/src/storage.js
webapp/web/src/string/* webapp/web/src/string/*
webapp/web/src/string.js webapp/web/src/string.js
webapp/web/src/style.js webapp/web/src/style.js
webapp/web/src/svg.js webapp/web/src/svg.js
webapp/web/src/text/* webapp/web/src/text/*
webapp/web/src/undo/* webapp/web/src/undo/*
webapp/web/src/uri/* webapp/web/src/uri/*
webapp/web/src/uuid/* webapp/web/src/uuid/*
webapp/web/src/validate/* webapp/web/src/validate/*
webapp/web/src/validate.js webapp/web/src/validate.js
webapp/web/src/widget/* webapp/web/src/widget/*
webapp/web/src/widget/**/* webapp/web/src/widget/**/*
webapp/web/src/xml/* webapp/web/src/xml/*
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/WEB-INF/tlds/sparqltag.tld webapp/web/WEB-INF/tlds/sparqltag.tld
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/WEB-INF/tlds/c.tld webapp/web/WEB-INF/tlds/c.tld
webapp/web/WEB-INF/tlds/fn.tld webapp/web/WEB-INF/tlds/fn.tld
# PROBLEM: Can't find any info on licensing. # PROBLEM: Can't find any info on licensing.
webapp/web/WEB-INF/tlds/database.tld webapp/web/WEB-INF/tlds/database.tld
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/WEB-INF/tlds/taglibs-mailer.tld webapp/web/WEB-INF/tlds/taglibs-mailer.tld
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/WEB-INF/tlds/taglibs-random.tld webapp/web/WEB-INF/tlds/taglibs-random.tld
webapp/web/WEB-INF/tlds/taglibs-string.tld webapp/web/WEB-INF/tlds/taglibs-string.tld
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/themes/enhanced/css/blueprint/grid.css webapp/web/themes/enhanced/css/blueprint/grid.css
webapp/web/themes/enhanced/css/blueprint/ie.css webapp/web/themes/enhanced/css/blueprint/ie.css
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/css/jquery_plugins/jquery.realperson.css webapp/web/css/jquery_plugins/jquery.realperson.css
# PROBLEM: Can't find any info on licensing. # PROBLEM: Can't find any info on licensing.
webapp/web/themes/enhanced/css/blueprint/liquid.css webapp/web/themes/enhanced/css/blueprint/liquid.css
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/betterDateInput.js webapp/web/js/betterDateInput.js
# PROBLEM: Can't find any info on licensing. # PROBLEM: Can't find any info on licensing.
webapp/web/js/detect.js webapp/web/js/detect.js
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/toggle.js webapp/web/toggle.js
webapp/web/js/toggle.js webapp/web/js/toggle.js
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/html5.js webapp/web/js/html5.js
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/selectivizr.js webapp/web/js/selectivizr.js
# PROBLEM: Can't find any info on licensing. # PROBLEM: Can't find any info on licensing.
webapp/web/js/jquery_plugins/supersleight.js webapp/web/js/jquery_plugins/supersleight.js
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/raphael/* webapp/web/js/raphael/*
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/sparql/prototype.js webapp/web/js/sparql/prototype.js
# See /doc/3rd-party-licenses.txt for LICENSE file # See /doc/3rd-party-licenses.txt for LICENSE file
webapp/web/js/amplify/amplify.store.min.js webapp/web/js/amplify/amplify.store.min.js
# Apache Solr search platform. See /doc/3rd-party-licenses.txt for LICENSE file # Apache Solr search platform. See /doc/3rd-party-licenses.txt for LICENSE file
solr/**/* solr/**/*
solr/* solr/*
# OWASP AntiSamy Project. See /doc/3rd-party-licenses.txt for LICENSE file # 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 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 # A kluge class derived from JarJar code. See /doc/3rd-party-licenses.txt for LICENSE file
utilities/buildutils/src/com/tonicsystems/jarjar/KlugedDepFind.java utilities/buildutils/src/com/tonicsystems/jarjar/KlugedDepFind.java
#Public Domain #Public Domain
webapp/web/js/json2.js webapp/web/js/json2.js
# Part of the OpenSocial integration - What license should apply here? # Part of the OpenSocial integration - What license should apply here?
webapp/src/edu/ucsf/vitro/opensocial/GadgetController.java webapp/src/edu/ucsf/vitro/opensocial/GadgetController.java
webapp/src/edu/ucsf/vitro/opensocial/GadgetSpec.java webapp/src/edu/ucsf/vitro/opensocial/GadgetSpec.java
webapp/src/edu/ucsf/vitro/opensocial/GadgetViewRequirements.java webapp/src/edu/ucsf/vitro/opensocial/GadgetViewRequirements.java
webapp/src/edu/ucsf/vitro/opensocial/OpenSocialManager.java webapp/src/edu/ucsf/vitro/opensocial/OpenSocialManager.java
webapp/src/edu/ucsf/vitro/opensocial/PreparedGadget.java webapp/src/edu/ucsf/vitro/opensocial/PreparedGadget.java
webapp/web/js/openSocial/shindig.js 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

View file

@ -188,7 +188,7 @@ public class VClassGroupCache implements IndexingEventListener {
//try to rebuild a couple times since the search engine may not yet be up. //try to rebuild a couple times since the search engine may not yet be up.
int attempts = 0; int attempts = 0;
int maxTries = 3; int maxTries = 5;
SearchEngineException exception = null; SearchEngineException exception = null;
while( attempts < maxTries ){ while( attempts < maxTries ){

View file

@ -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; package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters;
import java.io.InputStream; import java.io.InputStream;

View file

@ -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; package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters;
import java.io.InputStream; import java.io.InputStream;

View file

@ -1,20 +1,4 @@
/* /* $This file is distributed under the terms of the license in /doc/license.txt$ */
* 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.
*/
package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters;