[cvs] expresso commit by mtraum: organize imports
JCorporate Ltd
jcorp at jcorporate.com
Wed Apr 20 17:41:07 UTC 2005
Log Message:
-----------
organize imports
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security:
User.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
UserGroup.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller:
XMLController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
ViewBlob.java
Update.java
UpdateUpdate.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation:
ValidationEntry.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
DefaultForm.java
Revision Data
-------------
Index: UpdateUpdate.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java -u -r1.23 -r1.24
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java
@@ -70,6 +70,8 @@
* Copyright 1999, 2000, 2001 Jcorporate Ltd.
*/
+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,11 +83,9 @@
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 org.apache.log4j.Logger;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: ViewBlob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java -u -r1.13 -r1.14
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java
@@ -63,6 +63,14 @@
*/
package com.jcorporate.expresso.services.controller.dbmaint;
+import java.io.InputStream;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletResponse;
+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;
@@ -77,17 +85,10 @@
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.dbobj.MediaDBObject;
import com.jcorporate.expresso.services.dbobj.MimeTypes;
import com.jcorporate.expresso.services.dbobj.Setup;
-import org.apache.log4j.Logger;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-import java.io.InputStream;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: Update.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java -u -r1.28 -r1.29
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java
@@ -64,6 +64,11 @@
package com.jcorporate.expresso.services.controller.dbmaint;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
import com.jcorporate.expresso.core.controller.Block;
import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.ControllerException;
@@ -78,22 +83,16 @@
import com.jcorporate.expresso.core.dataobjects.Defineable;
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.ConfigManager;
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.core.security.UserInfo;
import com.jcorporate.expresso.services.controller.ui.DefaultAutoElement;
import com.jcorporate.expresso.services.dbobj.RegistrationDomain;
import com.jcorporate.expresso.services.dbobj.RegistrationObjectMap;
import com.jcorporate.expresso.services.dbobj.Setup;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: User.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java -u -r1.56 -r1.57
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/User.java
@@ -70,15 +70,27 @@
package com.jcorporate.expresso.core.security;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.mail.internet.MimeBodyPart;
+
+import org.apache.log4j.Logger;
+
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+
import com.jcorporate.expresso.core.controller.ControllerRequest;
import com.jcorporate.expresso.core.dataobjects.ContextNested;
import com.jcorporate.expresso.core.dataobjects.DataObject;
import com.jcorporate.expresso.core.dataobjects.Mappable;
+import com.jcorporate.expresso.core.dataobjects.Securable;
import com.jcorporate.expresso.core.db.DBConnection;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.dbobj.LookupInterface;
-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.ByteArrayDataSource;
@@ -87,21 +99,10 @@
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.MutableRequestRegistry;
import com.jcorporate.expresso.core.registry.RequestRegistry;
import com.jcorporate.expresso.kernel.util.FastStringBuffer;
import com.jcorporate.expresso.services.dbobj.UserGroup;
-import org.apache.log4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.mail.internet.MimeBodyPart;
-import com.jcorporate.expresso.core.dataobjects.Securable;
-import com.jcorporate.expresso.core.registry.MutableRequestRegistry;
/**
Index: ValidationEntry.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation/ValidationEntry.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation/ValidationEntry.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation/ValidationEntry.java -u -r1.28 -r1.29
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation/ValidationEntry.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/validation/ValidationEntry.java
@@ -78,7 +78,6 @@
import org.apache.log4j.Logger;
import com.jcorporate.expresso.core.db.DBException;
-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;
@@ -87,6 +86,7 @@
import com.jcorporate.expresso.core.misc.EMailSender;
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.CryptoManager;
+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.kernel.util.ClassLocator;
@@ -96,7 +96,6 @@
import com.jcorporate.expresso.services.dbobj.Setup;
import com.jcorporate.expresso.services.dbobj.ValidationQueue;
import com.jcorporate.expresso.services.dbobj.ValidationQueueParam;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: UserGroup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java -u -r1.26 -r1.27
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/UserGroup.java
@@ -64,15 +64,14 @@
package com.jcorporate.expresso.services.dbobj;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
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.SecuredDBObject;
import com.jcorporate.expresso.core.i18n.Messages;
-
-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: XMLController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/xml/controller/XMLController.java
@@ -69,6 +69,16 @@
*/
package com.jcorporate.expresso.ext.xml.controller;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+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;
@@ -82,20 +92,10 @@
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.ext.xml.dbobj.XMLDBObject;
import com.jcorporate.expresso.services.dbobj.SchemaList;
-import org.apache.log4j.Logger;
-
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: DefaultForm.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -u -r1.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
@@ -64,9 +64,16 @@
package com.jcorporate.expresso.core.controller;
-import com.jcorporate.expresso.core.i18n.Messages;
-import com.jcorporate.expresso.core.misc.StringUtil;
-import com.jcorporate.expresso.core.misc.URLUTF8Encoder;
+import java.io.Serializable;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Locale;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.validator.Validator;
@@ -79,16 +86,9 @@
import org.apache.struts.util.RequestUtils;
import org.apache.struts.validator.Resources;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import java.io.Serializable;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.StringTokenizer;
+import com.jcorporate.expresso.core.i18n.Messages;
import com.jcorporate.expresso.core.misc.ConfigManager;
+import com.jcorporate.expresso.core.misc.StringUtil;
/**
More information about the cvs
mailing list