[cvs] eforum commit by mtraum: organize imports
JCorporate Ltd
jcorp at jcorp2.servlets.net
Sun Oct 24 08:39:17 PDT 2004
Log Message:
-----------
organize imports
Modified Files:
--------------
eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj:
ForumAttachment.java
ForumMessage.java
ForumAttachmentMessage.java
ForumSignature.java
ForumMail.java
ForumThread.java
ForumSubscribe.java
ForumVarTextDef.java
DefaultIndexProgressModel.java
ForumOptions.java
ForumGroup.java
SchemaTests.java
ForumSecurity.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/controller:
SearchForm.java
BrowseForm.java
AttachmentStoreBean.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/job:
SendNotice.java
eforum/src/WEB-INF/src/com/jcorporate/eforum:
ForumSchema.java
EForumTestSuite.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/search:
SearchIndexer.java
Revision Data
-------------
Index: ForumMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -u -r1.16 -r1.17
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java
@@ -16,6 +16,9 @@
// ================================================================================
// History
// $Log$
+// Revision 1.17 2004/10/24 15:39:14 mtraum
+// organize imports
+//
// Revision 1.16 2004/10/12 17:55:33 lhamel
// remove deprecations; make compile with expresso 5.6
//
@@ -60,10 +63,18 @@
package com.jcorporate.eforum.dbobj;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.eforum.ForumSchema;
import com.jcorporate.eforum.search.SearchIndexer;
import com.jcorporate.eforum.search.SearchIndexerFactory;
-import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.db.exception.DBRecordNotFoundException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
@@ -75,17 +86,8 @@
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.core.security.UserInfo;
import com.jcorporate.expresso.kernel.util.FastStringBuffer;
-import com.jcorporate.expresso.services.dbobj.MediaDBObject;
import com.jcorporate.expresso.services.dbobj.MimeTypes;
import com.jcorporate.expresso.services.dbobj.Setup;
-import org.apache.log4j.Logger;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
/**
Index: SchemaTests.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/SchemaTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/SchemaTests.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/SchemaTests.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/SchemaTests.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/SchemaTests.java
@@ -1,9 +1,8 @@
package com.jcorporate.eforum.dbobj;
-import com.jcorporate.expresso.core.utility.DBToolTests;
-import com.jcorporate.expresso.services.test.*;
+import junit.framework.TestSuite;
-import junit.framework.*;
+import com.jcorporate.expresso.core.utility.DBToolTests;
/**
Index: ForumVarTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -u -r1.2 -r1.3
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java
@@ -1,11 +1,10 @@
package com.jcorporate.eforum.dbobj;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
+import java.util.Vector;
+
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.eforum.ForumSchema;
-import java.util.Vector;
/**
* This is a data object stores a static list of proportional spaced
Index: ForumAttachmentMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java
@@ -1,15 +1,11 @@
package com.jcorporate.eforum.dbobj;
-import java.util.Date;
-import java.util.Iterator;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
-import com.jcorporate.expresso.core.dataobjects.Securable;
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.eforum.ForumSchema;
-import org.apache.log4j.Logger;
/**
Index: ForumSubscribe.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java -u -r1.13 -r1.14
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java
@@ -1,6 +1,9 @@
package com.jcorporate.eforum.dbobj;
import java.util.Iterator;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
import com.jcorporate.expresso.core.dataobjects.Securable;
@@ -8,11 +11,9 @@
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.misc.EventHandler;
+import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.core.security.UserListener;
-import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.eforum.ForumSchema;
-import org.apache.log4j.Logger;
//
// MYSQL Alteration Tue Nov 18 23:31:12 GMT 2003
Index: ForumAttachment.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -u -r1.5 -r1.6
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java
@@ -1,20 +1,15 @@
package com.jcorporate.eforum.dbobj;
import java.util.Date;
-import java.util.Iterator;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
-import com.jcorporate.expresso.core.dataobjects.Securable;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.expresso.services.dbobj.MediaDBObject;
-import com.jcorporate.expresso.services.dbobj.MimeTypes;
import com.jcorporate.expresso.core.dbobj.RequestContext;
-import com.jcorporate.expresso.core.misc.EventHandler;
import com.jcorporate.expresso.core.security.User;
-import com.jcorporate.expresso.core.security.UserListener;
-import com.jcorporate.eforum.ForumSchema;
-import org.apache.log4j.Logger;
+import com.jcorporate.expresso.services.dbobj.MediaDBObject;
+import com.jcorporate.expresso.services.dbobj.MimeTypes;
/**
Index: ForumThread.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -u -r1.6 -r1.7
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java
@@ -1,22 +1,13 @@
package com.jcorporate.eforum.dbobj;
-import com.jcorporate.expresso.core.*;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
+import java.util.Hashtable;
+
+import org.apache.log4j.Logger;
-/*
- * ForumThread.java
- *
- * Copyright 1999 Jcorporate Ltd.
- */
+import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.*;
+import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.misc.DateTime;
-import com.jcorporate.eforum.ForumSchema;
-
-import java.util.Calendar;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.log4j.Logger;
/**
Index: ForumSignature.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java
@@ -1,15 +1,12 @@
package com.jcorporate.eforum.dbobj;
-import java.util.Date;
-import java.util.Iterator;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.dbobj.RequestContext;
-import com.jcorporate.eforum.ForumSchema;
-import org.apache.log4j.Logger;
+import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
/**
Index: ForumGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -u -r1.11 -r1.12
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java
@@ -4,10 +4,11 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector;
-import com.jcorporate.eforum.ForumSchema;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.cache.CacheException;
import com.jcorporate.expresso.core.cache.CacheManager;
-import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
@@ -16,7 +17,6 @@
import com.jcorporate.expresso.core.misc.DateTime;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.User;
-import org.apache.log4j.Logger;
/**
@@ -257,8 +257,8 @@
// is the master record, and the detail records is, for
// example, `ForumThread'. What does this mean? It means if
// `ForumGroup' data object is deleted, then the corresponding
- // data record entry in the database is deleted, but also the
- // matching records in the `ForumThread' table are deleted, if
+ // data record entry in�the database is deleted, but also the
+ // matching records in�the `ForumThread' table are deleted, if
// any such record exists.
addDetail("com.jcorporate.eforum.dbobj.ForumThread", FLD_GROUP_ID, FLD_GROUP_ID);
addDetail("com.jcorporate.eforum.dbobj.ForumSecurity", FLD_GROUP_ID, FLD_GROUP_ID);
Index: ForumMail.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java
@@ -1,18 +1,8 @@
package com.jcorporate.eforum.dbobj;
-import com.jcorporate.expresso.core.*;
import com.jcorporate.expresso.core.controller.ControllerRequest;
-/*
- * ForumMail.java
- *
- * Copyright 1999 Jcorporate Ltd.
- */
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.*;
-import com.jcorporate.expresso.core.misc.DateTime;
-import com.jcorporate.eforum.ForumSchema;
-
-import java.util.Calendar;
+import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
/**
Index: DefaultIndexProgressModel.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -u -r1.8 -r1.9
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java
@@ -17,6 +17,9 @@
// History
// ================================================================================
// $Log$
+// Revision 1.9 2004/10/24 15:39:14 mtraum
+// organize imports
+//
// Revision 1.8 2004/10/12 17:55:33 lhamel
// remove deprecations; make compile with expresso 5.6
//
@@ -45,7 +48,11 @@
//
package com.jcorporate.eforum.dbobj;
-import com.jcorporate.eforum.ForumSchema;
+import java.util.Date;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.eforum.search.IndexProgressModel;
import com.jcorporate.eforum.search.IndexStatus;
import com.jcorporate.expresso.core.db.DBException;
@@ -53,9 +60,6 @@
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.DateTime;
-import org.apache.log4j.Logger;
-import java.util.Date;
-import java.util.Vector;
/**
@@ -68,7 +72,7 @@
*
* <p>
* This implementation stores the information centrally inside a database using
- * a DBObject. In this way every client can access the persistent data safely
+ * a DBObject. In�this way every client can access the persistent data safely
* and securely.
* </p>
* <br><br>
@@ -333,7 +337,7 @@
myValues.addElement(new ValidValue(
IndexStatus.CANCELED.toString(), "Indexing was canceled"));
myValues.addElement(new ValidValue(
- IndexStatus.INDEXING.toString(), "Indexing is in progress"));
+ IndexStatus.INDEXING.toString(), "Indexing is in�progress"));
myValues.addElement(new ValidValue(IndexStatus.ERROR.toString(),
"Error occured during last indexing"));
Index: ForumOptions.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
@@ -1,16 +1,12 @@
package com.jcorporate.eforum.dbobj;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
-import com.jcorporate.expresso.core.dataobjects.Securable;
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.eforum.ForumSchema;
-import java.util.Vector;
-import org.apache.log4j.Logger;
/**
* This is a data object stores a static set of
Index: ForumSecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -u -r1.9 -r1.10
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java
@@ -6,15 +6,15 @@
package com.jcorporate.eforum.dbobj;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.*;
+import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
+import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.services.dbobj.UserGroup;
-import com.jcorporate.eforum.ForumSchema;
-import org.apache.log4j.Logger;
-
-import java.util.Enumeration;
-import java.util.Vector;
/**
Index: AttachmentStoreBean.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/AttachmentStoreBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/AttachmentStoreBean.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/AttachmentStoreBean.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/controller/AttachmentStoreBean.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/AttachmentStoreBean.java
@@ -18,11 +18,7 @@
package com.jcorporate.eforum.controller;
-import java.io.*;
-import java.util.Date;
-import org.apache.struts.upload.FormFile;
-//import org.apache.commons.fileupload.FileUpload;
-//import org.apache.commons.fileupload.DiskFileUpload;
+import java.io.ByteArrayOutputStream;
import com.jcorporate.expresso.core.misc.StringUtil;
Index: BrowseForm.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/BrowseForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/BrowseForm.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/BrowseForm.java -u -r1.5 -r1.6
--- src/WEB-INF/src/com/jcorporate/eforum/controller/BrowseForm.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/BrowseForm.java
@@ -18,6 +18,9 @@
// History
// ================================================================================
// $Log$
+// Revision 1.6 2004/10/24 15:39:14 mtraum
+// organize imports
+//
// Revision 1.5 2004/03/19 02:25:25 ppilgrim
// Removed old single upload attribute properties from the form bean. The
// browseform bean support uploading of multiple attachments into
@@ -46,28 +49,17 @@
package com.jcorporate.eforum.controller;
-import java.io.*;
-import java.util.*;
-import javax.servlet.ServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.util.Date;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMappings;
-
import org.apache.struts.upload.FormFile;
-//import org.apache.commons.fileupload.FileUpload;
-//import org.apache.commons.fileupload.DiskFileUpload;
-import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.controller.DefaultForm;
+import com.jcorporate.expresso.core.misc.StringUtil;
/**
* <p><code>BrowseForm</code> </p>
Index: SearchForm.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/SearchForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/SearchForm.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/SearchForm.java -u -r1.5 -r1.6
--- src/WEB-INF/src/com/jcorporate/eforum/controller/SearchForm.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/SearchForm.java
@@ -18,6 +18,9 @@
// History
// ================================================================================
// $Log$
+// Revision 1.6 2004/10/24 15:39:14 mtraum
+// organize imports
+//
// Revision 1.5 2003/03/11 02:45:32 rimovm
// Updates for Expresso 5.0.4, and other minor tweaks.
//
@@ -42,38 +45,28 @@
package com.jcorporate.eforum.controller;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import java.text.DateFormatSymbols;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.text.DateFormatSymbols;
-import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.log4j.Logger;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMappings;
-import com.jcorporate.expresso.core.dbobj.ValidValue;
-// import com.jcorporate.expresso.core.dbobj.ISOValidValue;
-import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.expresso.core.controller.DefaultForm;
import com.jcorporate.eforum.ForumSchema;
-import com.jcorporate.eforum.search.QueryContext;
import com.jcorporate.eforum.search.DateRange;
+import com.jcorporate.eforum.search.QueryContext;
import com.jcorporate.eforum.search.SortType;
+import com.jcorporate.expresso.core.controller.DefaultForm;
+import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.i18n.Messages;
-import org.apache.log4j.Logger;
+import com.jcorporate.expresso.core.misc.StringUtil;
/**
Index: SendNotice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java -u -r1.7 -r1.8
--- src/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java
+++ src/WEB-INF/src/com/jcorporate/eforum/job/SendNotice.java
@@ -1,33 +1,22 @@
package com.jcorporate.eforum.job;
-import com.jcorporate.eforum.dbobj.ForumSubscribe;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Vector;
+
+import javax.servlet.ServletException;
+import org.apache.log4j.Logger;
+
+import com.jcorporate.eforum.dbobj.ForumSubscribe;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.job.Job;
-import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.User;
-import com.jcorporate.expresso.ext.dbobj.DownloadLog;
import com.jcorporate.expresso.services.dbobj.Event;
import com.jcorporate.expresso.services.dbobj.GroupMembers;
import com.jcorporate.expresso.services.dbobj.JobQueue;
import com.jcorporate.expresso.services.dbobj.JobQueueParam;
-import com.jcorporate.expresso.services.dbobj.UserGroup;
-import com.jcorporate.expresso.services.html.*;
-import org.apache.log4j.Logger;
-
-
-import java.io.*;
-import java.util.*;
-
-/*
- * SendNotice.java
- *
- * Copyright 1999 Jcorporate Ltd.
- */
-import javax.servlet.*;
-import javax.servlet.http.*;
/**
Index: ForumSchema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java -u -r1.16 -r1.17
--- src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java
+++ src/WEB-INF/src/com/jcorporate/eforum/ForumSchema.java
@@ -1,13 +1,9 @@
package com.jcorporate.eforum;
-import com.jcorporate.expresso.core.db.DBConnection;
+import com.jcorporate.eforum.search.SearchIndexer;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.Schema;
-import com.jcorporate.expresso.services.html.HtmlException;
import com.jcorporate.expresso.services.dbobj.Setup;
-
-import com.jcorporate.eforum.search.SearchIndexer; // *PP* Tue Oct 22 00:55:01 BST 2002
-import com.jcorporate.eforum.job.IndexMessages; // *PP* Wed Oct 30 03:05:20 GMT 2002
/**
* Schema object for the forum package
Index: EForumTestSuite.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/EForumTestSuite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/EForumTestSuite.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/EForumTestSuite.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/EForumTestSuite.java
+++ src/WEB-INF/src/com/jcorporate/eforum/EForumTestSuite.java
@@ -1,13 +1,11 @@
package com.jcorporate.eforum;
//Test Suites
-import com.jcorporate.eforum.dbobj.SchemaTests;
-
-import com.jcorporate.expresso.services.test.*;
-
import java.util.Vector;
-import junit.framework.*;
+import com.jcorporate.eforum.dbobj.SchemaTests;
+import com.jcorporate.expresso.services.test.DBTestSuite;
+import com.jcorporate.expresso.services.test.TestSystemInitializer;
/**
Index: SearchIndexer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java -u -r1.7 -r1.8
--- src/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java
+++ src/WEB-INF/src/com/jcorporate/eforum/search/SearchIndexer.java
@@ -17,6 +17,9 @@
// History
// ================================================================================
// $Log$
+// Revision 1.8 2004/10/24 15:39:15 mtraum
+// organize imports
+//
// Revision 1.7 2003/08/12 05:06:29 rimovm
// Formatting and @deprecation removal cleanups
//
@@ -37,15 +40,13 @@
//
package com.jcorporate.eforum.search;
+import java.io.IOException;
+import java.util.List;
+
import com.jcorporate.eforum.ForumSchema;
import com.jcorporate.eforum.dbobj.ForumMessage;
-import com.jcorporate.expresso.core.controller.Controller;
-import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
-import com.jcorporate.expresso.core.dbobj.Schema;
-import java.util.Iterator;
-import java.util.List;
/**
@@ -153,7 +154,7 @@
/**
* A <em>hook</em> method to register additional resources Controllers as
- * part of the eForum. In this method additional controller that are
+ * part of the eForum. In�this method additional controller that are
* required plug-in can be defined.
*
* <p>
@@ -178,7 +179,7 @@
/**
* A <em>hook</em> method to register additional resources DBObjects as
- * part of the eForum. In this method additional database objects that are
+ * part of the eForum. In�this method additional database objects that are
* required plug-in can be defined.
*
* <p>
More information about the cvs
mailing list