# HG changeset patch # User robcast # Date 1361701138 -3600 # Node ID 29e86ae1e3b2a8d558471405e0f8f32560161c1d # Parent 2a976f71311f51deec1e3a9494ac3f5ed4f636e2 starting to clean license headers. diff -r 2a976f71311f -r 29e86ae1e3b2 .hgignore --- a/.hgignore Fri Feb 22 18:23:38 2013 +0100 +++ b/.hgignore Sun Feb 24 11:18:58 2013 +0100 @@ -99,3 +99,6 @@ ^webapp/src/main/webapp/WEB-INF/digilib-map\.xml$ syntax: regexp ^webapp/src/main/webapp/WEB-INF/log4j-config\.xml$ + +syntax: regexp +^target$ \ No newline at end of file diff -r 2a976f71311f -r 29e86ae1e3b2 pom.xml --- a/pom.xml Fri Feb 22 18:23:38 2013 +0100 +++ b/pom.xml Sun Feb 24 11:18:58 2013 +0100 @@ -1,177 +1,221 @@ - - 4.0.0 + + 4.0.0 - digilib - digilib - 2.1-SNAPSHOT - pom + digilib + digilib + 2.1-SNAPSHOT + pom - digilib - The Digital Image Library - http://digilib.berlios.de + digilib + The Digital Image Library + http://digilib.berlios.de + + + digilib Community + http://digilib.berlios.de + - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - - - - - org.apache.maven.plugins - maven-scm-plugin - 1.5 - - install - - - - - - - servlet2 - - true - - - - servlet3 - - - - text - - text - - - - pdf - - pdf - - - - codec-jai - - common-jai - - - - codec-imagej - - common-imagej - - - - codec-bioformats - - common-bioformats - - - - - + 2001 + + + robcast + Robert Casties + robcast@berlios.de + Max Planck Institute for the History of Science + http://www.mpiwg-berlin.mpg.de + + + + + hertzhaft + Martin Raspe + hertzhaft@berlios.de + Bibliotheca Hertziana + http://www.biblhertz.it + + + + + GNU General Lesser Public License (LGPL) version 3.0 + http://www.gnu.org/licenses/lgpl-3.0.html + repo + + + + scm:hg:http://hg.berlios.de/repos/digilib + scm:hg:https://hg.berlios.de/repos/digilib + http://hg.berlios.de/repos/digilib + + + Trac + https://it-dev.mpiwg-berlin.mpg.de/tracs/digilib + - - - - org.jdom - jdom - 1.1 - - - log4j - log4j - 1.2.14 - - - - digilib - digilib-common - 2.1-SNAPSHOT - - - digilib - digilib-common-jai - 2.1-SNAPSHOT - - - digilib - digilib-common-imagej - 2.1-SNAPSHOT - - - digilib - digilib-common-bioformats - 2.1-SNAPSHOT - - - digilib - digilib-pdf - 2.1-SNAPSHOT - - - digilib - digilib-text - 2.1-SNAPSHOT - - - digilib - digilib-servlet2 - 2.1-SNAPSHOT - - - digilib - digilib-servlet3 - 2.1-SNAPSHOT - - - digilib - digilib-webapp - 2.1-SNAPSHOT - - - - - UTF-8 - + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + + + + org.apache.maven.plugins + maven-scm-plugin + 1.5 + + install + + + + org.codehaus.mojo + license-maven-plugin + 1.4 + + + lgpl_v3 + + + + + + + + servlet2 + + true + + + + servlet3 + + + + text + + text + + + + pdf + + pdf + + + + codec-jai + + common-jai + + + + codec-imagej + + common-imagej + + + + codec-bioformats + + common-bioformats + + + + + - 2001 - - - robcast - Robert Casties - robcast@berlios.de - Max Planck Institute for the History of Science - http://www.mpiwg-berlin.mpg.de - - - - - hertzhaft - Martin Raspe - hertzhaft@berlios.de - Bibliotheca Hertziana - http://www.biblhertz.it - - - - scm:hg:http://hg.berlios.de/repos/digilib - scm:hg:https://hg.berlios.de/repos/digilib - http://hg.berlios.de/repos/digilib - - - - - - common - servlet2 - servlet3 - webapp - + + + + org.jdom + jdom + 1.1 + + + log4j + log4j + 1.2.14 + + + + digilib + digilib-common + 2.1-SNAPSHOT + + + digilib + digilib-common-jai + 2.1-SNAPSHOT + + + digilib + digilib-common-imagej + 2.1-SNAPSHOT + + + digilib + digilib-common-bioformats + 2.1-SNAPSHOT + + + digilib + digilib-pdf + 2.1-SNAPSHOT + + + digilib + digilib-text + 2.1-SNAPSHOT + + + digilib + digilib-servlet2 + 2.1-SNAPSHOT + + + digilib + digilib-servlet3 + 2.1-SNAPSHOT + + + digilib + digilib-webapp + 2.1-SNAPSHOT + + + + + UTF-8 + + + + + + + common + servlet2 + servlet3 + webapp + \ No newline at end of file diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/pom.xml --- a/servlet3/pom.xml Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/pom.xml Sun Feb 24 11:18:58 2013 +0100 @@ -36,4 +36,5 @@ provided + digilib servlet components using asynchronous servlet API. \ No newline at end of file diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java --- a/servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java Sun Feb 24 11:18:58 2013 +0100 @@ -1,7 +1,31 @@ -/** +package digilib.servlet; + +/* + * #%L + * AsyncServletWorker.java + * + * Worker class for the asynchronous Servlet API. * + * %% + * Copyright (C) 2011 - 2013 Robert Casties (robcast@berlios.de) + * %% + * 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 + * . + * #L% + * + * created 19.2.2011 */ -package digilib.servlet; import java.io.IOException; @@ -21,6 +45,8 @@ import digilib.servlet.Scaler.Error; /** + * Worker class for the asynchronous Servlet API. + * * @author casties * */ diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/src/main/java/digilib/servlet/DigilibServletConfiguration.java --- a/servlet3/src/main/java/digilib/servlet/DigilibServletConfiguration.java Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/src/main/java/digilib/servlet/DigilibServletConfiguration.java Sun Feb 24 11:18:58 2013 +0100 @@ -1,26 +1,31 @@ +package digilib.servlet; + /* - * DigilibConfiguration -- Holding all parameters for digilib servlet. + * #%L + * DigilibServletConfiguration.java * - * Digital Image Library servlet components - * - * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de) + * Class holding all parameters for digilib servlet. * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * Please read license.txt for the full details. A copy of the GPL may be found - * at http://www.gnu.org/copyleft/lgpl.html + * %% + * Copyright (C) 2001 - 2013 Robert Casties (robcast@mail.berlios.de) + * %% + * 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. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA - * + * 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 + * . + * #L% + * */ -package digilib.servlet; - import java.io.File; import java.util.Map; import java.util.Map.Entry; diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/src/main/java/digilib/servlet/DigilibServletRequest.java --- a/servlet3/src/main/java/digilib/servlet/DigilibServletRequest.java Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/src/main/java/digilib/servlet/DigilibServletRequest.java Sun Feb 24 11:18:58 2013 +0100 @@ -1,31 +1,34 @@ +package digilib.servlet; + /* - * DigilibRequest.java + * #%L + * + * DigilibServletRequest.java * * lightweight class carrying all parameters for a request to digilib - * - - Digital Image Library servlet components - - Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de), - Christian Luginbuehl - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - Please read license.txt for the full details. A copy of the GPL - may be found at http://www.gnu.org/copyleft/lgpl.html - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + * + * %% + * Copyright (C) 2002 - 2013 Robert Casties (robcast@berlios.de), + * Christian Luginbuehl + * %% + * 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 + * . + * #L% + * * Created on 27. August 2002, 19:43 */ -package digilib.servlet; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.Enumeration; diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/src/main/java/digilib/servlet/DocumentBean.java --- a/servlet3/src/main/java/digilib/servlet/DocumentBean.java Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/src/main/java/digilib/servlet/DocumentBean.java Sun Feb 24 11:18:58 2013 +0100 @@ -1,26 +1,31 @@ +package digilib.servlet; + /* + * #%L + * * DocumentBean -- Access control bean for JSP * * Digital Image Library servlet components * - * Copyright (C) 2001, 2002, 2003 Robert Casties (robcast@mail.berlios.de) - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Please read license.txt for the full details. A copy of the GPL may be found - * at http://www.gnu.org/copyleft/lgpl.html - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA - * + * %% + * Copyright (C) 2001 - 2013 Robert Casties (robcast@mail.berlios.de) + * %% + * 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 + * . + * #L% */ -package digilib.servlet; - import java.util.List; import javax.servlet.ServletConfig; diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/src/main/java/digilib/servlet/Initialiser.java --- a/servlet3/src/main/java/digilib/servlet/Initialiser.java Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/src/main/java/digilib/servlet/Initialiser.java Sun Feb 24 11:18:58 2013 +0100 @@ -1,24 +1,30 @@ -/* Initialiser.java -- initalisation servlet for setup tasks +package digilib.servlet; + +/* + * #%L + * Initialiser.java -- initalisation servlet for setup tasks * * Digital Image Library servlet components * - * Copyright (C) 2004 Robert Casties (robcast@mail.berlios.de) - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. + * %% + * Copyright (C) 2004 - 2013 Robert Casties (robcast@mail.berlios.de) + * %% + * 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. * - * Please read license.txt for the full details. A copy of the GPL may be found - * at http://www.gnu.org/copyleft/lgpl.html + * 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 Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA - * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% * Created on 18.10.2004 */ -package digilib.servlet; import java.io.File; import java.io.OutputStream; diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/src/main/java/digilib/servlet/Scaler.java --- a/servlet3/src/main/java/digilib/servlet/Scaler.java Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/src/main/java/digilib/servlet/Scaler.java Sun Feb 24 11:18:58 2013 +0100 @@ -1,5 +1,30 @@ package digilib.servlet; +/* + * #%L + * Scaler.java + * + * Scaler servlet that uses asynchronous servlet API V3.0. + * + * %% + * Copyright (C) 2001 - 2013 Robert Casties (robcast@berlios.de) + * %% + * 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 + * . + * #L% + */ + import java.io.File; import java.io.IOException; import java.util.List; diff -r 2a976f71311f -r 29e86ae1e3b2 servlet3/src/main/java/digilib/servlet/ServletOps.java --- a/servlet3/src/main/java/digilib/servlet/ServletOps.java Fri Feb 22 18:23:38 2013 +0100 +++ b/servlet3/src/main/java/digilib/servlet/ServletOps.java Sun Feb 24 11:18:58 2013 +0100 @@ -1,26 +1,31 @@ +package digilib.servlet; + /* + * #%L + * * ServletOps -- Servlet utility class * * Digital Image Library servlet components * - * Copyright (C) 2001, 2002 Robert Casties (robcast@mail.berlios.de) - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. + * %% + * Copyright (C) 2001 - 2013 Robert Casties (robcast@mail.berlios.de) + * %% + * 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. * - * Please read license.txt for the full details. A copy of the GPL may be found - * at http://www.gnu.org/copyleft/lgpl.html + * 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 Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA - * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% */ -package digilib.servlet; - import java.io.File; import java.io.FileInputStream; import java.io.IOException;