Mercurial > hg > digilib
changeset 1158:29e86ae1e3b2
starting to clean license headers.
author | robcast |
---|---|
date | Sun, 24 Feb 2013 11:18:58 +0100 |
parents | 2a976f71311f |
children | 0fec3e64e95b |
files | .hgignore pom.xml servlet3/pom.xml servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java servlet3/src/main/java/digilib/servlet/DigilibServletConfiguration.java servlet3/src/main/java/digilib/servlet/DigilibServletRequest.java servlet3/src/main/java/digilib/servlet/DocumentBean.java servlet3/src/main/java/digilib/servlet/Initialiser.java servlet3/src/main/java/digilib/servlet/Scaler.java servlet3/src/main/java/digilib/servlet/ServletOps.java |
diffstat | 10 files changed, 378 insertions(+), 255 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <groupId>digilib</groupId> - <artifactId>digilib</artifactId> - <version>2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>digilib</groupId> + <artifactId>digilib</artifactId> + <version>2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>digilib</name> - <description>The Digital Image Library</description> - <url>http://digilib.berlios.de</url> + <name>digilib</name> + <description>The Digital Image Library</description> + <url>http://digilib.berlios.de</url> + + <organization> + <name>digilib Community</name> + <url>http://digilib.berlios.de</url> + </organization> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-plugin</artifactId> - <version>1.5</version> - <configuration> - <goals>install</goals> - </configuration> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>servlet2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - <profile> - <id>servlet3</id> - </profile> - <!-- optional modules with dependencies selected by profile --> - <profile> - <id>text</id> - <modules> - <module>text</module> - </modules> - </profile> - <profile> - <id>pdf</id> - <modules> - <module>pdf</module> - </modules> - </profile> - <profile> - <id>codec-jai</id> - <modules> - <module>common-jai</module> - </modules> - </profile> - <profile> - <id>codec-imagej</id> - <modules> - <module>common-imagej</module> - </modules> - </profile> - <profile> - <id>codec-bioformats</id> - <modules> - <module>common-bioformats</module> - </modules> - </profile> - </profiles> - <repositories> - </repositories> + <inceptionYear>2001</inceptionYear> + <developers> + <developer> + <id>robcast</id> + <name>Robert Casties</name> + <email>robcast@berlios.de</email> + <organization>Max Planck Institute for the History of Science</organization> + <organizationUrl>http://www.mpiwg-berlin.mpg.de</organizationUrl> + <roles> + </roles> + </developer> + <developer> + <id>hertzhaft</id> + <name>Martin Raspe</name> + <email>hertzhaft@berlios.de</email> + <organization>Bibliotheca Hertziana</organization> + <organizationUrl>http://www.biblhertz.it</organizationUrl> + </developer> + </developers> + <licenses> + <license> + <name>GNU General Lesser Public License (LGPL) version 3.0</name> + <url>http://www.gnu.org/licenses/lgpl-3.0.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:hg:http://hg.berlios.de/repos/digilib</connection> + <developerConnection>scm:hg:https://hg.berlios.de/repos/digilib</developerConnection> + <url>http://hg.berlios.de/repos/digilib</url> + </scm> + <issueManagement> + <system>Trac</system> + <url>https://it-dev.mpiwg-berlin.mpg.de/tracs/digilib</url> + </issueManagement> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - <!-- digilib module versions --> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-common</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-common-jai</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-common-imagej</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-common-bioformats</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-pdf</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-text</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-servlet2</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-servlet3</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-webapp</artifactId> - <version>2.1-SNAPSHOT</version> - </dependency> - </dependencies> - </dependencyManagement> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-plugin</artifactId> + <version>1.5</version> + <configuration> + <goals>install</goals> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>1.4</version> + <configuration> + <!-- <verbose>false</verbose> --> + <licenseName>lgpl_v3</licenseName> + </configuration> +<!-- <executions> + <execution> + <id>first</id> + <goals> + <goal>update-file-header</goal> + <goal>check-file-header</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <includes> + <include>*Dao.java</include> + <include>*Bean.java</include> + <include>.*entities.*.xml</include> + </includes> + </configuration> + </execution> + </executions> --> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>servlet2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + <profile> + <id>servlet3</id> + </profile> + <!-- optional modules with dependencies selected by profile --> + <profile> + <id>text</id> + <modules> + <module>text</module> + </modules> + </profile> + <profile> + <id>pdf</id> + <modules> + <module>pdf</module> + </modules> + </profile> + <profile> + <id>codec-jai</id> + <modules> + <module>common-jai</module> + </modules> + </profile> + <profile> + <id>codec-imagej</id> + <modules> + <module>common-imagej</module> + </modules> + </profile> + <profile> + <id>codec-bioformats</id> + <modules> + <module>common-bioformats</module> + </modules> + </profile> + </profiles> + <repositories> + </repositories> - <inceptionYear>2001</inceptionYear> - <developers> - <developer> - <id>robcast</id> - <name>Robert Casties</name> - <email>robcast@berlios.de</email> - <organization>Max Planck Institute for the History of Science</organization> - <organizationUrl>http://www.mpiwg-berlin.mpg.de</organizationUrl> - <roles> - </roles> - </developer> - <developer> - <id>hertzhaft</id> - <name>Martin Raspe</name> - <email>hertzhaft@berlios.de</email> - <organization>Bibliotheca Hertziana</organization> - <organizationUrl>http://www.biblhertz.it</organizationUrl> - </developer> - </developers> - <scm> - <connection>scm:hg:http://hg.berlios.de/repos/digilib</connection> - <developerConnection>scm:hg:https://hg.berlios.de/repos/digilib</developerConnection> - <url>http://hg.berlios.de/repos/digilib</url> - </scm> - <dependencies> - </dependencies> - <!-- default modules --> - <modules> - <module>common</module> - <module>servlet2</module> - <module>servlet3</module> - <module>webapp</module> - </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + <!-- digilib module versions --> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-common</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-common-jai</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-common-imagej</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-common-bioformats</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-pdf</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-text</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-servlet2</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-servlet3</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>digilib</groupId> + <artifactId>digilib-webapp</artifactId> + <version>2.1-SNAPSHOT</version> + </dependency> + </dependencies> + </dependencyManagement> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + </dependencies> + <!-- default modules --> + <modules> + <module>common</module> + <module>servlet2</module> + <module>servlet3</module> + <module>webapp</module> + </modules> </project> \ No newline at end of file
--- 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 @@ <scope>provided</scope> </dependency> </dependencies> + <description>digilib servlet components using asynchronous servlet API.</description> </project> \ No newline at end of file
--- 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 + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #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 * */
--- 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 + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + * */ -package digilib.servlet; - import java.io.File; import java.util.Map; import java.util.Map.Entry;
--- 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 + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + * * Created on 27. August 2002, 19:43 */ -package digilib.servlet; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.Enumeration;
--- 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 + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ -package digilib.servlet; - import java.util.List; import javax.servlet.ServletConfig;
--- 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 + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% * Created on 18.10.2004 */ -package digilib.servlet; import java.io.File; import java.io.OutputStream;
--- 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 + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.io.File; import java.io.IOException; import java.util.List;
--- 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 + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% */ -package digilib.servlet; - import java.io.File; import java.io.FileInputStream; import java.io.IOException;