Author: jason.greene(a)jboss.com Date: 2007-02-23 15:01:21 -0500 (Fri, 23 Feb 2007) New Revision: 2451 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java Log: Revert ConcurrentHashMap changes Correct coding style in ExtensibleMetaData Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-23 19:00:15 UTC (rev 2450) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-23 20:01:21 UTC (rev 2451) @@ -23,6 +23,21 @@ // $Id$ +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Observable; +import java.util.Properties; + +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -40,17 +55,13 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.config.*; +import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.config.Configurable; +import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.ws.metadata.config.EndpointFeature; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; -import java.lang.reflect.Method; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - /** * A Service component describes a set of endpoints. * @@ -110,7 +121,7 @@ // True if the handlers are initialized private boolean handlersInitialized; // Maps the java method to the operation meta data - private Map<Method, OperationMetaData> opMetaDataCache = new ConcurrentHashMap<Method, OperationMetaData>(); + private Map<Method, OperationMetaData> opMetaDataCache = new HashMap<Method, OperationMetaData>(); // All of the registered types private List<Class> registeredTypes = new ArrayList<Class>(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java 2007-02-23 19:00:15 UTC (rev 2450) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java 2007-02-23 20:01:21 UTC (rev 2451) @@ -2,28 +2,29 @@ import java.util.HashMap; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** * Base class for UMD elements that are extensible. * * @author Heiko Braun, <heiko(a)openj.net&gt; * @since 21-Mar-2006 */ -public abstract class ExtensibleMetaData { +public abstract class ExtensibleMetaData +{ + private Map<String, MetaDataExtension> extensions = new HashMap<String, MetaDataExtension>(); - private Map<String, MetaDataExtension> extensions = new ConcurrentHashMap<String, MetaDataExtension>(); - - public Map<String, MetaDataExtension> getExtensions() { + public Map<String, MetaDataExtension> getExtensions() + { return extensions; } - public void addExtension(MetaDataExtension ext) { + public void addExtension(MetaDataExtension ext) + { getExtensions().put(ext.getExtensionNameSpace(), ext); } - public MetaDataExtension getExtension(String namespace) { + public MetaDataExtension getExtension(String namespace) + { return getExtensions().get(namespace); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-23 19:00:15 UTC (rev 2450) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-23 20:01:21 UTC (rev 2451) @@ -27,11 +27,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.LinkedHashMap; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; import javax.xml.namespace.QName; import javax.xml.rpc.encoding.TypeMappingRegistry; @@ -69,7 +68,7 @@ private UnifiedMetaData wsMetaData; // The service endpoints - private Map<QName, EndpointMetaData> endpoints = new ConcurrentHashMap<QName, EndpointMetaData>(); + private Map<QName, EndpointMetaData> endpoints = new HashMap<QName, EndpointMetaData>(); private QName serviceName; private String serviceRefName; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-23 19:00:15 UTC (rev 2450) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-23 20:01:21 UTC (rev 2451) @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import java.util.concurrent.ConcurrentHashMap; import org.jboss.logging.Logger; import org.jboss.ws.core.UnifiedVirtualFile; @@ -69,10 +68,10 @@ private static boolean isFinalRelease; // Map<String, WSDLDefinitions> the wsdl-file to the wsdl Document // Note the same wsdl can be used in multiple webservice descriptions - Map<String, WSDLDefinitions> wsdlMap = new ConcurrentHashMap<String, WSDLDefinitions>(); + Map<String, WSDLDefinitions> wsdlMap = new HashMap<String, WSDLDefinitions>(); // Maps the jaxrpc-mapping-file to {@link JavaWsdlMapping} object // Note the same jaxrpc-mapping.xml can be used in multiple webservice descriptions - Map<String, JavaWsdlMapping> jaxrpcMap = new ConcurrentHashMap<String, JavaWsdlMapping>(); + Map<String, JavaWsdlMapping> jaxrpcMap = new HashMap<String, JavaWsdlMapping>(); // The list of service meta data private List<ServiceMetaData> services = new ArrayList<ServiceMetaData>(); // Used by eager initialization