You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by di...@apache.org on 2004/10/29 04:18:22 UTC

svn commit: rev 55932 - in incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm: axis axis/util axis/util/encoding jsr181/model jsr181/processor/apt jsr181/processor/reflection jsr181/wsdl

Author: dims
Date: Thu Oct 28 19:18:21 2004
New Revision: 55932

Modified:
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
   incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
Log:
Cleaning up imports (remove unused and get rid of ".*")



Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java	Thu Oct 28 19:18:21 2004
@@ -20,62 +20,24 @@
  * 
  */
 
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLDecoder;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-
 import org.apache.axis.AxisFault;
-import org.apache.axis.AxisProperties;
 import org.apache.axis.Constants;
 import org.apache.axis.MessageContext;
 import org.apache.axis.client.Call;
-import org.apache.axis.components.compiler.Compiler;
-import org.apache.axis.components.compiler.CompilerError;
-import org.apache.axis.components.compiler.CompilerFactory;
 import org.apache.axis.components.logger.LogFactory;
 import org.apache.axis.description.ServiceDesc;
 import org.apache.axis.handlers.BasicHandler;
 import org.apache.axis.handlers.soap.SOAPService;
 import org.apache.axis.providers.java.RPCProvider;
-import org.apache.axis.transport.http.HTTPConstants;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.axis.utils.JWSClassLoader;
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.beehive.wsm.axis.HandlerHandler;
 import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
-import org.apache.beehive.wsm.axis.util.ClasspathUtils;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
 import org.apache.commons.logging.Log;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /*******************************************************************************
  * A few annotation specific things added and lots of code copied from the

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java	Thu Oct 28 19:18:21 2004
@@ -15,51 +15,46 @@
  */
 package org.apache.beehive.wsm.axis;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.io.File;
-import java.io.Serializable;
-import java.rmi.Remote;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.WebParam;
-import javax.xml.namespace.QName;
-import javax.wsdl.OperationType;
-
-import org.apache.axis.wsdl.fromJava.Emitter;
-import org.apache.axis.wsdl.fromJava.Namespaces;
-import org.apache.axis.wsdl.fromJava.Types;
-import org.apache.axis.encoding.SerializerFactory;
+import org.apache.axis.description.FaultDesc;
+import org.apache.axis.description.JavaServiceDesc;
+import org.apache.axis.description.OperationDesc;
+import org.apache.axis.description.ParameterDesc;
+import org.apache.axis.description.ServiceDesc;
 import org.apache.axis.encoding.DeserializerFactory;
+import org.apache.axis.encoding.SerializerFactory;
 import org.apache.axis.encoding.TypeMapping;
-import org.apache.axis.encoding.ser.ArraySerializerFactory;
 import org.apache.axis.encoding.ser.ArrayDeserializerFactory;
+import org.apache.axis.encoding.ser.ArraySerializerFactory;
 import org.apache.axis.encoding.ser.BeanDeserializerFactory;
 import org.apache.axis.encoding.ser.BeanSerializerFactory;
 import org.apache.axis.encoding.ser.VectorDeserializerFactory;
-import org.apache.axis.description.ElementDesc;
-import org.apache.axis.description.FaultDesc;
-import org.apache.axis.description.FieldDesc;
-import org.apache.axis.description.ServiceDesc;
-import org.apache.axis.description.TypeDesc;
-import org.apache.axis.description.JavaServiceDesc;
-import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.description.OperationDesc;
 import org.apache.axis.utils.BeanPropertyDescriptor;
+import org.apache.axis.wsdl.fromJava.Namespaces;
+import org.apache.axis.wsdl.fromJava.Types;
 import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
 import org.apache.beehive.wsm.axis.util.encoding.CollectionSerializerFactory;
-import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
 import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
+import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
 import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
 import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 import org.apache.xmlbeans.XmlBeans;
 import org.apache.xmlbeans.XmlObject;
 
+import javax.jws.WebParam;
+import javax.wsdl.OperationType;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.rmi.Remote;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 /*******************************************************************************
  * 
  *
@@ -111,6 +106,8 @@
                 od.setElementQName(new QName(operationName));
                 od.setName(operationName);
                 allowedMethods.add(operationName);
+                od.setUse(sd.getUse());
+                od.setStyle(sd.getStyle());
 
                 od.setSoapAction(meth.getWmAction());
                 
@@ -118,7 +115,7 @@
                     od.setMep(OperationType.ONE_WAY);
                 }
                 else {
-                    od.setReturnQName(new QName(meth.getWrTargetNamespace(),
+                    od.setReturnQName(new QName("",
                                                 meth.getWrName()));
                     Class returnType = meth.getJavaReturnType();
                     QName type = configureTypeMapping(sd, returnType);

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java	Thu Oct 28 19:18:21 2004
@@ -21,15 +21,14 @@
  */
 package org.apache.beehive.wsm.axis;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
 import org.apache.axis.MessageContext;
 import org.apache.axis.providers.java.RPCProvider;
-
 import org.apache.beehive.controls.api.bean.Control;
 import org.apache.beehive.controls.api.context.ControlBeanContext;
 import org.apache.beehive.controls.runtime.bean.ControlContainerContext;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java	Thu Oct 28 19:18:21 2004
@@ -22,35 +22,24 @@
 package org.apache.beehive.wsm.axis;
 
 import com.sun.tools.apt.main.Main;
-
-import java.lang.reflect.Method;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.jws.WebParam;
-
-import org.apache.axis.server.AxisServer;
 import org.apache.axis.configuration.FileProvider;
 import org.apache.axis.deployment.wsdd.WSDDDeployment;
 import org.apache.axis.deployment.wsdd.WSDDOperation;
 import org.apache.axis.deployment.wsdd.WSDDService;
 import org.apache.axis.description.JavaServiceDesc;
-import org.apache.axis.description.ServiceDesc;
 import org.apache.axis.description.OperationDesc;
-import org.apache.axis.description.ParameterDesc;
 import org.apache.axis.encoding.SerializationContext;
-import org.apache.axis.handlers.soap.SOAPService;
-import org.apache.axis.providers.java.RPCProvider;
+import org.apache.axis.server.AxisServer;
 import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
 import org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessor;
+
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java	Thu Oct 28 19:18:21 2004
@@ -20,62 +20,39 @@
  * 
  */
 
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLDecoder;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-
 import org.apache.axis.AxisFault;
-import org.apache.axis.AxisProperties;
 import org.apache.axis.Constants;
 import org.apache.axis.MessageContext;
 import org.apache.axis.client.Call;
-import org.apache.axis.components.compiler.Compiler;
-import org.apache.axis.components.compiler.CompilerError;
-import org.apache.axis.components.compiler.CompilerFactory;
 import org.apache.axis.components.logger.LogFactory;
 import org.apache.axis.description.ServiceDesc;
 import org.apache.axis.handlers.BasicHandler;
 import org.apache.axis.handlers.soap.SOAPService;
 import org.apache.axis.providers.java.RPCProvider;
