[cvs] Expresso commit by lhamel: remove deprecations;
make compile with
JCorporate Ltd
jcorp at jcorp2.servlets.net
Tue Oct 12 10:55:36 PDT 2004
Log Message:
-----------
remove deprecations; make compile with expresso 5.6
Modified Files:
--------------
eforum/src/WEB-INF/src/com/jcorporate/eforum/controller:
Browse.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj:
DefaultIndexProgressModel.java
ForumAttachment.java
ForumAttachmentMessage.java
ForumGroup.java
ForumMail.java
ForumMessage.java
ForumMonoTextDef.java
ForumOptions.java
ForumSecurity.java
ForumSignature.java
ForumSubscribe.java
ForumThread.java
ForumVarTextDef.java
eforum/src/WEB-INF/src/com/jcorporate/eforum/search/lucene:
LuceneSearchIndexer.java
Revision Data
-------------
Index: Browse.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java -u -r1.22 -r1.23
--- src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java
+++ src/WEB-INF/src/com/jcorporate/eforum/controller/Browse.java
@@ -50,12 +50,12 @@
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.misc.FastStringBuffer;
import com.jcorporate.expresso.core.misc.RecordPaginator;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.core.security.filters.FilterManager;
import com.jcorporate.expresso.services.dbobj.ControllerDefault;
+import com.jcorporate.expresso.kernel.util.FastStringBuffer;
import org.apache.log4j.Logger;
import java.io.BufferedReader;
import java.io.IOException;
Index: ForumThread.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java -u -r1.5 -r1.6
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumThread.java
@@ -109,10 +109,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
setTargetTable("FORUMTHREAD");
setDescription("TN_FORUMTHREAD");
Index: ForumMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMessage.java -u -r1.15 -r1.16
--- 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.16 2004/10/12 17:55:33 lhamel
+// remove deprecations; make compile with expresso 5.6
+//
// Revision 1.15 2004/05/19 23:57:47 ppilgrim
// Fix compilation error with missing `UserInfo' object.
//
@@ -57,36 +60,33 @@
package com.jcorporate.eforum.dbobj;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
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;
import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
+import com.jcorporate.expresso.core.misc.ByteArrayDataSource;
import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.DateTime;
import com.jcorporate.expresso.core.misc.EventHandler;
-import com.jcorporate.expresso.core.misc.FastStringBuffer;
-import com.jcorporate.expresso.core.misc.ByteArrayDataSource;
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 com.jcorporate.expresso.core.misc.FastStringBuffer;
-import com.jcorporate.expresso.core.dataobjects.Securable;
-// import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
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;
+
/**
* ForumMessage data object that defines an individual message that is
@@ -121,7 +121,6 @@
/** data field name constant */
public static final String FLD_REPLY_TO = "ReplyTo";
- private Hashtable values = null;
protected static Logger log = Logger.getLogger(ForumMessage.class);
private static final String thisClass = ForumMessage.class.getName() + ".";
@@ -187,7 +186,6 @@
*/
public void add() throws DBException
{
- String myName = new String(thisClass + "add()");
if (getField(FLD_NEXT_MESSAGE).equals("")) {
setField(FLD_NEXT_MESSAGE, "0");
@@ -218,7 +216,6 @@
myGroup.setField(ForumGroup.LASTPOSTINGBY, getField(EXPUID));
myGroup.update();
- Calendar rightNow = Calendar.getInstance();
setField(FLD_CREATED, DateTime.getDateTimeForDB());
// Persist this new forum message record to the database
super.add();
@@ -302,7 +299,6 @@
// If we get here we have successfully stored a record, now it
// is time to send electronic mail
- String replyString = null;
// Now find everyone who is set up for email notifications to this group
// and send them the content of this message */
@@ -589,9 +585,6 @@
protected synchronized void setupFields()
throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
setTargetTable("FORUMMESSAGE");
setDescription("TN_FORUMMESSAGES");
Index: ForumSignature.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java -u -r1.2 -r1.3
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSignature.java
@@ -82,10 +82,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
// 01234567890123456789
setTargetTable("FORUMSIGNATURE");
setDescription("TN_FORUMSIGNATURE");
Index: ForumMonoTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMonoTextDef.java
@@ -1,10 +1,9 @@
package com.jcorporate.eforum.dbobj;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
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;
/**
@@ -80,10 +79,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
setTargetTable("FORUMMONOTEXTDEF");
setName("Forum Mono Text Css Definitions");
setDescription("TN_FORUMMONOTEXTDEF");
Index: ForumGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java -u -r1.10 -r1.11
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumGroup.java
@@ -225,9 +225,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
setTargetTable("FORUMGROUP");
setDescription("TN_FORUMGROUP");
Index: ForumVarTextDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java -u -r1.1 -r1.2
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumVarTextDef.java
@@ -80,10 +80,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
setTargetTable("FORUMVARTEXTDEF");
setName("Forum Variable Text Css Definitions");
setDescription("TN_FORUMVARTEXTDEF");
Index: ForumOptions.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java -u -r1.2 -r1.3
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumOptions.java
@@ -133,10 +133,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
setTargetTable("FORUMOPTIONS");
setName("Forum User Options");
setDescription("TN_FORUMOPTIONS");
Index: ForumMail.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumMail.java
@@ -66,9 +66,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
setTargetTable("FORUMMAIL");
Index: ForumAttachmentMessage.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java -u -r1.3 -r1.4
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachmentMessage.java
@@ -78,10 +78,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
setTargetTable("FORUMATTACHMSG");
setDescription("TN_FORUMATTACHMENTMSG");
Index: DefaultIndexProgressModel.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/DefaultIndexProgressModel.java -u -r1.7 -r1.8
--- 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.8 2004/10/12 17:55:33 lhamel
+// remove deprecations; make compile with expresso 5.6
+//
// Revision 1.7 2004/02/11 00:13:58 ppilgrim
// Patch confusion with Francesco Galli (f.galli at inera.it) i18n changes. The static constants still need to renamed and agreed upon. Some changes for sending forum email with MIME attachments also.
//
@@ -426,10 +429,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- //Francesco Galli (f.galli at inera.it) added 20040120: needed for i18n
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
setTargetTable("FORUMPROGRESS");
setName("FORUMPROGRESS");
Index: ForumSubscribe.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java -u -r1.11 -r1.12
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSubscribe.java
@@ -229,10 +229,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
setTargetTable("FORUMSUBSCRIBE");
setDescription("TN_FORUMSUBSCRIBER");
@@ -270,13 +266,13 @@
// Set up rendering hints (attributes) for each field, such
// that a renderer (like DBMaint) can generate a web user
// interface.
- setAttribute(FLD_NOTICES, "checkbox", "Y");
- setAttribute(FLD_EMAIL, "checkbox", "Y");
- setAttribute(FLD_SUMMARIES, "checkbox", "Y");
- setAttribute(FLD_FORUM_ADMIN, "checkbox", "Y");
- setAttribute(FLD_MODERATOR, "checkbox", "Y");
- setAttribute(FLD_UPLOAD_ATTACHMENTS, "checkbox", "N");
- setAttribute(FLD_DOWNLOAD_ATTACHMENTS, "checkbox", "Y");
+ getMetaData().getFieldMetadata(FLD_NOTICES).setAttribute("checkbox", "Y");
+ getMetaData().getFieldMetadata(FLD_EMAIL).setAttribute("checkbox", "Y");
+ getMetaData().getFieldMetadata(FLD_SUMMARIES).setAttribute("checkbox", "Y");
+ getMetaData().getFieldMetadata(FLD_FORUM_ADMIN).setAttribute("checkbox", "Y");
+ getMetaData().getFieldMetadata(FLD_MODERATOR).setAttribute("checkbox", "Y");
+ getMetaData().getFieldMetadata(FLD_UPLOAD_ATTACHMENTS).setAttribute("checkbox", "N");
+ getMetaData().getFieldMetadata(FLD_DOWNLOAD_ATTACHMENTS).setAttribute("checkbox", "Y");
// Define primary key fields
addKey(FLD_GROUP_ID);
@@ -285,9 +281,6 @@
// Define lookup fields
setLookupObject(FLD_UID, "com.jcorporate.expresso.core.security.User");
setLookupObject(FLD_GROUP_ID, "com.jcorporate.eforum.dbobj.ForumGroup");
-
- //Francesco Galli (f.galli at inera.it) added 20040120: needed for i18n
- setSchema("com.jcorporate.eforum.ForumSchema");
} /* setupFields() */
Index: ForumSecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java -u -r1.8 -r1.9
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumSecurity.java
@@ -88,7 +88,7 @@
protected void checkAllRefs() throws DBException
{
checkRef(GROUPNAME, new UserGroup(SecuredDBObject.SYSTEM_ACCOUNT),
- "Invalid " + getDescription(GROUPNAME));
+ "Invalid " + getString(getMetaData().getDescription(GROUPNAME)));
} /* checkAllRefs() */
@@ -125,9 +125,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
setTargetTable("FORUMSECURITY");
setName("Forum Security");
Index: ForumAttachment.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java -u -r1.4 -r1.5
--- src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java
+++ src/WEB-INF/src/com/jcorporate/eforum/dbobj/ForumAttachment.java
@@ -127,10 +127,6 @@
*/
protected synchronized void setupFields() throws DBException
{
- // Temporarily hard set the schema in order to load the
- // correct resource bundle.
- this.setSchema(ForumSchema.class.getName()); // for internationalisation (i18n)
-
setTargetTable("FORUMATTACHMENT");
setDescription("TN_FORUMATTACHMENT");
Index: LuceneSearchIndexer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/eforum/src/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java -Lsrc/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java -u -r1.10 -r1.11
--- src/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java
+++ src/WEB-INF/src/com/jcorporate/eforum/search/lucene/LuceneSearchIndexer.java
@@ -17,6 +17,9 @@
// History
// ================================================================================
// $Log$
+// Revision 1.11 2004/10/12 17:55:33 lhamel
+// remove deprecations; make compile with expresso 5.6
+//
// Revision 1.10 2004/01/31 03:46:18 ppilgrim
// JavaDoc improvements for reference implementation
//
@@ -74,7 +77,7 @@
import com.jcorporate.eforum.search.SearchResult;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
-import com.jcorporate.expresso.core.misc.FastStringBuffer;
+import com.jcorporate.expresso.kernel.util.FastStringBuffer;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.StopAnalyzer;
import org.apache.lucene.document.DateField;
@@ -206,7 +209,6 @@
String myName = thisClass + "indexMessages() ";
System.out.println(myName + "Start.");
- String dbname = request.getDBName();
int numRecords = 0;
IndexProgressModel progressModel = new DefaultIndexProgressModel(request);
More information about the cvs
mailing list