[cvs] expresso commit by mtraum: organize imports
JCorporate Ltd
jcorp at jcorporate.com
Wed Apr 20 17:10:57 UTC 2005
Log Message:
-----------
organize imports
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller:
DataTransfer.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
ControllerSecurityMatrix.java
SimpleLoginController.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test:
ControllerTestCase.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
ConfigManager.java
Revision Data
-------------
Index: ControllerSecurityMatrix.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/ControllerSecurityMatrix.java
@@ -69,6 +69,11 @@
*/
package com.jcorporate.expresso.services.controller;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Vector;
+
import com.jcorporate.expresso.core.controller.Block;
import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.ControllerException;
@@ -83,20 +88,14 @@
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.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.StringUtil;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.servlet.StdServlet;
import com.jcorporate.expresso.services.dbobj.ControllerSecurity;
import com.jcorporate.expresso.services.dbobj.SchemaList;
import com.jcorporate.expresso.services.dbobj.UserGroup;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
Index: SimpleLoginController.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java -u -r1.33 -r1.34
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/SimpleLoginController.java
@@ -89,7 +89,6 @@
import com.jcorporate.expresso.core.controller.State;
import com.jcorporate.expresso.core.controller.Transition;
import com.jcorporate.expresso.core.controller.session.PersistentSession;
-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.ValidValue;
@@ -98,13 +97,13 @@
import com.jcorporate.expresso.core.misc.ConfigurationException;
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.util.FastStringBuffer;
import com.jcorporate.expresso.services.dbobj.RegistrationDomain;
import com.jcorporate.expresso.services.dbobj.Setup;
import com.jcorporate.expresso.services.validation.AuthValidationException;
import com.jcorporate.expresso.services.validation.ValidationEntry;
-import com.jcorporate.expresso.core.security.SuperUser;
/**
* Main Login Controller - used for login/logout and basic interaction with
Index: ControllerTestCase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java
@@ -65,36 +65,33 @@
package com.jcorporate.expresso.services.test;
import java.io.IOException;
-import java.net.HttpURLConnection;
import java.util.ArrayList;
import java.util.List;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
+
+import org.apache.cactus.ServletTestCase;
+import org.apache.cactus.WebRequest;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionServlet;
+import org.apache.struts.config.ActionConfig;
+import org.apache.struts.util.RequestUtils;
+
import com.jcorporate.expresso.core.ExpressoConstants;
import com.jcorporate.expresso.core.controller.Controller;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerResponse;
+import com.jcorporate.expresso.core.controller.ExpressoActionServlet;
import com.jcorporate.expresso.core.db.DBConnectionPool;
import com.jcorporate.expresso.core.dbobj.Schema;
import com.jcorporate.expresso.core.dbobj.SchemaFactory;
import com.jcorporate.expresso.core.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.CookieUtil;
-import com.jcorporate.expresso.core.misc.StringDOMParser;
-import com.jcorporate.expresso.core.controller.ExpressoActionServlet;
import com.jcorporate.expresso.kernel.ConsoleInstallLog;
-import org.apache.cactus.WebRequest;
-import org.apache.cactus.WebResponse;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
-import org.apache.struts.config.ActionConfig;
-import org.apache.struts.util.RequestUtils;
-import org.apache.xpath.XPathAPI;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.apache.cactus.ServletTestCase;
/**
Index: DataTransfer.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/ext/controller/DataTransfer.java
@@ -64,6 +64,12 @@
package com.jcorporate.expresso.ext.controller;
+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;
@@ -77,18 +83,12 @@
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.misc.ConfigManager;
import com.jcorporate.expresso.core.misc.ConfigurationException;
import com.jcorporate.expresso.core.misc.StringUtil;
-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;
+import com.jcorporate.expresso.services.dbobj.SchemaList;
/**
Index: ConfigManager.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java -u -r1.84 -r1.85
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/ConfigManager.java
@@ -64,6 +64,35 @@
package com.jcorporate.expresso.core.misc;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+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.Vector;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.digester.Digester;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.config.ActionConfig;
+import org.apache.struts.config.ForwardConfig;
+import org.apache.struts.config.ModuleConfig;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
import com.jcorporate.expresso.core.cache.CacheManager;
import com.jcorporate.expresso.core.controller.ControllerException;
import com.jcorporate.expresso.core.controller.ControllerFactory;
@@ -72,13 +101,12 @@
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.job.ServerException;
import com.jcorporate.expresso.core.jsdkapi.GenericDispatcher;
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.ReadOnlyUser;
+import com.jcorporate.expresso.core.security.SuperUser;
import com.jcorporate.expresso.core.utility.JobHandler;
import com.jcorporate.expresso.kernel.LogManager;
import com.jcorporate.expresso.kernel.digester.SaxParserConfigurer;
@@ -87,33 +115,6 @@
import com.jcorporate.expresso.services.dbobj.SchemaList;
import com.jcorporate.expresso.services.dbobj.Setup;
import com.jcorporate.expresso.services.test.TestSystemInitializer;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.digester.Digester;
-import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.config.ActionConfig;
-import org.apache.struts.config.ForwardConfig;
-import org.apache.struts.config.ModuleConfig;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-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.Vector;
/**
* ConfigManager is a static class that utilizes the Struts Digester
More information about the cvs
mailing list