[cvs] expresso commit by mtraum: organize imports
JCorporate Ltd
jcorp at jcorporate.com
Wed Apr 20 17:19:10 UTC 2005
Log Message:
-----------
organize imports
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
DBToolTests.java
DBTool.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
DefaultUserInfo.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
DBMaint.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/servlet:
DBCreate.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
Download.java
Revision Data
-------------
Index: DBMaint.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java -u -r1.21 -r1.22
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java
@@ -64,6 +64,12 @@
* products and are subject to their respective licenses.
*/
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.controller.ControllerResponse;
@@ -75,8 +81,8 @@
import com.jcorporate.expresso.core.dbobj.DBObject;
import com.jcorporate.expresso.core.dbobj.Schema;
import com.jcorporate.expresso.core.dbobj.SchemaFactory;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.dbobj.ValidValue;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.services.controller.dbmaint.Add;
import com.jcorporate.expresso.services.controller.dbmaint.AddUpdate;
import com.jcorporate.expresso.services.controller.dbmaint.List;
@@ -88,12 +94,6 @@
import com.jcorporate.expresso.services.controller.dbmaint.ViewBlob;
import com.jcorporate.expresso.services.dbobj.DBOtherMap;
import com.jcorporate.expresso.services.dbobj.SchemaList;
-import org.apache.log4j.Logger;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: DBCreate.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/servlet/DBCreate.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/servlet/DBCreate.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/servlet/DBCreate.java -u -r1.28 -r1.29
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/servlet/DBCreate.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/servlet/DBCreate.java
@@ -69,16 +69,30 @@
*/
package com.jcorporate.expresso.services.servlet;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.ExpressoSchema;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.Schema;
import com.jcorporate.expresso.core.dbobj.SchemaFactory;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.jsdkapi.GenericSession;
import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.ConfigurationException;
import com.jcorporate.expresso.core.misc.CurrentLogin;
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.DBServlet;
import com.jcorporate.expresso.core.servlet.ServletInstallLog;
@@ -95,19 +109,6 @@
import com.jcorporate.expresso.services.html.Row;
import com.jcorporate.expresso.services.html.Table;
import com.jcorporate.expresso.services.html.Text;
-import org.apache.log4j.Logger;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
-import com.jcorporate.expresso.core.registry.MutableRequestRegistry;
/**
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.58
retrieving revision 1.59
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.58 -r1.59
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBTool.java
@@ -63,6 +63,31 @@
*/
package com.jcorporate.expresso.core.utility;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.ExpressoSchema;
import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.dataobjects.Securable;
@@ -70,12 +95,10 @@
import com.jcorporate.expresso.core.db.DBConnectionPool;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.db.TableCreator;
-import com.jcorporate.expresso.core.registry.RequestRegistry;
import com.jcorporate.expresso.core.db.TypeMapper;
import com.jcorporate.expresso.core.dbobj.DBObject;
import com.jcorporate.expresso.core.dbobj.Schema;
import com.jcorporate.expresso.core.dbobj.SchemaFactory;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.i18n.Messages;
import com.jcorporate.expresso.core.job.Job;
import com.jcorporate.expresso.core.job.ServerException;
@@ -84,6 +107,7 @@
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.registry.RequestRegistry;
import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.core.servlet.StdServlet;
@@ -105,30 +129,6 @@
import com.jcorporate.expresso.services.html.Page;
import com.jcorporate.expresso.services.html.Paragraph;
import com.jcorporate.expresso.services.html.Text;
-import org.apache.log4j.Logger;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
/**
Index: DBToolTests.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java -u -r1.21 -r1.22
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/DBToolTests.java
@@ -64,12 +64,23 @@
package com.jcorporate.expresso.core.utility;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Enumeration;
+import java.util.TreeSet;
+import java.util.Vector;
+
+import junit.framework.TestSuite;
+
import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBConnectionPool;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.DBObject;
import com.jcorporate.expresso.core.dbobj.Schema;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.ext.dbobj.SingleDBUserInfo;
import com.jcorporate.expresso.kernel.ConsoleInstallLog;
import com.jcorporate.expresso.kernel.InstallLog;
@@ -78,17 +89,6 @@
import com.jcorporate.expresso.services.test.ExpressoTestCase;
import com.jcorporate.expresso.services.test.SchemaDeleter;
import com.jcorporate.expresso.services.test.TestSystemInitializer;
-import junit.framework.TestSuite;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Enumeration;
-import java.util.TreeSet;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: DefaultUserInfo.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java -u -r1.54 -r1.55
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/DefaultUserInfo.java
@@ -64,6 +64,17 @@
package com.jcorporate.expresso.services.dbobj;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.cache.Cache;
import com.jcorporate.expresso.core.cache.CacheException;
import com.jcorporate.expresso.core.cache.CacheManager;
@@ -73,7 +84,6 @@
import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.DBField;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.logging.LogException;
import com.jcorporate.expresso.core.misc.Base64;
@@ -84,22 +94,12 @@
import com.jcorporate.expresso.core.misc.EventHandler;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.CryptoManager;
+import com.jcorporate.expresso.core.security.ReadOnlyUser;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.core.security.UserInfo;
import com.jcorporate.expresso.kernel.exception.ChainedException;
import com.jcorporate.expresso.kernel.util.FastStringBuffer;
-import org.apache.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.ReadOnlyUser;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: Download.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java -u -r1.28 -r1.29
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/Download.java
@@ -64,6 +64,21 @@
package com.jcorporate.expresso.ext.controller;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.controller.Block;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
@@ -74,32 +89,18 @@
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.misc.DateTime;
import com.jcorporate.expresso.core.misc.EventHandler;
import com.jcorporate.expresso.core.misc.FileUtil;
import com.jcorporate.expresso.core.misc.RecordPaginator;
import com.jcorporate.expresso.core.misc.StringUtil;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.ext.dbobj.DownloadFiles;
import com.jcorporate.expresso.ext.dbobj.DownloadLog;
import com.jcorporate.expresso.ext.dbobj.RestrictedCountries;
import com.jcorporate.expresso.ext.dbobj.RestrictedOverrides;
import com.jcorporate.expresso.services.dbobj.MimeTypes;
-import org.apache.log4j.Logger;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
More information about the cvs
mailing list