[cvs] expresso commit by mtraum: organize imports
JCorporate Ltd
jcorp at jcorporate.com
Wed Apr 20 17:32:28 UTC 2005
Log Message:
-----------
organize imports
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
List.java
DynamicCmd.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging:
Log.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
GroupNest.java
JobSecurity.java
GroupMembers.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
JobSecurityMatrix.java
ErrorHandler.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
JobHandler.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report:
DownloadUsers.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job:
Job.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core:
ExpressoSchema.java
Revision Data
-------------
Index: DownloadUsers.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/report/DownloadUsers.java
@@ -64,19 +64,18 @@
package com.jcorporate.expresso.ext.report;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+
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.SecuredDBObject;
+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.ext.dbobj.DownloadLog;
import com.jcorporate.expresso.services.html.HtmlException;
import com.jcorporate.expresso.services.html.ReportPage;
-
-import java.io.PrintWriter;
-import java.util.Enumeration;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: DynamicCmd.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java -u -r1.43 -r1.44
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java
@@ -64,6 +64,13 @@
package com.jcorporate.expresso.services.controller.dbmaint;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.controller.Block;
import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.ControllerException;
@@ -80,24 +87,17 @@
import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.DBObject;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.ConfigurationException;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.misc.URLUTF8Encoder;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.kernel.util.ClassLocator;
import com.jcorporate.expresso.kernel.util.FastStringBuffer;
import com.jcorporate.expresso.services.dbobj.DBObjLimit;
import com.jcorporate.expresso.services.dbobj.Setup;
-import org.apache.log4j.Logger;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: List.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/List.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/List.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/List.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/List.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/List.java
@@ -72,11 +72,9 @@
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.expresso.core.security.User;
-import com.jcorporate.expresso.services.dbobj.Setup;
import com.jcorporate.expresso.core.security.SuperUser;
+import com.jcorporate.expresso.services.dbobj.Setup;
/**
* list all records in a DBObject.
Index: Log.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/logging/Log.java
@@ -69,17 +69,17 @@
package com.jcorporate.expresso.core.logging;
-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.SecuredDBObject;
-import com.jcorporate.expresso.services.dbobj.LogEntry;
-
-import javax.servlet.ServletContext;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+
+import javax.servlet.ServletContext;
+
+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.security.SuperUser;
+import com.jcorporate.expresso.services.dbobj.LogEntry;
/**
Index: GroupMembers.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java -u -r1.29 -r1.30
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupMembers.java
@@ -64,20 +64,20 @@
package com.jcorporate.expresso.services.dbobj;
+import java.util.Date;
+import java.util.Iterator;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.controller.ControllerRequest;
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.misc.StringUtil;
-import com.jcorporate.expresso.core.security.User;
-import com.jcorporate.expresso.core.security.UserListener;
-import org.apache.log4j.Logger;
-
-import java.util.Date;
-import java.util.Iterator;
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.UserListener;
/**
Index: JobSecurity.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java -u -r1.14 -r1.15
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobSecurity.java
@@ -64,17 +64,16 @@
package com.jcorporate.expresso.services.dbobj;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Vector;
+
import com.jcorporate.expresso.core.controller.ControllerRequest;
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.dbobj.ValidValue;
import com.jcorporate.expresso.core.job.Job;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
import com.jcorporate.expresso.core.security.ReadOnlyUser;
import com.jcorporate.expresso.core.security.SuperUser;
Index: GroupNest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupNest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupNest.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupNest.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupNest.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/GroupNest.java
@@ -64,11 +64,10 @@
package com.jcorporate.expresso.services.dbobj;
+import java.util.Iterator;
+
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.RequestContext;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-
-import java.util.Iterator;
import com.jcorporate.expresso.core.security.ReadOnlyUser;
import com.jcorporate.expresso.core.security.SuperUser;
Index: Job.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java -u -r1.37 -r1.38
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/job/Job.java
@@ -64,14 +64,25 @@
package com.jcorporate.expresso.core.job;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.ExpressoSchema;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.i18n.Messages;
import com.jcorporate.expresso.core.misc.EMailSender;
import com.jcorporate.expresso.core.misc.EventHandler;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.registry.ExpressoThread;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.kernel.util.ClassLocator;
import com.jcorporate.expresso.kernel.util.FastStringBuffer;
@@ -80,17 +91,6 @@
import com.jcorporate.expresso.services.dbobj.JobQueue;
import com.jcorporate.expresso.services.dbobj.JobQueueParam;
import com.jcorporate.expresso.services.dbobj.Setup;
-import org.apache.log4j.Logger;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
* A Job is an asynchronous task who's results will generally be emailed to
Index: JobSecurityMatrix.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/JobSecurityMatrix.java
@@ -70,6 +70,13 @@
* Copyright 2000, 2001 Jcorporate Ltd.
*/
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Vector;
+
+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;
@@ -84,20 +91,13 @@
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.dbobj.ValidValue;
import com.jcorporate.expresso.core.job.Job;
import com.jcorporate.expresso.core.misc.StringUtil;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.services.dbobj.JobSecurity;
import com.jcorporate.expresso.services.dbobj.SchemaList;
import com.jcorporate.expresso.services.dbobj.UserGroup;
-import org.apache.log4j.Logger;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: ErrorHandler.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ErrorHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ErrorHandler.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ErrorHandler.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ErrorHandler.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ErrorHandler.java
@@ -64,6 +64,13 @@
package com.jcorporate.expresso.services.controller;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
+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;
@@ -72,7 +79,6 @@
import com.jcorporate.expresso.core.controller.Output;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.ConfigurationException;
import com.jcorporate.expresso.core.misc.DateTime;
@@ -80,17 +86,11 @@
import com.jcorporate.expresso.core.misc.EventHandler;
import com.jcorporate.expresso.core.misc.SerializableString;
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.kernel.exception.ChainedException;
import com.jcorporate.expresso.services.dbobj.DBMessage;
import com.jcorporate.expresso.services.dbobj.Setup;
-import org.apache.log4j.Logger;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: JobHandler.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java -u -r1.36 -r1.37
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/JobHandler.java
@@ -64,11 +64,22 @@
package com.jcorporate.expresso.core.utility;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
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.NextNumber;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.job.Job;
import com.jcorporate.expresso.core.job.ServerException;
import com.jcorporate.expresso.core.misc.ConfigManager;
@@ -86,17 +97,6 @@
import com.jcorporate.expresso.services.dbobj.JobHandlerRegistry;
import com.jcorporate.expresso.services.dbobj.JobQueue;
import com.jcorporate.expresso.services.dbobj.Setup;
-import org.apache.log4j.Logger;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
/**
Index: ExpressoSchema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java -u -r1.56 -r1.57
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java
@@ -65,13 +65,12 @@
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.Schema;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.misc.ConfigManager;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.kernel.InstallLog;
import com.jcorporate.expresso.kernel.util.ClassLocator;
import com.jcorporate.expresso.services.dbobj.JobQueue;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
More information about the cvs
mailing list