[cvs] expresso commit by mtraum: organize imports
JCorporate Ltd
jcorp at jcorporate.com
Wed Apr 20 17:06:31 UTC 2005
Log Message:
-----------
organize imports
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job:
ClearOldValidation.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
Add.java
expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/jdbc/tests:
JoinedObjectTest.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry:
RequestRegistryFilter.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
ComponentManager.java
Revision Data
-------------
Index: JoinedObjectTest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/jdbc/tests/JoinedObjectTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lexpresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/jdbc/tests/JoinedObjectTest.java -Lexpresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/jdbc/tests/JoinedObjectTest.java -u -r1.4 -r1.5
--- expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/jdbc/tests/JoinedObjectTest.java
+++ expresso-web/WEB-INF/test-src/com/jcorporate/expresso/core/dataobjects/jdbc/tests/JoinedObjectTest.java
@@ -64,20 +64,21 @@
package com.jcorporate.expresso.core.dataobjects.jdbc.tests;
+import java.util.ArrayList;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import com.jcorporate.expresso.core.dataobjects.DataException;
-import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.dataobjects.jdbc.JoinedDataObject;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.ConfigurationException;
+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.services.test.TestSystemInitializer;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import com.jcorporate.expresso.core.security.*;
-import com.jcorporate.expresso.core.registry.*;
-import java.util.ArrayList;
-import com.jcorporate.expresso.services.dbobj.MimeTypes;
/**
Index: RequestRegistryFilter.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java -u -r1.7 -r1.8
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/registry/RequestRegistryFilter.java
@@ -63,16 +63,7 @@
package com.jcorporate.expresso.core.registry;
-import com.jcorporate.expresso.core.controller.NonHandleableException;
-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.jsdkapi.GenericSession;
-import com.jcorporate.expresso.core.misc.CurrentLogin;
-import com.jcorporate.expresso.core.security.SuperUser;
-import com.jcorporate.expresso.core.security.User;
-import com.jcorporate.expresso.core.servlet.CheckLogin;
-import com.jcorporate.expresso.services.dbobj.DefaultUserInfo;
+import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -82,7 +73,16 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
+
+import com.jcorporate.expresso.core.controller.NonHandleableException;
+import com.jcorporate.expresso.core.dataobjects.DataObject;
+import com.jcorporate.expresso.core.db.DBException;
+import com.jcorporate.expresso.core.jsdkapi.GenericSession;
+import com.jcorporate.expresso.core.misc.CurrentLogin;
+import com.jcorporate.expresso.core.security.SuperUser;
+import com.jcorporate.expresso.core.security.User;
+import com.jcorporate.expresso.core.servlet.CheckLogin;
+import com.jcorporate.expresso.services.dbobj.DefaultUserInfo;
/**
* Does a similar job as Expresso's checkLogin() but it also sets the
Index: ClearOldValidation.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java -u -r1.5 -r1.6
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/job/ClearOldValidation.java
@@ -63,13 +63,13 @@
*/
package com.jcorporate.expresso.services.job;
-import com.jcorporate.expresso.core.db.DBConnection;
-import com.jcorporate.expresso.core.dbobj.SecuredDBObject;
-import com.jcorporate.expresso.services.dbobj.ValidationQueue;
+import java.util.ArrayList;
+
import org.apache.log4j.Logger;
-import java.util.ArrayList;
+import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.security.SuperUser;
+import com.jcorporate.expresso.services.dbobj.ValidationQueue;
/**
* This job clears all expired validation queue entries. It is typically run
Index: Add.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java -u -r1.25 -r1.26
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java
@@ -65,6 +65,9 @@
package com.jcorporate.expresso.services.controller.dbmaint;
+import java.util.HashMap;
+import java.util.Map;
+
import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerRequest;
@@ -77,15 +80,10 @@
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.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.HashMap;
-import java.util.Map;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: ComponentManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/ComponentManager.java
@@ -64,6 +64,14 @@
package com.jcorporate.expresso.ext.controller;
+import java.util.ArrayList;
+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.ExpressoSchema;
import com.jcorporate.expresso.core.controller.Block;
import com.jcorporate.expresso.core.controller.Controller;
@@ -78,7 +86,6 @@
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.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.db.exception.DBRecordNotFoundException;
import com.jcorporate.expresso.core.dbobj.DBObject;
@@ -87,18 +94,11 @@
import com.jcorporate.expresso.core.job.Job;
import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.StringUtil;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.utility.DBTool;
import com.jcorporate.expresso.services.dbobj.SchemaList;
import com.jcorporate.expresso.services.test.SchemaCreator;
import com.jcorporate.expresso.services.test.SchemaDeleter;
-import org.apache.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
More information about the cvs
mailing list