Organizing imports, removed asterisks and duplicities

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

Author: dmatej

functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ProcessMonitorThread.java

@@ -19,9 +19,11 @@
 
 package com.sun.corba.ee.impl.activation;
 
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import java.util.Iterator;
+import java.util.Map;
+
 /** ProcessMonitorThread is started when ServerManager is instantiated. The
   * thread wakes up every minute (This can be changed by setting sleepTime) and
   * makes sure that all the processes (Servers) registered with the ServerTool

functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java

@@ -19,17 +19,20 @@
 
 package com.sun.corba.ee.impl.activation;
 
+import com.sun.corba.ee.spi.activation.Activator;
+import com.sun.corba.ee.spi.activation.ActivatorHelper;
+import com.sun.corba.ee.spi.misc.ORBClassLoader;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.io.*;
 import java.util.Date;
 import java.util.Properties;
 
 import org.omg.CORBA.ORB;
-import com.sun.corba.ee.spi.activation.Activator;
-import com.sun.corba.ee.spi.activation.ActivatorHelper;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.misc.ORBClassLoader;
 
 /**
  * @version     1.8, 99/11/02

functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTool.java

@@ -19,24 +19,38 @@
 
 package com.sun.corba.ee.impl.activation;
 
+import com.sun.corba.ee.impl.misc.CorbaResourceUtil;
+import com.sun.corba.ee.spi.activation.Activator;
+import com.sun.corba.ee.spi.activation.ActivatorHelper;
+import com.sun.corba.ee.spi.activation.BadServerDefinition;
+import com.sun.corba.ee.spi.activation.EndPointInfo;
+import com.sun.corba.ee.spi.activation.IIOP_CLEAR_TEXT;
+import com.sun.corba.ee.spi.activation.InvalidORBid;
+import com.sun.corba.ee.spi.activation.Locator;
+import com.sun.corba.ee.spi.activation.LocatorHelper;
+import com.sun.corba.ee.spi.activation.NoSuchEndPoint;
+import com.sun.corba.ee.spi.activation.ORBPortInfo;
+import com.sun.corba.ee.spi.activation.Repository;
+import com.sun.corba.ee.spi.activation.RepositoryHelper;
+import com.sun.corba.ee.spi.activation.ServerAlreadyActive;
+import com.sun.corba.ee.spi.activation.ServerAlreadyRegistered;
+import com.sun.corba.ee.spi.activation.ServerHeldDown;
+import com.sun.corba.ee.spi.activation.ServerNotActive;
+import com.sun.corba.ee.spi.activation.ServerNotRegistered;
+import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocation;
+import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocationPerORB;
+import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
 import org.omg.CORBA.ORB;
-import org.omg.CORBA.INITIALIZE;
-import org.omg.CORBA.CompletionStatus;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.CorbaResourceUtil;
-import com.sun.corba.ee.spi.activation.*;
-import com.sun.corba.ee.spi.activation.ServerHeldDown;
-import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef;
-import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocation;
-import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocationPerORB;
 
 /**
  *

functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java

@@ -19,16 +19,19 @@
 
 package com.sun.corba.ee.impl.naming.pcosnaming;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
+
 import java.io.File;
 
 import org.omg.CORBA.Policy;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
-import org.omg.PortableServer.*;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.PortableServer.IdAssignmentPolicyValue;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 /**
  * @version     1.3, 00/04/06

functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NamingContextImpl.java

@@ -19,36 +19,39 @@
 
 package com.sun.corba.ee.impl.naming.pcosnaming;
 
-
-import org.omg.CORBA.Object;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.Policy;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.LifespanPolicyValue;
-import org.omg.PortableServer.IdAssignmentPolicyValue;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
-
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-
+import com.sun.corba.ee.impl.naming.cosnaming.BindingIteratorImpl;
 import com.sun.corba.ee.impl.naming.cosnaming.NamingContextDataStore;
-import com.sun.corba.ee.impl.naming.cosnaming.NamingUtils;
-
 import com.sun.corba.ee.impl.naming.namingutil.INSURLHandler;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.logging.NamingSystemException;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.trace.Naming;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
-
 import java.io.Serializable;
 import java.util.Hashtable;
 
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.Object;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.SystemException;
+import org.omg.CosNaming.BindingIteratorHolder;
+import org.omg.CosNaming.BindingListHolder;
+import org.omg.CosNaming.BindingType;
+import org.omg.CosNaming.BindingTypeHolder;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextExtPOA;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
+import org.omg.CosNaming.NamingContextPackage.NotFoundReason;
+import org.omg.PortableServer.IdAssignmentPolicyValue;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
+
 /**
  * Class NamingContextImpl implements the org.omg.CosNaming::NamingContext and
  * NamingContextExt interface.

functional-tests/src/test/java/corba/Client.java

@@ -27,12 +27,10 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+
 import corba.framework.Controller;
-import corba.framework.Options;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 public class Client
 {

functional-tests/src/test/java/corba/adapteractivator/AdapterActivator.java

@@ -19,10 +19,9 @@
 
 package corba.adapteractivator;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
-import org.omg.CORBA.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 public class AdapterActivator extends CORBATest
 {

functional-tests/src/test/java/corba/codeset/CodeSetTest.java

@@ -19,11 +19,13 @@
 
 package corba.codeset;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import org.omg.CORBA.*;
+
+import java.util.Properties;
+
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 /**
  * Simple tests in GIOP 1.1 and 1.2 of chars and wstrings.

functional-tests/src/test/java/corba/connectintercept_1_4/Common.java

@@ -24,13 +24,15 @@
 
 package corba.connectintercept_1_4;
 
+import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
+import com.sun.corba.ee.spi.legacy.interceptor.UnknownType;
+
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.INTERNAL;
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-
-import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
-import com.sun.corba.ee.spi.legacy.interceptor.UnknownType;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public abstract class Common
 {

functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java

@@ -24,26 +24,27 @@
 
 package corba.connectintercept_1_4;
 
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
+import com.sun.corba.ee.spi.legacy.connection.GetEndPointInfoAgainException;
+import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
+import com.sun.corba.ee.spi.transport.SocketInfo;
+
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
 import org.omg.CORBA.ORB;
 import org.omg.IOP.TaggedComponent;
 
-import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
-import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
-import com.sun.corba.ee.spi.legacy.connection.GetEndPointInfoAgainException;
-import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
-import com.sun.corba.ee.spi.transport.SocketInfo;
-
-import com.sun.corba.ee.impl.misc.ORBUtility;
-
 public class MySocketFactory
     implements
         ORBSocketFactory