-import org.apache.axis.transport.http.HTTPConstants;
 import org.apache.axis.utils.ClassUtils;
-import org.apache.axis.utils.JWSClassLoader;
 import org.apache.axis.utils.Messages;
 import org.apache.axis.utils.XMLUtils;
-import org.apache.beehive.wsm.axis.HandlerHandler;
 import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
 import org.apache.beehive.wsm.axis.util.ClasspathUtils;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
 import org.apache.commons.logging.Log;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /*******************************************************************************
  * A few annotation specific things added and lots of code copied 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java	Thu Oct 28 19:18:21 2004
@@ -23,8 +23,6 @@
 import org.apache.axis.MessageContext;
 import org.apache.axis.handlers.BasicHandler;
 import org.apache.axis.handlers.HandlerChainImpl;
-import org.apache.axis.handlers.JAXRPCHandler;
-
 import org.apache.beehive.wsm.jsr181.model.SOAPMessageHandlerInfo;
 import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java	Thu Oct 28 19:18:21 2004
@@ -19,24 +19,22 @@
  */
 package org.apache.beehive.wsm.axis.util;
 
+import org.apache.axis.AxisProperties;
+import org.apache.axis.MessageContext;
+import org.apache.axis.transport.http.HTTPConstants;
+
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLDecoder;
 import java.util.StringTokenizer;
 import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
 import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
-
-import org.apache.axis.AxisProperties;
-import org.apache.axis.MessageContext;
-import org.apache.axis.transport.http.HTTPConstants;
-
-import org.apache.beehive.wsm.axis.util.JavaArchiveFilter;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java	Thu Oct 28 19:18:21 2004
@@ -12,14 +12,14 @@
  */
 package org.apache.beehive.wsm.axis.util.encoding;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Vector;
-import javax.xml.namespace.QName;
-
 import org.apache.axis.encoding.SerializationContext;
 import org.apache.axis.encoding.ser.VectorSerializer;
 import org.xml.sax.Attributes;
+
+import javax.xml.namespace.QName;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Vector;
 
 
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java	Thu Oct 28 19:18:21 2004
@@ -15,8 +15,9 @@
  */
 package org.apache.beehive.wsm.axis.util.encoding;
 
-import javax.xml.namespace.QName;
 import org.apache.axis.encoding.ser.BaseSerializerFactory;
+
+import javax.xml.namespace.QName;
 
 /******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java	Thu Oct 28 19:18:21 2004
@@ -21,9 +21,6 @@
  */
 package org.apache.beehive.wsm.axis.util.encoding;
 
-import java.lang.reflect.Method;
-import javax.xml.namespace.QName;
-import org.xml.sax.SAXException;
 import org.apache.axis.encoding.DeserializationContext;
 import org.apache.axis.encoding.DeserializerImpl;
 import org.apache.axis.message.MessageElement;
@@ -31,11 +28,10 @@
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.XmlException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.Node;
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+import javax.xml.namespace.QName;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java	Thu Oct 28 19:18:21 2004
@@ -21,8 +21,9 @@
  */
 package org.apache.beehive.wsm.axis.util.encoding;
 
-import javax.xml.namespace.QName;
 import org.apache.axis.encoding.ser.BaseDeserializerFactory;
+
+import javax.xml.namespace.QName;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java	Thu Oct 28 19:18:21 2004
@@ -19,33 +19,30 @@
  */
 package org.apache.beehive.wsm.axis.util.encoding;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Set;
-import javax.xml.namespace.QName;
-
 import org.apache.axis.Constants;
 import org.apache.axis.encoding.SerializationContext;
 import org.apache.axis.encoding.Serializer;
+import org.apache.axis.wsdl.fromJava.Types;
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.XmlAnyURI;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.axis.wsdl.fromJava.Types;
+import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.w3.x2001.xmlSchema.TopLevelComplexType;
+import org.w3.x2001.xmlSchema.TopLevelElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3.x2001.xmlSchema.SchemaDocument;
-import org.w3.x2001.xmlSchema.TopLevelComplexType;
-import org.w3.x2001.xmlSchema.TopLevelElement;
-import org.xmlsoap.schemas.wsdl.TDefinitions;
-import org.xmlsoap.schemas.wsdl.TTypes;
-import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 import org.xml.sax.Attributes;
+import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
+import org.xmlsoap.schemas.wsdl.TDefinitions;
+
+import javax.xml.namespace.QName;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java	Thu Oct 28 19:18:21 2004
@@ -21,9 +21,9 @@
  */
 package org.apache.beehive.wsm.axis.util.encoding;
 
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.Serializer;
 import org.apache.axis.encoding.ser.BaseSerializerFactory;
+
+import javax.xml.namespace.QName;
 
 /*******************************************************************************
  * 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java	Thu Oct 28 19:18:21 2004
@@ -19,7 +19,6 @@
  */
 
 import java.lang.annotation.Annotation;
