[cvs] expresso commit by mtraum: organize imports
JCorporate Ltd
jcorp at jcorporate.com
Wed Apr 20 17:37:20 UTC 2005
Log Message:
-----------
organize imports
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
TestController.java
ReportServer.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job:
SendNotice.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test:
SchemaCreator.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
Log.java
QueueJob.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
Search.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility:
QueueJob.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
RecordPaginator.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job:
TestJob.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
SecureIfSetController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj:
RegisteredUser.java
Revision Data
-------------
Index: TestJob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/TestJob.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/TestJob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/TestJob.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/TestJob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/TestJob.java
@@ -69,16 +69,16 @@
*/
package com.jcorporate.expresso.services.job;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
+import java.util.Iterator;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.job.Job;
import com.jcorporate.expresso.core.misc.EventHandler;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.security.User;
import com.jcorporate.expresso.services.dbobj.JobQueue;
import com.jcorporate.expresso.services.dbobj.JobQueueParam;
-import org.apache.log4j.Logger;
-
-import java.util.Iterator;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: ReportServer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java -u -r1.5 -r1.6
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ReportServer.java
@@ -63,6 +63,13 @@
*/
package com.jcorporate.expresso.ext.controller;
+import java.util.Iterator;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletResponse;
+
+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;
@@ -74,19 +81,13 @@
import com.jcorporate.expresso.core.controller.Transition;
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.dbobj.ValidValue;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.ext.report.ExpressoReport;
import com.jcorporate.expresso.ext.report.MultiFormatReport;
import com.jcorporate.expresso.ext.report.ReportException;
import com.jcorporate.expresso.kernel.util.ClassLocator;
import com.jcorporate.expresso.services.dbobj.SchemaList;
-import org.apache.log4j.Logger;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.Iterator;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: TestController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/TestController.java
@@ -70,6 +70,29 @@
package com.jcorporate.expresso.ext.controller;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.text.NumberFormat;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Vector;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestFailure;
+import junit.framework.TestListener;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+import junit.runner.ReloadingTestSuiteLoader;
+import junit.runner.StandardTestSuiteLoader;
+import junit.runner.TestSuiteLoader;
+
+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;
@@ -81,33 +104,11 @@
import com.jcorporate.expresso.core.controller.Transition;
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.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.ConfigManager;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.services.controller.Registration;
import com.jcorporate.expresso.services.dbobj.SchemaList;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestFailure;
-import junit.framework.TestListener;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.runner.ReloadingTestSuiteLoader;
-import junit.runner.StandardTestSuiteLoader;
-import junit.runner.TestSuiteLoader;
-import org.apache.log4j.Logger;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.text.NumberFormat;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: SendNotice.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/job/SendNotice.java
@@ -69,20 +69,21 @@
*/
package com.jcorporate.expresso.ext.job;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import javax.servlet.ServletException;
+
+import org.apache.log4j.Logger;
+
import com.jcorporate.expresso.core.job.Job;
+import com.jcorporate.expresso.core.security.SuperUser;
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.JobQueue;
import com.jcorporate.expresso.services.dbobj.JobQueueParam;
-import org.apache.log4j.Logger;
-
-import javax.servlet.ServletException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: SchemaCreator.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/SchemaCreator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/SchemaCreator.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/SchemaCreator.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/SchemaCreator.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/SchemaCreator.java
@@ -64,18 +64,18 @@
package com.jcorporate.expresso.services.test;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import org.apache.log4j.Logger;
+
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.core.utility.DBTool;
import com.jcorporate.expresso.kernel.InstallLog;
import com.jcorporate.expresso.services.dbobj.SchemaList;
-import org.apache.log4j.Logger;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: Log.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Log.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Log.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Log.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Log.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/Log.java
@@ -69,6 +69,8 @@
*/
package com.jcorporate.expresso.services.controller;
+import java.util.Iterator;
+
import com.jcorporate.expresso.core.controller.Block;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
@@ -77,13 +79,10 @@
import com.jcorporate.expresso.core.controller.Output;
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
import com.jcorporate.expresso.core.logging.LogException;
import com.jcorporate.expresso.core.logging.LogHandler;
-import com.jcorporate.expresso.services.dbobj.LogEntry;
-
-import java.util.Iterator;
import com.jcorporate.expresso.core.security.SuperUser;
+import com.jcorporate.expresso.services.dbobj.LogEntry;
/**
Index: QueueJob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/QueueJob.java
@@ -70,6 +70,14 @@
* Copyright 2000, 2001 Jcorporate Ltd.
*/
+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.controller.Controller;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
@@ -84,23 +92,15 @@
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.core.security.User;
import com.jcorporate.expresso.services.dbobj.JobQueue;
import com.jcorporate.expresso.services.dbobj.JobQueueParam;
import com.jcorporate.expresso.services.dbobj.JobSecurity;
import com.jcorporate.expresso.services.dbobj.SchemaList;
-import org.apache.log4j.Logger;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import java.util.List;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: Search.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java -u -r1.27 -r1.28
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java
@@ -64,6 +64,8 @@
package com.jcorporate.expresso.services.controller.dbmaint;
+import java.util.Vector;
+
import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
@@ -76,15 +78,11 @@
import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
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.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.expresso.core.security.User;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.services.controller.ui.DefaultAutoElement;
import com.jcorporate.expresso.services.dbobj.Setup;
-
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: SecureIfSetController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java -u -r1.7 -r1.8
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/SecureIfSetController.java
@@ -67,9 +67,8 @@
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.ControllerSecurity;
import com.jcorporate.expresso.core.security.SuperUser;
+import com.jcorporate.expresso.services.dbobj.ControllerSecurity;
/**
* Controller that uses security if the security system is available.
Index: QueueJob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/utility/QueueJob.java
@@ -69,17 +69,16 @@
*/
package com.jcorporate.expresso.core.utility;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+
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.security.SuperUser;
import com.jcorporate.expresso.kernel.LogManager;
import com.jcorporate.expresso.services.dbobj.JobQueue;
import com.jcorporate.expresso.services.dbobj.JobQueueParam;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: RecordPaginator.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/RecordPaginator.java
@@ -64,21 +64,20 @@
package com.jcorporate.expresso.core.misc;
-import com.jcorporate.expresso.core.controller.ControllerException;
-import com.jcorporate.expresso.core.controller.ControllerRequest;
-import com.jcorporate.expresso.core.dataobjects.DataObject;
-import com.jcorporate.expresso.core.db.DBException;
-import com.jcorporate.expresso.core.dbobj.MultiDBObject;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.expresso.services.dbobj.DBObjLimit;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+
+import com.jcorporate.expresso.core.controller.ControllerException;
+import com.jcorporate.expresso.core.controller.ControllerRequest;
+import com.jcorporate.expresso.core.dataobjects.DataObject;
+import com.jcorporate.expresso.core.db.DBException;
+import com.jcorporate.expresso.core.dbobj.MultiDBObject;
import com.jcorporate.expresso.core.security.SuperUser;
+import com.jcorporate.expresso.services.dbobj.DBObjLimit;
/**
Index: RegisteredUser.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java -u -r1.26 -r1.27
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/dbobj/RegisteredUser.java
@@ -64,21 +64,20 @@
package com.jcorporate.expresso.ext.dbobj;
+import java.util.Iterator;
+import java.util.Vector;
+
import com.jcorporate.expresso.core.db.DBConnection;
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.dbobj.ValidValue;
import com.jcorporate.expresso.core.misc.DateTime;
import com.jcorporate.expresso.core.misc.EventHandler;
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.util.FastStringBuffer;
-
-import java.util.Iterator;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
* Extention to the normal user object to record some additional information
More information about the cvs
mailing list