[cvs] expresso commit by lhamel: javadoc, remove unused
JCorporate Ltd
jcorp at jcorp2.servlets.net
Tue Oct 19 18:33:18 PDT 2004
Log Message:
-----------
javadoc, remove unused
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
DBTool.java
Revision Data
-------------
Index: DBTool.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java -u -r1.50 -r1.51
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
@@ -82,6 +82,8 @@
import com.jcorporate.expresso.core.misc.ConfigurationException;
import com.jcorporate.expresso.core.misc.DateTime;
import com.jcorporate.expresso.core.misc.StringUtil;
+import com.jcorporate.expresso.core.registry.MutableRequestRegistry;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.core.servlet.StdServlet;
import com.jcorporate.expresso.kernel.InstallLog;
@@ -126,8 +128,6 @@
import java.util.List;
import java.util.StringTokenizer;
import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
-import com.jcorporate.expresso.core.registry.MutableRequestRegistry;
/**
@@ -166,15 +166,13 @@
* </ul>
*
*
- * @version $Revision$ $Date$
* @author Michael Nash
*
* Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
public class DBTool
extends Thread {
- private static final String thisClass = "com.jcorporate.expresso.core.utility.DBTool.";
+ private static final String thisClass = DBTool.class.getName();
private static String dbName = null;
private static Logger log = Logger.getLogger(DBTool.class);
@@ -1803,70 +1801,6 @@
return preparedWord;
} /* prepareWord(String) */
- /**
- * This methods moves old UserDBObjects to use the new user table. Primary
- * keys are based upon an integer for faster lookups.
- * @throws DBException upon error
- */
-// private static void doUidChange()
-// throws DBException {
-// System.out.println("Processing UID updates from old user table");
-//
-// DefaultUserInfo oldList = new DefaultUserInfo();
-// oldList.setDBName(dbName);
-//
-// DefaultUserInfo oneNew = null;
-// DefaultUserInfo oneOld = null;
-//
-// List list = oldList.searchAndRetrieveList();
-// for (Iterator iterator = list.iterator(); iterator.hasNext();) {
-// DefaultUserInfo info = (DefaultUserInfo) iterator.next();
-// System.out.println("Processing " + oneOld.getField("UserName"));
-// oneNew = new DefaultUserInfo();
-// oneNew.setDBName(dbName);
-// oneNew.setField("LoginName", oneOld.getField("UserName"));
-//
-// if (!oneNew.find()) {
-// oneNew.setField("LoginName", oneOld.getField("UserName"));
-// oneNew.setField("UserName", oneOld.getField("Descrip"));
-// oneNew.setField("Passwd", oneOld.getField("Passwd"));
-// oneNew.setField("EMail", oneOld.getField("EMail"));
-// oneNew.setField("AccountStatus",
-// oneOld.getField("AccountStatus"));
-// oneNew.setField("EmailValCode",
-// oneOld.getField("EmailValCode"));
-// oneNew.setField("CreateDate", oneOld.getField("CreateDate"));
-// oneNew.setField("RegDomId", "1");
-// oneNew.setField("RegComplete", "Y");
-//
-// try {
-// oneNew.add();
-// } catch (DBException de) {
-// de.printStackTrace(System.out);
-// }
-// }
-//
-// String newId = oneNew.getField("ExpUid");
-//
-// if (!newId.equals("")) {
-// GroupMembers memberList = new GroupMembers();
-// memberList.setDBName(dbName);
-// memberList.setField("UserName", oneNew.getField("LoginName"));
-//
-// GroupMembers oneMember = null;
-//
-// List memList = memberList.searchAndRetrieveList();
-// for (Iterator iter = memList.iterator(); iter.hasNext();) {
-// GroupMembers oneMember = (GroupMembers) iter.next();
-// oneMember.setField("ExpUid", newId);
-// oneMember.setCheckZeroUpdate(false);
-// oneMember.update();
-//
-// }
-// }
-// }
-// } /* doUidChange() */
-
/**
* Performs the Expresso 3 to Expresso 4 name changes
@@ -1925,13 +1859,11 @@
*
* @param dbName The data context to use
* @throws DBException
- * @throws HtmlException
* @throws ConfigurationException if we're working with a data context
* that does not exist in the config files.
*/
private static void setup(String dbName)
- throws DBException, HtmlException,
- ConfigurationException {
+ throws DBException, ConfigurationException {
System.out.println("Beginning system setup...");
if (StringUtil.notNull(dbName).equals("")) {
@@ -2183,12 +2115,10 @@
* @param dbName The database context to create the database in.
* @throws DBException If there is a database problem creating
* the new default values
- * @throws HtmlException If there is a problem building the
- * confirmation page
*/
public static synchronized void otherSetups(InstallLog theLog, Vector allSchemas,
String dbName)
- throws DBException, HtmlException {
+ throws DBException {
Schema oneSchema = null;
for (Enumeration e = allSchemas.elements(); e.hasMoreElements();) {
More information about the cvs
mailing list