Mercurial > hg > digilib

changeset 1633:ee3417196bc8 release-2.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from HEAD 5c81d249ccd0185abd5c6871a39f60ea838152a1
author robcast
date Fri, 02 Jun 2017 12:42:50 +0200
parents 373af7570bb7 (current diff) 5c81d249ccd0 (diff)
children ba6e93840f38
files common/src/main/java/digilib/conf/DigilibConfiguration.java webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 7 files changed, 51 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/common/src/main/java/digilib/conf/DigilibConfiguration.java	Fri Jun 02 12:18:05 2017 +0200
+++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java	Fri Jun 02 12:42:50 2017 +0200
@@ -6,7 +6,7 @@
  * 
  * Digital Image Library servlet components
  * %%
- * Copyright (C) 2001 - 2013 MPIWG Berlin
+ * Copyright (C) 2001 - 2017 MPIWG Berlin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as 
--- a/common/src/main/java/digilib/conf/DigilibOption.java	Fri Jun 02 12:18:05 2017 +0200
+++ b/common/src/main/java/digilib/conf/DigilibOption.java	Fri Jun 02 12:42:50 2017 +0200
@@ -1,5 +1,28 @@
 package digilib.conf;
 
+/*
+ * #%L
+ * digilib-common
+ * %%
+ * Copyright (C) 2016 - 2017 digilib Community
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ * Author: Robert Casties (robcast@users.sourceforge.net)
+ */
+
 /**
  * Enum of options for the digilib "mo" parameter.
  * 
--- a/common/src/main/java/digilib/util/OptionsSet.java	Fri Jun 02 12:18:05 2017 +0200
+++ b/common/src/main/java/digilib/util/OptionsSet.java	Fri Jun 02 12:42:50 2017 +0200
@@ -1,5 +1,28 @@
 package digilib.util;
 
+/*
+ * #%L
+ * digilib-common
+ * %%
+ * Copyright (C) 2016 - 2017 digilib Community
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ * Author: Robert Casties (robcast@users.sourceforge.net)
+ */
+
 import java.util.EnumSet;
 import java.util.StringTokenizer;
 
--- a/servlet/src/main/java/digilib/auth/MetaAccessAuthzOps.java	Fri Jun 02 12:18:05 2017 +0200
+++ b/servlet/src/main/java/digilib/auth/MetaAccessAuthzOps.java	Fri Jun 02 12:42:50 2017 +0200
@@ -8,7 +8,7 @@
  * Digital Image Library servlet components
  * 
  * %%
- * Copyright (C) 2013-2016 MPIWG Berlin
+ * Copyright (C) 2013 - 2016 MPIWG Berlin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as 
--- a/servlet/src/main/java/digilib/conf/DigilibServletConfiguration.java	Fri Jun 02 12:18:05 2017 +0200
+++ b/servlet/src/main/java/digilib/conf/DigilibServletConfiguration.java	Fri Jun 02 12:42:50 2017 +0200
@@ -7,7 +7,7 @@
  * Digital Image Library servlet components
  * 
  * %%
- * Copyright (C) 2001 - 2013 MPIWG Berlin
+ * Copyright (C) 2001 - 2017 MPIWG Berlin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as 
--- a/servlet/src/main/java/digilib/servlet/ServletOps.java	Fri Jun 02 12:18:05 2017 +0200
+++ b/servlet/src/main/java/digilib/servlet/ServletOps.java	Fri Jun 02 12:42:50 2017 +0200
@@ -7,7 +7,7 @@
  * Digital Image Library servlet components
  * 
  * %%
- * Copyright (C) 2001 - 2013 MPIWG Berlin
+ * Copyright (C) 2001 - 2017 MPIWG Berlin
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as 
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Jun 02 12:18:05 2017 +0200
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Jun 02 12:42:50 2017 +0200
@@ -2,7 +2,7 @@
  * #%L
  * digilib-webapp
  * %%
- * Copyright (C) 2011 - 2015 MPIWG Berlin, Bibliotheca Hertziana
+ * Copyright (C) 2011 - 2017 MPIWG Berlin, Bibliotheca Hertziana
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as