You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sr...@apache.org on 2003/11/26 21:06:52 UTC
cvs commit: jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/lucene Engine.java SearchUtils.java
sraeburn 2003/11/26 12:06:52
Modified: scaffold/src/java/org/apache/commons/scaffold/util
ProcessBeanBase.java Scroller.java
ProcessResult.java ResultList.java
ProcessResultBase.java ProcessBean.java
ScrollerBean.java BizResponse.java
ResultListBase.java
scaffold/src/java/org/apache/commons/scaffold/sql
ServletAdaptor.java MockAdaptor.java
ResultSetUtils.java PoolmanAdaptor.java
CommandStore.java StorageBeanBase.java
scaffold/src/java/org/apache/commons/scaffold/http
ResourceServlet.java ConnectionServlet.java
SetUp.java
scaffold/src/java/org/apache/commons/scaffold/lucene
Engine.java SearchUtils.java
Log:
Remove unused imports
Revision Changes Path
1.10 +1 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessBeanBase.java
Index: ProcessBeanBase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessBeanBase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProcessBeanBase.java 23 Nov 2002 19:05:49 -0000 1.9
+++ ProcessBeanBase.java 26 Nov 2003 20:06:51 -0000 1.10
@@ -5,7 +5,6 @@
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.scaffold.lang.ChainedException;
// ------------------------------------------------------------------------ 78
1.6 +1 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/Scroller.java
Index: Scroller.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/Scroller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Scroller.java 23 Nov 2002 02:45:55 -0000 1.5
+++ Scroller.java 26 Nov 2003 20:06:51 -0000 1.6
@@ -1,7 +1,6 @@
package org.apache.commons.scaffold.util;
-import java.util.List;
import java.util.Map;
import org.apache.commons.scaffold.text.ConvertUtils;
1.4 +1 -3 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessResult.java
Index: ProcessResult.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessResult.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProcessResult.java 24 Nov 2002 15:53:53 -0000 1.3
+++ ProcessResult.java 26 Nov 2003 20:06:51 -0000 1.4
@@ -1,7 +1,5 @@
package org.apache.commons.scaffold.util;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
// ----------------------------------------------------------------------
1.5 +1 -7 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ResultList.java
Index: ResultList.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ResultList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResultList.java 23 Nov 2002 02:45:55 -0000 1.4
+++ ResultList.java 26 Nov 2003 20:06:51 -0000 1.5
@@ -1,16 +1,10 @@
package org.apache.commons.scaffold.util;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-
-import org.apache.commons.scaffold.lang.ChainedException;
/**
1.6 +1 -5 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessResultBase.java
Index: ProcessResultBase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessResultBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessResultBase.java 24 Nov 2002 15:53:53 -0000 1.5
+++ ProcessResultBase.java 26 Nov 2003 20:06:51 -0000 1.6
@@ -2,11 +2,7 @@
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
-
-import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.scaffold.lang.Tokens;
1.7 +1 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessBean.java
Index: ProcessBean.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ProcessBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProcessBean.java 23 Nov 2002 19:05:49 -0000 1.6
+++ ProcessBean.java 26 Nov 2003 20:06:51 -0000 1.7
@@ -2,7 +2,6 @@
import java.util.Locale;
-import java.util.Map;
/**
1.6 +1 -4 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ScrollerBean.java
Index: ScrollerBean.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ScrollerBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScrollerBean.java 13 Oct 2003 08:24:12 -0000 1.5
+++ ScrollerBean.java 26 Nov 2003 20:06:51 -0000 1.6
@@ -3,9 +3,6 @@
import java.util.Collection;
-import org.apache.commons.scaffold.lang.Tokens;
-
-import org.apache.commons.scaffold.lang.ParameterException;
import org.apache.commons.scaffold.lang.ResourceException;
1.3 +1 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/BizResponse.java
Index: BizResponse.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/BizResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BizResponse.java 24 Nov 2002 15:53:53 -0000 1.2
+++ BizResponse.java 26 Nov 2003 20:06:51 -0000 1.3
@@ -1,6 +1,5 @@
package org.apache.commons.scaffold.util;
-import java.util.List;
// ----------------------------------------------------------------------
1.4 +1 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ResultListBase.java
Index: ResultListBase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/util/ResultListBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResultListBase.java 18 Oct 2002 20:45:49 -0000 1.3
+++ ResultListBase.java 26 Nov 2003 20:06:51 -0000 1.4
@@ -8,7 +8,6 @@
import java.util.Map;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.scaffold.lang.ChainedException;
import org.apache.commons.scaffold.lang.Tokens;
1.3 +2 -3 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/ServletAdaptor.java
Index: ServletAdaptor.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/ServletAdaptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletAdaptor.java 13 Oct 2003 08:24:43 -0000 1.2
+++ ServletAdaptor.java 26 Nov 2003 20:06:52 -0000 1.3
@@ -1,7 +1,6 @@
package org.apache.commons.scaffold.sql;
-import java.sql.Connection;
import java.sql.SQLException;
import javax.servlet.http.HttpServlet;
@@ -34,7 +33,7 @@
* to allow access to the servlet context.
*/
public void setServlet(HttpServlet servlet) {
- this.servlet = servlet;
+ ServletAdaptor.servlet = servlet;
}
1.3 +3 -3 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/MockAdaptor.java
Index: MockAdaptor.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/MockAdaptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockAdaptor.java 13 Oct 2003 08:24:42 -0000 1.2
+++ MockAdaptor.java 26 Nov 2003 20:06:52 -0000 1.3
@@ -8,8 +8,8 @@
* @version $Revision$ $Date$
*/
-import java.sql.Connection;
import java.sql.SQLException;
+
import javax.sql.DataSource;
import com.mockobjects.sql.MockDataSource;
@@ -37,7 +37,7 @@
*/
public void setupDataSource(DataSource datasource) {
- this.datasource = datasource;
+ ConnectionAdaptor.datasource = datasource;
}
1.7 +3 -10 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/ResultSetUtils.java
Index: ResultSetUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/ResultSetUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResultSetUtils.java 13 Oct 2003 08:24:42 -0000 1.6
+++ ResultSetUtils.java 26 Nov 2003 20:06:52 -0000 1.7
@@ -2,19 +2,12 @@
import java.beans.PropertyDescriptor;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Types;
-
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -124,8 +117,8 @@
* @author Craig R. McClanahan
* @author Ralph Schaer
* @author Chris Audley
- * @author Rey Fran�ois
- * @author Gregor Ra�man
+ * @author Rey Fran�ois
+ * @author Gregor Ra�man
* @author Ted Husted
*
* @param bean JavaBean whose properties are being populated
1.3 +2 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/PoolmanAdaptor.java
Index: PoolmanAdaptor.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/PoolmanAdaptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PoolmanAdaptor.java 13 Oct 2003 08:24:42 -0000 1.2
+++ PoolmanAdaptor.java 26 Nov 2003 20:06:52 -0000 1.3
@@ -11,8 +11,8 @@
* @version $Revision$ $Date$
*/
-import java.sql.Connection;
import java.sql.SQLException;
+
import javax.sql.DataSource;
import com.codestudio.sql.PoolMan;
1.4 +2 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/CommandStore.java
Index: CommandStore.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/CommandStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommandStore.java 23 Nov 2002 02:12:02 -0000 1.3
+++ CommandStore.java 26 Nov 2003 20:06:52 -0000 1.4
@@ -74,7 +74,7 @@
*/
public CommandStore(Properties properties) {
- this.properties = properties;
+ CommandStore.properties = properties;
}
1.19 +3 -10 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/StorageBeanBase.java
Index: StorageBeanBase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/sql/StorageBeanBase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StorageBeanBase.java 13 Oct 2003 08:24:43 -0000 1.18
+++ StorageBeanBase.java 26 Nov 2003 20:06:52 -0000 1.19
@@ -3,7 +3,6 @@
import java.sql.SQLException;
import java.sql.Timestamp;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -11,24 +10,18 @@
import java.util.Properties;
import org.apache.commons.beanutils.BeanUtils;
-
import org.apache.commons.scaffold.lang.ParameterException;
import org.apache.commons.scaffold.lang.PopulateException;
import org.apache.commons.scaffold.lang.PropertiesException;
import org.apache.commons.scaffold.lang.ResourceException;
import org.apache.commons.scaffold.lang.Tokens;
-
-import org.apache.commons.scaffold.lucene.SearchUtils;
import org.apache.commons.scaffold.lucene.Engine;
-
-import org.apache.commons.scaffold.sql.StatementUtils;
+import org.apache.commons.scaffold.lucene.SearchUtils;
import org.apache.commons.scaffold.text.ConvertUtils;
-
-import org.apache.commons.scaffold.util.ResourceUtils;
-import org.apache.commons.scaffold.util.StorageBean;
import org.apache.commons.scaffold.util.ProcessBeanBase;
import org.apache.commons.scaffold.util.ProcessResult;
import org.apache.commons.scaffold.util.ProcessResultBase;
+import org.apache.commons.scaffold.util.StorageBean;
// ------------------------------------------------------------------------ 78
1.5 +0 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/ResourceServlet.java
Index: ResourceServlet.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/ResourceServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceServlet.java 13 Oct 2003 08:26:26 -0000 1.4
+++ ResourceServlet.java 26 Nov 2003 20:06:52 -0000 1.5
@@ -10,8 +10,6 @@
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.scaffold.lang.Log;
1.3 +0 -1 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/ConnectionServlet.java
Index: ConnectionServlet.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/ConnectionServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionServlet.java 13 Oct 2003 08:26:26 -0000 1.2
+++ ConnectionServlet.java 26 Nov 2003 20:06:52 -0000 1.3
@@ -2,7 +2,6 @@
import java.io.IOException;
-import java.util.Properties;
import javax.servlet.ServletException;
import org.apache.commons.scaffold.http.ResourceServlet;
1.4 +0 -2 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/SetUp.java
Index: SetUp.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/http/SetUp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetUp.java 13 Oct 2003 08:26:26 -0000 1.3
+++ SetUp.java 26 Nov 2003 20:06:52 -0000 1.4
@@ -5,8 +5,6 @@
import java.util.Properties;
import javax.servlet.ServletException;
-import org.apache.commons.scaffold.lucene.Engine;
-import org.apache.commons.scaffold.sql.ConnectionAdaptor;
import org.apache.commons.scaffold.http.ConnectionServlet;
/**
1.3 +4 -13 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/lucene/Engine.java
Index: Engine.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/lucene/Engine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Engine.java 13 Oct 2003 08:25:52 -0000 1.2
+++ Engine.java 26 Nov 2003 20:06:52 -0000 1.3
@@ -3,29 +3,20 @@
import java.io.IOException;
-import java.util.Collection;
+import org.apache.commons.scaffold.lang.ParameterException;
+import org.apache.commons.scaffold.lang.ResourceException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.StopAnalyzer;
-
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-
-import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.queryParser.ParseException;
-
+import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Searcher;
-
-import org.apache.commons.scaffold.lang.ParameterException;
-import org.apache.commons.scaffold.lang.ResourceException;
-import org.apache.commons.scaffold.lucene.SearchUtils;
/**
1.6 +4 -8 jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/lucene/SearchUtils.java
Index: SearchUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/scaffold/src/java/org/apache/commons/scaffold/lucene/SearchUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SearchUtils.java 13 Oct 2003 08:25:52 -0000 1.5
+++ SearchUtils.java 26 Nov 2003 20:06:52 -0000 1.6
@@ -1,21 +1,17 @@
package org.apache.commons.scaffold.lucene;
-import java.lang.reflect.InvocationTargetException;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.scaffold.lang.PopulateException;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.search.Hits;
-
-import org.apache.commons.beanutils.BeanUtils;
-
-import org.apache.commons.scaffold.lang.PopulateException;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org