vladimir 2003/02/10 12:33:14
Modified: java/scratchpad/admin/src/org/apache/xindice/admin
XindiceAdmin.java
java/scratchpad/admin/src/org/apache/xindice/admin/commandline
BaseCommand.java BasePrompt.java
CommandRegister.java ShellPrompt.java
XindiceTools.java
java/scratchpad/admin/src/org/apache/xindice/admin/commands
AddCommand.java CreateCommand.java DropCommand.java
ExportCommand.java GetCommand.java
ImportCommand.java IndexCommand.java
InfoCommand.java ListCommand.java QueryCommand.java
ShutdownCommand.java UseCommand.java
Log:
fixed the imports because they bug me everytime I run PMD on my other projects
Revision Changes Path
1.4 +10 -9
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/XindiceAdmin.java
Index: XindiceAdmin.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/XindiceAdmin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XindiceAdmin.java 5 Dec 2002 06:50:23 -0000 1.3
+++ XindiceAdmin.java 10 Feb 2003 20:33:13 -0000 1.4
@@ -59,21 +59,22 @@
* $Id$
*/
+import java.security.Security;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import javax.net.ssl.SSLSocketFactory;
+
import org.apache.xindice.admin.commandline.ShellPrompt;
import org.apache.xindice.admin.xmlrpc.XindiceX509TrustManager;
import org.apache.xmlrpc.XmlRpc;
import org.apache.xmlrpc.XmlRpcClient;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.security.Security;
-
-import com.sun.net.ssl.KeyManager;
-import com.sun.net.ssl.SSLContext;
+/* TODO why not use the javax.net.ssl package? */
import com.sun.net.ssl.HostnameVerifier;
import com.sun.net.ssl.internal.www.protocol.https.HttpsURLConnection;
-
-import javax.net.ssl.SSLSocketFactory;
+import com.sun.net.ssl.KeyManager;
+import com.sun.net.ssl.SSLContext;
/**
* Command line tools
1.5 +3 -4
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/BaseCommand.java
Index: BaseCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/BaseCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseCommand.java 5 Dec 2002 06:50:23 -0000 1.4
+++ BaseCommand.java 10 Feb 2003 20:33:13 -0000 1.5
@@ -59,11 +59,10 @@
* $Id$
*/
-import org.apache.xindice.admin.utility.StopWatch;
-
import java.util.Iterator;
import java.util.Vector;
-import java.util.Hashtable;
+
+import org.apache.xindice.admin.utility.StopWatch;
/**
* Base class for creating named commands.
1.5 +6 -6
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/BasePrompt.java
Index: BasePrompt.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/BasePrompt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasePrompt.java 5 Dec 2002 06:50:23 -0000 1.4
+++ BasePrompt.java 10 Feb 2003 20:33:13 -0000 1.5
@@ -59,11 +59,11 @@
* $Id$
*/
-import java.util.StringTokenizer;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Iterator;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
/**
* Base class for all command prompts.
1.5 +3 -3
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/CommandRegister.java
Index: CommandRegister.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/CommandRegister.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CommandRegister.java 5 Dec 2002 06:50:23 -0000 1.4
+++ CommandRegister.java 10 Feb 2003 20:33:13 -0000 1.5
@@ -59,9 +59,9 @@
* $Id$
*/
-import java.util.StringTokenizer;
-import java.util.Iterator;
import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.StringTokenizer;
import java.util.Vector;
/**
1.4 +1 -5
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/ShellPrompt.java
Index: ShellPrompt.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/ShellPrompt.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ShellPrompt.java 9 Nov 2002 06:21:08 -0000 1.3
+++ ShellPrompt.java 10 Feb 2003 20:33:13 -0000 1.4
@@ -59,10 +59,6 @@
* $Id$
*/
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.io.*;
/**
* Command prompt
1.5 +11 -2
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/XindiceTools.java
Index: XindiceTools.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commandline/XindiceTools.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XindiceTools.java 5 Dec 2002 06:50:23 -0000 1.4
+++ XindiceTools.java 10 Feb 2003 20:33:13 -0000 1.5
@@ -59,7 +59,16 @@
* $Id$
*/
-import org.apache.xindice.admin.commands.*;
+import org.apache.xindice.admin.commands.CreateCommand;
+import org.apache.xindice.admin.commands.DirCommand;
+import org.apache.xindice.admin.commands.DropCommand;
+import org.apache.xindice.admin.commands.ExitCommand;
+import org.apache.xindice.admin.commands.HelpCommand;
+import org.apache.xindice.admin.commands.InfoCommand;
+import org.apache.xindice.admin.commands.ListCommand;
+import org.apache.xindice.admin.commands.RunScriptCommand;
+import org.apache.xindice.admin.commands.TimeCommand;
+import org.apache.xindice.admin.commands.UseCommand;
/**
* Register the commands to be made availabe; this could easily be modified
1.2 +0 -4
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/AddCommand.java
Index: AddCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/AddCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddCommand.java 9 Nov 2002 06:19:24 -0000 1.1
+++ AddCommand.java 10 Feb 2003 20:33:13 -0000 1.2
@@ -1,10 +1,6 @@
package org.apache.xindice.admin.commands;
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
/**
* This command is used to query information about any command that has
1.6 +1 -4
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/CreateCommand.java
Index: CreateCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/CreateCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CreateCommand.java 5 Dec 2002 06:50:23 -0000 1.5
+++ CreateCommand.java 10 Feb 2003 20:33:13 -0000 1.6
@@ -59,12 +59,9 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
import java.util.Hashtable;
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
import org.apache.xindice.admin.XindiceAdmin;
/**
1.3 +1 -4
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/DropCommand.java
Index: DropCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/DropCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DropCommand.java 5 Dec 2002 06:50:23 -0000 1.2
+++ DropCommand.java 10 Feb 2003 20:33:13 -0000 1.3
@@ -59,12 +59,9 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
import java.util.Hashtable;
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
import org.apache.xindice.admin.XindiceAdmin;
/**
1.2 +1 -5
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ExportCommand.java
Index: ExportCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ExportCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExportCommand.java 10 Nov 2002 19:51:30 -0000 1.1
+++ ExportCommand.java 10 Feb 2003 20:33:13 -0000 1.2
@@ -59,11 +59,7 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
/**
* Command for creating collections
1.2 +1 -5
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/GetCommand.java
Index: GetCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/GetCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GetCommand.java 10 Nov 2002 19:51:30 -0000 1.1
+++ GetCommand.java 10 Feb 2003 20:33:13 -0000 1.2
@@ -59,11 +59,7 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
/**
* Command for creating collections
1.2 +1 -5
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ImportCommand.java
Index: ImportCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ImportCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ImportCommand.java 10 Nov 2002 19:51:30 -0000 1.1
+++ ImportCommand.java 10 Feb 2003 20:33:13 -0000 1.2
@@ -59,11 +59,7 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
/**
* Command for creating collections
1.2 +1 -5
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/IndexCommand.java
Index: IndexCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/IndexCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IndexCommand.java 10 Nov 2002 19:51:30 -0000 1.1
+++ IndexCommand.java 10 Feb 2003 20:33:13 -0000 1.2
@@ -59,11 +59,7 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
/**
* Command for creating collections
1.3 +0 -4
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/InfoCommand.java
Index: InfoCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/InfoCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InfoCommand.java 5 Dec 2002 06:50:23 -0000 1.2
+++ InfoCommand.java 10 Feb 2003 20:33:13 -0000 1.3
@@ -2,11 +2,7 @@
import org.apache.xindice.admin.commandline.BaseCommand;
import org.apache.xindice.admin.XindiceAdmin;
-import org.apache.xmlrpc.XmlRpc;
-import org.apache.xmlrpc.XmlRpcClient;
import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Date;
/**
* Displays client/server info
1.6 +1 -3
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ListCommand.java
Index: ListCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ListCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListCommand.java 5 Dec 2002 06:50:23 -0000 1.5
+++ ListCommand.java 10 Feb 2003 20:33:13 -0000 1.6
@@ -60,12 +60,10 @@
*/
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.CommandException;
import org.apache.xindice.admin.XindiceAdmin;
import java.util.Hashtable;
import java.util.Vector;
-import java.util.Date;
import java.util.Enumeration;
/**
1.4 +1 -4
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/QueryCommand.java
Index: QueryCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/QueryCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QueryCommand.java 9 Nov 2002 06:19:24 -0000 1.3
+++ QueryCommand.java 10 Feb 2003 20:33:13 -0000 1.4
@@ -59,10 +59,7 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
/**
* Command for querying collections and documents
1.2 +1 -5
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ShutdownCommand.java
Index: ShutdownCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/ShutdownCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ShutdownCommand.java 10 Nov 2002 19:51:30 -0000 1.1
+++ ShutdownCommand.java 10 Feb 2003 20:33:13 -0000 1.2
@@ -59,11 +59,7 @@
* $Id$
*/
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
/**
* Command for creating collections
1.5 +1 -2
xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/UseCommand.java
Index: UseCommand.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/scratchpad/admin/src/org/apache/xindice/admin/commands/UseCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UseCommand.java 5 Dec 2002 06:50:23 -0000 1.4
+++ UseCommand.java 10 Feb 2003 20:33:13 -0000 1.5
@@ -62,7 +62,6 @@
import java.util.*;
import org.apache.xindice.admin.commandline.BaseCommand;
-import org.apache.xindice.admin.commandline.Command;
import org.apache.xindice.admin.XindiceAdmin;
/**
