Author: thomas.diesler(a)jboss.com Date: 2006-12-06 05:29:48 -0500 (Wed, 06 Dec 2006) New Revision: 1570 Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializer.java Removed: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializer.java Modified: branches/tdiesler/trunk/src/main/java/javax/xml/ws/WebServiceRefs.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/LiteralTypeMapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/Base64Deserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializerFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializerFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SimpleDeserializer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaWsdlMapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaXmlTypeMapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceEndpointInterfaceMapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceInterfaceMapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11DefinitionFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Reader.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Writer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLDefinitionsFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLInterfaceFault.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLUtils.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSNamespaceItem.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSObjectList.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/DOMWriter.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/JavaUtils.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/MimeUtils.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/soap/SOAPMessageMarshaller.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshaller.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/SchemaBindingBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/XercesXSMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientDeployment.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCDeployment.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSEndpointConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/JAXWSDeployment.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJVisitor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementRpc.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/AddressingPropertiesImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpoint.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpointImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventingConstants.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/SubscriptionManagerEndpoint.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpointDI.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/DeliveryType.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/EndpointReference.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/FilterType.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/StatusRequest.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscribeRequest.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscriptionEndRequest.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/UnsubscribeRequest.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatchJob.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherDelegate.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventDispatcher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventingBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/Subscription.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionManager.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionTicket.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/CreateAttachmentVisitor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/DisableMTOMHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/RestoreXOPElementVisitor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/JBossXBContentAdapter.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPScanner.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPUnmarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentMarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentUnmarshallerImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/ReflectiveXOPScanner.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java Log: partial commit Modified: branches/tdiesler/trunk/src/main/java/javax/xml/ws/WebServiceRefs.java =================================================================== --- branches/tdiesler/trunk/src/main/java/javax/xml/ws/WebServiceRefs.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/javax/xml/ws/WebServiceRefs.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,11 +21,12 @@ */ package javax.xml.ws; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; +import java.lang.annotation.Retention; import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; /** * The <code>WebServiceRefs</code> annotation allows Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/LiteralTypeMapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/LiteralTypeMapping.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/LiteralTypeMapping.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,6 +23,8 @@ // $Id$ +import java.awt.Image; + import javax.activation.DataHandler; import javax.mail.internet.MimeMultipart; import javax.xml.soap.SOAPElement; @@ -30,9 +32,13 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; -import org.jboss.ws.common.jaxrpc.encoding.*; +import org.jboss.ws.common.jaxrpc.encoding.ElementDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.ElementSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.JBossXBDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.JBossXBSerializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.SOAPElementDeserializerFactory; +import org.jboss.ws.common.jaxrpc.encoding.SOAPElementSerializerFactory; import org.w3c.dom.Element; -import java.awt.*; /** * This is the representation of a type mapping. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/Base64Deserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/Base64Deserializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/Base64Deserializer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,6 +23,8 @@ // $Id$ +import java.io.IOException; + import javax.xml.namespace.QName; import org.jboss.logging.Logger; @@ -36,8 +38,6 @@ import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; import org.w3c.dom.Element; - -import java.io.IOException; /** * Deserializer for Base64 * Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializer.java (from rev 1569, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializer.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -0,0 +1,113 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.common.jaxrpc.encoding; + +// $Id$ + +import java.io.ByteArrayInputStream; + +import javax.xml.namespace.QName; + +import org.apache.xerces.xs.XSModel; +import org.jboss.logging.Logger; +import org.jboss.ws.common.binding.BindingException; +import org.jboss.ws.common.binding.SerializationContext; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.core.binding.ComplexTypeDeserializer; +import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; +import org.jboss.ws.core.jbossxb.JBossXBConstants; +import org.jboss.ws.core.jbossxb.JBossXBUnmarshaller; +import org.jboss.ws.core.jbossxb.JBossXBUnmarshallerImpl; + +/** + * A Deserializer that can handle complex types by delegating to JAXB. + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-Dec-2004 + */ +public class JBossXBDeserializer extends ComplexTypeDeserializer +{ + // provide logging + private static final Logger log = Logger.getLogger(JBossXBDeserializer.class); + + private JBossXBUnmarshaller unmarshaller; + + public JBossXBDeserializer() throws BindingException + { + // Get the JAXB marshaller for complex objects + unmarshaller = new JBossXBUnmarshallerImpl(); + } + + /** + * For unmarshalling the WS layer passes to the JAXB layer + * + * - required self contained xml content + * - required map of packaged or generated XSDSchema + * - optional QName of the root complex type + * - optional instance of JavaWsdlMapping + * + * The xmlType is redundant if the root element name corresponds to a global element definition in schema. + * If the java mapping is null, default mapping rules apply. + * + * The result is an object instance or null. + * In case of an unmarshalling problem a descriptive exception is thrown. + */ + public Object deserialize(QName xmlName, QName xmlType, String val, SerializationContext serContext) throws BindingException + { + log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + + // Expect the specific JAXRPC serialization context + SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; + + Object value = null; + String typeName = xmlType.getLocalPart(); + + try + { + // Get the parsed model + XSModel model = jaxrpcContext.getXsModel(); + + // Get the jaxrpc-mapping.xml meta data + JavaWsdlMapping jaxrpcMapping = jaxrpcContext.getJavaWsdlMapping(); + + unmarshaller.setProperty(JBossXBConstants.JBXB_XS_MODEL, model); + unmarshaller.setProperty(JBossXBConstants.JBXB_ROOT_QNAME, xmlName); + unmarshaller.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); + unmarshaller.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, jaxrpcMapping); + + ByteArrayInputStream ins = new ByteArrayInputStream(val.getBytes("UTF-8")); + value = unmarshaller.unmarshal(ins); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new BindingException(ex); + } + + log.debug("deserialized: " + (value != null ? value.getClass().getName() : null)); + return value; + + } +} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializerFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializerFactory.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBDeserializerFactory.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,7 +23,6 @@ import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.DeserializerSupport; -import org.jboss.ws.core.jbossxb.JBossXBDeserializer; // $Id$ Copied: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializer.java (from rev 1569, branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializer.java) =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -0,0 +1,126 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.common.jaxrpc.encoding; + +// $Id$ + +import java.io.StringWriter; + +import javax.xml.namespace.QName; + +import org.apache.xerces.xs.XSModel; +import org.jboss.logging.Logger; +import org.jboss.ws.common.binding.BindingException; +import org.jboss.ws.common.binding.SerializationContext; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.core.binding.ComplexTypeSerializer; +import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; +import org.jboss.ws.core.jbossxb.JBossXBConstants; +import org.jboss.ws.core.jbossxb.JBossXBMarshaller; +import org.jboss.ws.core.jbossxb.JBossXBMarshallerImpl; +import org.jboss.ws.core.jbossxb.XercesXSMarshallerImpl; +import org.w3c.dom.NamedNodeMap; + +/** + * A Serializer that can handle complex types by delegating to JAXB. + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-Dec-2004 + */ +public class JBossXBSerializer extends ComplexTypeSerializer +{ + // provide logging + private static final Logger log = Logger.getLogger(JBossXBSerializer.class); + + private JBossXBMarshaller marshaller; + + public JBossXBSerializer() throws BindingException + { + // Get the JAXB marshaller for complex objects + marshaller = new JBossXBMarshallerImpl(); + } + + /** + * For marshalling the WS layer passes to the JAXB layer + * + * - optional java object instance + * - required map of packaged or generated XSDSchema + * - required QName of the root element + * - optional QName of the root complex type + * - optional instance of JavaWsdlMapping + * + * If the object value is null, the corresponding XML representation of the nillable element should be marshalled. + * The xmlType is redundant if the xmlName corresponds to a global element definition in schema. + * If the java mapping is null, default mapping rules apply. + * + * The result is a self contained (i.e. contains all namespace definitions) XML document without the XML declaration. + * In case of an marshalling problem a descriptive exception is thrown. + */ + public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException + { + log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + + // Expect the specific JAXRPC serialization context + SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; + + try + { + // Get the parsed model + XSModel model = jaxrpcContext.getXsModel(); + + // Get the jaxrpc-mapping.xml object graph + JavaWsdlMapping jaxrpcMapping = jaxrpcContext.getJavaWsdlMapping(); + + // schemabinding marshaller is the default delegate + JBossXBMarshaller delegate = marshaller; + + if(value instanceof Exception) + { + // todo: CTS workaround for custom exceptions, clarify when Alexey is back + // causes NPE in MarshallerImpl:458 + delegate = new XercesXSMarshallerImpl(); + } + + // marshalling context + delegate.setProperty(JBossXBConstants.JBXB_XS_MODEL, model); + delegate.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); + delegate.setProperty(JBossXBConstants.JBXB_ROOT_QNAME, xmlName); + delegate.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, jaxrpcMapping); + + // marshall + StringWriter strwr = new StringWriter(); + delegate.marshal(value, strwr); + String xmlFragment = strwr.toString(); + + log.debug("serialized: " + xmlFragment); + return xmlFragment; + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new BindingException(ex); + } + } +} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializerFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializerFactory.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/JBossXBSerializerFactory.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,7 +23,6 @@ import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.SerializerSupport; -import org.jboss.ws.core.jbossxb.JBossXBSerializer; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SOAPElementDeserializer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -24,13 +24,13 @@ // $Id$ import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; import org.jboss.logging.Logger; import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.DeserializerSupport; import org.jboss.ws.common.binding.SerializationContext; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.w3c.dom.Element; @@ -52,7 +52,7 @@ { Element domElement = DOMUtils.parse(xmlFragment); SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); - SOAPElementImpl soapElement = soapFactory.createElement(domElement, true); + SOAPElement soapElement = soapFactory.createElement(domElement, true); return soapElement; } catch (RuntimeException rte) Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SimpleDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SimpleDeserializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/jaxrpc/encoding/SimpleDeserializer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,14 +23,14 @@ // $Id$ +import javax.xml.namespace.QName; + import org.jboss.logging.Logger; import org.jboss.ws.common.binding.BindingException; import org.jboss.ws.common.binding.DeserializerSupport; import org.jboss.ws.common.binding.SerializationContext; import org.jboss.xb.binding.SimpleTypeBindings; -import javax.xml.namespace.QName; - /** * A deserializer that can handle XMLSchema simple types. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaWsdlMapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaWsdlMapping.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaWsdlMapping.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,15 +23,15 @@ // $Id$ -import org.jboss.logging.Logger; - -import javax.xml.namespace.QName; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.xml.namespace.QName; + +import org.jboss.logging.Logger; + /** * XML mapping of the java-wsdl-mapping root element in jaxrpc-mapping.xml * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaXmlTypeMapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaXmlTypeMapping.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/JavaXmlTypeMapping.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,11 +23,11 @@ // $Id$ -import javax.xml.namespace.QName; - import java.io.Serializable; import java.util.ArrayList; +import javax.xml.namespace.QName; + /** * XML mapping of the java-wsdl-mapping/java-xml-type-mapping element. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceEndpointInterfaceMapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceEndpointInterfaceMapping.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceEndpointInterfaceMapping.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,13 +23,13 @@ // $Id$ -import javax.xml.namespace.QName; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.xml.namespace.QName; + /** * XML mapping of the java-wsdl-mapping/service-endpoint-interface-mapping element. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceInterfaceMapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceInterfaceMapping.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/jaxrpcmapping/ServiceInterfaceMapping.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,13 +23,13 @@ // $Id$ -import javax.xml.namespace.QName; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.xml.namespace.QName; + /** * XML mapping of the java-wsdl-mapping/service-interface-mapping element. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/webservices/WebservicesFactory.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -27,7 +27,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11DefinitionFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11DefinitionFactory.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11DefinitionFactory.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,23 +23,19 @@ // $Id$ -import org.jboss.logging.Logger; -import org.jboss.ws.common.utils.JBossWSEntityResolver; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; +import java.net.URL; -import com.ibm.wsdl.xml.WSDLReaderImpl; - import javax.wsdl.Definition; import javax.wsdl.WSDLException; import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLLocator; import javax.wsdl.xml.WSDLReader; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; +import org.jboss.logging.Logger; +import org.jboss.ws.common.utils.JBossWSEntityResolver; +import org.xml.sax.EntityResolver; + +import com.ibm.wsdl.xml.WSDLReaderImpl; + /** * A factory that creates a WSDL-1.1 <code>Definition</code> from an URL. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Reader.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Reader.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Reader.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -29,7 +29,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Writer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Writer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDL11Writer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -25,7 +25,6 @@ import java.io.Writer; import java.util.Arrays; import java.util.HashSet; -import java.util.Set; import javax.wsdl.Definition; import javax.wsdl.WSDLException; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLDefinitionsFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLDefinitionsFactory.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLDefinitionsFactory.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -34,7 +34,6 @@ import javax.wsdl.Definition; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; -import javax.xml.bind.JAXBContext; import javax.xml.parsers.DocumentBuilder; import org.jboss.logging.Logger; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLInterfaceFault.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLInterfaceFault.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLInterfaceFault.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -27,8 +27,6 @@ import javax.xml.namespace.QName; -import org.jboss.ws.common.WSException; - /** * An Interface Fault component describes a fault that MAY occur during invocation of an operation of the * interface. The Interface Fault component declares an abstract fault by naming it and indicating the Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLUtils.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLUtils.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/WSDLUtils.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.EmptyStackException; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -67,7 +66,6 @@ import javax.xml.rpc.holders.StringHolder; import org.apache.xerces.xs.XSComplexTypeDefinition; -import org.apache.xerces.xs.XSModel; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSNamespaceItem.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSNamespaceItem.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSNamespaceItem.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -28,7 +28,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.TreeSet; import org.apache.xerces.xs.StringList; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSObjectList.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSObjectList.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/metadata/wsdl/xmlschema/JBossXSObjectList.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -22,7 +22,6 @@ package org.jboss.ws.common.metadata.wsdl.xmlschema; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.apache.xerces.xs.XSObject; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ClientEndpointMetaData.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -25,22 +25,15 @@ import java.net.MalformedURLException; import java.net.URL; -import java.util.ArrayList; -import java.util.List; import javax.xml.namespace.QName; import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; -import org.jboss.ws.common.umdm.EndpointMetaData.Type; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.metadata.config.WSConfigFactory; -import org.jboss.ws.core.metadata.config.jaxrpc.WSClientConfigJAXRPC; import org.jboss.ws.core.metadata.config.jaxrpc.WSConfigRootJAXRPC; -import org.jboss.ws.core.metadata.config.jaxws.WSClientConfigJAXWS; import org.jboss.ws.core.metadata.config.jaxws.WSConfigRootJAXWS; -import org.jboss.ws.core.metadata.config.jaxws.WSHandlerChainsConfigJAXWS; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; /** * Client side endpoint meta data. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/ExtensibleMetaData.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,7 +1,7 @@ package org.jboss.ws.common.umdm; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/umdm/HandlerMetaDataJAXRPC.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -26,9 +26,7 @@ import java.util.HashSet; import java.util.Set; -import javax.xml.namespace.QName; - /** * The JAXRPC metdata data for a handler element * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/DOMWriter.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/DOMWriter.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/DOMWriter.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -67,12 +67,12 @@ import java.util.Iterator; import java.util.Map; +import org.jboss.logging.Logger; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.jboss.logging.Logger; /** * Traverse a DOM tree in order to print a document that is parsed. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/IOUtils.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,15 +23,24 @@ // $Id$ -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; +import javax.activation.DataHandler; + import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; import org.jboss.ws.core.server.ServerConfig; import org.jboss.ws.core.server.ServerConfigFactory; -import javax.activation.DataHandler; - /** * IO utilites * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/JavaUtils.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/JavaUtils.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/JavaUtils.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -29,7 +29,6 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; -import java.net.URLClassLoader; import java.util.HashMap; import java.util.HashSet; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/MimeUtils.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/MimeUtils.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/common/utils/MimeUtils.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -25,23 +25,29 @@ -import com.sun.image.codec.jpeg.JPEGCodec; -import com.sun.image.codec.jpeg.JPEGImageDecoder; -import com.sun.image.codec.jpeg.JPEGImageEncoder; -import org.jboss.ws.common.Constants; -import org.jboss.ws.common.WSException; +import java.awt.image.BufferedImage; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import javax.mail.internet.ContentType; import javax.mail.internet.MimeMultipart; import javax.mail.internet.ParseException; import javax.xml.namespace.QName; import javax.xml.transform.stream.StreamSource; -import java.awt.image.BufferedImage; -import java.io.*; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; +import org.jboss.ws.common.Constants; +import org.jboss.ws.common.WSException; + +import com.sun.image.codec.jpeg.JPEGCodec; +import com.sun.image.codec.jpeg.JPEGImageDecoder; +import com.sun.image.codec.jpeg.JPEGImageEncoder; + /** * Generic mime utility class. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -60,7 +60,6 @@ import org.jboss.ws.core.binding.UnboundHeader; import org.jboss.ws.core.jaxrpc.ParameterWrapping; import org.jboss.ws.core.jaxrpc.StubExt; -import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/soap/SOAPMessageMarshaller.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/soap/SOAPMessageMarshaller.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/binding/soap/SOAPMessageMarshaller.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -32,8 +32,6 @@ import org.jboss.remoting.InvocationRequest; import org.jboss.remoting.invocation.OnewayInvocation; import org.jboss.remoting.marshal.Marshaller; -import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.common.utils.DOMWriter; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPElementWriter; import org.jboss.ws.core.soap.SOAPMessageImpl; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxrpc/ServiceImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -25,7 +25,6 @@ import java.lang.reflect.Proxy; import java.net.URL; -import java.net.URLClassLoader; import java.rmi.Remote; import java.util.ArrayList; import java.util.Iterator; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -26,7 +26,12 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.rmi.RemoteException; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/client/ResponseImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,8 +23,6 @@ // $Id$ -import javax.xml.ws.Response; -import javax.xml.ws.WebServiceException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutionException; @@ -32,6 +30,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import javax.xml.ws.Response; +import javax.xml.ws.WebServiceException; + /** * The Response interface provides methods used to obtain the payload and context of a * message sent in response to an operation invocation. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jaxws/handler/SOAPMessageContextJAXWS.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -39,8 +39,6 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.soap.SOAPMessageContext; -import org.jboss.ws.core.CommonMessageContext; - /** * The interface SOAPMessageContext provides access to the SOAP message for either RPC request or response. * The javax.xml.soap.SOAPMessage specifies the standard Java API for the representation of a SOAP 1.1 message with attachments. Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBDeserializer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,110 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jbossxb; - -// $Id$ - -import java.io.ByteArrayInputStream; - -import javax.xml.namespace.QName; - -import org.apache.xerces.xs.XSModel; -import org.jboss.logging.Logger; -import org.jboss.ws.common.binding.BindingException; -import org.jboss.ws.common.binding.SerializationContext; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.core.binding.ComplexTypeDeserializer; -import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; - -/** - * A Deserializer that can handle complex types by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public class JBossXBDeserializer extends ComplexTypeDeserializer -{ - // provide logging - private static final Logger log = Logger.getLogger(JBossXBDeserializer.class); - - private JBossXBUnmarshaller unmarshaller; - - public JBossXBDeserializer() throws BindingException - { - // Get the JAXB marshaller for complex objects - unmarshaller = new JBossXBUnmarshallerImpl(); - } - - /** - * For unmarshalling the WS layer passes to the JAXB layer - * - * - required self contained xml content - * - required map of packaged or generated XSDSchema - * - optional QName of the root complex type - * - optional instance of JavaWsdlMapping - * - * The xmlType is redundant if the root element name corresponds to a global element definition in schema. - * If the java mapping is null, default mapping rules apply. - * - * The result is an object instance or null. - * In case of an unmarshalling problem a descriptive exception is thrown. - */ - public Object deserialize(QName xmlName, QName xmlType, String val, SerializationContext serContext) throws BindingException - { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); - - // Expect the specific JAXRPC serialization context - SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; - - Object value = null; - String typeName = xmlType.getLocalPart(); - - try - { - // Get the parsed model - XSModel model = jaxrpcContext.getXsModel(); - - // Get the jaxrpc-mapping.xml meta data - JavaWsdlMapping jaxrpcMapping = jaxrpcContext.getJavaWsdlMapping(); - - unmarshaller.setProperty(JBossXBConstants.JBXB_XS_MODEL, model); - unmarshaller.setProperty(JBossXBConstants.JBXB_ROOT_QNAME, xmlName); - unmarshaller.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); - unmarshaller.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, jaxrpcMapping); - - ByteArrayInputStream ins = new ByteArrayInputStream(val.getBytes("UTF-8")); - value = unmarshaller.unmarshal(ins); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new BindingException(ex); - } - - log.debug("deserialized: " + (value != null ? value.getClass().getName() : null)); - return value; - - } -} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshaller.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshaller.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshaller.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,12 +21,12 @@ */ package org.jboss.ws.core.jbossxb; +import java.io.OutputStream; +import java.io.Writer; + +import org.w3c.dom.Node; import org.xml.sax.ContentHandler; -import org.w3c.dom.Node; -import java.io.Writer; -import java.io.OutputStream; - /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshallerImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBMarshallerImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,6 +23,13 @@ // $Id$ +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.HashMap; + +import javax.xml.namespace.QName; + import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.common.WSException; @@ -32,18 +39,11 @@ import org.jboss.ws.common.utils.JavaUtils; import org.jboss.ws.extras.xop.jaxrpc.XOPMarshallerImpl; import org.jboss.xb.binding.Constants; - import org.jboss.xb.binding.sunday.marshalling.MarshallerImpl; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; import org.w3c.dom.Node; import org.xml.sax.ContentHandler; -import javax.xml.namespace.QName; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.HashMap; - /** * An implementation of a JAXB Marshaller that uses the JBossXB schema binding marshaller. * Deleted: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBSerializer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,121 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jbossxb; - -// $Id$ - -import org.apache.xerces.xs.XSModel; -import org.jboss.logging.Logger; -import org.jboss.ws.common.binding.BindingException; -import org.jboss.ws.common.binding.SerializationContext; -import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.core.binding.ComplexTypeSerializer; -import org.jboss.ws.core.jaxrpc.SerializationContextJAXRPC; -import org.w3c.dom.NamedNodeMap; - -import javax.xml.namespace.QName; -import java.io.StringWriter; - -/** - * A Serializer that can handle complex types by delegating to JAXB. - * - * @author Thomas.Diesler(a)jboss.org - * @since 04-Dec-2004 - */ -public class JBossXBSerializer extends ComplexTypeSerializer -{ - // provide logging - private static final Logger log = Logger.getLogger(JBossXBSerializer.class); - - private JBossXBMarshaller marshaller; - - public JBossXBSerializer() throws BindingException - { - // Get the JAXB marshaller for complex objects - marshaller = new JBossXBMarshallerImpl(); - } - - /** - * For marshalling the WS layer passes to the JAXB layer - * - * - optional java object instance - * - required map of packaged or generated XSDSchema - * - required QName of the root element - * - optional QName of the root complex type - * - optional instance of JavaWsdlMapping - * - * If the object value is null, the corresponding XML representation of the nillable element should be marshalled. - * The xmlType is redundant if the xmlName corresponds to a global element definition in schema. - * If the java mapping is null, default mapping rules apply. - * - * The result is a self contained (i.e. contains all namespace definitions) XML document without the XML declaration. - * In case of an marshalling problem a descriptive exception is thrown. - */ - public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException - { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); - - // Expect the specific JAXRPC serialization context - SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; - - try - { - // Get the parsed model - XSModel model = jaxrpcContext.getXsModel(); - - // Get the jaxrpc-mapping.xml object graph - JavaWsdlMapping jaxrpcMapping = jaxrpcContext.getJavaWsdlMapping(); - - // schemabinding marshaller is the default delegate - JBossXBMarshaller delegate = marshaller; - - if(value instanceof Exception) - { - // todo: CTS workaround for custom exceptions, clarify when Alexey is back - // causes NPE in MarshallerImpl:458 - delegate = new XercesXSMarshallerImpl(); - } - - // marshalling context - delegate.setProperty(JBossXBConstants.JBXB_XS_MODEL, model); - delegate.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType); - delegate.setProperty(JBossXBConstants.JBXB_ROOT_QNAME, xmlName); - delegate.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, jaxrpcMapping); - - // marshall - StringWriter strwr = new StringWriter(); - delegate.marshal(value, strwr); - String xmlFragment = strwr.toString(); - - log.debug("serialized: " + xmlFragment); - return xmlFragment; - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new BindingException(ex); - } - } -} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshallerImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/JBossXBUnmarshallerImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,13 +23,14 @@ // $Id$ +import java.io.InputStream; +import java.util.HashMap; + import org.jboss.ws.common.WSException; import org.jboss.ws.extras.xop.jaxrpc.XOPUnmarshallerImpl; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.UnmarshallerFactory; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; -import java.io.InputStream; -import java.util.HashMap; /** * An implementation of a JAXB Unmarshaller. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/SchemaBindingBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/SchemaBindingBuilder.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/SchemaBindingBuilder.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,32 +23,49 @@ // $Id$ +import java.util.ArrayList; +import java.util.Iterator; + +import javax.xml.namespace.NamespaceContext; +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; + import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; import org.jboss.util.xml.JBossEntityResolver; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; -import org.jboss.ws.common.metadata.jaxrpcmapping.*; +import org.jboss.ws.common.metadata.jaxrpcmapping.ExceptionMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.JavaXmlTypeMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.PackageMapping; +import org.jboss.ws.common.metadata.jaxrpcmapping.VariableMapping; import org.jboss.ws.common.utils.JBossWSEntityResolver; import org.jboss.ws.extras.xop.jaxrpc.JBossXBContentAdapter; import org.jboss.xb.binding.metadata.ClassMetaData; import org.jboss.xb.binding.metadata.PackageMetaData; import org.jboss.xb.binding.metadata.PropertyMetaData; import org.jboss.xb.binding.metadata.ValueMetaData; -import org.jboss.xb.binding.sunday.unmarshalling.*; +import org.jboss.xb.binding.sunday.unmarshalling.AttributeBinding; +import org.jboss.xb.binding.sunday.unmarshalling.CharactersHandler; +import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; +import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding; +import org.jboss.xb.binding.sunday.unmarshalling.ModelGroupBinding; +import org.jboss.xb.binding.sunday.unmarshalling.ParticleBinding; +import org.jboss.xb.binding.sunday.unmarshalling.ParticleHandler; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; +import org.jboss.xb.binding.sunday.unmarshalling.SimpleTypeBinding; +import org.jboss.xb.binding.sunday.unmarshalling.TermBinding; +import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding; +import org.jboss.xb.binding.sunday.unmarshalling.WildcardBinding; +import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder; import org.jboss.xb.binding.sunday.unmarshalling.impl.runtime.RtElementHandler; import org.w3c.dom.Element; import org.w3c.dom.Text; import org.xml.sax.Attributes; -import javax.xml.namespace.NamespaceContext; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import java.util.ArrayList; -import java.util.Iterator; - /** * Create SchemaBinding from XSModel and jaxrpc-mapping. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/XercesXSMarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/XercesXSMarshallerImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/jbossxb/XercesXSMarshallerImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,6 +23,13 @@ // $Id$ +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.HashMap; + +import javax.xml.namespace.QName; + import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; @@ -37,12 +44,6 @@ import org.w3c.dom.Node; import org.xml.sax.ContentHandler; -import javax.xml.namespace.QName; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.HashMap; - /** * An implementation of a JAXB Marshaller that user XercesXSMarshaller impl. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientDeployment.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientDeployment.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientDeployment.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -22,7 +22,6 @@ package org.jboss.ws.core.metadata.builder.jaxrpc; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -25,8 +25,6 @@ import java.io.IOException; import java.net.URL; -import java.util.Arrays; -import java.util.List; import java.util.Set; import javax.xml.namespace.QName; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCDeployment.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCDeployment.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCDeployment.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -27,7 +27,6 @@ import org.jboss.ws.common.metadata.webservices.WebservicesFactory; import org.jboss.ws.common.metadata.webservices.WebservicesMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -22,9 +22,6 @@ // $Id$ package org.jboss.ws.core.metadata.builder.jaxrpc; -import java.io.IOException; -import java.util.List; -import java.util.Map; import java.util.Set; import javax.management.ObjectName; @@ -39,7 +36,6 @@ import org.jboss.ws.common.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.common.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.common.metadata.wsdl.WSDLService; -import org.jboss.ws.common.umdm.EndpointMetaData; import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.umdm.ServiceMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; @@ -51,10 +47,7 @@ import org.jboss.ws.core.metadata.j2ee.UnifiedEjbPortComponentMetaData; import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.core.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.core.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.core.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** * A server side meta data builder that is based on webservices.xml. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB21.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -24,15 +24,11 @@ import java.util.Iterator; -import javax.jws.WebService; - import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; -import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -32,7 +32,6 @@ import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.core.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -26,9 +26,7 @@ import javax.jws.WebService; import javax.xml.ws.WebServiceProvider; -import org.jboss.logging.Logger; import org.jboss.ws.common.umdm.UnifiedMetaData; -import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** An abstract annotation meta data builder. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/WSConfigFactory.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -27,12 +27,7 @@ import java.io.InputStream; import java.net.URL; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - import org.jboss.logging.Logger; -import org.jboss.util.xml.JBossEntityResolver; -import org.jboss.util.xml.JBossErrorHandler; import org.jboss.ws.common.WSException; import org.jboss.ws.common.utils.DOMUtils; import org.jboss.ws.common.utils.JBossWSEntityResolver; @@ -43,7 +38,6 @@ import org.jboss.xb.binding.UnmarshallerFactory; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder; -import org.w3c.dom.Document; import org.w3c.dom.Element; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSConfigFactoryJAXRPC.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -27,7 +27,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.common.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; import org.jboss.xb.binding.ObjectModelFactory; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxrpc/WSEndpointConfigJAXRPC.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,16 +21,8 @@ */ package org.jboss.ws.core.metadata.config.jaxrpc; -import java.util.ArrayList; -import java.util.List; -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - // $Id$ /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSEndpointConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSEndpointConfigJAXWS.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,15 +21,7 @@ */ package org.jboss.ws.core.metadata.config.jaxws; -import java.util.ArrayList; -import java.util.List; -import org.jboss.ws.common.umdm.EndpointMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; -import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; - // $Id$ /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/config/jaxws/WSHandlerChainsConfigJAXWS.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.metadata.jsr181.HandlerChainMetaData; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/metadata/jsr181/HandlerChainMetaData.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -29,7 +29,6 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.common.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.core.metadata.j2ee.UnifiedHandlerMetaData; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/JAXWSDeployment.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/JAXWSDeployment.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/JAXWSDeployment.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,7 +21,6 @@ */ package org.jboss.ws.core.server; -import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; // $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -36,7 +36,6 @@ import org.jboss.ws.core.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; import org.jboss.ws.core.metadata.builder.jaxws.JAXWSMetaDataBuilderEJB3; import org.jboss.ws.core.metadata.builder.jaxws.JAXWSMetaDataBuilderJSE; -import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; /** * The POJO deployer for web service endpoints. This Deployer is already decoupled from the target Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJVisitor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJVisitor.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SAAJVisitor.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,7 +21,6 @@ */ package org.jboss.ws.core.soap; -import javax.xml.soap.SOAPElement; /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementMessage.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,13 +21,14 @@ */ package org.jboss.ws.core.soap; -import org.jboss.ws.common.utils.DOMWriter; +import java.io.Writer; +import javax.xml.rpc.JAXRPCException; import javax.xml.soap.Name; import javax.xml.soap.SOAPBodyElement; -import javax.xml.rpc.JAXRPCException; -import java.io.Writer; +import org.jboss.ws.common.utils.DOMWriter; + /** * An abstract implemenation of the SOAPBodyElement * <p/> Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementRpc.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementRpc.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementRpc.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,15 +21,8 @@ */ package org.jboss.ws.core.soap; -import org.jboss.ws.common.WSException; -import org.jboss.ws.common.utils.DOMWriter; -import org.w3c.dom.Element; import javax.xml.soap.Name; import javax.xml.soap.SOAPBodyElement; -import javax.xml.rpc.JAXRPCException; -import java.io.IOException; -import java.io.Writer; -import java.util.Iterator; /** * An abstract implemenation of the SOAPBodyElement Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,6 +23,21 @@ // $Id$ +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.Writer; +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.util.Iterator; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.xml.namespace.QName; +import javax.xml.soap.Name; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; + import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; @@ -43,22 +58,14 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; import org.jboss.ws.extras.xop.XOPContext; -import org.w3c.dom.*; +import org.w3c.dom.Attr; +import org.w3c.dom.DOMException; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.TypeInfo; -import javax.xml.namespace.QName; -import javax.xml.soap.Name; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import java.io.IOException; -import java.io.Writer; -import java.io.InputStream; -import java.io.ByteArrayOutputStream; -import java.lang.reflect.Array; -import java.lang.reflect.Method; -import java.util.Iterator; - /** * A SOAPElement that gives access to its content as XML fragment or Java object. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPEnvelopeImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,12 +23,9 @@ // $Id$ -import java.io.IOException; -import java.io.Writer; import java.util.Iterator; import javax.xml.namespace.QName; -import javax.xml.rpc.JAXRPCException; import javax.xml.rpc.soap.SOAPFaultException; import javax.xml.soap.Name; import javax.xml.soap.Node; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/SOAPFaultImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,13 +21,11 @@ */ package org.jboss.ws.core.soap; -import java.io.IOException; import java.io.Writer; import java.util.Iterator; import java.util.Locale; import javax.xml.namespace.QName; -import javax.xml.rpc.JAXRPCException; import javax.xml.soap.Detail; import javax.xml.soap.Name; import javax.xml.soap.SOAPElement; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/ByteArrayContentHandler.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,19 +21,20 @@ */ package org.jboss.ws.core.soap.attachment; -import org.jboss.ws.common.utils.IOUtils; -import org.jboss.ws.common.utils.MimeUtils; - -import javax.activation.ActivationDataFlavor; -import javax.activation.DataContentHandler; -import javax.activation.DataSource; -import javax.activation.DataHandler; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.OutputStream; +import javax.activation.ActivationDataFlavor; +import javax.activation.DataContentHandler; +import javax.activation.DataHandler; +import javax.activation.DataSource; + +import org.jboss.ws.common.utils.IOUtils; +import org.jboss.ws.common.utils.MimeUtils; + /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -29,7 +29,6 @@ import java.util.Collection; import java.util.Enumeration; import java.util.LinkedList; -import java.util.List; import javax.activation.DataHandler; import javax.mail.Header; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/AddressingPropertiesImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/AddressingPropertiesImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/AddressingPropertiesImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -28,10 +28,15 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; -import javax.xml.ws.addressing.*; +import javax.xml.ws.addressing.AddressingBuilder; +import javax.xml.ws.addressing.AddressingConstants; +import javax.xml.ws.addressing.AddressingProperties; +import javax.xml.ws.addressing.AddressingType; +import javax.xml.ws.addressing.AttributedURI; +import javax.xml.ws.addressing.EndpointReference; +import javax.xml.ws.addressing.ReferenceParameters; +import javax.xml.ws.addressing.Relationship; -import org.jboss.ws.core.soap.NameImpl; - // $Id$ /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/jaxws/WSAddressingServerHandler.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -22,17 +22,13 @@ package org.jboss.ws.extras.addressing.jaxws; import java.net.URISyntaxException; -import java.util.HashSet; -import java.util.Set; -import javax.xml.namespace.QName; import javax.xml.soap.SOAPMessage; import javax.xml.ws.addressing.AddressingBuilder; import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.addressing.soap.SOAPAddressingBuilder; import javax.xml.ws.addressing.soap.SOAPAddressingProperties; import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; import javax.xml.ws.handler.soap.SOAPMessageContext; import org.jboss.logging.Logger; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/addressing/soap/SOAPAddressingPropertiesImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -47,7 +47,6 @@ import org.jboss.util.NotImplementedException; import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.common.utils.ThreadLocalAssociation; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpoint.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpoint.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpoint.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,13 +23,13 @@ // $Id$ +import java.rmi.Remote; +import java.rmi.RemoteException; + import org.jboss.ws.extras.eventing.element.SubscribeRequest; import org.jboss.ws.extras.eventing.element.SubscribeResponse; import org.jboss.ws.extras.eventing.element.SubscriptionEndRequest; -import java.rmi.Remote; -import java.rmi.RemoteException; - /** * Event source endpoint interface. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpointImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventSourceEndpointImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,6 +23,12 @@ // $Id$ +import java.rmi.RemoteException; + +import javax.xml.rpc.soap.SOAPFaultException; +import javax.xml.ws.addressing.AddressingProperties; +import javax.xml.ws.addressing.AttributedURI; + import org.jboss.logging.Logger; import org.jboss.ws.extras.eventing.element.EndpointReference; import org.jboss.ws.extras.eventing.element.SubscribeRequest; @@ -33,11 +39,6 @@ import org.jboss.ws.extras.eventing.mgmt.SubscriptionManagerMBean; import org.jboss.ws.extras.eventing.mgmt.SubscriptionTicket; -import javax.xml.rpc.soap.SOAPFaultException; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.AttributedURI; -import java.rmi.RemoteException; - /** * Event source endpoint implementation.<br> * Delegates to {@link org.jboss.ws.extras.eventing.mgmt.SubscriptionManager} Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventingConstants.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventingConstants.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/EventingConstants.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,15 +23,13 @@ // $Id$ -import org.jboss.ws.common.WSException; +import java.net.URI; +import java.net.URISyntaxException; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; import javax.xml.ws.addressing.AddressingBuilder; import javax.xml.ws.addressing.AddressingConstants; -import java.net.URI; -import java.net.URISyntaxException; +import org.jboss.ws.common.WSException; /** * @author Heiko Braun, <heiko(a)openj.net&gt; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/SubscriptionManagerEndpoint.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/SubscriptionManagerEndpoint.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/SubscriptionManagerEndpoint.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,11 +23,15 @@ // $Id$ -import org.jboss.ws.extras.eventing.element.*; - import java.rmi.Remote; import java.rmi.RemoteException; +import org.jboss.ws.extras.eventing.element.RenewRequest; +import org.jboss.ws.extras.eventing.element.RenewResponse; +import org.jboss.ws.extras.eventing.element.StatusRequest; +import org.jboss.ws.extras.eventing.element.StatusResponse; +import org.jboss.ws.extras.eventing.element.UnsubscribeRequest; + /** * Subscription manager endpoint interface. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpointDI.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpointDI.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/deployment/EventingEndpointDI.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,10 +1,10 @@ package org.jboss.ws.extras.eventing.deployment; +import java.io.IOException; + import org.jboss.ws.common.utils.DOMUtils; import org.w3c.dom.Element; -import java.io.IOException; - /** * Eventsource endpoint deployment info. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/DeliveryType.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/DeliveryType.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/DeliveryType.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,9 +23,10 @@ // $Id$ -import javax.xml.soap.SOAPElement; import java.net.URI; +import javax.xml.soap.SOAPElement; + /** * A delivery element states where and how to send notifications. * It can contain an EPR where the notifications should be delivered to: Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/EndpointReference.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/EndpointReference.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/EndpointReference.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,16 +23,16 @@ // $Id$ -import org.w3c.dom.Element; +import java.net.URI; + +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFactory; + import org.jboss.ws.core.soap.SOAPFactoryImpl; import org.jboss.ws.extras.addressing.EndpointReferenceImpl; import org.jboss.ws.extras.eventing.EventingConstants; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPException; -import java.net.URI; - /** * Simplified endpoint representation. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/FilterType.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/FilterType.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/FilterType.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,9 +23,10 @@ // $Id$ -import javax.xml.soap.SOAPElement; import java.net.URI; +import javax.xml.soap.SOAPElement; + /** * A Boolean expression in some dialect, * either as a string or as an XML fragment. If the expression evaluates to false Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/StatusRequest.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/StatusRequest.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/StatusRequest.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -22,7 +22,6 @@ package org.jboss.ws.extras.eventing.element; import javax.xml.soap.SOAPElement; -// $Id$ /** * @author Heiko Braun, <heiko(a)openj.net&gt; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscribeRequest.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscribeRequest.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscribeRequest.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,9 +23,10 @@ // $Id$ -import javax.xml.soap.SOAPElement; import java.util.Date; +import javax.xml.soap.SOAPElement; + /** * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 24-Nov-2005 Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscriptionEndRequest.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscriptionEndRequest.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/SubscriptionEndRequest.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,10 +23,10 @@ // $Id$ +import java.net.URI; + import org.jboss.ws.extras.addressing.EndpointReferenceImpl; -import java.net.URI; - /** * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 25-Nov-2005 Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/UnsubscribeRequest.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/UnsubscribeRequest.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/element/UnsubscribeRequest.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,9 +23,10 @@ // $Id$ -import javax.xml.soap.SOAPElement; import java.net.URI; +import javax.xml.soap.SOAPElement; + /** * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 19-Dec-2005 Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatchJob.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatchJob.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatchJob.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,12 +23,12 @@ // $Id$ -import org.w3c.dom.Element; - import java.net.URI; import java.util.List; import java.util.concurrent.ConcurrentMap; +import org.w3c.dom.Element; + /** * Event dispatch job implementation. */ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherDelegate.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherDelegate.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherDelegate.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -3,13 +3,18 @@ import java.net.URI; import java.util.Properties; -import javax.naming.*; +import javax.management.MBeanServerConnection; +import javax.management.MBeanServerInvocationHandler; import javax.management.ObjectName; -import javax.management.MBeanServerInvocationHandler; -import javax.management.MBeanServerConnection; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; +import javax.naming.StringRefAddr; +import org.jboss.ws.common.WSException; import org.w3c.dom.Element; -import org.jboss.ws.common.WSException; /** * Event dispatching delegate that will be bound to JNDI. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherFactory.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/DispatcherFactory.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,10 +1,11 @@ package org.jboss.ws.extras.eventing.mgmt; +import java.util.Hashtable; + import javax.naming.Context; import javax.naming.Name; import javax.naming.Reference; import javax.naming.spi.ObjectFactory; -import java.util.Hashtable; /** * Creates event dispatcher delegates. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventDispatcher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventDispatcher.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventDispatcher.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,10 +23,10 @@ // $Id$ +import java.net.URI; + import org.w3c.dom.Element; -import java.net.URI; - /** * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 07-Dec-2005 Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventingBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventingBuilder.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/EventingBuilder.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,12 +1,12 @@ package org.jboss.ws.extras.eventing.mgmt; +import java.net.URI; +import java.net.URISyntaxException; + import org.jboss.ws.common.WSException; import org.jboss.ws.extras.eventing.EventingConstants; import org.jboss.ws.extras.eventing.deployment.EventingEndpointDI; -import java.net.URI; -import java.net.URISyntaxException; - /** * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 24-Jan-2006 Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/Subscription.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/Subscription.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/Subscription.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,6 +23,15 @@ // $Id$ +import java.io.ByteArrayInputStream; +import java.net.URI; +import java.net.URL; +import java.util.Date; + +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; +import javax.xml.transform.TransformerException; + import org.apache.xpath.XPathAPI; import org.apache.xpath.objects.XObject; import org.jboss.logging.Logger; @@ -32,16 +41,6 @@ import org.jboss.ws.extras.eventing.element.EndpointReference; import org.w3c.dom.Element; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPMessage; -import javax.xml.transform.TransformerException; -import java.io.ByteArrayInputStream; -import java.net.URI; -import java.net.URL; -import java.util.Date; - /** * Represents a subscription. * Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionManager.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionManager.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionManager.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -27,9 +27,9 @@ import java.io.StringWriter; import java.net.URI; import java.net.URISyntaxException; +import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.ArrayList; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -38,9 +38,11 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; +import javax.management.ObjectName; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.management.*; import org.jboss.logging.Logger; import org.jboss.util.naming.Util; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionTicket.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionTicket.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/eventing/mgmt/SubscriptionTicket.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -23,11 +23,11 @@ // $Id$ -import org.jboss.ws.extras.eventing.element.EndpointReference; - import java.net.URI; import java.util.Date; +import org.jboss.ws.extras.eventing.element.EndpointReference; + /** * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 02-Dec-2005 Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/CreateAttachmentVisitor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/CreateAttachmentVisitor.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/CreateAttachmentVisitor.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,14 +21,14 @@ */ package org.jboss.ws.extras.xop; +import java.io.IOException; +import java.io.Writer; +import java.util.Iterator; + import org.jboss.ws.core.soap.SAAJVisitor; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPElementImpl; -import java.util.Iterator; -import java.io.Writer; -import java.io.IOException; - /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id: CreateAttachmentVisitor.java 1408 2006-11-07 13:42:25Z heiko.braun(a)jboss.com $ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/DisableMTOMHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/DisableMTOMHandler.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/DisableMTOMHandler.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,12 +21,12 @@ */ package org.jboss.ws.extras.xop; -import org.jboss.ws.core.jaxrpc.StubExt; - import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; import javax.xml.rpc.handler.MessageContext; +import org.jboss.ws.core.jaxrpc.StubExt; + /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/RestoreXOPElementVisitor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/RestoreXOPElementVisitor.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/RestoreXOPElementVisitor.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,12 +21,12 @@ */ package org.jboss.ws.extras.xop; +import java.util.Iterator; + import org.jboss.ws.core.soap.SAAJVisitor; import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.soap.SOAPElementImpl; -import java.util.Iterator; - /** * Visit soap object model and restore XOP contents. * This visitor is invoked when: Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/XOPContext.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,6 +21,18 @@ */ package org.jboss.ws.extras.xop; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.Iterator; + +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.soap.AttachmentPart; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; @@ -39,13 +51,6 @@ import org.jboss.xb.binding.sunday.xop.XOPMarshaller; import org.jboss.xb.binding.sunday.xop.XOPObject; -import javax.activation.DataHandler; -import javax.xml.namespace.QName; -import javax.xml.soap.*; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.Iterator; - /** * XOP context associated with a message context. * Acts as a facade to the current soap message and supports the various XOP transitions.<p> Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/JBossXBContentAdapter.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/JBossXBContentAdapter.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/JBossXBContentAdapter.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,6 +21,15 @@ */ package org.jboss.ws.extras.xop.jaxrpc; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.xml.namespace.QName; + import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; @@ -36,14 +45,6 @@ import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding; import org.jboss.xb.binding.sunday.unmarshalling.UnmarshallingContext; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.xml.namespace.QName; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; - /** * Adopts raw binary contents to java types. * This class works in conjunction with the <code>XOPUnmarshallerImpl</code> Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPMarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPMarshallerImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPMarshallerImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,6 +21,10 @@ */ package org.jboss.ws.extras.xop.jaxrpc; +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.soap.AttachmentPart; + import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.CommonMessageContext; @@ -32,10 +36,6 @@ import org.jboss.xb.binding.sunday.xop.XOPMarshaller; import org.jboss.xb.binding.sunday.xop.XOPObject; -import javax.activation.DataHandler; -import javax.xml.namespace.QName; -import javax.xml.soap.AttachmentPart; - /** * The XOPUnmarshallerImpl allows callbacks from the binding layer towards the * soap processing components in order to optimize binary processing. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPScanner.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPScanner.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPScanner.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,11 +21,18 @@ */ package org.jboss.ws.extras.xop.jaxrpc; -import org.apache.xerces.xs.*; - import java.util.ArrayList; import java.util.List; +import org.apache.xerces.xs.XSComplexTypeDefinition; +import org.apache.xerces.xs.XSElementDeclaration; +import org.apache.xerces.xs.XSModelGroup; +import org.apache.xerces.xs.XSObjectList; +import org.apache.xerces.xs.XSParticle; +import org.apache.xerces.xs.XSSimpleTypeDefinition; +import org.apache.xerces.xs.XSTerm; +import org.apache.xerces.xs.XSTypeDefinition; + /** * Scans complex type definitions for nested XOP type declarations. * A XOP type declaration is identified as a complex type Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPUnmarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPUnmarshallerImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxrpc/XOPUnmarshallerImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,6 +21,14 @@ */ package org.jboss.ws.extras.xop.jaxrpc; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import javax.activation.DataHandler; +import javax.xml.namespace.QName; +import javax.xml.soap.AttachmentPart; +import javax.xml.soap.SOAPException; + import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; @@ -29,13 +37,6 @@ import org.jboss.xb.binding.sunday.xop.XOPObject; import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; -import javax.activation.DataHandler; -import javax.xml.namespace.QName; -import javax.xml.soap.AttachmentPart; -import javax.xml.soap.SOAPException; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - /** * The XOPUnmarshallerImpl allows callbacks from the binding layer towards the * soap processing components in order to optimize binary processing. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentMarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentMarshallerImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentMarshallerImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,14 +1,14 @@ package org.jboss.ws.extras.xop.jaxws; +import javax.activation.DataHandler; +import javax.xml.bind.attachment.AttachmentMarshaller; + import org.jboss.ws.common.WSException; import org.jboss.ws.extras.xop.XOPContext; import org.jboss.ws.extras.xop.jaxrpc.XOPMarshallerImpl; +import org.jboss.xb.binding.sunday.xop.XOPMarshaller; import org.jboss.xb.binding.sunday.xop.XOPObject; -import org.jboss.xb.binding.sunday.xop.XOPMarshaller; -import javax.xml.bind.attachment.AttachmentMarshaller; -import javax.activation.DataHandler; - /** * Created by IntelliJ IDEA. * User: hbraun Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentUnmarshallerImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentUnmarshallerImpl.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/AttachmentUnmarshallerImpl.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -1,13 +1,13 @@ package org.jboss.ws.extras.xop.jaxws; +import javax.activation.DataHandler; +import javax.xml.bind.attachment.AttachmentUnmarshaller; + import org.jboss.ws.extras.xop.XOPContext; import org.jboss.ws.extras.xop.jaxrpc.XOPUnmarshallerImpl; +import org.jboss.xb.binding.sunday.xop.XOPObject; import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; -import org.jboss.xb.binding.sunday.xop.XOPObject; -import javax.activation.DataHandler; -import javax.xml.bind.attachment.AttachmentUnmarshaller; - /** * Created by IntelliJ IDEA. * User: hbraun Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/ReflectiveXOPScanner.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/ReflectiveXOPScanner.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/extras/xop/jaxws/ReflectiveXOPScanner.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,10 +21,11 @@ */ package org.jboss.ws.extras.xop.jaxws; -import javax.xml.bind.annotation.XmlMimeType; import java.lang.reflect.Field; import java.lang.reflect.Method; +import javax.xml.bind.annotation.XmlMimeType; + /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -31,7 +31,6 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.metadata.WebMetaData; -import org.jboss.ws.common.umdm.UnifiedMetaData; import org.jboss.ws.core.server.KernelLocator; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointPublisher.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -35,7 +35,6 @@ import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; /** * Publish the HTTP service endpoint to Tomcat Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -37,7 +37,7 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.naming.Util; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.WSException; +import org.jboss.ws.common.WSException; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.common.metadata.wsdl.WSDL11DefinitionFactory; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -24,7 +24,6 @@ // $Id$ import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedHashMap; import javax.xml.namespace.QName; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -24,21 +24,11 @@ // $Id$ import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; import java.net.URL; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.jboss.logging.Logger; import org.jboss.ws.common.WSException; import org.jboss.ws.core.CommonContextServlet; -import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -32,11 +32,8 @@ import java.math.BigInteger; import java.net.URI; import java.rmi.Remote; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.List; -import java.util.StringTokenizer; import javax.xml.namespace.QName; import javax.xml.rpc.holders.ByteArrayHolder; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -22,7 +22,6 @@ package org.jboss.ws.tools.helpers; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -32,15 +31,12 @@ import java.util.Set; import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; import javax.xml.rpc.encoding.TypeMapping; -import javax.xml.rpc.holders.ByteArrayHolder; import javax.xml.rpc.holders.Holder; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.ws.common.Constants; import org.jboss.ws.common.WSException; -import org.jboss.ws.common.jaxrpc.LiteralTypeMapping; import org.jboss.ws.common.jaxrpc.Style; import org.jboss.ws.common.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.JavaWsdlMapping; @@ -54,21 +50,8 @@ import org.jboss.ws.common.metadata.jaxrpcmapping.VariableMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.WsdlMessageMapping; import org.jboss.ws.common.metadata.jaxrpcmapping.WsdlReturnValueMapping; -import org.jboss.ws.common.metadata.wsdl.NCName; import org.jboss.ws.common.metadata.wsdl.WSDLBinding; -import org.jboss.ws.common.metadata.wsdl.WSDLBindingFault; -import org.jboss.ws.common.metadata.wsdl.WSDLBindingOperation; -import org.jboss.ws.common.metadata.wsdl.WSDLBindingOperationInput; -import org.jboss.ws.common.metadata.wsdl.WSDLBindingOperationOutput; -import org.jboss.ws.common.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.common.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.common.metadata.wsdl.WSDLInterface; -import org.jboss.ws.common.metadata.wsdl.WSDLInterfaceFault; -import org.jboss.ws.common.metadata.wsdl.WSDLInterfaceOperation; -import org.jboss.ws.common.metadata.wsdl.WSDLInterfaceOperationInput; -import org.jboss.ws.common.metadata.wsdl.WSDLInterfaceOperationOutfault; -import org.jboss.ws.common.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.common.metadata.wsdl.WSDLProperty; import org.jboss.ws.common.metadata.wsdl.WSDLService; import org.jboss.ws.common.metadata.wsdl.WSDLTypes; import org.jboss.ws.common.metadata.wsdl.WSDLUtils; @@ -81,10 +64,8 @@ import org.jboss.ws.common.umdm.FaultMetaData; import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.umdm.ParameterMetaData; -import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.umdm.WrappedParameter; import org.jboss.ws.common.utils.JavaUtils; -import org.jboss.ws.core.CommonSOAPBinding; import org.jboss.ws.tools.JavaToXSD; import org.jboss.ws.tools.interfaces.JavaToXSDIntf; import org.jboss.ws.tools.interfaces.SchemaCreatorIntf; Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/ReformatXML.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -21,15 +21,15 @@ */ package org.jboss.ws.tools.helpers; -import org.w3c.dom.Element; -import org.jboss.ws.common.utils.DOMUtils; -import org.jboss.ws.common.utils.DOMWriter; - import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; +import org.jboss.ws.common.utils.DOMUtils; +import org.jboss.ws.common.utils.DOMWriter; +import org.w3c.dom.Element; + /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; * @version $Id$ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-12-06 10:17:42 UTC (rev 1569) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-12-06 10:29:48 UTC (rev 1570) @@ -52,7 +52,6 @@ import org.jboss.ws.common.umdm.FaultMetaData; import org.jboss.ws.common.umdm.OperationMetaData; import org.jboss.ws.common.umdm.ParameterMetaData; -import org.jboss.ws.common.umdm.ServerEndpointMetaData; import org.jboss.ws.common.umdm.ServiceMetaData;