From c5eb9c4b94860e51c9cab6e4a616fcc950ee102d Mon Sep 17 00:00:00 2001 From: tkellner Date: Tue, 21 Jun 2011 17:06:40 +0000 Subject: Merge branch 'license_change' git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@780 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- .../src/main/java/at/gv/egiz/pdfas/web/CurrentLocalOperation.java | 3 --- .../src/main/java/at/gv/egiz/pdfas/web/ExternAppInformation.java | 2 +- pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/PDFContainer.java | 2 +- .../src/main/java/at/gv/egiz/pdfas/web/filter/EncodingFilter.java | 2 +- pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/ApiHelper.java | 2 +- .../src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java | 3 --- .../src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java | 3 --- .../src/main/java/at/gv/egiz/pdfas/web/helper/SigningTimeHelper.java | 2 +- .../src/main/java/at/gv/egiz/pdfas/web/helper/WebSettingsReader.java | 2 +- pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebUtils.java | 2 +- .../main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java | 2 +- .../src/main/java/at/gv/egiz/pdfas/web/i18n/LocaleParamFilter.java | 2 +- .../src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayDataSink.java | 2 +- .../src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayPdfDataSource.java | 2 +- pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/TextDataSource.java | 2 +- pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/itext/IText.java | 2 +- .../src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java | 3 --- .../src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java | 2 +- .../at/gv/egiz/pdfas/web/servlets/RetrieveSignatureDataServlet.java | 3 --- .../src/main/java/at/gv/egiz/pdfas/web/servlets/UpdateFormServlet.java | 2 +- .../main/java/at/gv/egiz/pdfas/web/session/SignSessionInformation.java | 3 --- 21 files changed, 15 insertions(+), 33 deletions(-) (limited to 'pdf-as-web/src/main') diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/CurrentLocalOperation.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/CurrentLocalOperation.java index ccab84a..ef1dc9c 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/CurrentLocalOperation.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/CurrentLocalOperation.java @@ -20,9 +20,6 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * -/** - * */ package at.gv.egiz.pdfas.web; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ExternAppInformation.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ExternAppInformation.java index e6f6432..ad0a9af 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ExternAppInformation.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ExternAppInformation.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web; import java.io.Serializable; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/PDFContainer.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/PDFContainer.java index 58351df..9bfd70f 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/PDFContainer.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/PDFContainer.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web; public class PDFContainer { diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/EncodingFilter.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/EncodingFilter.java index 0e2f291..1f946dc 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/EncodingFilter.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/filter/EncodingFilter.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.filter; import java.io.IOException; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/ApiHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/ApiHelper.java index ba8a444..6bf0e1b 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/ApiHelper.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/ApiHelper.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.helper; import java.io.File; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java index 9fc8455..338818d 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SessionHelper.java @@ -20,9 +20,6 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * -/** - * */ package at.gv.egiz.pdfas.web.helper; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java index b1e7b8c..832b044 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SignServletHelper.java @@ -20,9 +20,6 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * -/** - * */ package at.gv.egiz.pdfas.web.helper; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SigningTimeHelper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SigningTimeHelper.java index 705a5b2..2faaa18 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SigningTimeHelper.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/SigningTimeHelper.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.helper; import java.util.Date; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebSettingsReader.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebSettingsReader.java index 4260259..d8c28cb 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebSettingsReader.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebSettingsReader.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.helper; import java.io.File; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebUtils.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebUtils.java index 5f5f189..e7a6237 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebUtils.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/WebUtils.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.helper; import javax.servlet.http.HttpServletRequest; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java index c9e2ab3..de9c3c6 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LanguageDecoratorMapper.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.i18n; import java.io.File; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LocaleParamFilter.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LocaleParamFilter.java index 7a524cc..dbddd51 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LocaleParamFilter.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/i18n/LocaleParamFilter.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.i18n; import java.io.IOException; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayDataSink.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayDataSink.java index 46b1978..83f6eaa 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayDataSink.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayDataSink.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.io; import java.io.ByteArrayOutputStream; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayPdfDataSource.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayPdfDataSource.java index ded5fc0..80bb218 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayPdfDataSource.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/ByteArrayPdfDataSource.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.io; import java.io.ByteArrayInputStream; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/TextDataSource.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/TextDataSource.java index 25b30f1..421b357 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/TextDataSource.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/io/TextDataSource.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.io; import java.io.ByteArrayInputStream; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/itext/IText.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/itext/IText.java index d9a25e5..4c829e3 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/itext/IText.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/itext/IText.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.itext; import java.awt.color.ICC_Profile; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java index 39c3f59..d63bc72 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/DataURLServlet.java @@ -20,9 +20,6 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * -/** - * */ package at.gv.egiz.pdfas.web.servlets; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java index 3e57ff1..741c8a6 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.servlets; import java.io.ByteArrayInputStream; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/RetrieveSignatureDataServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/RetrieveSignatureDataServlet.java index e33feca..767fa29 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/RetrieveSignatureDataServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/RetrieveSignatureDataServlet.java @@ -20,9 +20,6 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * -/** - * */ package at.gv.egiz.pdfas.web.servlets; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UpdateFormServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UpdateFormServlet.java index 891c98f..bf222f8 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UpdateFormServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/UpdateFormServlet.java @@ -20,7 +20,7 @@ * file for details on the various modules and licenses. * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. - * + */ package at.gv.egiz.pdfas.web.servlets; import java.io.IOException; diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/session/SignSessionInformation.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/session/SignSessionInformation.java index 0349349..cf87ab8 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/session/SignSessionInformation.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/session/SignSessionInformation.java @@ -21,9 +21,6 @@ * The "NOTICE" text file is part of the distribution. Any derivative works * that you distribute must include a readable copy of the "NOTICE" text file. * -/** - * - */ package at.gv.egiz.pdfas.web.session; import java.io.Serializable; -- cgit v1.2.3