-
 import java.util.Collection;
 
 public abstract class AnnotationModel {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java	Thu Oct 28 19:18:21 2004
@@ -18,16 +18,14 @@
  * $Header:$
  */
 
-import java.lang.annotation.Annotation;
+import javax.jws.soap.InitParam;
+import javax.jws.soap.SOAPMessageHandler;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
-import javax.jws.soap.InitParam;
-import javax.jws.soap.SOAPMessageHandler;
 
 public class SOAPMessageHandlerInfo
 {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java	Thu Oct 28 19:18:21 2004
@@ -1,11 +1,10 @@
 package org.apache.beehive.wsm.jsr181.model;
 
+import javax.jws.security.SecurityRoles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-
-import javax.jws.security.SecurityRoles;
 
 /*
  * Copyright 2004 The Apache Software Foundation

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java	Thu Oct 28 19:18:21 2004
@@ -18,18 +18,16 @@
  * $Header:$
  */
 
-import java.lang.annotation.Annotation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
 import javax.jws.Oneway;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebResult;
 import javax.jws.security.SecurityRoles;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 public class WebServiceMETHODMetadata extends AnnotationModel
 {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java	Thu Oct 28 19:18:21 2004
@@ -18,11 +18,9 @@
  * $Header:$
  */
 
+import javax.jws.WebParam;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
 import java.util.Collection;
-
-import javax.jws.WebParam;
 
 public class WebServicePARAMETERMetadata extends AnnotationModel
 {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java	Thu Oct 28 19:18:21 2004
@@ -18,22 +18,13 @@
  * $Header:$Factory
  */
 
-import java.io.IOException;
-
-import java.lang.reflect.Type;
-import java.lang.reflect.Method;
-
-import java.lang.annotation.Annotation;
-
-import java.net.URL;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
+import org.apache.xmlbeans.XmlException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 
 import javax.jws.HandlerChain;
 import javax.jws.WebService;
@@ -42,21 +33,19 @@
 import javax.jws.soap.SOAPBinding;
 import javax.jws.soap.SOAPMessageHandler;
 import javax.jws.soap.SOAPMessageHandlers;
-
-//import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
-
-import org.apache.xmlbeans.XmlException;
-
-import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class WebServiceTYPEMetadata extends AnnotationModel
 {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java	Thu Oct 28 19:18:21 2004
@@ -18,21 +18,14 @@
  * $Header:$
  */
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
 import com.sun.mirror.apt.AnnotationProcessor;
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
 import com.sun.mirror.declaration.Declaration;
-
 import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
+
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * The TwoPhaseAnnotationProcessor class is an abstract class that implements the APT

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java	Thu Oct 28 19:18:21 2004
@@ -18,7 +18,10 @@
  * $Header:$
  */
 
-import com.sun.mirror.type.*; 
+import com.sun.mirror.type.ArrayType;
+import com.sun.mirror.type.PrimitiveType;
+import com.sun.mirror.type.TypeMirror;
+import com.sun.mirror.type.VoidType; 
 
 public class TypeMirrorUtil {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java	Thu Oct 28 19:18:21 2004
@@ -18,52 +18,13 @@
  * $Header:$
  */
 
-import com.sun.tools.apt.Main;
-
-import java.lang.annotation.Annotation;
-
-import java.io.File;
-import java.io.PrintWriter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-import com.sun.mirror.apt.Filer.Location;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-
-
-import com.sun.mirror.declaration.FieldDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.PackageDeclaration;
-
-import com.sun.mirror.util.SourcePosition;
-
-import com.sun.mirror.type.AnnotationType;
-import com.sun.mirror.type.*;
-
-import org.apache.beehive.wsm.jsr181.model.*;
-import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
+import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.SecurityRolesInfo;
 import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
 import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
 import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
 
-import javax.jws.*;
-import javax.jws.WebParam;
-import javax.jws.soap.*;
-import javax.jws.soap.SOAPBinding;
+import java.util.Collection;
 
 public class WebServiceMetadataViewer {
 

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java	Thu Oct 28 19:18:21 2004
@@ -18,17 +18,7 @@
  * $Header:$
  */
 
-import java.lang.annotation.Annotation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import java.io.File;
-
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.declaration.AnnotationMirror;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
 import com.sun.mirror.declaration.ClassDeclaration;
@@ -37,22 +27,20 @@
 import com.sun.mirror.declaration.MethodDeclaration;
 import com.sun.mirror.declaration.ParameterDeclaration;
 import com.sun.mirror.declaration.TypeDeclaration;
-
 import com.sun.mirror.type.AnnotationType;
-import com.sun.mirror.type.TypeMirror;
-
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
-import com.sun.tools.apt.Main;
-
 import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
 import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
 import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
 import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-
 import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
 
-import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class WsmAnnotationProcessor extends TwoPhaseAnnotationProcessor
 {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java	Thu Oct 28 19:18:21 2004
@@ -18,16 +18,16 @@
  * $Header:$
  */
 
-import static java.util.Arrays.*;
-import java.util.Collection;
-import static java.util.Collections.*;
-import java.util.Set;
-
 import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
+import com.sun.mirror.apt.AnnotationProcessorFactory;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+
+import static java.util.Arrays.asList;
+import java.util.Collection;
+import static java.util.Collections.unmodifiableCollection;
+import static java.util.Collections.emptySet;
+import java.util.Set;
 
 public class WsmAnnotationProcessorFactory implements AnnotationProcessorFactory
 {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java	Thu Oct 28 19:18:21 2004
@@ -18,23 +18,19 @@
  * $Header:$
  */
 
+import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
+import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
+import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
-
-import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
 
 public class WsmReflectionAnnotationProcessor
 {

Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java	(original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java	Thu Oct 28 19:18:21 2004
@@ -18,26 +18,18 @@
 
 package org.apache.beehive.wsm.jsr181.wsdl;
 
-import java.lang.reflect.Array;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
-import javax.xml.namespace.QName;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.WebParam;
-
+import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
+import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
+import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
+import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
 import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
-import org.xmlsoap.schemas.wsdl.TDefinitions;
+import org.xmlsoap.schemas.wsdl.TBinding;
 import org.xmlsoap.schemas.wsdl.TBindingOperation;
 import org.xmlsoap.schemas.wsdl.TBindingOperationMessage;
-import org.xmlsoap.schemas.wsdl.TBinding;
 import org.xmlsoap.schemas.wsdl.TDefinitions;
 import org.xmlsoap.schemas.wsdl.TMessage;
 import org.xmlsoap.schemas.wsdl.TOperation;
@@ -46,19 +38,22 @@
 import org.xmlsoap.schemas.wsdl.TPort;
 import org.xmlsoap.schemas.wsdl.TPortType;
 import org.xmlsoap.schemas.wsdl.TService;
-
-import org.xmlsoap.schemas.wsdl.soap.UseChoice;
 import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
+import org.xmlsoap.schemas.wsdl.soap.UseChoice;
 
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
-import org.apache.xmlbeans.XmlObject;
-
-import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
-import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
-import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
+import javax.jws.WebParam;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /*******************************************************************************
  * 

Cleaning up imports (Re: svn commit: rev 55932 - in incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm: axis axis/util axis/util/encoding jsr181/model jsr181/processor/apt jsr181/processor/reflection jsr181/wsdl)

Posted by Davanum Srinivas <da...@gmail.com>.
Hope no one minds if i clean up some imports today (and may be some
javadocs tomorrow)

thanks,
dims


On 29 Oct 2004 02:18:22 -0000, dims@apache.org <di...@apache.org> wrote:
> Author: dims
> Date: Thu Oct 28 19:18:21 2004
> New Revision: 55932
> 
> Modified:
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
>    incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
> Log:
> Cleaning up imports (remove unused and get rid of ".*")
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java       (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AnnotatedWebServiceDeploymentHandler.java       Thu Oct 28 19:18:21 2004
> @@ -20,62 +20,24 @@
>   *
> 
>   */
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
> 
> -
> 
> -import java.io.File;
> 
> -import java.io.FileFilter;
> 
> -import java.io.FileInputStream;
> 
> -import java.io.FileOutputStream;
> 
> -import java.io.FileNotFoundException;
> 
> -import java.io.FileReader;
> 
> -import java.io.FileWriter;
> 
> -import java.io.InputStream;
> 
> -import java.io.IOException;
> 
> -import java.io.PrintWriter;
> 
> -import java.io.StringWriter;
> 
> -
> 
> -import java.net.URL;
> 
> -import java.net.URLClassLoader;
> 
> -import java.net.URLDecoder;
> 
> -
> 
> -import java.util.HashMap;
> 
> -import java.util.Iterator;
> 
> -import java.util.List;
> 
> -import java.util.Map;
> 
> -import java.util.StringTokenizer;
> 
> -
> 
> -import java.util.jar.Attributes;
> 
> -import java.util.jar.JarFile;
> 
> -import java.util.jar.JarInputStream;
> 
> -import java.util.jar.Manifest;
> 
> -
> 
>  import org.apache.axis.AxisFault;
> 
> -import org.apache.axis.AxisProperties;
> 
>  import org.apache.axis.Constants;
> 
>  import org.apache.axis.MessageContext;
> 
>  import org.apache.axis.client.Call;
> 
> -import org.apache.axis.components.compiler.Compiler;
> 
> -import org.apache.axis.components.compiler.CompilerError;
> 
> -import org.apache.axis.components.compiler.CompilerFactory;
> 
>  import org.apache.axis.components.logger.LogFactory;
> 
>  import org.apache.axis.description.ServiceDesc;
> 
>  import org.apache.axis.handlers.BasicHandler;
> 
>  import org.apache.axis.handlers.soap.SOAPService;
> 
>  import org.apache.axis.providers.java.RPCProvider;
> 
> -import org.apache.axis.transport.http.HTTPConstants;
> 
> -import org.apache.axis.utils.ClassUtils;
> 
> -import org.apache.axis.utils.JWSClassLoader;
> 
> -import org.apache.axis.utils.Messages;
> 
> -import org.apache.axis.utils.XMLUtils;
> 
> -import org.apache.beehive.wsm.axis.HandlerHandler;
> 
>  import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
> 
> -import org.apache.beehive.wsm.axis.util.ClasspathUtils;
> 
> +import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> +import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
> 
>  import org.apache.commons.logging.Log;
> 
> -import org.w3c.dom.Document;
> 
> -import org.w3c.dom.Element;
> 
> +
> 
> +import java.util.HashMap;
> 
> +import java.util.Iterator;
> 
> +import java.util.List;
> 
> +import java.util.Map;
> 
>  /*******************************************************************************
> 
>   * A few annotation specific things added and lots of code copied from the
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java   (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/AxisHook.java   Thu Oct 28 19:18:21 2004
> @@ -15,51 +15,46 @@
>   */
> 
>  package org.apache.beehive.wsm.axis;
> 
> -import java.lang.reflect.Constructor;
> 
> -import java.lang.reflect.Method;
> 
> -import java.io.File;
> 
> -import java.io.Serializable;
> 
> -import java.rmi.Remote;
> 
> -import java.util.ArrayList;
> 
> -import java.util.Collection;
> 
> -import java.util.List;
> 
> -import java.util.Map;
> 
> -
> 
> -import javax.jws.WebParam;
> 
> -import javax.xml.namespace.QName;
> 
> -import javax.wsdl.OperationType;
> 
> -
> 
> -import org.apache.axis.wsdl.fromJava.Emitter;
> 
> -import org.apache.axis.wsdl.fromJava.Namespaces;
> 
> -import org.apache.axis.wsdl.fromJava.Types;
> 
> -import org.apache.axis.encoding.SerializerFactory;
> 
> +import org.apache.axis.description.FaultDesc;
> 
> +import org.apache.axis.description.JavaServiceDesc;
> 
> +import org.apache.axis.description.OperationDesc;
> 
> +import org.apache.axis.description.ParameterDesc;
> 
> +import org.apache.axis.description.ServiceDesc;
> 
>  import org.apache.axis.encoding.DeserializerFactory;
> 
> +import org.apache.axis.encoding.SerializerFactory;
> 
>  import org.apache.axis.encoding.TypeMapping;
> 
> -import org.apache.axis.encoding.ser.ArraySerializerFactory;
> 
>  import org.apache.axis.encoding.ser.ArrayDeserializerFactory;
> 
> +import org.apache.axis.encoding.ser.ArraySerializerFactory;
> 
>  import org.apache.axis.encoding.ser.BeanDeserializerFactory;
> 
>  import org.apache.axis.encoding.ser.BeanSerializerFactory;
> 
>  import org.apache.axis.encoding.ser.VectorDeserializerFactory;
> 
> -import org.apache.axis.description.ElementDesc;
> 
> -import org.apache.axis.description.FaultDesc;
> 
> -import org.apache.axis.description.FieldDesc;
> 
> -import org.apache.axis.description.ServiceDesc;
> 
> -import org.apache.axis.description.TypeDesc;
> 
> -import org.apache.axis.description.JavaServiceDesc;
> 
> -import org.apache.axis.description.ParameterDesc;
> 
> -import org.apache.axis.description.OperationDesc;
> 
>  import org.apache.axis.utils.BeanPropertyDescriptor;
> 
> +import org.apache.axis.wsdl.fromJava.Namespaces;
> 
> +import org.apache.axis.wsdl.fromJava.Types;
> 
>  import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
> 
>  import org.apache.beehive.wsm.axis.util.encoding.CollectionSerializerFactory;
> 
> -import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
> 
>  import org.apache.beehive.wsm.axis.util.encoding.XmlBeanDeserializerFactory;
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> +import org.apache.beehive.wsm.axis.util.encoding.XmlBeanSerializerFactory;
> 
> +import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
> 
>  import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> 
>  import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
> 
> +import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
>  import org.apache.xmlbeans.XmlBeans;
> 
>  import org.apache.xmlbeans.XmlObject;
> 
> +import javax.jws.WebParam;
> 
> +import javax.wsdl.OperationType;
> 
> +import javax.xml.namespace.QName;
> 
> +import java.io.File;
> 
> +import java.io.Serializable;
> 
> +import java.lang.reflect.Constructor;
> 
> +import java.lang.reflect.Method;
> 
> +import java.rmi.Remote;
> 
> +import java.util.ArrayList;
> 
> +import java.util.Collection;
> 
> +import java.util.List;
> 
> +import java.util.Map;
> 
> +
> 
>  /*******************************************************************************
> 
>   *
> 
>   *
> 
> @@ -111,6 +106,8 @@
>                  od.setElementQName(new QName(operationName));
> 
>                  od.setName(operationName);
> 
>                  allowedMethods.add(operationName);
> 
> +                od.setUse(sd.getUse());
> 
> +                od.setStyle(sd.getStyle());
> 
>                  od.setSoapAction(meth.getWmAction());
> 
> @@ -118,7 +115,7 @@
>                      od.setMep(OperationType.ONE_WAY);
> 
>                  }
> 
>                  else {
> 
> -                    od.setReturnQName(new QName(meth.getWrTargetNamespace(),
> 
> +                    od.setReturnQName(new QName("",
> 
>                                                  meth.getWrName()));
> 
>                      Class returnType = meth.getJavaReturnType();
> 
>                      QName type = configureTypeMapping(sd, returnType);
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java    (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/ControlProvider.java    Thu Oct 28 19:18:21 2004
> @@ -21,15 +21,14 @@
>   */
> 
>  package org.apache.beehive.wsm.axis;
> 
> -import java.lang.reflect.Field;
> 
> -import java.lang.reflect.Method;
> 
> -
> 
>  import org.apache.axis.MessageContext;
> 
>  import org.apache.axis.providers.java.RPCProvider;
> 
> -
> 
>  import org.apache.beehive.controls.api.bean.Control;
> 
>  import org.apache.beehive.controls.api.context.ControlBeanContext;
> 
>  import org.apache.beehive.controls.runtime.bean.ControlContainerContext;
> 
> +
> 
> +import java.lang.reflect.Field;
> 
> +import java.lang.reflect.Method;
> 
>  /*******************************************************************************
> 
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java   (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DeploymentDumper.java   Thu Oct 28 19:18:21 2004
> @@ -22,35 +22,24 @@
>  package org.apache.beehive.wsm.axis;
> 
>  import com.sun.tools.apt.main.Main;
> 
> -
> 
> -import java.lang.reflect.Method;
> 
> -import java.io.FileOutputStream;
> 
> -import java.io.OutputStreamWriter;
> 
> -import java.io.Writer;
> 
> -import java.util.ArrayList;
> 
> -import java.util.Collection;
> 
> -import java.util.List;
> 
> -import java.util.Set;
> 
> -
> 
> -import javax.xml.namespace.QName;
> 
> -import javax.jws.WebParam;
> 
> -
> 
> -import org.apache.axis.server.AxisServer;
> 
>  import org.apache.axis.configuration.FileProvider;
> 
>  import org.apache.axis.deployment.wsdd.WSDDDeployment;
> 
>  import org.apache.axis.deployment.wsdd.WSDDOperation;
> 
>  import org.apache.axis.deployment.wsdd.WSDDService;
> 
>  import org.apache.axis.description.JavaServiceDesc;
> 
> -import org.apache.axis.description.ServiceDesc;
> 
>  import org.apache.axis.description.OperationDesc;
> 
> -import org.apache.axis.description.ParameterDesc;
> 
>  import org.apache.axis.encoding.SerializationContext;
> 
> -import org.apache.axis.handlers.soap.SOAPService;
> 
> -import org.apache.axis.providers.java.RPCProvider;
> 
> +import org.apache.axis.server.AxisServer;
> 
>  import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> 
>  import org.apache.beehive.wsm.jsr181.processor.apt.WsmAnnotationProcessor;
> 
> +
> 
> +import java.io.FileOutputStream;
> 
> +import java.io.OutputStreamWriter;
> 
> +import java.io.Writer;
> 
> +import java.util.ArrayList;
> 
> +import java.util.Collection;
> 
> +import java.util.List;
> 
> +import java.util.Set;
> 
>  /*******************************************************************************
> 
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java    (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/DropInDeploymentHandler.java    Thu Oct 28 19:18:21 2004
> @@ -20,62 +20,39 @@
>   *
>   */
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> -import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> -import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> -import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
> -
> -import java.io.File;
> -import java.io.FileFilter;
> -import java.io.FileInputStream;
> -import java.io.FileOutputStream;
> -import java.io.FileNotFoundException;
> -import java.io.FileReader;
> -import java.io.FileWriter;
> -import java.io.InputStream;
> -import java.io.IOException;
> -import java.io.PrintWriter;
> -import java.io.StringWriter;
> -
> -import java.net.URL;
> -import java.net.URLClassLoader;
> -import java.net.URLDecoder;
> -
> -import java.util.HashMap;
> -import java.util.Iterator;
> -import java.util.List;
> -import java.util.Map;
> -import java.util.StringTokenizer;
> -
> -import java.util.jar.Attributes;
> -import java.util.jar.JarFile;
> -import java.util.jar.JarInputStream;
> -import java.util.jar.Manifest;
> -
>  import org.apache.axis.AxisFault;
> -import org.apache.axis.AxisProperties;
>  import org.apache.axis.Constants;
>  import org.apache.axis.MessageContext;
>  import org.apache.axis.client.Call;
> -import org.apache.axis.components.compiler.Compiler;
> -import org.apache.axis.components.compiler.CompilerError;
> -import org.apache.axis.components.compiler.CompilerFactory;
>  import org.apache.axis.components.logger.LogFactory;
>  import org.apache.axis.description.ServiceDesc;
>  import org.apache.axis.handlers.BasicHandler;
>  import org.apache.axis.handlers.soap.SOAPService;
>  import org.apache.axis.providers.java.RPCProvider;
> -import org.apache.axis.transport.http.HTTPConstants;
>  import org.apache.axis.utils.ClassUtils;
> -import org.apache.axis.utils.JWSClassLoader;
>  import org.apache.axis.utils.Messages;
>  import org.apache.axis.utils.XMLUtils;
> -import org.apache.beehive.wsm.axis.HandlerHandler;
>  import org.apache.beehive.wsm.axis.badtiger.EnumWrapper;
>  import org.apache.beehive.wsm.axis.util.ClasspathUtils;
> +import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> +import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
>  import org.apache.commons.logging.Log;
>  import org.w3c.dom.Document;
>  import org.w3c.dom.Element;
> +
> +import java.io.File;
> +import java.io.FileInputStream;
> +import java.io.FileNotFoundException;
> +import java.io.FileOutputStream;
> +import java.io.IOException;
> +import java.io.PrintWriter;
> +import java.io.StringWriter;
> +import java.net.URL;
> +import java.net.URLClassLoader;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.List;
> +import java.util.Map;
> 
>  /*******************************************************************************
>   * A few annotation specific things added and lots of code copied
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java     (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/HandlerHandler.java     Thu Oct 28 19:18:21 2004
> @@ -23,8 +23,6 @@
>  import org.apache.axis.MessageContext;
>  import org.apache.axis.handlers.BasicHandler;
>  import org.apache.axis.handlers.HandlerChainImpl;
> -import org.apache.axis.handlers.JAXRPCHandler;
> -
>  import org.apache.beehive.wsm.jsr181.model.SOAPMessageHandlerInfo;
>  import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java        (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/ClasspathUtils.java        Thu Oct 28 19:18:21 2004
> @@ -19,24 +19,22 @@
>   */
> 
>  package org.apache.beehive.wsm.axis.util;
> 
> +import org.apache.axis.AxisProperties;
> 
> +import org.apache.axis.MessageContext;
> 
> +import org.apache.axis.transport.http.HTTPConstants;
> 
> +
> 
>  import java.io.File;
> 
>  import java.io.FileInputStream;
> 
> -import java.io.InputStream;
> 
>  import java.io.IOException;
> 
> +import java.io.InputStream;
> 
>  import java.net.URL;
> 
>  import java.net.URLClassLoader;
> 
>  import java.net.URLDecoder;
> 
>  import java.util.StringTokenizer;
> 
>  import java.util.jar.Attributes;
> 
> -import java.util.jar.JarInputStream;
> 
>  import java.util.jar.JarFile;
> 
> +import java.util.jar.JarInputStream;
> 
>  import java.util.jar.Manifest;
> 
> -
> 
> -import org.apache.axis.AxisProperties;
> 
> -import org.apache.axis.MessageContext;
> 
> -import org.apache.axis.transport.http.HTTPConstants;
> 
> -
> 
> -import org.apache.beehive.wsm.axis.util.JavaArchiveFilter;
> 
>  /*******************************************************************************
> 
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializer.java Thu Oct 28 19:18:21 2004
> @@ -12,14 +12,14 @@
>   */
>  package org.apache.beehive.wsm.axis.util.encoding;
> 
> -import java.io.IOException;
> -import java.util.Collection;
> -import java.util.Vector;
> -import javax.xml.namespace.QName;
> -
>  import org.apache.axis.encoding.SerializationContext;
>  import org.apache.axis.encoding.ser.VectorSerializer;
>  import org.xml.sax.Attributes;
> +
> +import javax.xml.namespace.QName;
> +import java.io.IOException;
> +import java.util.Collection;
> +import java.util.Vector;
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java  (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/CollectionSerializerFactory.java  Thu Oct 28 19:18:21 2004
> @@ -15,8 +15,9 @@
>   */
>  package org.apache.beehive.wsm.axis.util.encoding;
> 
> -import javax.xml.namespace.QName;
>  import org.apache.axis.encoding.ser.BaseSerializerFactory;
> +
> +import javax.xml.namespace.QName;
> 
>  /******************************************************************************
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java  (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializer.java  Thu Oct 28 19:18:21 2004
> @@ -21,9 +21,6 @@
>   */
>  package org.apache.beehive.wsm.axis.util.encoding;
> 
> -import java.lang.reflect.Method;
> -import javax.xml.namespace.QName;
> -import org.xml.sax.SAXException;
>  import org.apache.axis.encoding.DeserializationContext;
>  import org.apache.axis.encoding.DeserializerImpl;
>  import org.apache.axis.message.MessageElement;
> @@ -31,11 +28,10 @@
>  import org.apache.xmlbeans.SchemaType;
>  import org.apache.xmlbeans.XmlObject;
>  import org.apache.xmlbeans.XmlOptions;
> -import org.apache.xmlbeans.XmlException;
> -import org.w3c.dom.Document;
> -import org.w3c.dom.DocumentFragment;
> -import org.w3c.dom.Node;
>  import org.xml.sax.Attributes;
> +import org.xml.sax.SAXException;
> +
> +import javax.xml.namespace.QName;
> 
>  /*******************************************************************************
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java   (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanDeserializerFactory.java   Thu Oct 28 19:18:21 2004
> @@ -21,8 +21,9 @@
>   */
>  package org.apache.beehive.wsm.axis.util.encoding;
> 
> -import javax.xml.namespace.QName;
>  import org.apache.axis.encoding.ser.BaseDeserializerFactory;
> +
> +import javax.xml.namespace.QName;
> 
>  /*******************************************************************************
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java    (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializer.java    Thu Oct 28 19:18:21 2004
> @@ -19,33 +19,30 @@
>   */
>  package org.apache.beehive.wsm.axis.util.encoding;
> 
> -import java.io.IOException;
> -import java.io.InputStream;
> -import java.util.HashSet;
> -import java.util.Set;
> -import javax.xml.namespace.QName;
> -
>  import org.apache.axis.Constants;
>  import org.apache.axis.encoding.SerializationContext;
>  import org.apache.axis.encoding.Serializer;
> +import org.apache.axis.wsdl.fromJava.Types;
>  import org.apache.xmlbeans.SchemaType;
>  import org.apache.xmlbeans.XmlBeans;
> -import org.apache.xmlbeans.XmlAnyURI;
>  import org.apache.xmlbeans.XmlObject;
>  import org.apache.xmlbeans.XmlOptions;
> -import org.apache.xmlbeans.XmlDocumentProperties;
> -import org.apache.axis.wsdl.fromJava.Types;
> +import org.w3.x2001.xmlSchema.SchemaDocument;
> +import org.w3.x2001.xmlSchema.TopLevelComplexType;
> +import org.w3.x2001.xmlSchema.TopLevelElement;
>  import org.w3c.dom.Document;
>  import org.w3c.dom.Element;
>  import org.w3c.dom.Node;
>  import org.w3c.dom.NodeList;
> -import org.w3.x2001.xmlSchema.SchemaDocument;
> -import org.w3.x2001.xmlSchema.TopLevelComplexType;
> -import org.w3.x2001.xmlSchema.TopLevelElement;
> -import org.xmlsoap.schemas.wsdl.TDefinitions;
> -import org.xmlsoap.schemas.wsdl.TTypes;
> -import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
>  import org.xml.sax.Attributes;
> +import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
> +import org.xmlsoap.schemas.wsdl.TDefinitions;
> +
> +import javax.xml.namespace.QName;
> +import java.io.IOException;
> +import java.io.InputStream;
> +import java.util.HashSet;
> +import java.util.Set;
> 
>  /*******************************************************************************
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java     (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/axis/util/encoding/XmlBeanSerializerFactory.java     Thu Oct 28 19:18:21 2004
> @@ -21,9 +21,9 @@
>   */
>  package org.apache.beehive.wsm.axis.util.encoding;
> 
> -import javax.xml.namespace.QName;
> -import javax.xml.rpc.encoding.Serializer;
>  import org.apache.axis.encoding.ser.BaseSerializerFactory;
> +
> +import javax.xml.namespace.QName;
> 
>  /*******************************************************************************
>   *
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java    (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/AnnotationModel.java    Thu Oct 28 19:18:21 2004
> @@ -19,7 +19,6 @@
>   */
> 
>  import java.lang.annotation.Annotation;
> 
> -
> 
>  import java.util.Collection;
> 
>  public abstract class AnnotationModel {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java     (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SOAPMessageHandlerInfo.java     Thu Oct 28 19:18:21 2004
> @@ -18,16 +18,14 @@
>   * $Header:$
> 
>   */
> 
> -import java.lang.annotation.Annotation;
> 
> +import javax.jws.soap.InitParam;
> 
> +import javax.jws.soap.SOAPMessageHandler;
> 
>  import java.util.ArrayList;
> 
>  import java.util.Arrays;
> 
>  import java.util.Collection;
> 
>  import java.util.Collections;
> 
>  import java.util.HashMap;
> 
>  import java.util.Map;
> 
> -
> 
> -import javax.jws.soap.InitParam;
> 
> -import javax.jws.soap.SOAPMessageHandler;
> 
>  public class SOAPMessageHandlerInfo
> 
>  {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java  (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/SecurityRolesInfo.java  Thu Oct 28 19:18:21 2004
> @@ -1,11 +1,10 @@
>  package org.apache.beehive.wsm.jsr181.model;
> 
> +import javax.jws.security.SecurityRoles;
>  import java.util.ArrayList;
>  import java.util.Arrays;
>  import java.util.Collection;
>  import java.util.Collections;
> -
> -import javax.jws.security.SecurityRoles;
> 
>  /*
>   * Copyright 2004 The Apache Software Foundation
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java   (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceMETHODMetadata.java   Thu Oct 28 19:18:21 2004
> @@ -18,18 +18,16 @@
>   * $Header:$
>   */
> 
> -import java.lang.annotation.Annotation;
> -
> -import java.util.ArrayList;
> -import java.util.Collection;
> -import java.util.Collections;
> -import java.util.List;
> -
>  import javax.jws.Oneway;
>  import javax.jws.WebMethod;
>  import javax.jws.WebParam;
>  import javax.jws.WebResult;
>  import javax.jws.security.SecurityRoles;
> +import java.lang.annotation.Annotation;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +import java.util.Collections;
> +import java.util.List;
> 
>  public class WebServiceMETHODMetadata extends AnnotationModel
>  {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java        (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServicePARAMETERMetadata.java        Thu Oct 28 19:18:21 2004
> @@ -18,11 +18,9 @@
>   * $Header:$
>   */
> 
> +import javax.jws.WebParam;
>  import java.lang.annotation.Annotation;
> -import java.lang.reflect.Type;
>  import java.util.Collection;
> -
> -import javax.jws.WebParam;
> 
>  public class WebServicePARAMETERMetadata extends AnnotationModel
>  {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java     (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/model/WebServiceTYPEMetadata.java     Thu Oct 28 19:18:21 2004
> @@ -18,22 +18,13 @@
>   * $Header:$Factory
>   */
> 
> -import java.io.IOException;
> -
> -import java.lang.reflect.Type;
> -import java.lang.reflect.Method;
> -
> -import java.lang.annotation.Annotation;
> -
> -import java.net.URL;
> -
> -import java.util.ArrayList;
> -import java.util.Collection;
> -import java.util.Collections;
> -import java.util.HashMap;
> -import java.util.Iterator;
> -import java.util.List;
> -import java.util.Map;
> +import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
> +import org.apache.xmlbeans.XmlException;
> +import org.w3c.dom.Document;
> +import org.w3c.dom.Element;
> +import org.w3c.dom.Node;
> +import org.w3c.dom.NodeList;
> +import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
> 
>  import javax.jws.HandlerChain;
>  import javax.jws.WebService;
> @@ -42,21 +33,19 @@
>  import javax.jws.soap.SOAPBinding;
>  import javax.jws.soap.SOAPMessageHandler;
>  import javax.jws.soap.SOAPMessageHandlers;
> -
> -//import javax.xml.namespace.QName;
>  import javax.xml.parsers.DocumentBuilder;
>  import javax.xml.parsers.DocumentBuilderFactory;
> -
> -import org.w3c.dom.Document;
> -import org.w3c.dom.Element;
> -import org.w3c.dom.Node;
> -import org.w3c.dom.NodeList;
> -
> -import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
> -
> -import org.apache.xmlbeans.XmlException;
> -
> -import org.apache.beehive.wsm.jsr181.wsdl.WSDLProcessor;
> +import java.io.IOException;
> +import java.lang.annotation.Annotation;
> +import java.lang.reflect.Method;
> +import java.lang.reflect.Type;
> +import java.net.URL;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +import java.util.Collections;
> +import java.util.HashMap;
> +import java.util.List;
> +import java.util.Map;
> 
>  public class WebServiceTYPEMetadata extends AnnotationModel
>  {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java        (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TwoPhaseAnnotationProcessor.java        Thu Oct 28 19:18:21 2004
> @@ -18,21 +18,14 @@
>   * $Header:$
>   */
> 
> -import java.io.IOException;
> -import java.util.Arrays;
> -import java.util.ArrayList;
> -import java.util.Collection;
> -import java.util.Collections;
> -import java.util.HashMap;
> -import java.util.List;
> -import java.util.Set;
> -
>  import com.sun.mirror.apt.AnnotationProcessor;
>  import com.sun.mirror.apt.AnnotationProcessorEnvironment;
>  import com.sun.mirror.declaration.AnnotationTypeDeclaration;
>  import com.sun.mirror.declaration.Declaration;
> -
>  import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
> +
> +import java.util.Collection;
> +import java.util.Set;
> 
>  /**
>   * The TwoPhaseAnnotationProcessor class is an abstract class that implements the APT
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java     (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/TypeMirrorUtil.java     Thu Oct 28 19:18:21 2004
> @@ -18,7 +18,10 @@
>   * $Header:$
>   */
> 
> -import com.sun.mirror.type.*;
> +import com.sun.mirror.type.ArrayType;
> +import com.sun.mirror.type.PrimitiveType;
> +import com.sun.mirror.type.TypeMirror;
> +import com.sun.mirror.type.VoidType;
> 
>  public class TypeMirrorUtil {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java   (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WebServiceMetadataViewer.java   Thu Oct 28 19:18:21 2004
> @@ -18,52 +18,13 @@
>   * $Header:$
> 
>   */
> 
> -import com.sun.tools.apt.Main;
> 
> -
> 
> -import java.lang.annotation.Annotation;
> 
> -
> 
> -import java.io.File;
> 
> -import java.io.PrintWriter;
> 
> -
> 
> -import java.util.ArrayList;
> 
> -import java.util.Collection;
> 
> -import java.util.HashMap;
> 
> -import java.util.Iterator;
> 
> -import java.util.List;
> 
> -import java.util.Map;
> 
> -import java.util.Set;
> 
> -
> 
> -import com.sun.mirror.apt.AnnotationProcessorEnvironment;
> 
> -import com.sun.mirror.apt.Filer;
> 
> -import com.sun.mirror.apt.Filer.Location;
> 
> -
> 
> -import com.sun.mirror.declaration.AnnotationMirror;
> 
> -import com.sun.mirror.declaration.AnnotationTypeDeclaration;
> 
> -import com.sun.mirror.declaration.ClassDeclaration;
> 
> -import com.sun.mirror.declaration.Declaration;
> 
> -import com.sun.mirror.declaration.MethodDeclaration;
> 
> -import com.sun.mirror.declaration.ParameterDeclaration;
> 
> -
> 
> -
> 
> -import com.sun.mirror.declaration.FieldDeclaration;
> 
> -import com.sun.mirror.declaration.TypeDeclaration;
> 
> -import com.sun.mirror.declaration.PackageDeclaration;
> 
> -
> 
> -import com.sun.mirror.util.SourcePosition;
> 
> -
> 
> -import com.sun.mirror.type.AnnotationType;
> 
> -import com.sun.mirror.type.*;
> 
> -
> 
> -import org.apache.beehive.wsm.jsr181.model.*;
> 
> -import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
> 
> +import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
> 
> +import org.apache.beehive.wsm.jsr181.model.SecurityRolesInfo;
> 
>  import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> 
>  import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> 
>  import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> -import javax.jws.*;
> 
> -import javax.jws.WebParam;
> 
> -import javax.jws.soap.*;
> 
> -import javax.jws.soap.SOAPBinding;
> 
> +import java.util.Collection;
> 
>  public class WebServiceMetadataViewer {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java     (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessor.java     Thu Oct 28 19:18:21 2004
> @@ -18,17 +18,7 @@
>   * $Header:$
>   */
> 
> -import java.lang.annotation.Annotation;
> -
> -import java.util.ArrayList;
> -import java.util.Collection;
> -import java.util.HashMap;
> -import java.util.List;
> -import java.util.Map;
> -import java.util.Set;
> -
> -import java.io.File;
> -
> +import com.sun.mirror.apt.AnnotationProcessorEnvironment;
>  import com.sun.mirror.declaration.AnnotationMirror;
>  import com.sun.mirror.declaration.AnnotationTypeDeclaration;
>  import com.sun.mirror.declaration.ClassDeclaration;
> @@ -37,22 +27,20 @@
>  import com.sun.mirror.declaration.MethodDeclaration;
>  import com.sun.mirror.declaration.ParameterDeclaration;
>  import com.sun.mirror.declaration.TypeDeclaration;
> -
>  import com.sun.mirror.type.AnnotationType;
> -import com.sun.mirror.type.TypeMirror;
> -
> -import com.sun.mirror.apt.AnnotationProcessorEnvironment;
> -
> -import com.sun.tools.apt.Main;
> -
>  import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
>  import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
>  import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
>  import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> -
>  import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
> 
> -import org.apache.beehive.wsm.jsr181.processor.reflection.WsmReflectionAnnotationProcessor;
> +import java.lang.annotation.Annotation;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.List;
> +import java.util.Map;
> +import java.util.Set;
> 
>  public class WsmAnnotationProcessor extends TwoPhaseAnnotationProcessor
>  {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java      (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/apt/WsmAnnotationProcessorFactory.java      Thu Oct 28 19:18:21 2004
> @@ -18,16 +18,16 @@
>   * $Header:$
>   */
> 
> -import static java.util.Arrays.*;
> -import java.util.Collection;
> -import static java.util.Collections.*;
> -import java.util.Set;
> -
>  import com.sun.mirror.apt.AnnotationProcessor;
> -import com.sun.mirror.apt.AnnotationProcessorFactory;
>  import com.sun.mirror.apt.AnnotationProcessorEnvironment;
> -
> +import com.sun.mirror.apt.AnnotationProcessorFactory;
>  import com.sun.mirror.declaration.AnnotationTypeDeclaration;
> +
> +import static java.util.Arrays.asList;
> +import java.util.Collection;
> +import static java.util.Collections.unmodifiableCollection;
> +import static java.util.Collections.emptySet;
> +import java.util.Set;
> 
>  public class WsmAnnotationProcessorFactory implements AnnotationProcessorFactory
>  {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java    (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/processor/reflection/WsmReflectionAnnotationProcessor.java    Thu Oct 28 19:18:21 2004
> @@ -18,23 +18,19 @@
>   * $Header:$
> 
>   */
> 
> +import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
> 
> +import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> 
> +import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> 
> +import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> +
> 
> +import javax.jws.WebMethod;
> 
> +import javax.jws.WebService;
> 
>  import java.lang.annotation.Annotation;
> 
>  import java.lang.reflect.Method;
> 
>  import java.util.ArrayList;
> 
>  import java.util.Arrays;
> 
>  import java.util.Collection;
> 
>  import java.util.List;
> 
> -
> 
> -import javax.jws.WebMethod;
> 
> -import javax.jws.WebParam;
> 
> -import javax.jws.WebService;
> 
> -
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> 
> -import org.apache.beehive.wsm.jsr181.model.AnnotationModel;
> 
> -
> 
> -import org.apache.beehive.wsm.jsr181.processor.ProcessorException;
> 
>  public class WsmReflectionAnnotationProcessor
> 
>  {
> 
> Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java
> ==============================================================================
> --- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java       (original)
> +++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/WSDLProcessor.java       Thu Oct 28 19:18:21 2004
> @@ -18,26 +18,18 @@
> 
>  package org.apache.beehive.wsm.jsr181.wsdl;
> 
> -import java.lang.reflect.Array;
> -import java.io.File;
> -import java.io.IOException;
> -import java.net.MalformedURLException;
> -import java.net.URL;
> -import java.util.ArrayList;
> -import java.util.Collection;
> -import java.util.List;
> -import java.util.Map;
> -import java.util.HashMap;
> -
> -import javax.xml.namespace.QName;
> -import javax.jws.soap.SOAPBinding;
> -import javax.jws.WebParam;
> -
> +import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
> +import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> +import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> +import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> +import org.apache.xmlbeans.SchemaType;
> +import org.apache.xmlbeans.XmlCursor;
> +import org.apache.xmlbeans.XmlException;
> +import org.apache.xmlbeans.XmlObject;
>  import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
> -import org.xmlsoap.schemas.wsdl.TDefinitions;
> +import org.xmlsoap.schemas.wsdl.TBinding;
>  import org.xmlsoap.schemas.wsdl.TBindingOperation;
>  import org.xmlsoap.schemas.wsdl.TBindingOperationMessage;
> -import org.xmlsoap.schemas.wsdl.TBinding;
>  import org.xmlsoap.schemas.wsdl.TDefinitions;
>  import org.xmlsoap.schemas.wsdl.TMessage;
>  import org.xmlsoap.schemas.wsdl.TOperation;
> @@ -46,19 +38,22 @@
>  import org.xmlsoap.schemas.wsdl.TPort;
>  import org.xmlsoap.schemas.wsdl.TPortType;
>  import org.xmlsoap.schemas.wsdl.TService;
> -
> -import org.xmlsoap.schemas.wsdl.soap.UseChoice;
>  import org.xmlsoap.schemas.wsdl.soap.TStyleChoice;
> +import org.xmlsoap.schemas.wsdl.soap.UseChoice;
> 
> -import org.apache.xmlbeans.SchemaType;
> -import org.apache.xmlbeans.XmlCursor;
> -import org.apache.xmlbeans.XmlException;
> -import org.apache.xmlbeans.XmlObject;
> -
> -import org.apache.beehive.wsm.jsr181.model.SOAPBindingInfo;
> -import org.apache.beehive.wsm.jsr181.model.WebServiceTYPEMetadata;
> -import org.apache.beehive.wsm.jsr181.model.WebServiceMETHODMetadata;
> -import org.apache.beehive.wsm.jsr181.model.WebServicePARAMETERMetadata;
> +import javax.jws.WebParam;
> +import javax.jws.soap.SOAPBinding;
> +import javax.xml.namespace.QName;
> +import java.io.File;
> +import java.io.IOException;
> +import java.lang.reflect.Array;
> +import java.net.MalformedURLException;
> +import java.net.URL;
> +import java.util.ArrayList;
> +import java.util.Collection;
> +import java.util.HashMap;
> +import java.util.List;
> +import java.util.Map;
> 
>  /*******************************************************************************
>   *
> 


-- 
Davanum Srinivas - http://webservices.apache.org/~dims/