From 10f4bb84a35aadd3a3fd5ba80fcf2ad9f2d54a0c Mon Sep 17 00:00:00 2001
From: zapata
Date: Thu, 10 Aug 2006 19:29:33 +0000
Subject: [PATCH] reintroduced StringUtil.regexpReplace updated license javadoc
---
source/Mir.java | 37 ++++---
source/OpenMir.java | 19 ++--
source/mir/changetracker/ChangeReporter.java | 7 +-
source/mir/changetracker/ChangeTracker.java | 4 +-
source/mir/misc/StringUtil.java | 40 ++++----
source/mir/module/AbstractModule.java | 5 +-
source/mir/module/ModuleExc.java | 15 ++-
source/mir/module/ModuleFailure.java | 14 ++-
source/mir/producer/AbstractProducerNode.java | 4 +-
source/mir/producer/AssignmentProducerNode.java | 18 ++--
source/mir/producer/BundleProducerNode.java | 4 +-
source/mir/producer/CompositeProducerNode.java | 4 +-
source/mir/producer/ConditionalProducerNode.java | 14 ++-
source/mir/producer/DirCopyingProducerNode.java | 10 +-
.../mir/producer/EntityBatchingProducerNode.java | 4 +-
.../mir/producer/EntityDeletingProducerNode.java | 8 +-
.../producer/EntityEnumeratingProducerNode.java | 4 +-
source/mir/producer/EntityListProducerNode.java | 4 +-
.../mir/producer/EntityModifyingProducerNode.java | 15 ++-
.../producer/EvaluatedAssignmentProducerNode.java | 9 +-
.../mir/producer/ExecuteProgramProducerNode.java | 4 +-
.../producer/ExpandedAssignmentProducerNode.java | 18 ++--
source/mir/producer/ExternalDbProducerNode.java | 4 +-
.../mir/producer/FileDateSettingProducerNode.java | 10 +-
source/mir/producer/FileDeletingProducerNode.java | 14 ++-
source/mir/producer/FileOperationProducerNode.java | 20 ++--
source/mir/producer/FreeQueryProducerNode.java | 9 +-
source/mir/producer/GeneratingProducerNode.java | 10 +-
.../mir/producer/ListEnumeratingProducerNode.java | 12 +--
source/mir/producer/LoggingProducerNode.java | 18 ++--
source/mir/producer/LoopProducerNode.java | 14 ++-
source/mir/producer/NodedProducer.java | 4 +-
source/mir/producer/Producer.java | 4 +-
source/mir/producer/ProducerExc.java | 14 ++-
source/mir/producer/ProducerFactory.java | 4 +-
source/mir/producer/ProducerFailure.java | 14 ++-
source/mir/producer/ProducerNode.java | 4 +-
source/mir/producer/ProducerNodeDecorator.java | 14 ++-
source/mir/producer/ProductionContext.java | 4 +-
source/mir/producer/RDFAggregatorProducerNode.java | 10 +-
source/mir/producer/RSSProducerNode.java | 9 +-
source/mir/producer/SimpleProducerVerb.java | 14 ++-
.../reader/DefaultProducerNodeBuilders.java | 4 +-
source/mir/producer/reader/ProducerConfigExc.java | 14 ++-
.../mir/producer/reader/ProducerConfigFailure.java | 14 ++-
.../mir/producer/reader/ProducerConfigReader.java | 4 +-
.../mir/producer/reader/ProducerNodeBuilder.java | 10 +-
.../reader/ProducerNodeBuilderLibrary.java | 14 ++-
.../producer/reader/ScriptedProducerFactory.java | 10 +-
.../mir/producer/reader/ScriptedProducerNode.java | 14 ++-
.../reader/ScriptedProducerNodeDefinition.java | 14 ++-
.../producer/reader/ScriptedProducerNodeTool.java | 14 ++-
source/mir/rss/RDFResource.java | 4 +-
source/mir/rss/RSS091Reader.java | 14 ++-
source/mir/rss/RSSAggregator.java | 4 +-
source/mir/rss/RSSBasicModule.java | 4 +-
source/mir/rss/RSSData.java | 4 +-
source/mir/rss/RSSExc.java | 14 ++-
source/mir/rss/RSSFailure.java | 14 ++-
source/mir/rss/RSSModule.java | 4 +-
source/mir/rss/RSSReader.java | 16 ++-
source/mir/servlet/AbstractServlet.java | 23 ++---
source/mir/servlet/AdminServletModule.java | 4 +-
source/mir/servlet/ServletModule.java | 4 +-
source/mir/servlet/ServletModuleExc.java | 14 ++-
source/mir/servlet/ServletModuleFailure.java | 14 ++-
source/mir/servlet/ServletModuleUserExc.java | 14 ++-
source/mir/session/CommonsUploadedFileAdapter.java | 14 ++-
source/mir/session/HTTPAdapters.java | 16 ++-
source/mir/session/Request.java | 4 +-
source/mir/session/Response.java | 14 ++-
source/mir/session/Session.java | 4 +-
source/mir/session/SessionExc.java | 14 ++-
source/mir/session/SessionFailure.java | 14 ++-
source/mir/session/SessionHandler.java | 14 ++-
source/mir/session/SimpleResponse.java | 14 ++-
source/mir/session/UploadedFile.java | 14 ++-
source/mir/session/ValidationError.java | 5 +-
source/mir/session/ValidationHelper.java | 5 +-
source/mir/storage/Database.java | 6 +-
source/mir/storage/DatabaseExc.java | 14 ++-
source/mir/storage/DatabaseFailure.java | 14 ++-
source/mir/storage/DatabaseHelper.java | 4 +-
source/mir/storage/RecordInserter.java | 5 +-
source/mir/storage/RecordRetriever.java | 4 +-
source/mir/storage/RecordUpdater.java | 4 +-
source/mir/storage/StatementGenerator.java | 4 +-
source/mir/storage/store/ObjectStore.java | 4 +-
source/mir/storage/store/ServletStoreInfo.java | 14 ++-
source/mir/storage/store/StorableObject.java | 14 ++-
source/mir/storage/store/StoreContainer.java | 24 ++---
source/mir/storage/store/StoreContainerType.java | 8 +-
source/mir/storage/store/StoreIdentifier.java | 10 +-
source/mir/storage/store/StoreUtil.java | 4 +-
source/mir/storage/store/test/EntityC1.java | 20 ++--
source/mir/storage/store/test/EntityC2.java | 18 ++--
source/mir/storage/store/test/EntityC3.java | 18 ++--
source/mir/storage/store/test/TestStore.java | 14 ++-
source/mir/util/CachingRewindableIterator.java | 4 +-
source/mir/util/DateTimeFunctions.java | 4 +-
source/mir/util/DateTimeRoutines.java | 4 +-
source/mir/util/EntityUtility.java | 4 +-
source/mir/util/ExceptionFunctions.java | 4 +-
source/mir/util/ExceptionRoutines.java | 21 ++--
source/mir/util/FileFunctions.java | 4 +-
source/mir/util/FileRoutines.java | 4 +-
source/mir/util/GeneratorDateTimeFunctions.java | 12 +--
source/mir/util/ShellRoutines.java | 41 ++++----
source/mir/util/SimpleParser.java | 111 ++++++++-------------
source/mir/util/xml/html/HTMLScanner.java | 4 +-
.../abuse/RegularExpressionFilterType.java | 4 +-
111 files changed, 524 insertions(+), 762 deletions(-)
diff --git a/source/Mir.java b/source/Mir.java
index c9ffdcea..011b1f98 100755
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -30,25 +28,38 @@
import mir.bundle.Bundle;
import mir.config.MirPropertiesConfiguration;
-import mir.log.LoggerWrapper;
-import mir.servlet.*;
-import mir.util.StringRoutines;
+import mir.servlet.AbstractServlet;
+import mir.servlet.AdminServletModule;
+import mir.servlet.ServletModuleExc;
+import mir.servlet.ServletModuleUserExc;
import mir.util.ExceptionRoutines;
+import mir.util.StringRoutines;
+import mircoders.entity.EntityUsers;
+import mircoders.global.MirGlobal;
+import mircoders.module.ModuleUsers;
+import mircoders.servlet.ServletHelper;
import multex.Failure;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.*;
-
-import mircoders.module.ModuleUsers;
-import mircoders.global.MirGlobal;
-import mircoders.servlet.ServletHelper;
-import mircoders.entity.EntityUsers;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
public class Mir extends AbstractServlet {
private static ModuleUsers usersModule = null;
diff --git a/source/OpenMir.java b/source/OpenMir.java
index 32c73a90..97ae802c 100755
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -28,24 +26,23 @@
* If you do not wish to do so, delete this exception statement from your version.
*/
-import java.io.IOException;
-import java.io.PrintWriter;
+import mir.servlet.AbstractServlet;
+import mir.servlet.ServletModuleUserExc;
+import mir.util.ExceptionRoutines;
+import mircoders.servlet.ServletModuleOpenIndy;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-
-import mir.servlet.AbstractServlet;
-import mir.servlet.ServletModuleUserExc;
-import mir.util.ExceptionRoutines;
-import mircoders.servlet.ServletModuleOpenIndy;
+import java.io.IOException;
+import java.io.PrintWriter;
/**
* OpenMir.java - main servlet for open posting and comment feature to articles
*
* @author RK 1999-2001, the mir-coders group
- * @version $Id: OpenMir.java,v 1.35.2.7 2005/10/01 18:40:40 zapata Exp $
+ * @version $Id: OpenMir.java,v 1.35.2.8 2006/08/10 19:29:33 zapata Exp $
*
*/
diff --git a/source/mir/changetracker/ChangeReporter.java b/source/mir/changetracker/ChangeReporter.java
index e90d0c2e..84f8bde5 100644
--- a/source/mir/changetracker/ChangeReporter.java
+++ b/source/mir/changetracker/ChangeReporter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,15 +19,12 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
* exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
- */
-package mir.changetracker;
+ */package mir.changetracker;
import mir.util.LockFile;
diff --git a/source/mir/changetracker/ChangeTracker.java b/source/mir/changetracker/ChangeTracker.java
index 0218f32a..7b5d2c7d 100644
--- a/source/mir/changetracker/ChangeTracker.java
+++ b/source/mir/changetracker/ChangeTracker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/misc/StringUtil.java b/source/mir/misc/StringUtil.java
index a4686979..6bdeac7b 100755
--- a/source/mir/misc/StringUtil.java
+++ b/source/mir/misc/StringUtil.java
@@ -26,8 +26,10 @@
*/
package mir.misc;
-import gnu.regexp.RE;
-import gnu.regexp.REException;
+import org.apache.oro.text.regex.Pattern;
+import org.apache.oro.text.regex.Perl5Matcher;
+import org.apache.oro.text.regex.Perl5Substitution;
+import org.apache.oro.text.regex.Util;
import java.text.NumberFormat;
import java.util.Calendar;
@@ -40,27 +42,14 @@ import java.util.TimeZone;
public final class StringUtil {
private static TimeZone UTC = TimeZone.getTimeZone("UTC");
- private static RE re_tags, re_tables, re_forbiddenTags;
private StringUtil() { } // this avoids contruction
- static {
- try {
- //precompile regex
- re_tags = new RE("<[^>]*>",RE.REG_ICASE);
- re_tables = new RE("<[ \t\r\n/]*(table|td|tr)[ \t\r\n]*>",RE.REG_ICASE);
- re_forbiddenTags = new RE("<[ \t\r\n/]*(html|meta|body|head|script)[ \t\r\n]*>",RE.REG_ICASE);
- }
- catch (REException e){
- System.err.println("FATAL: StringUtil: could not precompile REGEX: "+e.toString());
- }
- }
-
/**
* Formats a number with the specified minimum and maximum number of digits.
**/
public static synchronized String zeroPaddingNumber(long value, int minDigits,
- int maxDigits)
+ int maxDigits)
{
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMinimumIntegerDigits(minDigits);
@@ -74,7 +63,7 @@ public final class StringUtil {
* @return 8-ziffriger String (yyyymmdd)
*/
- public static final String date2webdbDate (GregorianCalendar theDate) {
+ public static String date2webdbDate (GregorianCalendar theDate) {
StringBuffer webdbDate = new StringBuffer();
webdbDate.append(String.valueOf(theDate.get(Calendar.YEAR)));
webdbDate.append(pad2(theDate.get(Calendar.MONTH) + 1));
@@ -89,7 +78,7 @@ public final class StringUtil {
* @return w3approved datetime
*/
- public static final String date2w3DateTime (GregorianCalendar theDate) {
+ public static String date2w3DateTime (GregorianCalendar theDate) {
StringBuffer webdbDate = new StringBuffer();
webdbDate.append(String.valueOf(theDate.get(Calendar.YEAR)));
webdbDate.append("-");
@@ -141,7 +130,7 @@ public final class StringUtil {
* @param webdbDate
* @return String mit /yyyy/mm/dd
*/
- public static final String webdbDate2path (String webdbDate) {
+ public static String webdbDate2path (String webdbDate) {
StringBuffer path = new StringBuffer();
path.append("/").append(webdbDate.substring(0, 4));
path.append("/").append(webdbDate.substring(4, 6));
@@ -156,7 +145,7 @@ public final class StringUtil {
* @param path
* @return String ohne /
am Ende
*/
- public static final String removeSlash (String path) {
+ public static String removeSlash (String path) {
return path.length() > 1 && path.endsWith("/") ? path.substring(0, path.length()
- 1) : path;
}
@@ -231,5 +220,16 @@ public final class StringUtil {
return calendar.getTime();
}
+ public String regexpReplace(String anInput, Pattern anExpression, String aReplacement) {
+ Perl5Matcher matcher = new Perl5Matcher();
+
+ return Util.substitute(
+ matcher, anExpression,
+ new Perl5Substitution(aReplacement), anInput,
+ Util.SUBSTITUTE_ALL);
+ }
+
+
+
}
diff --git a/source/mir/module/AbstractModule.java b/source/mir/module/AbstractModule.java
index eb4f9dab..cfd11a7a 100755
--- a/source/mir/module/AbstractModule.java
+++ b/source/mir/module/AbstractModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,14 +19,13 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
* exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
+
package mir.module;
import mir.entity.Entity;
diff --git a/source/mir/module/ModuleExc.java b/source/mir/module/ModuleExc.java
index fab1f1e8..c9491b37 100755
--- a/source/mir/module/ModuleExc.java
+++ b/source/mir/module/ModuleExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,15 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
+
package mir.module;
import multex.Exc;
diff --git a/source/mir/module/ModuleFailure.java b/source/mir/module/ModuleFailure.java
index 51d0634b..f8502dea 100755
--- a/source/mir/module/ModuleFailure.java
+++ b/source/mir/module/ModuleFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.module;
diff --git a/source/mir/producer/AbstractProducerNode.java b/source/mir/producer/AbstractProducerNode.java
index 5ae90cab..f8d7356d 100755
--- a/source/mir/producer/AbstractProducerNode.java
+++ b/source/mir/producer/AbstractProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/AssignmentProducerNode.java b/source/mir/producer/AssignmentProducerNode.java
index d79e89b8..35ed020b 100755
--- a/source/mir/producer/AssignmentProducerNode.java
+++ b/source/mir/producer/AssignmentProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,22 +18,20 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
+import java.util.Map;
+
public class AssignmentProducerNode extends ProducerNodeDecorator {
private String key;
private Object value;
diff --git a/source/mir/producer/BundleProducerNode.java b/source/mir/producer/BundleProducerNode.java
index 1dcf0448..4197a82c 100755
--- a/source/mir/producer/BundleProducerNode.java
+++ b/source/mir/producer/BundleProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/CompositeProducerNode.java b/source/mir/producer/CompositeProducerNode.java
index aa38556a..b50ca4ef 100755
--- a/source/mir/producer/CompositeProducerNode.java
+++ b/source/mir/producer/CompositeProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/ConditionalProducerNode.java b/source/mir/producer/ConditionalProducerNode.java
index cb92e9da..3c45ffb1 100755
--- a/source/mir/producer/ConditionalProducerNode.java
+++ b/source/mir/producer/ConditionalProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
diff --git a/source/mir/producer/DirCopyingProducerNode.java b/source/mir/producer/DirCopyingProducerNode.java
index 8fc13e9c..e9caa58e 100755
--- a/source/mir/producer/DirCopyingProducerNode.java
+++ b/source/mir/producer/DirCopyingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,13 +27,13 @@
*/
package mir.producer;
-import java.io.File;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.util.FileRoutines;
import mir.util.ParameterExpander;
+import java.io.File;
+import java.util.Map;
+
/**
*
*/
diff --git a/source/mir/producer/EntityBatchingProducerNode.java b/source/mir/producer/EntityBatchingProducerNode.java
index 3e3a294f..3f23bb25 100755
--- a/source/mir/producer/EntityBatchingProducerNode.java
+++ b/source/mir/producer/EntityBatchingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/EntityDeletingProducerNode.java b/source/mir/producer/EntityDeletingProducerNode.java
index ea9fb42c..56b7d9ed 100755
--- a/source/mir/producer/EntityDeletingProducerNode.java
+++ b/source/mir/producer/EntityDeletingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,12 +27,12 @@
*/
package mir.producer;
-import java.util.Map;
-
import mir.entity.adapter.EntityAdapterModel;
import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
+import java.util.Map;
+
public class EntityDeletingProducerNode extends AbstractProducerNode {
private String whereClause;
private EntityAdapterModel model;
diff --git a/source/mir/producer/EntityEnumeratingProducerNode.java b/source/mir/producer/EntityEnumeratingProducerNode.java
index 7c87a165..3bbcca2c 100755
--- a/source/mir/producer/EntityEnumeratingProducerNode.java
+++ b/source/mir/producer/EntityEnumeratingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/EntityListProducerNode.java b/source/mir/producer/EntityListProducerNode.java
index 8801d7cd..e28a3ea4 100755
--- a/source/mir/producer/EntityListProducerNode.java
+++ b/source/mir/producer/EntityListProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/EntityModifyingProducerNode.java b/source/mir/producer/EntityModifyingProducerNode.java
index 87a7d66b..87533dfc 100755
--- a/source/mir/producer/EntityModifyingProducerNode.java
+++ b/source/mir/producer/EntityModifyingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,22 +19,14 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
* exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
-
package mir.producer;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
import mir.entity.Entity;
import mir.entity.adapter.EntityAdapter;
import mir.entity.adapter.EntityAdapterModel;
@@ -42,6 +34,11 @@ import mir.log.LoggerWrapper;
import mir.util.JDBCStringRoutines;
import mir.util.ParameterExpander;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
public class EntityModifyingProducerNode extends AbstractProducerNode {
private String entityExpression;
diff --git a/source/mir/producer/EvaluatedAssignmentProducerNode.java b/source/mir/producer/EvaluatedAssignmentProducerNode.java
index 74f093a5..35d05a6a 100755
--- a/source/mir/producer/EvaluatedAssignmentProducerNode.java
+++ b/source/mir/producer/EvaluatedAssignmentProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,22 +19,19 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
* exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
-
package mir.producer;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
+import java.util.Map;
+
public class EvaluatedAssignmentProducerNode extends AbstractProducerNode {
private String key;
private String value;
diff --git a/source/mir/producer/ExecuteProgramProducerNode.java b/source/mir/producer/ExecuteProgramProducerNode.java
index 2b5c0d9f..0aaccc81 100755
--- a/source/mir/producer/ExecuteProgramProducerNode.java
+++ b/source/mir/producer/ExecuteProgramProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/ExpandedAssignmentProducerNode.java b/source/mir/producer/ExpandedAssignmentProducerNode.java
index 49ea9a29..58f53c8e 100755
--- a/source/mir/producer/ExpandedAssignmentProducerNode.java
+++ b/source/mir/producer/ExpandedAssignmentProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,22 +18,20 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
+import java.util.Map;
+
public class ExpandedAssignmentProducerNode extends AbstractProducerNode {
private String key;
private String value;
diff --git a/source/mir/producer/ExternalDbProducerNode.java b/source/mir/producer/ExternalDbProducerNode.java
index 69f5a45a..3ff4b308 100755
--- a/source/mir/producer/ExternalDbProducerNode.java
+++ b/source/mir/producer/ExternalDbProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/FileDateSettingProducerNode.java b/source/mir/producer/FileDateSettingProducerNode.java
index 50f5b580..c6c70b91 100755
--- a/source/mir/producer/FileDateSettingProducerNode.java
+++ b/source/mir/producer/FileDateSettingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,13 +27,13 @@
*/
package mir.producer;
+import mir.log.LoggerWrapper;
+import mir.util.ParameterExpander;
+
import java.io.File;
import java.util.Date;
import java.util.Map;
-import mir.log.LoggerWrapper;
-import mir.util.ParameterExpander;
-
public class FileDateSettingProducerNode extends FileOperationProducerNode {
String dateExpression;
diff --git a/source/mir/producer/FileDeletingProducerNode.java b/source/mir/producer/FileDeletingProducerNode.java
index 4c60ce1a..2b823faf 100755
--- a/source/mir/producer/FileDeletingProducerNode.java
+++ b/source/mir/producer/FileDeletingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
diff --git a/source/mir/producer/FileOperationProducerNode.java b/source/mir/producer/FileOperationProducerNode.java
index e080a760..9bc793dd 100755
--- a/source/mir/producer/FileOperationProducerNode.java
+++ b/source/mir/producer/FileOperationProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,23 +18,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
-import java.io.File;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
+import java.io.File;
+import java.util.Map;
+
public abstract class FileOperationProducerNode extends AbstractProducerNode {
private String fileName;
diff --git a/source/mir/producer/FreeQueryProducerNode.java b/source/mir/producer/FreeQueryProducerNode.java
index 369916bf..cb135384 100755
--- a/source/mir/producer/FreeQueryProducerNode.java
+++ b/source/mir/producer/FreeQueryProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,23 +19,20 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
* exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
-
package mir.producer;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.storage.Database;
import mir.util.ParameterExpander;
+import java.util.Map;
+
public class FreeQueryProducerNode extends AbstractProducerNode {
public static final int QUERY_TYPE_SET = 1;
public static final int QUERY_TYPE_ROW = 2;
diff --git a/source/mir/producer/GeneratingProducerNode.java b/source/mir/producer/GeneratingProducerNode.java
index bab2deb8..5aaf89ec 100755
--- a/source/mir/producer/GeneratingProducerNode.java
+++ b/source/mir/producer/GeneratingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,14 +27,14 @@
*/
package mir.producer;
-import java.util.HashMap;
-import java.util.Map;
-
import mir.generator.Generator;
import mir.generator.WriterEngine;
import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
+import java.util.HashMap;
+import java.util.Map;
+
public class GeneratingProducerNode extends AbstractProducerNode {
private String generatorExpression;
private String destinationExpression;
diff --git a/source/mir/producer/ListEnumeratingProducerNode.java b/source/mir/producer/ListEnumeratingProducerNode.java
index 731655e2..a80a556d 100755
--- a/source/mir/producer/ListEnumeratingProducerNode.java
+++ b/source/mir/producer/ListEnumeratingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,14 +27,12 @@
*/
package mir.producer;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
import mir.util.RewindableIterator;
+import java.util.Collection;
+import java.util.Iterator;
+
public class ListEnumeratingProducerNode extends ProducerNodeDecorator {
private String key;
private String listExpression;
diff --git a/source/mir/producer/LoggingProducerNode.java b/source/mir/producer/LoggingProducerNode.java
index 7826f785..bbb359a0 100755
--- a/source/mir/producer/LoggingProducerNode.java
+++ b/source/mir/producer/LoggingProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,22 +18,20 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.util.ParameterExpander;
+import java.util.Map;
+
public class LoggingProducerNode extends AbstractProducerNode {
private String expression;
private int messageType;
diff --git a/source/mir/producer/LoopProducerNode.java b/source/mir/producer/LoopProducerNode.java
index 387bc456..c30d3744 100755
--- a/source/mir/producer/LoopProducerNode.java
+++ b/source/mir/producer/LoopProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
diff --git a/source/mir/producer/NodedProducer.java b/source/mir/producer/NodedProducer.java
index 9692ba69..946d28d3 100755
--- a/source/mir/producer/NodedProducer.java
+++ b/source/mir/producer/NodedProducer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/Producer.java b/source/mir/producer/Producer.java
index 75312a7a..a2883048 100755
--- a/source/mir/producer/Producer.java
+++ b/source/mir/producer/Producer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/ProducerExc.java b/source/mir/producer/ProducerExc.java
index 93772fee..c79086da 100755
--- a/source/mir/producer/ProducerExc.java
+++ b/source/mir/producer/ProducerExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
diff --git a/source/mir/producer/ProducerFactory.java b/source/mir/producer/ProducerFactory.java
index 61d6763f..462092bc 100755
--- a/source/mir/producer/ProducerFactory.java
+++ b/source/mir/producer/ProducerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/ProducerFailure.java b/source/mir/producer/ProducerFailure.java
index aa1a52b1..60d07f56 100755
--- a/source/mir/producer/ProducerFailure.java
+++ b/source/mir/producer/ProducerFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
diff --git a/source/mir/producer/ProducerNode.java b/source/mir/producer/ProducerNode.java
index d9502dec..0b9253c6 100755
--- a/source/mir/producer/ProducerNode.java
+++ b/source/mir/producer/ProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/ProducerNodeDecorator.java b/source/mir/producer/ProducerNodeDecorator.java
index 52011f0e..14dbe569 100755
--- a/source/mir/producer/ProducerNodeDecorator.java
+++ b/source/mir/producer/ProducerNodeDecorator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
diff --git a/source/mir/producer/ProductionContext.java b/source/mir/producer/ProductionContext.java
index 76cce0d2..937ea778 100755
--- a/source/mir/producer/ProductionContext.java
+++ b/source/mir/producer/ProductionContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/RDFAggregatorProducerNode.java b/source/mir/producer/RDFAggregatorProducerNode.java
index 14377e98..e35a64ce 100755
--- a/source/mir/producer/RDFAggregatorProducerNode.java
+++ b/source/mir/producer/RDFAggregatorProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,14 +27,14 @@
*/
package mir.producer;
-import java.util.List;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.rss.RSSAggregator;
import mir.util.ExceptionRoutines;
import mir.util.ParameterExpander;
+import java.util.List;
+import java.util.Map;
+
public class RDFAggregatorProducerNode extends AbstractProducerNode {
private String key;
private String source;
diff --git a/source/mir/producer/RSSProducerNode.java b/source/mir/producer/RSSProducerNode.java
index 29ee973e..2c6c0488 100755
--- a/source/mir/producer/RSSProducerNode.java
+++ b/source/mir/producer/RSSProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,15 +27,14 @@
*/
package mir.producer;
-import java.util.Map;
-
import mir.log.LoggerWrapper;
import mir.rss.RSS091Reader;
import mir.rss.RSSData;
import mir.rss.RSSReader;
-import mir.util.ExceptionRoutines;
import mir.util.ParameterExpander;
+import java.util.Map;
+
public class RSSProducerNode extends AbstractProducerNode {
private String key;
private String url;
diff --git a/source/mir/producer/SimpleProducerVerb.java b/source/mir/producer/SimpleProducerVerb.java
index 1bba575b..8e4c1435 100755
--- a/source/mir/producer/SimpleProducerVerb.java
+++ b/source/mir/producer/SimpleProducerVerb.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer;
diff --git a/source/mir/producer/reader/DefaultProducerNodeBuilders.java b/source/mir/producer/reader/DefaultProducerNodeBuilders.java
index aaaf59ae..1995de7c 100755
--- a/source/mir/producer/reader/DefaultProducerNodeBuilders.java
+++ b/source/mir/producer/reader/DefaultProducerNodeBuilders.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/reader/ProducerConfigExc.java b/source/mir/producer/reader/ProducerConfigExc.java
index 3a1dbe9f..6ae85d9f 100755
--- a/source/mir/producer/reader/ProducerConfigExc.java
+++ b/source/mir/producer/reader/ProducerConfigExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer.reader;
diff --git a/source/mir/producer/reader/ProducerConfigFailure.java b/source/mir/producer/reader/ProducerConfigFailure.java
index 43724c9f..46f76666 100755
--- a/source/mir/producer/reader/ProducerConfigFailure.java
+++ b/source/mir/producer/reader/ProducerConfigFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer.reader;
diff --git a/source/mir/producer/reader/ProducerConfigReader.java b/source/mir/producer/reader/ProducerConfigReader.java
index 3010a76e..988bb387 100755
--- a/source/mir/producer/reader/ProducerConfigReader.java
+++ b/source/mir/producer/reader/ProducerConfigReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/producer/reader/ProducerNodeBuilder.java b/source/mir/producer/reader/ProducerNodeBuilder.java
index 6b47ddef..5ab373cb 100755
--- a/source/mir/producer/reader/ProducerNodeBuilder.java
+++ b/source/mir/producer/reader/ProducerNodeBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,12 +27,12 @@
*/
package mir.producer.reader;
-import java.util.Map;
-import java.util.Set;
-
import mir.producer.ProducerNode;
import mir.util.xml.XMLParserExc;
+import java.util.Map;
+import java.util.Set;
+
public interface ProducerNodeBuilder {
public void setAttributes(Map anAttributes) throws ProducerConfigExc, XMLParserExc;
public void setSubNode(String aName, ProducerNode aNode) throws ProducerConfigExc;
diff --git a/source/mir/producer/reader/ProducerNodeBuilderLibrary.java b/source/mir/producer/reader/ProducerNodeBuilderLibrary.java
index 90d1a4f7..74be2fc5 100755
--- a/source/mir/producer/reader/ProducerNodeBuilderLibrary.java
+++ b/source/mir/producer/reader/ProducerNodeBuilderLibrary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer.reader;
diff --git a/source/mir/producer/reader/ScriptedProducerFactory.java b/source/mir/producer/reader/ScriptedProducerFactory.java
index 9e7b8253..00b66091 100755
--- a/source/mir/producer/reader/ScriptedProducerFactory.java
+++ b/source/mir/producer/reader/ScriptedProducerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,9 +27,6 @@
*/
package mir.producer.reader;
-import java.util.List;
-import java.util.Map;
-
import mir.producer.CompositeProducerNode;
import mir.producer.NodedProducer;
import mir.producer.Producer;
@@ -40,6 +35,9 @@ import mir.producer.ProducerFactory;
import mir.producer.ProducerFailure;
import mir.producer.ProducerNode;
+import java.util.List;
+import java.util.Map;
+
public class ScriptedProducerFactory implements ProducerFactory {
private List verbs;
private Map verbNodes;
diff --git a/source/mir/producer/reader/ScriptedProducerNode.java b/source/mir/producer/reader/ScriptedProducerNode.java
index 0f256785..ed8df73b 100755
--- a/source/mir/producer/reader/ScriptedProducerNode.java
+++ b/source/mir/producer/reader/ScriptedProducerNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer.reader;
diff --git a/source/mir/producer/reader/ScriptedProducerNodeDefinition.java b/source/mir/producer/reader/ScriptedProducerNodeDefinition.java
index cf2015b7..16d98bff 100755
--- a/source/mir/producer/reader/ScriptedProducerNodeDefinition.java
+++ b/source/mir/producer/reader/ScriptedProducerNodeDefinition.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer.reader;
diff --git a/source/mir/producer/reader/ScriptedProducerNodeTool.java b/source/mir/producer/reader/ScriptedProducerNodeTool.java
index bbe63022..31faf128 100755
--- a/source/mir/producer/reader/ScriptedProducerNodeTool.java
+++ b/source/mir/producer/reader/ScriptedProducerNodeTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.producer.reader;
diff --git a/source/mir/rss/RDFResource.java b/source/mir/rss/RDFResource.java
index 2aa8eaf9..28c3c958 100755
--- a/source/mir/rss/RDFResource.java
+++ b/source/mir/rss/RDFResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/rss/RSS091Reader.java b/source/mir/rss/RSS091Reader.java
index 2b9a4d01..5c832af4 100755
--- a/source/mir/rss/RSS091Reader.java
+++ b/source/mir/rss/RSS091Reader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,6 +27,11 @@
*/
package mir.rss;
+import mir.util.HTTPClientHelper;
+import mir.util.xml.XMLParserEngine;
+import mir.util.xml.XMLParserExc;
+import mir.util.xml.XMLParserFailure;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -36,11 +39,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import mir.util.HTTPClientHelper;
-import mir.util.xml.XMLParserEngine;
-import mir.util.xml.XMLParserExc;
-import mir.util.xml.XMLParserFailure;
-
/**
*
* Title:
diff --git a/source/mir/rss/RSSAggregator.java b/source/mir/rss/RSSAggregator.java
index 8b44191e..e8fa4998 100755
--- a/source/mir/rss/RSSAggregator.java
+++ b/source/mir/rss/RSSAggregator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/rss/RSSBasicModule.java b/source/mir/rss/RSSBasicModule.java
index ed03310d..3e70faa0 100755
--- a/source/mir/rss/RSSBasicModule.java
+++ b/source/mir/rss/RSSBasicModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/rss/RSSData.java b/source/mir/rss/RSSData.java
index e1aa6a98..f1696be5 100755
--- a/source/mir/rss/RSSData.java
+++ b/source/mir/rss/RSSData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/rss/RSSExc.java b/source/mir/rss/RSSExc.java
index b690e01c..b310246e 100755
--- a/source/mir/rss/RSSExc.java
+++ b/source/mir/rss/RSSExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.rss;
diff --git a/source/mir/rss/RSSFailure.java b/source/mir/rss/RSSFailure.java
index 659d6dab..94bf13d1 100755
--- a/source/mir/rss/RSSFailure.java
+++ b/source/mir/rss/RSSFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.rss;
diff --git a/source/mir/rss/RSSModule.java b/source/mir/rss/RSSModule.java
index 9eeb7228..3532b1b2 100755
--- a/source/mir/rss/RSSModule.java
+++ b/source/mir/rss/RSSModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/rss/RSSReader.java b/source/mir/rss/RSSReader.java
index 40db2173..f038335c 100755
--- a/source/mir/rss/RSSReader.java
+++ b/source/mir/rss/RSSReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,18 +27,18 @@
*/
package mir.rss;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import mir.util.DateTimeRoutines;
import mir.util.HTTPClientHelper;
import mir.util.xml.XMLParserEngine;
import mir.util.xml.XMLParserExc;
import mir.util.xml.XMLParserFailure;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class RSSReader {
public static final String RDF_NAMESPACE_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
public static final String RSS_1_0_NAMESPACE_URI = "http://purl.org/rss/1.0/";
diff --git a/source/mir/servlet/AbstractServlet.java b/source/mir/servlet/AbstractServlet.java
index ac3fdcb8..59e1493d 100755
--- a/source/mir/servlet/AbstractServlet.java
+++ b/source/mir/servlet/AbstractServlet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,11 +27,9 @@
*/
package mir.servlet;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.util.Locale;
+import mir.config.MirPropertiesConfiguration;
+import mir.log.LoggerWrapper;
+import mircoders.global.MirGlobal;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -41,10 +37,11 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-
-import mir.config.MirPropertiesConfiguration;
-import mir.log.LoggerWrapper;
-import mircoders.global.MirGlobal;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.util.Locale;
/**
* Title: Mir
@@ -52,7 +49,7 @@ import mircoders.global.MirGlobal;
* Copyright: Copyright (c) 2001, 2002
* Company: Mir-coders group
* @author idfx, the Mir-coders group
- * @version $Id: AbstractServlet.java,v 1.30.2.10 2005/10/01 18:40:40 zapata Exp $
+ * @version $Id: AbstractServlet.java,v 1.30.2.11 2006/08/10 19:29:35 zapata Exp $
*/
public abstract class AbstractServlet extends HttpServlet {
diff --git a/source/mir/servlet/AdminServletModule.java b/source/mir/servlet/AdminServletModule.java
index 60389f47..27c422d8 100755
--- a/source/mir/servlet/AdminServletModule.java
+++ b/source/mir/servlet/AdminServletModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java
index 3d0b72fc..624db7a0 100755
--- a/source/mir/servlet/ServletModule.java
+++ b/source/mir/servlet/ServletModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/servlet/ServletModuleExc.java b/source/mir/servlet/ServletModuleExc.java
index f4f59103..e09a7ea9 100755
--- a/source/mir/servlet/ServletModuleExc.java
+++ b/source/mir/servlet/ServletModuleExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.servlet;
diff --git a/source/mir/servlet/ServletModuleFailure.java b/source/mir/servlet/ServletModuleFailure.java
index 922cf639..b8699847 100755
--- a/source/mir/servlet/ServletModuleFailure.java
+++ b/source/mir/servlet/ServletModuleFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.servlet;
diff --git a/source/mir/servlet/ServletModuleUserExc.java b/source/mir/servlet/ServletModuleUserExc.java
index c50bd234..60fbda70 100755
--- a/source/mir/servlet/ServletModuleUserExc.java
+++ b/source/mir/servlet/ServletModuleUserExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.servlet;
diff --git a/source/mir/session/CommonsUploadedFileAdapter.java b/source/mir/session/CommonsUploadedFileAdapter.java
index 15c75bed..3a12c78e 100755
--- a/source/mir/session/CommonsUploadedFileAdapter.java
+++ b/source/mir/session/CommonsUploadedFileAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.session;
diff --git a/source/mir/session/HTTPAdapters.java b/source/mir/session/HTTPAdapters.java
index cc16c218..4b50f56b 100755
--- a/source/mir/session/HTTPAdapters.java
+++ b/source/mir/session/HTTPAdapters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,6 +27,11 @@
*/
package mir.session;
+import mir.util.HTTPParsedRequest;
+import org.apache.commons.fileupload.FileItem;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
@@ -38,13 +41,6 @@ import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import mir.util.HTTPParsedRequest;
-
-import org.apache.commons.fileupload.FileItem;
-
public class HTTPAdapters {
public static class HTTPRequestAdapter implements Request {
private HttpServletRequest request;
diff --git a/source/mir/session/Request.java b/source/mir/session/Request.java
index ce0bf07c..a2a9318a 100755
--- a/source/mir/session/Request.java
+++ b/source/mir/session/Request.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/session/Response.java b/source/mir/session/Response.java
index 4b222fbb..e60cd4a1 100755
--- a/source/mir/session/Response.java
+++ b/source/mir/session/Response.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.session;
diff --git a/source/mir/session/Session.java b/source/mir/session/Session.java
index b424af16..37ddd699 100755
--- a/source/mir/session/Session.java
+++ b/source/mir/session/Session.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/session/SessionExc.java b/source/mir/session/SessionExc.java
index 5b9f2bda..ac55a638 100755
--- a/source/mir/session/SessionExc.java
+++ b/source/mir/session/SessionExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.session;
diff --git a/source/mir/session/SessionFailure.java b/source/mir/session/SessionFailure.java
index 7ab1d641..dd99d05d 100755
--- a/source/mir/session/SessionFailure.java
+++ b/source/mir/session/SessionFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.session;
diff --git a/source/mir/session/SessionHandler.java b/source/mir/session/SessionHandler.java
index d64bfe01..8414e54e 100755
--- a/source/mir/session/SessionHandler.java
+++ b/source/mir/session/SessionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.session;
diff --git a/source/mir/session/SimpleResponse.java b/source/mir/session/SimpleResponse.java
index a1b9ed3a..223f1f4d 100755
--- a/source/mir/session/SimpleResponse.java
+++ b/source/mir/session/SimpleResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.session;
diff --git a/source/mir/session/UploadedFile.java b/source/mir/session/UploadedFile.java
index 58eac873..832b7b74 100755
--- a/source/mir/session/UploadedFile.java
+++ b/source/mir/session/UploadedFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.session;
diff --git a/source/mir/session/ValidationError.java b/source/mir/session/ValidationError.java
index 57682407..98e88ba4 100755
--- a/source/mir/session/ValidationError.java
+++ b/source/mir/session/ValidationError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,15 +19,12 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
* exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
-
package mir.session;
import java.util.Arrays;
diff --git a/source/mir/session/ValidationHelper.java b/source/mir/session/ValidationHelper.java
index 021770f7..d389c1d7 100755
--- a/source/mir/session/ValidationHelper.java
+++ b/source/mir/session/ValidationHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,15 +19,12 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
* exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
-
package mir.session;
import java.util.List;
diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index fbd22384..e18d3a5e 100755
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -55,7 +53,7 @@ import java.util.*;
/**
* Implements database access.
*
- * @version $Id: Database.java,v 1.44.2.35 2005/12/23 21:56:27 zapata Exp $
+ * @version $Id: Database.java,v 1.44.2.36 2006/08/10 19:29:36 zapata Exp $
* @author rk
* @author Zapata
*
diff --git a/source/mir/storage/DatabaseExc.java b/source/mir/storage/DatabaseExc.java
index d8c777bb..093c32ac 100755
--- a/source/mir/storage/DatabaseExc.java
+++ b/source/mir/storage/DatabaseExc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage;
diff --git a/source/mir/storage/DatabaseFailure.java b/source/mir/storage/DatabaseFailure.java
index c04e476f..5feec1d4 100755
--- a/source/mir/storage/DatabaseFailure.java
+++ b/source/mir/storage/DatabaseFailure.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage;
diff --git a/source/mir/storage/DatabaseHelper.java b/source/mir/storage/DatabaseHelper.java
index b65e86c4..d77466ce 100755
--- a/source/mir/storage/DatabaseHelper.java
+++ b/source/mir/storage/DatabaseHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/storage/RecordInserter.java b/source/mir/storage/RecordInserter.java
index a4f8d8ea..1027970c 100755
--- a/source/mir/storage/RecordInserter.java
+++ b/source/mir/storage/RecordInserter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -32,7 +30,6 @@ package mir.storage;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.util.Date;
/**
diff --git a/source/mir/storage/RecordRetriever.java b/source/mir/storage/RecordRetriever.java
index 5b3f098b..3e631efc 100755
--- a/source/mir/storage/RecordRetriever.java
+++ b/source/mir/storage/RecordRetriever.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/storage/RecordUpdater.java b/source/mir/storage/RecordUpdater.java
index 1ae012fd..7aaa7bef 100755
--- a/source/mir/storage/RecordUpdater.java
+++ b/source/mir/storage/RecordUpdater.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/storage/StatementGenerator.java b/source/mir/storage/StatementGenerator.java
index 51e0747a..1eb40366 100755
--- a/source/mir/storage/StatementGenerator.java
+++ b/source/mir/storage/StatementGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/storage/store/ObjectStore.java b/source/mir/storage/store/ObjectStore.java
index 3b4b6ce2..eba9fdd8 100755
--- a/source/mir/storage/store/ObjectStore.java
+++ b/source/mir/storage/store/ObjectStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/storage/store/ServletStoreInfo.java b/source/mir/storage/store/ServletStoreInfo.java
index 947513b3..d8e454e5 100755
--- a/source/mir/storage/store/ServletStoreInfo.java
+++ b/source/mir/storage/store/ServletStoreInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage.store;
diff --git a/source/mir/storage/store/StorableObject.java b/source/mir/storage/store/StorableObject.java
index 05766b24..e7db9acb 100755
--- a/source/mir/storage/store/StorableObject.java
+++ b/source/mir/storage/store/StorableObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage.store;
diff --git a/source/mir/storage/store/StoreContainer.java b/source/mir/storage/store/StoreContainer.java
index e1a455fa..f115e7aa 100755
--- a/source/mir/storage/store/StoreContainer.java
+++ b/source/mir/storage/store/StoreContainer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,16 +18,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
-
package mir.storage.store;
/**
@@ -45,14 +42,13 @@ package mir.storage.store;
* @version 1.0
*/
-import java.util.LinkedList;
-import java.util.ListIterator;
-
-import javax.servlet.http.HttpServletRequest;
-
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
+import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedList;
+import java.util.ListIterator;
+
public class StoreContainer {
private final static int DEFAULT_SIZE = 10;
private static int uniqueCounter = 10000;
diff --git a/source/mir/storage/store/StoreContainerType.java b/source/mir/storage/store/StoreContainerType.java
index 8e8bbcb3..d3fa4c23 100755
--- a/source/mir/storage/store/StoreContainerType.java
+++ b/source/mir/storage/store/StoreContainerType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -44,11 +42,11 @@ package mir.storage.store;
* @version 1.0
*/
+import mir.misc.StringUtil;
+
import java.util.HashMap;
import java.util.Map;
-import mir.misc.StringUtil;
-
public class StoreContainerType {
public final static int STOC_TYPE_UNKNOWN = -1;
diff --git a/source/mir/storage/store/StoreIdentifier.java b/source/mir/storage/store/StoreIdentifier.java
index bb986985..dc00801e 100755
--- a/source/mir/storage/store/StoreIdentifier.java
+++ b/source/mir/storage/store/StoreIdentifier.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -41,12 +39,12 @@ package mir.storage.store;
* @author rk
* @version 1.0
*/
-import java.util.Iterator;
-import java.util.Set;
-
import mir.entity.EntityList;
import mir.log.LoggerWrapper;
+import java.util.Iterator;
+import java.util.Set;
+
public class StoreIdentifier {
/** todo check if invalidating already to avoid deadlocks what about concurrency? */
diff --git a/source/mir/storage/store/StoreUtil.java b/source/mir/storage/store/StoreUtil.java
index f1717e2c..c32431c1 100755
--- a/source/mir/storage/store/StoreUtil.java
+++ b/source/mir/storage/store/StoreUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/storage/store/test/EntityC1.java b/source/mir/storage/store/test/EntityC1.java
index 837fb528..ac17bb4a 100755
--- a/source/mir/storage/store/test/EntityC1.java
+++ b/source/mir/storage/store/test/EntityC1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage.store.test;
@@ -38,13 +36,13 @@ package mir.storage.store.test;
* @version 1.0
*/
-import java.util.HashSet;
-import java.util.Set;
-
import mir.storage.store.StorableObject;
import mir.storage.store.StoreContainerType;
import mir.storage.store.StoreIdentifier;
+import java.util.HashSet;
+import java.util.Set;
+
public class EntityC1 implements StorableObject {
String id;
diff --git a/source/mir/storage/store/test/EntityC2.java b/source/mir/storage/store/test/EntityC2.java
index b8c80c9f..46170d73 100755
--- a/source/mir/storage/store/test/EntityC2.java
+++ b/source/mir/storage/store/test/EntityC2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage.store.test;
@@ -38,12 +36,12 @@ package mir.storage.store.test;
* @version 1.0
*/
-import java.util.Set;
-
import mir.storage.store.StorableObject;
import mir.storage.store.StoreContainerType;
import mir.storage.store.StoreIdentifier;
+import java.util.Set;
+
public class EntityC2 implements StorableObject {
String id;
diff --git a/source/mir/storage/store/test/EntityC3.java b/source/mir/storage/store/test/EntityC3.java
index f151f3d5..92626704 100755
--- a/source/mir/storage/store/test/EntityC3.java
+++ b/source/mir/storage/store/test/EntityC3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage.store.test;
@@ -38,12 +36,12 @@ package mir.storage.store.test;
* @version 1.0
*/
-import java.util.Set;
-
import mir.storage.store.StorableObject;
import mir.storage.store.StoreContainerType;
import mir.storage.store.StoreIdentifier;
+import java.util.Set;
+
public class EntityC3 implements StorableObject {
String id;
diff --git a/source/mir/storage/store/test/TestStore.java b/source/mir/storage/store/test/TestStore.java
index b541757b..77379588 100755
--- a/source/mir/storage/store/test/TestStore.java
+++ b/source/mir/storage/store/test/TestStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,13 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.storage.store.test;
diff --git a/source/mir/util/CachingRewindableIterator.java b/source/mir/util/CachingRewindableIterator.java
index 0678e746..d0f83c08 100755
--- a/source/mir/util/CachingRewindableIterator.java
+++ b/source/mir/util/CachingRewindableIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/util/DateTimeFunctions.java b/source/mir/util/DateTimeFunctions.java
index 95a81015..648debdd 100755
--- a/source/mir/util/DateTimeFunctions.java
+++ b/source/mir/util/DateTimeFunctions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/util/DateTimeRoutines.java b/source/mir/util/DateTimeRoutines.java
index d3fc9418..23f606da 100755
--- a/source/mir/util/DateTimeRoutines.java
+++ b/source/mir/util/DateTimeRoutines.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/util/EntityUtility.java b/source/mir/util/EntityUtility.java
index aca1e66a..0c345392 100755
--- a/source/mir/util/EntityUtility.java
+++ b/source/mir/util/EntityUtility.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/util/ExceptionFunctions.java b/source/mir/util/ExceptionFunctions.java
index aad178ca..5150b1d5 100755
--- a/source/mir/util/ExceptionFunctions.java
+++ b/source/mir/util/ExceptionFunctions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/util/ExceptionRoutines.java b/source/mir/util/ExceptionRoutines.java
index cf280506..8d194c4d 100755
--- a/source/mir/util/ExceptionRoutines.java
+++ b/source/mir/util/ExceptionRoutines.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -18,25 +18,22 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
- * and distribute linked combinations including the two. You must obey the
- * GNU General Public License in all respects for all of the code used other than
- * the above mentioned libraries. If you modify this file, you may extend this
- * exception to your version of the file, but you are not obligated to do so.
+ * the code of this program with any library licensed under the Apache Software License,
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
* If you do not wish to do so, delete this exception statement from your version.
*/
package mir.util;
+import multex.Failure;
+import org.xml.sax.SAXException;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.InvocationTargetException;
-import multex.Failure;
-
-import org.xml.sax.SAXException;
-
/**
* Routines to assist in handling and throwing exceptions
*/
diff --git a/source/mir/util/FileFunctions.java b/source/mir/util/FileFunctions.java
index 7ade9aa2..05aeb699 100755
--- a/source/mir/util/FileFunctions.java
+++ b/source/mir/util/FileFunctions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/util/FileRoutines.java b/source/mir/util/FileRoutines.java
index d42ab163..ac1d4c18 100755
--- a/source/mir/util/FileRoutines.java
+++ b/source/mir/util/FileRoutines.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
diff --git a/source/mir/util/GeneratorDateTimeFunctions.java b/source/mir/util/GeneratorDateTimeFunctions.java
index 48a2fa5c..dc3b56d0 100755
--- a/source/mir/util/GeneratorDateTimeFunctions.java
+++ b/source/mir/util/GeneratorDateTimeFunctions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
@@ -29,15 +27,15 @@
*/
package mir.util;
+import mir.generator.Generator;
+import mir.generator.GeneratorExc;
+import mir.generator.GeneratorFailure;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
-import mir.generator.Generator;
-import mir.generator.GeneratorExc;
-import mir.generator.GeneratorFailure;
-
public class GeneratorDateTimeFunctions {
private GeneratorDateTimeFunctions() {
}
diff --git a/source/mir/util/ShellRoutines.java b/source/mir/util/ShellRoutines.java
index 4dbd67a5..fc12d7d1 100644
--- a/source/mir/util/ShellRoutines.java
+++ b/source/mir/util/ShellRoutines.java
@@ -62,25 +62,29 @@ public class ShellRoutines {
*/
public static byte[] execIntoByteArray(String command) throws IOException {
File commandOutput = File.createTempFile("mircmd", "");
- int exitStatus;
try {
- // WARNING: unix specific
- exitStatus = Runtime.getRuntime().exec(new String[]{
- "/bin/sh", "-c",
- command + " " +
- ">" + commandOutput.getAbsolutePath()
- }).waitFor();
- }
- catch (InterruptedException e) {
- throw new IOException(e.toString());
+ int exitStatus;
+ try {
+ // WARNING: unix specific
+
+ exitStatus = Runtime.getRuntime().exec(new String[]{
+ "/bin/sh", "-c",
+ command + " " +
+ ">" + commandOutput.getAbsolutePath()
+ }).waitFor();
+ }
+ catch (InterruptedException e) {
+ throw new IOException(e.toString());
+ }
+ if (exitStatus != 0) {
+ throw new IOException("command exit satus:" + exitStatus);
+ }
+ return FileRoutines.readFileIntoByteArray
+ (commandOutput.getAbsoluteFile());
}
- if (exitStatus != 0) {
- throw new IOException("command exit satus:" + exitStatus);
+ finally {
+ commandOutput.delete();
}
- byte[] result = FileRoutines.readFileIntoByteArray
- (commandOutput.getAbsoluteFile());
- commandOutput.delete();
- return result;
}
/**
@@ -97,7 +101,9 @@ public class ShellRoutines {
"/bin/sh", "-c", command
});
Reader errorStreamReader = new InputStreamReader(process.getErrorStream());
- ReaderLogger logger = new ReaderLogger(errorStreamReader, new LoggerWrapper("Utility"));
+ ReaderLogger logger =
+ new ReaderLogger(errorStreamReader, new LoggerWrapper("Utility"));
+
new Thread(logger).start();
Reader outputStreamReader = new InputStreamReader(process.getInputStream());
@@ -134,6 +140,7 @@ public class ShellRoutines {
}
catch (IOException e) {
}
+
writer.close();
try {
reader.close();
diff --git a/source/mir/util/SimpleParser.java b/source/mir/util/SimpleParser.java
index 975dd3d7..4b0b1482 100755
--- a/source/mir/util/SimpleParser.java
+++ b/source/mir/util/SimpleParser.java
@@ -37,23 +37,16 @@ import multex.Exc;
import multex.Failure;
/**
- * a class to do some basic, regexp based parsing of character data
- *
- * Title:
- * Description:
- * Copyright: Copyright (c) 2003
- * Company:
- * @author not attributable
- * @version 1.0
+ * Simple parser. Can be used to parse a String
based using
+ * regular epxression.
*/
-
public class SimpleParser {
private String data;
private int position;
/**
- *
- * @param aData
+ * Initialize a new SimpleParser
, with aData
+ * as the text to parse.
*/
public SimpleParser(String aData) {
@@ -62,31 +55,15 @@ public class SimpleParser {
}
/**
- *
- * @param aRegularExpression
- * @return
- * @throws SimpleParserExc
+ * Parses a regular expression. Uses suppled aMessage
parameter
+ * in case of an error.
*/
-
- public boolean parses(RE aRegularExpression) throws SimpleParserExc {
- REMatch match = aRegularExpression.getMatch(data, position);
-
- return (match!=null && match.getStartIndex()==position) ;
- }
-
- /**
- *
- * @param aRegularExpression
- * @param aMessage
- * @return
- * @throws SimpleParserExc
- */
-
public String parse(RE aRegularExpression, String aMessage) throws SimpleParserExc {
REMatch match = aRegularExpression.getMatch(data, position);
- if (match==null || match.getStartIndex()!=position)
+ if (match==null || match.getStartIndex()!=position) {
throw new SimpleParserExc(aMessage+" at position "+position+" in '"+data+"'");
+ }
position=match.getEndIndex();
@@ -94,20 +71,21 @@ public class SimpleParser {
}
/**
+ * Attempts to match the data right after the parsing position to
+ * a regular expression
*
- * @param aRegularExpression
- * @return
- * @throws SimpleParserExc
+ * @throws SimpleParserExc if no match could be found for the given regular
+ * expression.
*/
-
public String parse(RE aRegularExpression) throws SimpleParserExc {
return parse( aRegularExpression, "No match found for '"+aRegularExpression.toString()+"'");
}
/**
+ * Attempts to skip data at the parsing position matching the supplied regular expression
*
- * @param aRegularExpression
- * @throws SimpleParserExc
+ * @throws SimpleParserExc if no match could be found for the given regular
+ * expression.
*/
public void skip(RE aRegularExpression) throws SimpleParserExc {
@@ -118,12 +96,9 @@ public class SimpleParser {
}
/**
- *
- * @param anExpression
- * @return
- * @throws SimpleParserExc
+ * Returns true
if the data at the parsing position matches the given
+ * regular expression.
*/
-
public boolean parses(String anExpression) throws SimpleParserExc {
try {
return parses(new RE(anExpression));
@@ -140,13 +115,22 @@ public class SimpleParser {
}
/**
- *
- * @param anExpression
- * @return
- * @throws SimpleParserExc
- * @throws SimpleParserFailure
+ * Returns true
if the data at the parsing position matches the given
+ * regular expression.
*/
+ public boolean parses(RE aRegularExpression) throws SimpleParserExc {
+ REMatch match = aRegularExpression.getMatch(data, position);
+
+ return (match!=null && match.getStartIndex()==position) ;
+ }
+ /**
+ * Attempts to match the data right after the parsing position to
+ * a regular expression
+ *
+ * @throws SimpleParserExc if no match could be found for the given regular
+ * expression.
+ */
public String parse(String anExpression) throws SimpleParserExc, SimpleParserFailure {
try {
return parse(new RE(anExpression));
@@ -162,15 +146,11 @@ public class SimpleParser {
}
}
+
/**
- *
- * @param anExpression
- * @param aMessage
- * @return
- * @throws SimpleParserExc
- * @throws SimpleParserFailure
+ * Parses text at the current parsing position matching the given anExpression
.
+ * Will apply the supplied message to an exception if no match could be found.
*/
-
public String parse(String anExpression, String aMessage) throws SimpleParserExc, SimpleParserFailure {
try {
return parse(new RE(anExpression), aMessage);
@@ -187,10 +167,7 @@ public class SimpleParser {
}
/**
- *
- * @param anExpression
- * @throws SimpleParserExc
- * @throws SimpleParserFailure
+ * Skips (i.e. discards) text matching the supplied regular expression
*/
public void skip(String anExpression) throws SimpleParserExc, SimpleParserFailure {
@@ -209,30 +186,21 @@ public class SimpleParser {
}
/**
- *
- * @return true if the parser is at the end of the data
+ * returns true
if the parser is at the end of the data
*/
-
public boolean isAtEnd() {
return position>=data.length();
}
/**
- *
- * @return
+ * Returns the "remaining" data: the data after the current position
*/
public String remainingData() {
return data.substring(position);
}
/**
- *
- * Title:
- * Description:
- * Copyright: Copyright (c) 2003
- * Company:
- * @author not attributable
- * @version 1.0
+ * Unchecked exception thrown from SimpleParser
*/
public static class SimpleParserFailure extends Failure {
@@ -245,6 +213,9 @@ public class SimpleParser {
}
}
+ /**
+ * Checked exception thrown from SimpleParser
+ */
public static class SimpleParserExc extends Exc {
public SimpleParserExc(String aMessage) {
super(aMessage);
diff --git a/source/mir/util/xml/html/HTMLScanner.java b/source/mir/util/xml/html/HTMLScanner.java
index 319d0533..adaf1f94 100755
--- a/source/mir/util/xml/html/HTMLScanner.java
+++ b/source/mir/util/xml/html/HTMLScanner.java
@@ -1,12 +1,12 @@
package mir.util.xml.html;
+import mir.util.HTMLRoutines;
+
import java.io.IOException;
import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
-import mir.util.HTMLRoutines;
-
public class HTMLScanner {
private ReaderWrapper reader;
private ScannerReceiver receiver;
diff --git a/source/mircoders/abuse/RegularExpressionFilterType.java b/source/mircoders/abuse/RegularExpressionFilterType.java
index c19b3f8e..b3b6cfa8 100755
--- a/source/mircoders/abuse/RegularExpressionFilterType.java
+++ b/source/mircoders/abuse/RegularExpressionFilterType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
*
* This file is part of Mir.
*
@@ -19,8 +19,6 @@
*
* In addition, as a special exception, The Mir-coders gives permission to link
* the code of this program with any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
* and distribute linked combinations including the two. You must obey the
* GNU General Public License in all respects for all of the code used other than
* the above mentioned libraries. If you modify this file, you may extend this
--
2.11.0