From e92bea31bf5fcc98f1fd1bfd98bc53f46f91d390 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Tue, 22 Jun 2010 14:55:55 +0000 Subject: [PATCH] Add license tags, or list as known exceptions. --- webapp/config/licenser/known_exceptions.txt | 6 ++++++ .../vitro/webapp/web/directives/DumpDataModelDirective.java | 2 ++ .../mannlib/vitro/webapp/web/directives/DumpDirective.java | 2 ++ .../templates/freemarker/page/partials/googleAnalytics.ftl | 2 -- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/webapp/config/licenser/known_exceptions.txt b/webapp/config/licenser/known_exceptions.txt index 12a9cdb63..58e9880fc 100644 --- a/webapp/config/licenser/known_exceptions.txt +++ b/webapp/config/licenser/known_exceptions.txt @@ -11,6 +11,9 @@ # # 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/**/* @@ -109,6 +112,9 @@ webapp/web/src/widget/* webapp/web/src/widget/**/* webapp/web/src/xml/* +# Sample code from Google. +webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl + # PROBLEM? Third-party tlds - where do they come from? webapp/config/tlds/c.tld webapp/config/tlds/fn.tld diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDataModelDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDataModelDirective.java index b065e9020..88352e561 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDataModelDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDataModelDirective.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.web.directives; import java.io.IOException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java index f3038ebb9..07b7353d1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/directives/DumpDirective.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.web.directives; import java.io.IOException; diff --git a/webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl b/webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl index cbcdad571..920b72ba1 100644 --- a/webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl +++ b/webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl @@ -1,5 +1,3 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - <#-- NOTICE: This is SAMPLE Google Analytics code. You must replace it with your institution's code. --> <#--