February 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r2275 - in trunk: jbossws-core/src/main/java/javax/xml/rpc/soap and 35 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-02-05 06:19:25 -0500 (Mon, 05 Feb 2007) New Revision: 2275 Modified: trunk/jbossws-core/src/main/java/javax/xml/rpc/ServiceFactory.java trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java trunk/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConnectionFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/XOPMarshallerImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 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/FaultMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.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/TypesMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL20.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx Log: Resource sparing logging. Profiling reveiled that logging easily becomes a congestion point. It improves CG as well Modified: trunk/jbossws-core/src/main/java/javax/xml/rpc/ServiceFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/javax/xml/rpc/ServiceFactory.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/javax/xml/rpc/ServiceFactory.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -101,7 +101,7 @@ } catch (ClassNotFoundException e1) { - log.debug("Cannot load factory: " + factoryName); + if(log.isDebugEnabled()) log.debug("Cannot load factory: " + factoryName); } } } Modified: trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java =================================================================== --- trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/javax/xml/rpc/soap/SOAPFaultException.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -89,7 +89,7 @@ super(faultString); Name detailName = faultDetail != null ? faultDetail.getElementName() : null; - log.debug("new SOAPFaultException [code=" + faultCode + ",string=" + faultString + ",actor=" + faultActor + ",detail=" + detailName + "]"); + if(log.isDebugEnabled()) log.debug("new SOAPFaultException [code=" + faultCode + ",string=" + faultString + ",actor=" + faultActor + ",detail=" + detailName + "]"); this.faultCode = faultCode; this.faultString = faultString; Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java =================================================================== --- trunk/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -72,7 +72,7 @@ { try { - log.debug("Load from system property: " + factoryName); + if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName); Class factoryClass = loader.loadClass(factoryName); factory = factoryClass.newInstance(); } @@ -82,8 +82,8 @@ } } - // Use the properties file "lib/jaxm.properties" in the JRE directory. - // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above. + // Use the properties file "lib/jaxm.properties" in the JRE directory. + // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above. if (factory == null) { action = new PropertyAccessAction("java.home"); @@ -98,7 +98,7 @@ factoryName = jaxmProperties.getProperty(propertyName); if (factoryName != null) { - log.debug("Load from " + jaxmFile + ": " + factoryName); + if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName); Class factoryClass = loader.loadClass(factoryName); factory = factoryClass.newInstance(); } @@ -110,7 +110,7 @@ } } - // Use the Services API (as detailed in the JAR specification), if available, to determine the classname. + // Use the Services API (as detailed in the JAR specification), if available, to determine the classname. if (factory == null) { String filename = "META-INF/services/" + propertyName; @@ -124,7 +124,7 @@ br.close(); if (factoryName != null) { - log.debug("Load from Service API " + filename + ": " + factoryName); + if(log.isDebugEnabled()) log.debug("Load from Service API " + filename + ": " + factoryName); Class factoryClass = loader.loadClass(factoryName); factory = factoryClass.newInstance(); } @@ -142,7 +142,7 @@ try { factoryName = defaultFactory; - log.debug("Load from default: " + factoryName); + if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName); Class factoryClass = loader.loadClass(factoryName); factory = factoryClass.newInstance(); } Modified: trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConnectionFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConnectionFactory.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/javax/xml/soap/SOAPConnectionFactory.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -81,7 +81,7 @@ } catch (ClassNotFoundException e1) { - log.debug("Cannot load factory: " + factoryName); + if(log.isDebugEnabled()) log.debug("Cannot load factory: " + factoryName); } } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -95,7 +95,7 @@ public void update(Observable observable, Object object) { - log.debug("Update config: " + object); + if(log.isDebugEnabled()) log.debug("Update config: " + object); configure(); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -283,12 +283,12 @@ try { URL wsaToURL = new URL(wsaTo); - log.debug("Sending request to addressing destination: " + wsaToURL); + if(log.isDebugEnabled()) log.debug("Sending request to addressing destination: " + wsaToURL); targetAddress = wsaToURL.toExternalForm(); } catch (MalformedURLException ex) { - log.debug("Not a valid URL: " + wsaTo); + if(log.isDebugEnabled()) log.debug("Not a valid URL: " + wsaTo); } } } @@ -343,7 +343,7 @@ // Check if protocol handlers modified the payload if (((SOAPBodyImpl)reqMessage.getSOAPBody()).isModifiedFromSource()) { - log.debug("Handler modified body payload, unbind message again"); + if(log.isDebugEnabled()) log.debug("Handler modified body payload, unbind message again"); SOAPMessage resMessage = msgContext.getSOAPMessage(); binding.unbindResponseMessage(opMetaData, resMessage, epInv, unboundHeaders); } @@ -363,7 +363,7 @@ { for (AttachmentPart part : attachmentParts) { - log.debug("Adding attachment part: " + part.getContentId()); + if(log.isDebugEnabled()) log.debug("Adding attachment part: " + part.getContentId()); reqMessage.addAttachmentPart(part); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -129,7 +129,7 @@ /** On the client side, generate the payload from IN parameters. */ public Object bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { - log.debug("bindRequestMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("bindRequestMessage: " + opMetaData.getQName()); try { @@ -141,7 +141,7 @@ if (opMetaData.isRPCEncoded()) XOPContext.setMTOMEnabled(false); else - XOPContext.setMTOMEnabled( isMTOMEnabled() ); + XOPContext.setMTOMEnabled( isMTOMEnabled() ); // Associate current message with message context SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData); @@ -161,7 +161,7 @@ QName opQName = opMetaData.getQName(); Name opName = new NameImpl(namespaceRegistry.registerQName(opQName)); - log.debug("Create RPC body element: " + opName); + if(log.isDebugEnabled()) log.debug("Create RPC body element: " + opName); soapBodyElement = new SOAPBodyElementRpc(opName); soapBodyElement = (SOAPBodyElement)soapBody.addChildElement(soapBodyElement); } @@ -199,7 +199,7 @@ xmlName = namespaceRegistry.registerQName(xmlName); Name soapName = new NameImpl(xmlName.getLocalPart(), xmlName.getPrefix(), xmlName.getNamespaceURI()); - log.debug("Add unboundHeader element: " + soapName); + if(log.isDebugEnabled()) log.debug("Add unboundHeader element: " + soapName); SOAPContentElement contentElement = new SOAPHeaderElementImpl(soapName); contentElement.setParamMetaData(unboundHeader.toParameterMetaData(opMetaData)); soapHeader.addChildElement(contentElement); @@ -226,7 +226,7 @@ /** On the server side, extract the IN parameters from the payload and populate an Invocation object */ public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, Object payload) throws BindingException { - log.debug("unbindRequestMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("unbindRequestMessage: " + opMetaData.getQName()); try { @@ -313,7 +313,7 @@ /** On the server side, generate the payload from OUT parameters. */ public Object bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException { - log.debug("bindResponseMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("bindResponseMessage: " + opMetaData.getQName()); try { @@ -416,7 +416,7 @@ public void unbindResponseMessage(OperationMetaData opMetaData, Object payload, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders) throws BindingException { - log.debug("unbindResponseMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("unbindResponseMessage: " + opMetaData.getQName()); try { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -99,13 +99,13 @@ public void setRequestParamValue(QName xmlName, Object value) { - log.debug("setRequestParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); + if(log.isDebugEnabled()) log.debug("setRequestParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); reqPayload.put(xmlName, value); } public Object getRequestParamValue(QName xmlName) throws SOAPException { - log.debug("getRequestParamValue: " + xmlName); + if(log.isDebugEnabled()) log.debug("getRequestParamValue: " + xmlName); Object paramValue = reqPayload.get(xmlName); ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); paramValue = transformPayloadValue(paramMetaData, paramValue); @@ -116,7 +116,7 @@ */ public Object[] getRequestPayload() throws SOAPException { - log.debug("getRequestPayload"); + if(log.isDebugEnabled()) log.debug("getRequestPayload"); List<QName> xmlNames = getRequestParamNames(); Object[] payload = new Object[opMetaData.getJavaMethod().getParameterTypes().length]; @@ -141,13 +141,13 @@ public void setResponseParamValue(QName xmlName, Object value) { - log.debug("setResponseParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); + if(log.isDebugEnabled()) log.debug("setResponseParamValue: [name=" + xmlName + ",value=" + getTypeName(value) + "]"); resPayload.put(xmlName, value); } public Object getResponseParamValue(QName xmlName) throws SOAPException { - log.debug("getResponseParamValue: " + xmlName); + if(log.isDebugEnabled()) log.debug("getResponseParamValue: " + xmlName); Object paramValue = resPayload.get(xmlName); ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); paramValue = transformPayloadValue(paramMetaData, paramValue); @@ -168,13 +168,13 @@ if (value != null && retMetaData == null) throw new WSException("Operation does not have a return value: " + opMetaData.getQName()); - log.debug("setReturnValue: " + getTypeName(value)); + if(log.isDebugEnabled()) log.debug("setReturnValue: " + getTypeName(value)); this.returnValue = value; } public Object getReturnValue() throws SOAPException { - log.debug("getReturnValue"); + if(log.isDebugEnabled()) log.debug("getReturnValue"); Object paramValue = returnValue; ParameterMetaData paramMetaData = opMetaData.getReturnParameter(); if (paramMetaData != null) @@ -241,7 +241,7 @@ } } - log.debug("transformPayloadValue: " + getTypeName(paramValue) + " -> " + getTypeName(retValue)); + if(log.isDebugEnabled()) log.debug("transformPayloadValue: " + getTypeName(paramValue) + " -> " + getTypeName(retValue)); return retValue; } @@ -333,7 +333,7 @@ retValue = JavaUtils.syncArray(retValue, targetParameterType); } - log.debug("syncEndpointInputParam: " + getTypeName(paramValue) + " -> " + getTypeName(retValue) + "(" + index + ")"); + if(log.isDebugEnabled()) log.debug("syncEndpointInputParam: " + getTypeName(paramValue) + " -> " + getTypeName(retValue) + "(" + index + ")"); payload[index] = retValue; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/ParameterWrapping.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -94,7 +94,7 @@ } catch (Exception ex) { - log.debug("Invalid request wrapper: " + ex); + if(log.isDebugEnabled()) log.debug("Invalid request wrapper: " + ex); return null; } } @@ -104,7 +104,7 @@ assertOperationMetaData(request.getOperationMetaData()); Class reqStructType = request.getJavaType(); - log.debug("wrapRequestParameters: " + reqStructType.getName()); + if(log.isDebugEnabled()) log.debug("wrapRequestParameters: " + reqStructType.getName()); List<WrappedParameter> wrappedParameters = request.getWrappedParameters(); try { @@ -140,7 +140,7 @@ List<WrappedParameter> wrappedParameters = request.getWrappedParameters(); Class reqStructType = reqStruct.getClass(); - log.debug("unwrapRequestParameters: " + reqStructType.getName()); + if(log.isDebugEnabled()) log.debug("unwrapRequestParameters: " + reqStructType.getName()); try { for (WrappedParameter param : wrappedParameters) @@ -177,11 +177,11 @@ Class resStructType = returnMetaData.getJavaType(); if (returnValue != null && returnValue.getClass() == resStructType) { - log.debug("Response parameter already wrapped" + resStructType.getName()); + if(log.isDebugEnabled()) log.debug("Response parameter already wrapped" + resStructType.getName()); return returnValue; } - log.debug("wrapResponseParameter: " + resStructType.getName()); + if(log.isDebugEnabled()) log.debug("wrapResponseParameter: " + resStructType.getName()); List<WrappedParameter> wrappedParameters = returnMetaData.getWrappedParameters(); try { @@ -214,7 +214,7 @@ { Class resStructType = resStruct.getClass(); - log.debug("unwrapResponseParameter: " + resStructType.getName()); + if(log.isDebugEnabled()) log.debug("unwrapResponseParameter: " + resStructType.getName()); List<WrappedParameter> wrappedParameters = retMetaData.getWrappedParameters(); Class[] targetTypes = operationMetaData.getJavaMethod().getParameterTypes(); try @@ -285,7 +285,7 @@ String packageName = endpointMetaData.getServiceEndpointInterface().getPackage().getName(); String wrapperName = packageName + "._JBossWS_" + serviceName + "_" + endpointName + "_" + parameterName; - log.debug("Generating wrapper: " + wrapperName); + if(log.isDebugEnabled()) log.debug("Generating wrapper: " + wrapperName); Class wrapperType; try Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -116,7 +116,7 @@ FaultMetaData faultMetaData = opMetaData.getFault(xmlName); if (faultMetaData != null) { - log.debug("Deserialize fault: " + faultMetaData); + if(log.isDebugEnabled()) log.debug("Deserialize fault: " + faultMetaData); QName xmlType = faultMetaData.getXmlType(); Class javaType = faultMetaData.getJavaType(); @@ -158,7 +158,7 @@ } else { - log.debug("Cannot find fault meta data for: " + xmlName); + if(log.isDebugEnabled()) log.debug("Cannot find fault meta data for: " + xmlName); } } } @@ -280,7 +280,7 @@ } else { - log.debug("Cannot obtain fault meta data for: " + javaType); + if(log.isDebugEnabled()) log.debug("Cannot obtain fault meta data for: " + javaType); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SchemaGenerator.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -49,7 +49,7 @@ public JBossXSModel generateXSDSchema(QName xmlType, Class javaType) { - log.debug("generateXSDSchema: [xmlType=" + xmlType + ",javaType=" + javaType.getName() + "]"); + if(log.isDebugEnabled()) log.debug("generateXSDSchema: [xmlType=" + xmlType + ",javaType=" + javaType.getName() + "]"); try { assertXmlType(xmlType); @@ -72,7 +72,7 @@ if (xsModel == null) throw new WSException("Cannot generate XSModel"); - log.debug("\n" + xsModel.serialize()); + if(log.isDebugEnabled()) log.debug("\n" + xsModel.serialize()); return xsModel; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SerializationContextJAXRPC.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -58,7 +58,7 @@ { if (jaxrpcMapping == null) { - log.debug("Generate jaxrpcMapping from typeMapping"); + if(log.isDebugEnabled()) log.debug("Generate jaxrpcMapping from typeMapping"); jaxrpcMapping = new JavaWsdlMapping(); for (QName xmlType : getTypeMapping().getRegisteredXmlTypes()) @@ -85,7 +85,7 @@ packageMapping.setNamespaceURI(nsURI); packageMapping.setPackageType(packageName); jaxrpcMapping.addPackageMapping(packageMapping); - log.debug("Add package mapping: " + packageMapping); + if(log.isDebugEnabled()) log.debug("Add package mapping: " + packageMapping); } // Do not add mappings for array types @@ -100,7 +100,7 @@ xmlTypeMapping.setJavaType(javaTypeName); xmlTypeMapping.setRootTypeQName(xmlType); jaxrpcMapping.addJavaXmlTypeMappings(xmlTypeMapping); - log.debug("Add type mapping: " + xmlTypeMapping); + if(log.isDebugEnabled()) log.debug("Add type mapping: " + xmlTypeMapping); } } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/TypeMappingImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -122,7 +122,7 @@ */ public void register(Class javaType, QName xmlType, SerializerFactory sf, DeserializerFactory df) { - log.debug("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]"); + if(log.isDebugEnabled()) log.debug("register: TypeMappingImpl@" + hashCode() + " [xmlType=" + xmlType + ",javaType=" + javaType.getName() + ",sf=" + sf + ",df=" + df + "]"); registerInternal(javaType, new IQName(xmlType), sf, df); keyPairCache.clear(); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -48,7 +48,7 @@ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); byte[] value = null; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -48,7 +48,7 @@ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); String xmlFragment = null; NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -42,7 +42,7 @@ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); Calendar value = null; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/CalendarSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -44,7 +44,7 @@ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); String valueStr = SimpleTypeBindings.marshalDateTime((Calendar)value); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -42,7 +42,7 @@ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); Date value = null; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/DateSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -48,7 +48,7 @@ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); if (value != null) { Calendar cal = new GregorianCalendar(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -44,7 +44,7 @@ */ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); try { Element domElement = DOMUtils.parse(xmlFragment); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/ElementSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -50,7 +50,7 @@ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); if (value == null) throw new IllegalArgumentException("Element value cannot be null"); if ((value instanceof Element) == false) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -42,7 +42,7 @@ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); byte[] value = null; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/HexSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -45,7 +45,7 @@ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); value = JavaUtils.getPrimitiveValueArray(value); String valueStr = SimpleTypeBindings.marshalHexBinary((byte[])value); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -70,7 +70,7 @@ */ public Object deserialize(QName xmlName, QName xmlType, String val, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); // Expect the specific JAXRPC serialization context SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; @@ -103,7 +103,7 @@ throw new BindingException(ex); } - log.debug("deserialized: " + (value != null ? value.getClass().getName() : null)); + if(log.isDebugEnabled()) log.debug("deserialized: " + (value != null ? value.getClass().getName() : null)); return value; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/JBossXBSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -73,7 +73,7 @@ */ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); // Expect the specific JAXRPC serialization context SerializationContextJAXRPC jaxrpcContext = (SerializationContextJAXRPC)serContext; @@ -100,7 +100,7 @@ delegate.marshal(value, strwr); String xmlFragment = strwr.toString(); - log.debug("serialized: " + xmlFragment); + if(log.isDebugEnabled()) log.debug("serialized: " + xmlFragment); return xmlFragment; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/NullValueSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -55,7 +55,7 @@ */ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); nsRegistry.registerURI(Constants.NS_SCHEMA_XSI, Constants.PREFIX_XSI); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -46,7 +46,7 @@ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); QName value = null; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/QNameSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -46,7 +46,7 @@ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); QName qnameValue = (QName)value; String nsURI = qnameValue.getNamespaceURI(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArrayDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -61,7 +61,7 @@ */ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); try { ParameterMetaData paramMetaData = (ParameterMetaData)serContext.getProperty(ParameterMetaData.class.getName()); @@ -84,7 +84,7 @@ throw new WSException("Cannot obtain component xmlType for: " + compJavaType); // Get the component type deserializer factory - log.debug("Get component deserializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]"); + if(log.isDebugEnabled()) log.debug("Get component deserializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]"); DeserializerFactoryBase compDeserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(compJavaType, compXmlType); if (compDeserializerFactory == null) { @@ -99,7 +99,7 @@ if (arrDims.length < 1 || 2 < arrDims.length) throw new WSException("Unsupported array dimensions: " + Arrays.asList(arrDims)); - + Iterator it = DOMUtils.getChildElements(arrayElement); if (arrDims.length == 1) { @@ -115,7 +115,7 @@ } } - log.debug("deserialized: " + retArray.getClass().getName()); + if(log.isDebugEnabled()) log.debug("deserialized: " + retArray.getClass().getName()); return retArray; } catch (RuntimeException e) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -59,7 +59,7 @@ */ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + ",valueType=" + value.getClass().getName() + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + ",valueType=" + value.getClass().getName() + "]"); try { ParameterMetaData paramMetaData = (ParameterMetaData)serContext.getProperty(ParameterMetaData.class.getName()); @@ -86,7 +86,7 @@ throw new WSException("Cannot obtain component xmlType for: " + compJavaType); // Get the component type serializer factory - log.debug("Get component serializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]"); + if(log.isDebugEnabled()) log.debug("Get component serializer for: [javaType=" + compJavaType.getName() + ",xmlType=" + compXmlType + "]"); SerializerFactoryBase compSerializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(compJavaType, compXmlType); if (compSerializerFactory == null) { @@ -130,7 +130,7 @@ } xmlFragment.append("</" + Constants.PREFIX_SOAP11_ENC + ":Array>"); - log.debug("serialized: " + xmlFragment); + if(log.isDebugEnabled()) log.debug("serialized: " + xmlFragment); return xmlFragment.toString(); } catch (RuntimeException e) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -44,7 +44,7 @@ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); try { Element domElement = DOMUtils.parse(xmlFragment); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPElementSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -49,7 +49,7 @@ */ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); if (value == null) throw new IllegalArgumentException("SOAPElement value cannot be null"); if ((value instanceof SOAPElement) == false) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -41,7 +41,7 @@ public Object deserialize(QName xmlName, QName xmlType, String xmlFragment, SerializationContext serContext) throws BindingException { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); Object value = null; String valueStr = unwrapValueStr(xmlFragment); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SimpleSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -50,7 +50,7 @@ */ public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); String valueStr; String typeName = xmlType.getLocalPart(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -281,7 +281,7 @@ } protected CommonMessageContext processPivot(CommonMessageContext requestContext) { - log.debug("Begin response processing"); + if(log.isDebugEnabled()) log.debug("Begin response processing"); return requestContext; } @@ -447,12 +447,12 @@ { if (null == name) throw new JAXRPCException("Unsupported property: " + name); - + // CTS: com/sun/ts/tests/jaxrpc/api/javax_xml_rpc/Call/Client.java#SetGetPropertyTest2 if (name.startsWith("javax.xml.rpc") && standardProperties.contains(name) == false) throw new JAXRPCException("Unsupported property: " + name); - log.debug("setProperty: [name=" + name + ",value=" + value + "]"); + if(log.isDebugEnabled()) log.debug("setProperty: [name=" + name + ",value=" + value + "]"); properties.put(name, value); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -112,7 +112,7 @@ HandlerMetaDataJAXRPC handler = new HandlerMetaDataJAXRPC(epMetaData, HandlerType.ENDPOINT); handler.setHandlerClassName(info.getHandlerClass().getName()); handler.setSoapRoles(roles); - log.debug("Add handler to: " + portName + handler); + if(log.isDebugEnabled()) log.debug("Add handler to: " + portName + handler); epMetaData.addHandler(handler); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -495,7 +495,7 @@ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); - log.debug("Adding client side handler to endpoint '" + portName + "': " + info); + if(log.isDebugEnabled()) log.debug("Adding client side handler to endpoint '" + portName + "': " + info); handlerInfos.add(info); // register the handlers with the client engine Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -140,7 +140,7 @@ URL wsdlLocation = usrMetaData.getWsdlLocation(); if (wsdlLocation != null) { - log.debug("Create jaxrpc service from wsdl"); + if(log.isDebugEnabled()) log.debug("Create jaxrpc service from wsdl"); // Create the actual service object QName serviceName = usrMetaData.getServiceQName(); @@ -149,7 +149,7 @@ } else { - log.debug("Create jaxrpc service with no wsdl"); + if(log.isDebugEnabled()) log.debug("Create jaxrpc service with no wsdl"); jaxrpcService = new ServiceImpl(new QName(Constants.NS_JBOSSWS_URI, "AnonymousService")); } @@ -163,7 +163,7 @@ if (pcLinkRef != null) { String pcLink = (String)pcLinkRef.getContent(); - log.debug("Resolving port-component-link: " + pcLink); + if(log.isDebugEnabled()) log.debug("Resolving port-component-link: " + pcLink); // First try to obtain the endpoint address loacally String endpointAddress = null; @@ -193,7 +193,7 @@ is.close(); } - log.debug("Resolved to: " + endpointAddress); + if(log.isDebugEnabled()) log.debug("Resolved to: " + endpointAddress); if (serviceMetaData.getEndpoints().size() == 1) { EndpointMetaData epMetaData = serviceMetaData.getEndpoints().get(0); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceProxy.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -109,7 +109,7 @@ Object retObj = null; if (jaxrpcServiceMethods.contains(method)) { - log.debug("Invoke on jaxrpc service: " + methodName); + if(log.isDebugEnabled()) log.debug("Invoke on jaxrpc service: " + methodName); if (method.getName().equals("getPort")) { @@ -124,7 +124,7 @@ } if (serviceInterfaceMethods.contains(method)) { - log.debug("Invoke on service interface: " + methodName); + if(log.isDebugEnabled()) log.debug("Invoke on service interface: " + methodName); Class seiClass = method.getReturnType(); retObj = getPortMethod.invoke(jaxrpcService, new Object[]{seiClass}); @@ -132,7 +132,7 @@ } if (objectMethods.contains(method)) { - log.debug("Invoke on object: " + methodName); + if(log.isDebugEnabled()) log.debug("Invoke on object: " + methodName); retObj = method.invoke(jaxrpcService, args); return retObj; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -186,7 +186,7 @@ } catch (IOException ex) { - log.debug("Cannot find security config: " + descriptorPath); + if(log.isDebugEnabled()) log.debug("Cannot find security config: " + descriptorPath); return null; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -90,7 +90,7 @@ */ public HandlerChainBaseImpl(List<HandlerInfo> infos, Set<String> roles) { - log.debug("Create a handler chain for roles: " + roles); + if(log.isDebugEnabled()) log.debug("Create a handler chain for roles: " + roles); addHandlersToChain(infos, roles); } @@ -159,7 +159,7 @@ */ public void init(Map config) { - log.debug("init: [config=" + config + "]"); + if(log.isDebugEnabled()) log.debug("init: [config=" + config + "]"); for (int i = 0; i < handlers.size(); i++) { HandlerEntry entry = (HandlerEntry)handlers.get(i); @@ -177,7 +177,7 @@ */ public void destroy() { - log.debug("destroy"); + if(log.isDebugEnabled()) log.debug("destroy"); for (int i = 0; i < handlers.size(); i++) { HandlerEntry entry = (HandlerEntry)handlers.get(i); @@ -217,7 +217,7 @@ public void setRoles(String[] soapActorNames) { List<String> newRoles = Arrays.asList(soapActorNames); - log.debug("setRoles: " + newRoles); + if(log.isDebugEnabled()) log.debug("setRoles: " + newRoles); roles.clear(); roles.addAll(newRoles); @@ -246,7 +246,7 @@ if (handlers.size() > 0) { - log.debug("Enter: handleRequest"); + if(log.isDebugEnabled()) log.debug("Enter: handleRequest"); SOAPMessageContextJAXRPC jaxrpcContext = (SOAPMessageContextJAXRPC)msgContext; jaxrpcContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -295,7 +295,7 @@ falseIndex = (handlerIndex - 1); jaxrpcContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - log.debug("Exit: handleRequest with status: " + doNext); + if(log.isDebugEnabled()) log.debug("Exit: handleRequest with status: " + doNext); } } @@ -328,7 +328,7 @@ if (handlers.size() > 0) { - log.debug("Enter: handleResponse"); + if(log.isDebugEnabled()) log.debug("Enter: handleResponse"); SOAPMessageContextJAXRPC jaxrpcContext = (SOAPMessageContextJAXRPC)msgContext; jaxrpcContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -377,7 +377,7 @@ falseIndex = (handlerIndex - 1); jaxrpcContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - log.debug("Exit: handleResponse with status: " + doNext); + if(log.isDebugEnabled()) log.debug("Exit: handleResponse with status: " + doNext); } } @@ -400,7 +400,7 @@ if (handlers.size() > 0) { - log.debug("Enter: handleFault"); + if(log.isDebugEnabled()) log.debug("Enter: handleFault"); SOAPMessageContextJAXRPC jaxrpcContext = (SOAPMessageContextJAXRPC)msgContext; jaxrpcContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -415,14 +415,14 @@ for (; doNext && handlerIndex >= 0; handlerIndex--) { currHandler = ((HandlerEntry)handlers.get(handlerIndex)).getHandler(); - log.debug("Handle fault: " + currHandler); + if(log.isDebugEnabled()) log.debug("Handle fault: " + currHandler); doNext = currHandler.handleFault(msgContext); } } finally { jaxrpcContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - log.debug("Exit: handleFault with status: " + doNext); + if(log.isDebugEnabled()) log.debug("Exit: handleFault with status: " + doNext); } } @@ -465,7 +465,7 @@ HandlerEntry entry = (HandlerEntry)handlers.get(i); if (entry.handler.getState() == HandlerWrapper.DOES_NOT_EXIST) { - log.debug("Replacing dirty handler: " + entry.handler); + if(log.isDebugEnabled()) log.debug("Replacing dirty handler: " + entry.handler); try { HandlerWrapper handler = new HandlerWrapper((Handler)entry.info.getHandlerClass().newInstance()); @@ -516,7 +516,7 @@ if (opMetaData == null) { // The security handler must have decrypted the incomming message - // before the dispatch target operation can be known + // before the dispatch target operation can be known EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); opMetaData = soapMessage.getOperationMetaData(epMetaData); } @@ -576,7 +576,7 @@ if (type == null) { - log.debug("Using handler type default: " + HandlerType.ENDPOINT); + if(log.isDebugEnabled()) log.debug("Using handler type default: " + HandlerType.ENDPOINT); type = HandlerType.ENDPOINT; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -171,7 +171,7 @@ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); - log.debug("Adding server side handler to service '" + sepMetaData.getPortName() + "': " + info); + if(log.isDebugEnabled()) log.debug("Adding server side handler to service '" + sepMetaData.getPortName() + "': " + info); hInfos.add(info); } @@ -180,7 +180,7 @@ private void initHandlerChain(ServiceEndpointInfo seInfo, List<HandlerInfo> hInfos, Set<String> handlerRoles, HandlerType type) { - log.debug("Init handler chain with [" + hInfos.size() + "] handlers"); + if(log.isDebugEnabled()) log.debug("Init handler chain with [" + hInfos.size() + "] handlers"); ServerHandlerChain handlerChain = new ServerHandlerChain(hInfos, handlerRoles, type); if (type == HandlerType.PRE) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerWrapper.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -90,7 +90,7 @@ */ public void init(HandlerInfo config) throws JAXRPCException { - log.debug("init: " + delegate); + if(log.isDebugEnabled()) log.debug("init: " + delegate); delegate.init(config); state = METHOD_READY; } @@ -100,7 +100,7 @@ */ public void destroy() throws JAXRPCException { - log.debug("destroy: " + delegate); + if(log.isDebugEnabled()) log.debug("destroy: " + delegate); state = DOES_NOT_EXIST; delegate.destroy(); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -99,7 +99,7 @@ if (wrappedParameters == null) throw new WSException("Cannot generate a type when their is no wrapper parameters"); - log.debug("Generating wrapper: " + wrapperName); + if(log.isDebugEnabled()) log.debug("Generating wrapper: " + wrapperName); QName xmlName = pmd.getXmlName(); QName xmlType = pmd.getXmlType(); @@ -131,7 +131,7 @@ public void generate(FaultMetaData fmd) { String faultBeanName = fmd.getFaultBeanName(); - log.debug("Generating fault bean: " + faultBeanName); + if(log.isDebugEnabled()) log.debug("Generating fault bean: " + faultBeanName); QName xmlType = fmd.getXmlType(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -58,7 +58,7 @@ @Override public Object deserialize(QName xmlName, QName xmlType, String val, SerializationContext serContext) { - log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("deserialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); Object value = null; try @@ -67,7 +67,7 @@ TypeMappingImpl typeMapping = serContext.getTypeMapping(); Class javaType = typeMapping.getJavaType(xmlType); - + JAXBContextCache contextCache = JAXBContextCache.getContextCache(); JAXBContext jaxbContext = contextCache.getInstance(types); @@ -78,7 +78,7 @@ JAXBElement jbe = unmarshaller.unmarshal(new StreamSource(ins), javaType); value = jbe.getValue(); - log.debug("deserialized: " + (value != null ? value.getClass().getName() : null)); + if(log.isDebugEnabled()) log.debug("deserialized: " + (value != null ? value.getClass().getName() : null)); } catch (Exception ex) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -59,7 +59,7 @@ @Override public String serialize(QName xmlName, QName xmlType, Object value, SerializationContext serContext, NamedNodeMap attributes) throws BindingException { - log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + ",xmlType=" + xmlType + "]"); String xmlFragment = null; try @@ -70,7 +70,7 @@ JAXBContextCache contextCache = JAXBContextCache.getContextCache(); JAXBContext jaxbContext = contextCache.getInstance(javaType); - + Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); @@ -80,7 +80,7 @@ marshaller.marshal(new JAXBElement(xmlName, javaType, value), strwr); xmlFragment = strwr.toString(); - log.debug("serialized: " + xmlFragment); + if(log.isDebugEnabled()) log.debug("serialized: " + xmlFragment); } catch (Exception ex) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -83,7 +83,7 @@ FaultMetaData faultMetaData = opMetaData.getFault(xmlName); if (faultMetaData != null) { - log.debug("Deserialize fault: " + faultMetaData); + if(log.isDebugEnabled()) log.debug("Deserialize fault: " + faultMetaData); QName xmlType = faultMetaData.getXmlType(); Class<?> faultBeanClass = faultMetaData.getFaultBean(); @@ -132,7 +132,7 @@ } else { - log.debug("Cannot find fault meta data for: " + xmlName); + if(log.isDebugEnabled()) log.debug("Cannot find fault meta data for: " + xmlName); } } } @@ -272,7 +272,7 @@ } else { - log.debug("Cannot obtain fault meta data for: " + exClass); + if(log.isDebugEnabled()) log.debug("Cannot obtain fault meta data for: " + exClass); } return soapMessage; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -88,7 +88,7 @@ } catch (NamingException e) { - log.debug("Cannot obtain realm mapping from: " + lookupName); + if(log.isDebugEnabled()) log.debug("Cannot obtain realm mapping from: " + lookupName); } } return realmMapping; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -87,13 +87,13 @@ public List<Handler> getHandlerChain() { - log.debug("getHandlerChain: " + jaxwsHandlerChain); + if(log.isDebugEnabled()) log.debug("getHandlerChain: " + jaxwsHandlerChain); return Collections.unmodifiableList(jaxwsHandlerChain); } public void setHandlerChain(List<Handler> handlerChain) { - log.debug("setHandlerChain: " + handlerChain); + if(log.isDebugEnabled()) log.debug("setHandlerChain: " + handlerChain); jaxwsHandlerChain.clear(); jaxwsHandlerChain.addAll(handlerChain); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/MessageBinding.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -67,7 +67,7 @@ /** On the server side, extract the IN parameters from the payload and populate an Invocation object */ public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, Object reqMessage) throws BindingException { - log.debug("unbindRequestMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("unbindRequestMessage: " + opMetaData.getQName()); try { @@ -94,7 +94,7 @@ /** On the server side, generate the payload from OUT parameters. */ public Object bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException { - log.debug("bindResponseMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("bindResponseMessage: " + opMetaData.getQName()); try { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -72,7 +72,7 @@ /** On the server side, extract the IN parameters from the payload and populate an Invocation object */ public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, Object payload) throws BindingException { - log.debug("unbindRequestMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("unbindRequestMessage: " + opMetaData.getQName()); try { @@ -103,7 +103,7 @@ /** On the server side, generate the payload from OUT parameters. */ public Object bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException { - log.debug("bindResponseMessage: " + opMetaData.getQName()); + if(log.isDebugEnabled()) log.debug("bindResponseMessage: " + opMetaData.getQName()); try { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -125,7 +125,7 @@ */ public void update(Observable observable, Object object) { - log.debug("Configuration change event received. Reconfigure handler chain: " + object); + if(log.isDebugEnabled()) log.debug("Configuration change event received. Reconfigure handler chain: " + object); // re-populate the binding handler chain resetCreateBindingHandlerChain(); @@ -205,7 +205,7 @@ protected CommonMessageContext processPivot(CommonMessageContext requestContext) { - log.debug("Begin response processing"); + if(log.isDebugEnabled()) log.debug("Begin response processing"); // remove existing context MessageContextAssociation.popMessageContext(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientProxy.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -177,8 +177,8 @@ ResponseImpl response = new ResponseImpl(); Runnable task = new AsyncRunnable(response, null, opName, args, retType); - log.debug("Schedule task " + ((AsyncRunnable)task).getTaskID().toString()); - + if(log.isDebugEnabled()) log.debug("Schedule task " + ((AsyncRunnable)task).getTaskID().toString()); + Future future = executor.submit(task); response.setFuture(future); return response; @@ -194,7 +194,7 @@ } /** - * 4.2.4 Conformance (Remote Exceptions): If an error occurs during a remote operation invocation, an implemention + * 4.2.4 Conformance (Remote Exceptions): If an error occurs during a remote operation invocation, an implemention * MUST throw a service specific exception if possible. If the error cannot be mapped to a service * specific exception, an implementation MUST throw a ProtocolException or one of its subclasses, as * appropriate for the binding in use. See section 6.4.1 for more details. @@ -240,7 +240,7 @@ Map<String, Object> resContext = response.getContext(); Object result = invoke(opName, args, retType, resContext); - log.debug("Finished task " + getTaskID().toString()+": " + result); + if(log.isDebugEnabled()) log.debug("Finished task " + getTaskID().toString()+": " + result); response.set(result); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -298,7 +298,7 @@ SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody(); SOAPElement soapElement = (SOAPElement)soapBody.getChildElements().next(); - log.debug("JAXB unmarshal: " + DOMWriter.printNode(soapElement, false)); + if(log.isDebugEnabled()) log.debug("JAXB unmarshal: " + DOMWriter.printNode(soapElement, false)); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); retObj = unmarshaller.unmarshal(soapElement); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -106,7 +106,7 @@ if (Service.class.getName().equals(targetClassName)) targetClassName = serviceClassName; - log.debug("[name=" + serviceRefName + ",service=" + serviceClassName + ",target=" + targetClassName + "]"); + if(log.isDebugEnabled()) log.debug("[name=" + serviceRefName + ",service=" + serviceClassName + ",target=" + targetClassName + "]"); // Load the service class ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); @@ -126,7 +126,7 @@ { // Associate the UnifiedServiceRef with this thread serviceRefAssociation.set(usRef); - + // Generic javax.xml.ws.Service if (serviceClass == Service.class) { @@ -202,7 +202,7 @@ return null; } } - + public static UnifiedServiceRef getUnifiedServiceRefAssociation() { // The ServiceDelegateImpl get the usRef at ctor time @@ -215,7 +215,7 @@ String configName = usRef.getConfigName(); if (service instanceof ConfigProvider) { - log.debug("Configure Service: [configName=" + configName + ",configFile=" + configFile + "]"); + if(log.isDebugEnabled()) log.debug("Configure Service: [configName=" + configName + ",configFile=" + configFile + "]"); ConfigProvider cp = (ConfigProvider)service; if (configName != null || configFile != null) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -64,7 +64,7 @@ { this.epMetaData = epMetaData; - log.debug("Create a handler executor: " + handlerList); + if(log.isDebugEnabled()) log.debug("Create a handler executor: " + handlerList); for (Handler handler : handlerList) { handlers.add(handler); @@ -76,7 +76,7 @@ */ public void close() { - log.debug("close"); + if(log.isDebugEnabled()) log.debug("close"); for (Handler handler : handlers) { handler.close(null); @@ -89,7 +89,7 @@ if (handlers.size() > 0) { - log.debug("Enter: handleRequest"); + if(log.isDebugEnabled()) log.debug("Enter: handleRequest"); SOAPMessageContextJAXWS soapContext = (SOAPMessageContextJAXWS)msgContext; soapContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -102,7 +102,7 @@ for (; doNext && handlerIndex < handlers.size(); handlerIndex++) { currHandler = handlers.get(handlerIndex); - + if (log.isTraceEnabled()) { SOAPPart soapPart = soapContext.getMessage().getSOAPPart(); @@ -130,7 +130,7 @@ falseIndex = (handlerIndex - 1); soapContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - log.debug("Exit: handleRequest with status: " + doNext); + if(log.isDebugEnabled()) log.debug("Exit: handleRequest with status: " + doNext); } } @@ -146,7 +146,7 @@ if (handlers.size() > 0) { - log.debug("Enter: handleResponse"); + if(log.isDebugEnabled()) log.debug("Enter: handleResponse"); int handlerIndex = handlers.size() - 1; if (falseIndex != -1) @@ -159,7 +159,7 @@ for (; doNext && handlerIndex >= 0; handlerIndex--) { currHandler = handlers.get(handlerIndex); - + if (log.isTraceEnabled()) { SOAPPart soapPart = soapContext.getMessage().getSOAPPart(); @@ -187,7 +187,7 @@ falseIndex = (handlerIndex - 1); soapContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - log.debug("Exit: handleResponse with status: " + doNext); + if(log.isDebugEnabled()) log.debug("Exit: handleResponse with status: " + doNext); } } @@ -200,7 +200,7 @@ if (handlers.size() > 0) { - log.debug("Enter: handleFault"); + if(log.isDebugEnabled()) log.debug("Enter: handleFault"); SOAPMessageContextJAXWS soapContext = (SOAPMessageContextJAXWS)msgContext; soapContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); @@ -213,7 +213,7 @@ for (; doNext && handlerIndex < handlers.size(); handlerIndex++) { currHandler = handlers.get(handlerIndex); - + if (log.isTraceEnabled()) { SOAPPart soapPart = soapContext.getMessage().getSOAPPart(); @@ -241,7 +241,7 @@ falseIndex = (handlerIndex - 1); soapContext.removeProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM); - log.debug("Exit: handleFault with status: " + doNext); + if(log.isDebugEnabled()) log.debug("Exit: handleFault with status: " + doNext); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -51,7 +51,7 @@ public boolean callRequestHandlerChain(ServiceEndpointInfo seInfo, HandlerType type) { - log.debug("callRequestHandlerChain: " + type); + if(log.isDebugEnabled()) log.debug("callRequestHandlerChain: " + type); SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext(); EndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); @@ -68,7 +68,7 @@ public boolean callResponseHandlerChain(ServiceEndpointInfo seInfo, HandlerType type) { - log.debug("callResponseHandlerChain: " + type); + if(log.isDebugEnabled()) log.debug("callResponseHandlerChain: " + type); SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext(); ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); List<Handler> handlerChain = getHandlerChain(epMetaData, type); @@ -78,7 +78,7 @@ public boolean callFaultHandlerChain(ServiceEndpointInfo seInfo, HandlerType type, Exception ex) { - log.debug("callFaultHandlerChain: " + type); + if(log.isDebugEnabled()) log.debug("callFaultHandlerChain: " + type); SOAPMessageContextJAXWS msgContext = (SOAPMessageContextJAXWS)MessageContextAssociation.peekMessageContext(); ServerEndpointMetaData epMetaData = seInfo.getServerEndpointMetaData(); List<Handler> handlerChain = getHandlerChain(epMetaData, type); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -74,14 +74,14 @@ public List<Handler> getHandlerChain(PortInfo info, HandlerType type) { - log.debug("getHandlerChain: [type=" + type + ",info=" + info + "]"); + if(log.isDebugEnabled()) log.debug("getHandlerChain: [type=" + type + ",info=" + info + "]"); List<Handler> unsortedChain = new ArrayList<Handler>(); String bindingID = info.getBindingID(); QName serviceName = info.getServiceName(); QName portName = info.getPortName(); - + Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type); if (bindingID != null) @@ -89,7 +89,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(null, null, bindingID)); if (list != null) { - log.debug("add protocol handlers: " + list); + if(log.isDebugEnabled()) log.debug("add protocol handlers: " + list); unsortedChain.addAll(list); } } @@ -99,7 +99,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(serviceName, null, null)); if (list != null) { - log.debug("add service handlers: " + list); + if(log.isDebugEnabled()) log.debug("add service handlers: " + list); unsortedChain.addAll(list); } } @@ -109,7 +109,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(null, portName, null)); if (list != null) { - log.debug("add port handlers: " + list); + if(log.isDebugEnabled()) log.debug("add port handlers: " + list); unsortedChain.addAll(list); } } @@ -117,7 +117,7 @@ List<Handler> list = handlerMap.get(new PortInfoImpl(null, null, null)); if (list != null) { - log.debug("add general handlers: " + list); + if(log.isDebugEnabled()) log.debug("add general handlers: " + list); unsortedChain.addAll(list); } @@ -139,10 +139,10 @@ public void initHandlerChain(EndpointMetaData epMetaData, HandlerType type) { - log.debug("initHandlerChain: " + type); + if(log.isDebugEnabled()) log.debug("initHandlerChain: " + type); // clear all exisisting handler to avoid double registration - log.debug("Clear handler map: " + jaxwsHandlers); + if(log.isDebugEnabled()) log.debug("Clear handler map: " + jaxwsHandlers); Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type); handlerMap.clear(); @@ -286,7 +286,7 @@ private boolean addHandler(PortInfo info, Handler handler, HandlerType type) { - log.debug("addHandler: " + info + ":" + handler); + if(log.isDebugEnabled()) log.debug("addHandler: " + info + ":" + handler); Map<PortInfo, List<Handler>> handlerMap = getHandlerMap(type); List<Handler> handlerList = handlerMap.get(info); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -71,11 +71,11 @@ public EndpointImpl(String bindingId, Object implementor) { - log.debug("new EndpointImpl(bindingId=" + bindingId + ",implementor=" + implementor + ")"); - + if(log.isDebugEnabled()) log.debug("new EndpointImpl(bindingId=" + bindingId + ",implementor=" + implementor + ")"); + if (implementor == null) throw new IllegalArgumentException("Implementor cannot be null"); - + this.implementor = implementor; this.bindingProvider = new BindingProviderImpl(bindingId); } @@ -93,17 +93,17 @@ } /** - * Publishes this endpoint at the given address. The necessary server infrastructure will be created and configured by the JAX-WS - * implementation using some default configuration. In order to get more control over the server configuration, + * Publishes this endpoint at the given address. The necessary server infrastructure will be created and configured by the JAX-WS + * implementation using some default configuration. In order to get more control over the server configuration, * please use the javax.xml.ws.Endpoint#publish(Object) method instead. - * + * * @param URI specifying the address to use. The address must be compatible with the binding specified at the time the endpoint was created. */ @Override public void publish(String address) { - log.debug("publish: " + address); - + if(log.isDebugEnabled()) log.debug("publish: " + address); + URI addrURI; try { @@ -116,7 +116,7 @@ // Check with the security manger checkPublishEndpointPermission(); - + // Create and start the HTTP server HttpServer httpServer = HttpServer.create(); httpServer.setProperties(properties); @@ -130,23 +130,23 @@ } /** - * Publishes this endpoint at the provided server context. - * A server context encapsulates the server infrastructure and addressing information for a particular transport. + * Publishes this endpoint at the provided server context. + * A server context encapsulates the server infrastructure and addressing information for a particular transport. * For a call to this method to succeed, the server context passed as an argument to it must be compatible with the endpoint's binding. - * + * * @param serverContext An object representing a server context to be used for publishing the endpoint. */ @Override public void publish(Object context) { - log.debug("publish: " + context); - + if(log.isDebugEnabled()) log.debug("publish: " + context); + if (isDestroyed) throw new IllegalStateException("Endpoint already destroyed"); // Check with the security manger checkPublishEndpointPermission(); - + // Check if we are standalone boolean isStandalone; try @@ -155,15 +155,15 @@ factory.getServiceEndpointManager(); isStandalone = false; } - catch (Exception ex) + catch (Exception ex) { // ignore, there should be no ServiceEndpointManager in VM isStandalone = true; } - + if (isStandalone == false) throw new IllegalStateException("Cannot publish endpoint from within server"); - + if (context instanceof HttpContext) { serverContext = (HttpContext)context; @@ -176,7 +176,7 @@ @Override public void stop() { - log.debug("stop"); + if(log.isDebugEnabled()) log.debug("stop"); if (serverContext == null || isPublished == false) log.error("Endpoint not published"); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -352,13 +352,13 @@ if(usRef == null || usRef.getPortInfos().size() == 0) { - log.debug("No port configuration for: " + portName); + if(log.isDebugEnabled()) log.debug("No port configuration for: " + portName); return; } - + String configFile = usRef.getConfigFile(); String configName = usRef.getConfigName(); - + boolean match = false; for (PortInfo pi : usRef.getPortInfos()) { @@ -369,7 +369,7 @@ { if (piSEI != null && piPort != null) match = seiName.equals(piSEI) && portName.equals(piPort); - else + else match = seiName.equals(piSEI) || portName.equals(piPort); } if (match == true) @@ -378,12 +378,12 @@ configFile = pi.getConfigFile(); if (pi.getConfigName() != null) configName = pi.getConfigName(); - + BindingProvider bp = (BindingProvider)stub; Map<String, Object> reqCtx = bp.getRequestContext(); for (NameValuePair nvp : pi.getStubProperties()) { - log.debug("Set stub property: " + nvp); + if(log.isDebugEnabled()) log.debug("Set stub property: " + nvp); reqCtx.put(nvp.getName(), nvp.getValue()); } break; @@ -391,9 +391,9 @@ } if (match == false) - log.debug("No matching port configuration for: [portName=" + portName + ",seiName=" + seiName + "]"); - - log.debug("Configure Stub: [configName=" + configName + ",configFile=" + configFile + "]"); + if(log.isDebugEnabled()) log.debug("No matching port configuration for: [portName=" + portName + ",seiName=" + seiName + "]"); + + if(log.isDebugEnabled()) log.debug("Configure Stub: [configName=" + configName + ",configFile=" + configFile + "]"); if (configName != null || configFile != null) stub.setConfigName(configName, configFile); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointInvoker.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -160,7 +160,7 @@ // Check if protocol handlers modified the payload if (((SOAPBodyImpl)reqMessage.getSOAPBody()).isModifiedFromSource()) { - log.debug("Handler modified body payload, unbind message again"); + if(log.isDebugEnabled()) log.debug("Handler modified body payload, unbind message again"); epInv = binding.unbindRequestMessage(opMetaData, reqMessage); } @@ -185,7 +185,7 @@ if(binding instanceof CommonSOAPBinding) XOPContext.setMTOMEnabled( ((CommonSOAPBinding)binding).isMTOMEnabled()); - + // Bind the response message SOAPMessage resMessage = (SOAPMessage)binding.bindResponseMessage(opMetaData, epInv); msgContext.setSOAPMessage(resMessage); @@ -208,7 +208,7 @@ { CommonBinding binding = bindingProvider.getCommonBinding(); binding.bindFaultMessage(ex); - + // call the handler chain boolean handlersPass = callFaultHandlerChain(seInfo, HandlerType.POST, ex); handlersPass = handlersPass && callFaultHandlerChain(seInfo, HandlerType.ENDPOINT, ex); @@ -228,7 +228,7 @@ protected CommonMessageContext processPivot(CommonMessageContext requestContext) { - log.debug("Begin response processing"); + if(log.isDebugEnabled()) log.debug("Begin response processing"); // TODO: implement return requestContext; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -106,7 +106,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { - log.debug("doPost: " + req.getRequestURI()); + if(log.isDebugEnabled()) log.debug("doPost: " + req.getRequestURI()); try { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -119,7 +119,7 @@ { seMetrics.stop(); seInfo.setState(State.STOPED); - log.debug("Stop Endpoint" + seMetrics); + if(log.isDebugEnabled()) log.debug("Stop Endpoint" + seMetrics); } public void destroy() @@ -136,15 +136,15 @@ //String wsdlHost = reqURL.getHost(); String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost() + ":" + reqURL.getPort(); - + ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); ServiceEndpointManager epManager = factory.getServiceEndpointManager(); if (epManager.getWebServiceHost().equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == false) { wsdlHost = epManager.getWebServiceHost(); } - log.debug("WSDL request, using host: " + wsdlHost); - + if(log.isDebugEnabled()) log.debug("WSDL request, using host: " + wsdlHost); + WSDLRequestHandler wsdlRequestHandler = new WSDLRequestHandler(epMetaData); Document document = wsdlRequestHandler.getDocumentForPath(reqURL, wsdlHost, resPath); @@ -174,7 +174,7 @@ throw new SOAPFaultException(faultCode, faultString, null, null); } - log.debug("BEGIN handleRequest: " + seInfo.getServiceEndpointID()); + if(log.isDebugEnabled()) log.debug("BEGIN handleRequest: " + seInfo.getServiceEndpointID()); beginProcessing = seMetrics.processRequestMessage(); MessageFactoryImpl msgFactory = new MessageFactoryImpl(); @@ -202,7 +202,7 @@ // Invoke the service endpoint ServiceEndpointInvoker seInvoker = seInfo.getInvoker(); SOAPMessage resMessage = seInvoker.invoke(seInfo, context); - + if (resMessage != null) postProcessResponse(headerSource, resMessage); @@ -223,7 +223,7 @@ if (resMessage != null) postProcessResponse(headerSource, resMessage); - + return resMessage; } finally @@ -250,7 +250,7 @@ // Reset the thread context class loader Thread.currentThread().setContextClassLoader(ctxClassLoader); - log.debug("END handleRequest: " + seInfo.getServiceEndpointID()); + if(log.isDebugEnabled()) log.debug("END handleRequest: " + seInfo.getServiceEndpointID()); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointDeployer.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -70,7 +70,7 @@ public void create(UnifiedDeploymentInfo udi) { - log.debug("create: " + udi.name); + if(log.isDebugEnabled()) log.debug("create: " + udi.name); try { UnifiedMetaData wsMetaData; @@ -122,7 +122,7 @@ public void start(UnifiedDeploymentInfo udi) { - log.debug("start: " + udi.name); + if(log.isDebugEnabled()) log.debug("start: " + udi.name); try { UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); @@ -157,7 +157,7 @@ public void stop(UnifiedDeploymentInfo udi) { - log.debug("stop: " + udi.name); + if(log.isDebugEnabled()) log.debug("stop: " + udi.name); try { UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); @@ -190,7 +190,7 @@ public void destroy(UnifiedDeploymentInfo udi) { - log.debug("destroy: " + udi.name); + if(log.isDebugEnabled()) log.debug("destroy: " + udi.name); try { UnifiedMetaData wsMetaData = getUnifiedMetaData(udi); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvokerJSE.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -86,7 +86,7 @@ /** Invoke an instance of the SEI implementation bean */ public void invokeServiceEndpoint(ServiceEndpointInfo seInfo, Object seiImpl, EndpointInvocation epInv) throws SOAPFaultException, Exception { - log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); + if(log.isDebugEnabled()) log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); try { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -134,13 +134,13 @@ { if (host == null || host.trim().length() == 0) { - log.debug("Using undefined host: " + UNDEFINED_HOSTNAME); + if(log.isDebugEnabled()) log.debug("Using undefined host: " + UNDEFINED_HOSTNAME); host = UNDEFINED_HOSTNAME; } if ("0.0.0.0".equals(host)) { InetAddress localHost = InetAddress.getLocalHost(); - log.debug("Using local host: " + localHost.getHostName()); + if(log.isDebugEnabled()) log.debug("Using local host: " + localHost.getHostName()); host = localHost.getHostName(); } this.webServiceHost = host; @@ -205,7 +205,7 @@ { return UnifiedMetaData.getImplementationVersion(); } - + public List<ObjectName> getServiceEndpoints() { ArrayList<ObjectName> list = new ArrayList<ObjectName>(); @@ -416,23 +416,23 @@ msgContext.setProperty(MessageContextJAXWS.SERVLET_CONTEXT, servletContext); msgContext.setProperty(MessageContextJAXWS.SERVLET_REQUEST, httpRequest); msgContext.setProperty(MessageContextJAXWS.SERVLET_RESPONSE, httpResponse); - + } msgContext.setEndpointMetaData(sepMetaData); - + MessageContextAssociation.pushMessageContext(msgContext); try { SOAPMessage resMessage = wsEndpoint.handleRequest(headerSource, context, inStream); - + Map<String, List<String>> headers = (Map<String, List<String>>)msgContext.getProperty(MessageContextJAXWS.HTTP_RESPONSE_HEADERS); if (headers != null) headerSource.setHeaderMap(headers); - + Integer code = (Integer)msgContext.getProperty(MessageContextJAXWS.HTTP_RESPONSE_CODE); if (code != null) httpResponse.setStatus(code.intValue()); - + SOAPPart part = resMessage.getSOAPPart(); if (part == null) throw new SOAPException("Cannot obtain SOAPPart from response message"); @@ -480,7 +480,7 @@ } if (wsaTo != null) { - log.debug("Sending response to addressing destination: " + wsaTo); + if(log.isDebugEnabled()) log.debug("Sending response to addressing destination: " + wsaTo); new SOAPConnectionImpl().callOneWay(soapMessage, wsaTo); } else @@ -493,7 +493,7 @@ */ public String processSOAPRequest(ObjectName sepID, String inMessage) throws Exception { - log.debug("processSOAPRequest: " + sepID); + if(log.isDebugEnabled()) log.debug("processSOAPRequest: " + sepID); ByteArrayInputStream inputStream = new ByteArrayInputStream(inMessage.getBytes("UTF-8")); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(512); @@ -603,7 +603,7 @@ // Register the endpoint with the MBeanServer registry.put(sepID, wsEndpoint); - log.debug("WebService created: " + sepID); + if(log.isDebugEnabled()) log.debug("WebService created: " + sepID); } /** Start a service endpoint @@ -654,7 +654,7 @@ registry.remove(sepID); ServiceEndpointInfo seInfo = wsEndpoint.getServiceEndpointInfo(); - log.debug("WebService destroyed: " + seInfo.getServerEndpointMetaData().getEndpointAddress()); + if(log.isDebugEnabled()) log.debug("WebService destroyed: " + seInfo.getServerEndpointMetaData().getEndpointAddress()); } public void create() throws Exception @@ -669,7 +669,7 @@ public void destroy() throws Exception { - log.debug("Destroy service endpoint manager"); + if(log.isDebugEnabled()) log.debug("Destroy service endpoint manager"); MBeanServer server = getJMXServer(); if (server != null) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLFilePublisher.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -155,7 +155,7 @@ wsdlWriter.writeWSDL(subdef, fw); fw.close(); - log.debug("WSDL import published to: " + targetURL); + if(log.isDebugEnabled()) log.debug("WSDL import published to: " + targetURL); // recursivly publish imports publishWsdlImports(targetURL, subdef); @@ -209,7 +209,7 @@ fos.close(); is.close(); - log.debug("XMLSchema import published to: " + xsdURL); + if(log.isDebugEnabled()) log.debug("XMLSchema import published to: " + xsdURL); // recursivly publish imports Element subdoc = DOMUtils.parse(xsdURL.openStream()); @@ -273,9 +273,9 @@ if (wsdlLocation == null) throw new IllegalStateException("Cannot obtain wsdl location for: " + serviceMetaData.getServiceName()); + + if(log.isDebugEnabled()) log.debug("Publish WSDL file: " + wsdlLocation); - log.debug("Publish WSDL file: " + wsdlLocation); - // Only file URLs are supported in <wsdl-publish-location> String publishLocation = serviceMetaData.getWsdlPublishLocation(); boolean predefinedLocation = publishLocation != null && publishLocation.startsWith("file:"); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageContextAssociation.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -43,7 +43,7 @@ public static void pushMessageContext(CommonMessageContext msgContext) { - log.debug("pushMessageContext: " + msgContext + " (Thread " +Thread.currentThread().getName()+ ")"); + if(log.isDebugEnabled()) log.debug("pushMessageContext: " + msgContext + " (Thread " +Thread.currentThread().getName()+ ")"); Stack<CommonMessageContext> stack = ThreadLocalAssociation.localMsgContextAssoc().get(); if (stack == null) { @@ -52,7 +52,7 @@ } stack.push(msgContext); } - + public static CommonMessageContext peekMessageContext() { CommonMessageContext msgContext = null; @@ -63,7 +63,7 @@ } return msgContext; } - + public static CommonMessageContext popMessageContext() { CommonMessageContext msgContext = null; @@ -72,7 +72,7 @@ { msgContext = stack.pop(); } - log.debug("popMessageContext: " + msgContext +" (Thread " +Thread.currentThread().getName()+ ")"); + if(log.isDebugEnabled()) log.debug("popMessageContext: " + msgContext +" (Thread " +Thread.currentThread().getName()+ ")"); return msgContext; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -188,7 +188,7 @@ } ContentType contentType = getContentType(mimeHeaders); - log.debug("createMessage: [contentType=" + contentType + "]"); + if(log.isDebugEnabled()) log.debug("createMessage: [contentType=" + contentType + "]"); // Debug the incoming message if (log.isTraceEnabled()) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -103,7 +103,7 @@ public void setPayload(Source payload) { - log.debug("setPayload: " + payload.getClass().getName()); + if(log.isDebugEnabled()) log.debug("setPayload: " + payload.getClass().getName()); removeContents(); this.payload = payload; this.isDOMValid = false; @@ -377,7 +377,7 @@ child = DOMUtils.parse(new InputSource(reader)); } - // reset the excausted input stream + // reset the excausted input stream String xmlStr = DOMWriter.printNode(child, false); payload = new StreamSource(new ByteArrayInputStream(xmlStr.getBytes())); } @@ -400,8 +400,8 @@ } else if (payload instanceof SAXSource) { - // The fact that JAXBSource derives from SAXSource is an implementation detail. - // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource. + // The fact that JAXBSource derives from SAXSource is an implementation detail. + // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource. // The XMLReader object obtained by the getXMLReader method shall be used only for parsing the InputSource object returned by the getInputSource method. TransformerFactory tf = TransformerFactory.newInstance(); @@ -433,7 +433,7 @@ { Element child = getBodyElementFromSource(); String xmlPayload = DOMWriter.printNode(child, false); - log.debug("writeElementContent from payload: " + xmlPayload); + if(log.isDebugEnabled()) log.debug("writeElementContent from payload: " + xmlPayload); writer.write(xmlPayload); } else Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -245,7 +245,7 @@ try { // Get the invoker from Remoting for a given endpoint address - log.debug("Get locator for: " + endpoint); + if(log.isDebugEnabled()) log.debug("Get locator for: " + endpoint); targetAddress = addURLParameter(targetAddress, InvokerLocator.DATATYPE, "SOAPMessage"); InvokerLocator locator = new InvokerLocator(targetAddress); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -209,7 +209,7 @@ Class javaType = getJavaType(); QName xmlName = getElementQName(); - log.debug("getXMLFragment from Object [xmlType=" + xmlType + ",javaType=" + javaType + "]"); + if(log.isDebugEnabled()) log.debug("getXMLFragment from Object [xmlType=" + xmlType + ",javaType=" + javaType + "]"); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext == null) @@ -234,7 +234,7 @@ } String tmpFragment = ser.serialize(xmlName, xmlType, getObjectValue(), serContext, null); - log.debug("xmlFragment: " + tmpFragment); + if(log.isDebugEnabled()) log.debug("xmlFragment: " + tmpFragment); setXMLFragment(tmpFragment); } @@ -247,9 +247,9 @@ // Generate the xmlFragment from the DOM tree else if (xmlFragment == null && isDOMValid) { - log.debug("getXMLFragment from DOM"); + if(log.isDebugEnabled()) log.debug("getXMLFragment from DOM"); xmlFragment = DOMWriter.printNode(this, false); - log.debug("xmlFragment: " + xmlFragment); + if(log.isDebugEnabled()) log.debug("xmlFragment: " + xmlFragment); invalidateDOMContent(); } @@ -261,7 +261,7 @@ public void setXMLFragment(String xmlFragment) { - log.debug("setXMLFragment: " + xmlFragment); + if(log.isDebugEnabled()) log.debug("setXMLFragment: " + xmlFragment); if (xmlFragment == null || xmlFragment.startsWith("<") == false) throw new WSException("Invalid XMLFragment: " + xmlFragment); @@ -281,7 +281,7 @@ QName xmlType = getXmlType(); Class javaType = getJavaType(); - log.debug("getObjectValue [xmlType=" + xmlType + ",javaType=" + javaType + "]"); + if(log.isDebugEnabled()) log.debug("getObjectValue [xmlType=" + xmlType + ",javaType=" + javaType + "]"); assertContentMapping(); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); @@ -345,7 +345,7 @@ try { String contentType = MimeUtils.resolveMimeType(javaType); - log.debug("Adopt DataHandler to " + javaType +", contentType "+ contentType); + if(log.isDebugEnabled()) log.debug("Adopt DataHandler to " + javaType +", contentType "+ contentType); DataSource ds = new SwapableMemoryDataSource(((DataHandler)obj).getInputStream(), contentType); DataHandler dh = new DataHandler(ds); @@ -379,7 +379,7 @@ throw new WSException(e); } - log.debug("objectValue: " + (objectValue != null ? objectValue.getClass().getName() : null)); + if(log.isDebugEnabled()) log.debug("objectValue: " + (objectValue != null ? objectValue.getClass().getName() : null)); } return objectValue; @@ -387,7 +387,7 @@ public void setObjectValue(Object objValue) { - log.debug("setObjectValue: " + objValue); + if(log.isDebugEnabled()) log.debug("setObjectValue: " + objValue); removeContentsAsIs(); resetElementContent(); this.objectValue = objValue; @@ -1068,7 +1068,7 @@ // This will inline any XOP include element and remove the attachment part. // See SOAPFactoryImpl for details. - log.debug("MTOM disabled: Force inline XOP data"); + if(log.isDebugEnabled()) log.debug("MTOM disabled: Force inline XOP data"); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setProperty(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); expandToDOM(); @@ -1079,7 +1079,7 @@ // but MTOM is enabled we need to convert the inlined // element back to an xop:Include element and create the attachment part - log.debug("MTOM enabled: Restore XOP data"); + if(log.isDebugEnabled()) log.debug("MTOM enabled: Restore XOP data"); XOPContext.restoreXOPDataDOM(this); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -68,7 +68,7 @@ if (wsaAction.equals(opAux.getSOAPAction())) { opMetaData = opAux; - log.debug("Use wsa:Action dispatch: " + wsaAction); + if(log.isDebugEnabled()) log.debug("Use wsa:Action dispatch: " + wsaAction); break; } } @@ -91,13 +91,13 @@ { if (epMetaData.getStyle() == Style.RPC) throw new SOAPException("Empty SOAP body with no child element not supported for RPC"); - + // [JBWS-1125] Support empty soap body elements for (OperationMetaData opAux : epMetaData.getOperations()) { if (opAux.getParameters().size() == 0) { - log.debug ("Dispatching empty SOAP body"); + if(log.isDebugEnabled()) log.debug ("Dispatching empty SOAP body"); opMetaData = opAux; break; } @@ -122,14 +122,14 @@ { if (opAux.isMessageEndpoint()) { - log.debug("Use generic message style dispatch"); + if(log.isDebugEnabled()) log.debug("Use generic message style dispatch"); opMetaData = opAux; break; } } } - log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); + if(log.isDebugEnabled()) log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null)); return opMetaData; } } \ No newline at end of file Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -102,7 +102,7 @@ private MimeHeaders getMimeHeaders(Map metadata) { - log.debug("getMimeHeaders from: " + metadata); + if(log.isDebugEnabled()) log.debug("getMimeHeaders from: " + metadata); MimeHeaders headers = new MimeHeaders(); Iterator i = metadata.keySet().iterator(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -148,7 +148,7 @@ // Specifically, the HTTP response entity-body must be empty. if (source == null) { - log.debug("Setting content source to null removes the SOAPEnvelope"); + if(log.isDebugEnabled()) log.debug("Setting content source to null removes the SOAPEnvelope"); soapEnvelope = null; return; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/CIDGenerator.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -50,11 +50,11 @@ cid.append("cid:").append(count++).append("-").append(time).append("-") .append(cid.hashCode()).append("@").append(MimeConstants.CID_DOMAIN); - log.debug("generateFromCount: " + cid); + if(log.isDebugEnabled()) log.debug("generateFromCount: " + cid); return cid.toString(); } - public String generateFromName(String name) + public String generateFromName(String name) { // See http://www.ietf.org/rfc/rfc2392.txt on rules howto create cid's @@ -69,7 +69,7 @@ } String cid = name + "-" + UUIDGenerator.generateRandomUUIDString() + "@" + MimeConstants.CID_DOMAIN; - log.debug("generateFromName: " + cid); + if(log.isDebugEnabled()) log.debug("generateFromName: " + cid); return cid; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/SwapableMemoryDataSource.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -127,12 +127,12 @@ if (rbaos == null) { - log.debug("Using swap file, location = " + swapFile.toURL() + " size = " + swapFile.length()); + if(log.isDebugEnabled()) log.debug("Using swap file, location = " + swapFile.toURL() + " size = " + swapFile.length()); } else { contentLength = rbaos.size(); - log.debug("Using memory buffer, size = " + contentLength); + if(log.isDebugEnabled()) log.debug("Using memory buffer, size = " + contentLength); content = rbaos.getBytes(); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -59,14 +59,14 @@ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - log.debug("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]"); + if(log.isDebugEnabled()) log.debug("resolveEntity: [pub=" + publicId + ",sysid=" + systemId + "]"); InputSource inputSource = super.resolveEntity(publicId, systemId); if (inputSource == null) inputSource = resolveSystemIDAsURL(systemId, log.isTraceEnabled()); - + if (inputSource == null) - log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); + if(log.isDebugEnabled()) log.debug("Cannot resolve entity: [pub=" + publicId + ",sysid=" + systemId + "]"); return inputSource; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -411,7 +411,7 @@ { ClassLoader destLoader = dest.getClassLoader(); ClassLoader srcLoader = src.getClassLoader(); - log.debug("Not assignable because of conflicting class loaders:\ndstLoader=" + destLoader + "\nsrcLoader=" + srcLoader); + if(log.isDebugEnabled()) log.debug("Not assignable because of conflicting class loaders:\ndstLoader=" + destLoader + "\nsrcLoader=" + srcLoader); } if (isAssignable == false && isPrimitive(dest)) @@ -586,11 +586,11 @@ return ret; } - + /** * This method tests for retro translation by searching for a known problem where Class * does not implement Type. If this is true, then code must never cast a Class to a Type. - * + * * @return true if we are in retro */ public static boolean isRetro14() @@ -641,7 +641,7 @@ } catch (Exception e) { - log.debug("Could not clear blacklists on " + loader); + if(log.isDebugEnabled()) log.debug("Could not clear blacklists on " + loader); } } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingClientHandler.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -74,7 +74,7 @@ public boolean handleRequest(MessageContext msgContext) { - log.debug("handleRequest"); + if(log.isDebugEnabled()) log.debug("handleRequest"); SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.getProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); @@ -107,7 +107,7 @@ public boolean handleResponse(MessageContext msgContext) { - log.debug("handleResponse"); + if(log.isDebugEnabled()) log.debug("handleResponse"); try { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxrpc/WSAddressingServerHandler.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -81,7 +81,7 @@ */ public boolean handleRequest(MessageContext msgContext) { - log.debug("handleRequest"); + if(log.isDebugEnabled()) log.debug("handleRequest"); SOAPAddressingProperties addrProps = (SOAPAddressingProperties)ADDR_BUILDER.newAddressingProperties(); SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); @@ -100,7 +100,7 @@ */ public boolean handleResponse(MessageContext msgContext) { - log.debug("handleResponse"); + if(log.isDebugEnabled()) log.debug("handleResponse"); handleResponseOrFault(msgContext, false); return true; } @@ -111,7 +111,7 @@ */ public boolean handleFault(MessageContext msgContext) { - log.debug("handleFault"); + if(log.isDebugEnabled()) log.debug("handleFault"); handleResponseOrFault(msgContext, true); return true; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingClientHandler.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -60,7 +60,7 @@ protected boolean handleOutbound(MessageContext msgContext) { - log.debug("handleOutbound"); + if(log.isDebugEnabled()) log.debug("handleOutbound"); SOAPAddressingProperties addrProps = (SOAPAddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); if (addrProps != null) @@ -86,7 +86,7 @@ protected boolean handleInbound(MessageContext msgContext) { - log.debug("handleInbound"); + if(log.isDebugEnabled()) log.debug("handleInbound"); try { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -63,7 +63,7 @@ protected boolean handleInbound(MessageContext msgContext) { - log.debug("handleInbound"); + if(log.isDebugEnabled()) log.debug("handleInbound"); SOAPAddressingProperties addrProps = (SOAPAddressingProperties)ADDR_BUILDER.newAddressingProperties(); SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); @@ -78,7 +78,7 @@ protected boolean handleOutbound(MessageContext msgContext) { - log.debug("handleOutbound"); + if(log.isDebugEnabled()) log.debug("handleOutbound"); handleResponseOrFault(msgContext, false); return true; } @@ -89,7 +89,7 @@ */ public boolean handleFault(MessageContext msgContext) { - log.debug("handleFault"); + if(log.isDebugEnabled()) log.debug("handleFault"); handleResponseOrFault(msgContext, true); return true; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -75,7 +75,7 @@ public void notify(Element event) { - log.debug(getIdentifier() + " dispatching " + event); + if(log.isDebugEnabled()) log.debug(getIdentifier() + " dispatching " + event); try { @@ -137,7 +137,7 @@ if (null == endTo) // it's an optional field. return; - log.debug("Ending subscription " + getIdentifier()); + if(log.isDebugEnabled()) log.debug("Ending subscription " + getIdentifier()); StringBuffer sb = new StringBuffer(); sb.append("<env:Envelope xmlns:env='http://www.w3.org/2003/05/soap-envelope' "); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -145,7 +145,7 @@ MBeanServer server = getJMXServer(); if (server != null) { - log.debug("Create subscription manager"); + if(log.isDebugEnabled()) log.debug("Create subscription manager"); server.registerMBean(this, OBJECT_NAME); } } @@ -155,14 +155,14 @@ MBeanServer server = getJMXServer(); if (server != null) { - log.debug("Destroy subscription manager"); + if(log.isDebugEnabled()) log.debug("Destroy subscription manager"); server.unregisterMBean(OBJECT_NAME); } } public void start() throws Exception { - log.debug("Start subscription manager"); + if(log.isDebugEnabled()) log.debug("Start subscription manager"); // setup thread pool threadPool = new ThreadPoolExecutor(5, 15, // core/max num threads @@ -176,7 +176,7 @@ public void stop() { - log.debug("Stop subscription manager"); + if(log.isDebugEnabled()) log.debug("Stop subscription manager"); try { // remove event dispatcher @@ -226,7 +226,7 @@ updateManagerAddress(deploymentInfo, eventSource); eventSource.setState(EventSource.State.CREATED); - log.debug("Created: " + eventSource); + if(log.isDebugEnabled()) log.debug("Created: " + eventSource); } else { @@ -235,7 +235,7 @@ subscriptionMapping.put(eventSource.getNameSpace(), new CopyOnWriteArrayList<Subscription>()); eventSource.setState(EventSource.State.STARTED); - log.debug("Started: " + eventSource); + if(log.isDebugEnabled()) log.debug("Started: " + eventSource); } } @@ -285,7 +285,7 @@ subscriptions.clear(); eventSourceMapping.remove(eventSourceNS); - log.debug("Event source " + eventSourceNS + " removed"); + if(log.isDebugEnabled()) log.debug("Event source " + eventSourceNS + " removed"); } } @@ -295,7 +295,7 @@ public SubscriptionTicket subscribe(URI eventSourceNS, EndpointReferenceType notifyTo, EndpointReferenceType endTo, Date expires, Filter filter) throws SubscriptionError { - log.debug("Subscription request for " + eventSourceNS); + if(log.isDebugEnabled()) log.debug("Subscription request for " + eventSourceNS); EventSource eventSource = eventSourceMapping.get(eventSourceNS); if (null == eventSource) @@ -349,7 +349,7 @@ Subscription subscription = new Subscription(eventSource.getNameSpace(), epr, notifyTo, endTo, expires, filter); subscriptionMapping.get(eventSourceNS).add(subscription); - log.debug("Registered subscription " + subscription.getIdentifier()); + if(log.isDebugEnabled()) log.debug("Registered subscription " + subscription.getIdentifier()); return new SubscriptionTicket(epr, subscription.getExpires()); } @@ -414,7 +414,7 @@ if (identifier.equals(s.getIdentifier())) { subscriptions.remove(s); - log.debug("Removed subscription " + s); + if(log.isDebugEnabled()) log.debug("Removed subscription " + s); break; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -134,19 +134,19 @@ KeyStore keyStore = null; try { - log.debug("loadStore: " + storeURL); + if(log.isDebugEnabled()) log.debug("loadStore: " + storeURL); InputStream stream = storeURL.openStream(); if (stream == null) throw new WSSecurityException("Cannot load store from: " + storeURL); - + keyStore = KeyStore.getInstance(storeType); if (keyStore == null) throw new WSSecurityException("Cannot get keystore for type: " + storeType); - + String decryptedPassword = decryptPassword(storePassword); if (decryptedPassword == null) throw new WSSecurityException("Cannot decrypt store password"); - + keyStore.load(stream, decryptedPassword.toCharArray()); } catch (RuntimeException rte) @@ -161,7 +161,7 @@ { throw new WSSecurityException("Problems loading " + type + ": " + ex.getMessage(), ex); } - + return keyStore; } @@ -172,10 +172,10 @@ private String decryptPassword(String password) throws WSSecurityException { log.trace("decrypt password: " + password); - + if (password == null) throw new WSSecurityException("Invalid null password for security store"); - + if (password.charAt(0) == '{') { StringTokenizer tokenizer = new StringTokenizer(password, "{}"); @@ -196,14 +196,14 @@ } if (password == null) throw new WSSecurityException("Cannot decrypt password, result is null"); - + log.trace("decrypted password: " + password); return password; } private String execPasswordCmd(String keyStorePasswordCmd) throws WSSecurityException { - log.debug("Executing command: " + keyStorePasswordCmd); + if(log.isDebugEnabled()) log.debug("Executing command: " + keyStorePasswordCmd); try { Runtime rt = Runtime.getRuntime(); @@ -213,7 +213,7 @@ String password = reader.readLine(); stdin.close(); int exitCode = p.waitFor(); - log.debug("Command exited with: " + exitCode); + if(log.isDebugEnabled()) log.debug("Command exited with: " + exitCode); return password; } catch (Exception e) @@ -233,7 +233,7 @@ classname = keyStorePasswordCmd.substring(0, colon); ctorArg = keyStorePasswordCmd.substring(colon + 1); } - log.debug("Loading class: " + classname + ", ctorArg=" + ctorArg); + if(log.isDebugEnabled()) log.debug("Loading class: " + classname + ", ctorArg=" + ctorArg); try { ClassLoader loader = Thread.currentThread().getContextClassLoader(); @@ -252,16 +252,16 @@ } try { - log.debug("Checking for toCharArray"); + if(log.isDebugEnabled()) log.debug("Checking for toCharArray"); Class[] sig = {}; Method toCharArray = c.getMethod("toCharArray", sig); Object[] args = {}; - log.debug("Invoking toCharArray"); + if(log.isDebugEnabled()) log.debug("Invoking toCharArray"); password = new String((char[])toCharArray.invoke(instance, args)); } catch (NoSuchMethodException e) { - log.debug("No toCharArray found, invoking toString"); + if(log.isDebugEnabled()) log.debug("No toCharArray found, invoking toString"); password = instance.toString(); } } @@ -428,7 +428,7 @@ } catch (Exception e) { - log.debug("Certificate is invalid", e); + if(log.isDebugEnabled()) log.debug("Certificate is invalid", e); throw new FailedAuthenticationException(); } @@ -477,7 +477,7 @@ } catch (CertPathValidatorException cpve) { - log.debug("Certificate is invalid:", cpve); + if(log.isDebugEnabled()) log.debug("Certificate is invalid:", cpve); throw new FailedAuthenticationException(); } catch (InvalidAlgorithmParameterException e) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -143,7 +143,7 @@ SecurityDecoder decoder = new SecurityDecoder(securityStore); decoder.decode(soapMessage.getSOAPPart(), secHeaderElement); - log.debug("Decoded Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); + if(log.isDebugEnabled()) log.debug("Decoded Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); OperationMetaData opMetaData = ctx.getOperationMetaData(); if (opMetaData == null) @@ -160,7 +160,7 @@ List<OperationDescription<RequireOperation>> operations = buildRequireOperations(config, operation, port); decoder.verify(operations); - log.debug("Verification is successful"); + if(log.isDebugEnabled()) log.debug("Verification is successful"); decoder.complete(); } @@ -168,7 +168,7 @@ { if (e.isInternalError()) log.error("Internal error occured handling inbound message:", e); - else log.debug("Returning error to sender: " + e.getMessage()); + else if(log.isDebugEnabled()) log.debug("Returning error to sender: " + e.getMessage()); throw convertToFault(e); } @@ -232,7 +232,7 @@ Config operationConfig = getConfig(config, port, operation); - log.debug("WS-Security config:" + operationConfig); + if(log.isDebugEnabled()) log.debug("WS-Security config:" + operationConfig); // Nothing to process if (operationConfig == null) return; @@ -282,7 +282,7 @@ if (operations.size() == 0) return; - log.debug("Encoding Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); + if(log.isDebugEnabled()) log.debug("Encoding Message:\n" + DOMWriter.printNode(soapMessage.getSOAPPart(), true)); try { @@ -295,7 +295,7 @@ { if (e.isInternalError()) log.error("Internal error occured handling outbound message:", e); - else log.debug("Returning error to sender: " + e.getMessage()); + else if(log.isDebugEnabled()) log.debug("Returning error to sender: " + e.getMessage()); throw convertToFault(e); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -266,7 +266,7 @@ { SOAPElement parentElement = xopElement.getParentElement(); - log.debug("Replace base64 representation on element [xmlName=" + parentElement.getLocalName() + "]"); + if(log.isDebugEnabled()) log.debug("Replace base64 representation on element [xmlName=" + parentElement.getLocalName() + "]"); String base64 = xopElement.getValue(); byte[] data = SimpleTypeBindings.unmarshalBase64(base64); @@ -288,7 +288,7 @@ { SOAPElement xopInclude = xopElement.addChildElement(Constants.NAME_XOP_INCLUDE); xopInclude.setAttribute("href", cid); - log.debug("Restored xop:Include element on [xmlName=" + xopElement.getLocalName() + "]"); + if(log.isDebugEnabled()) log.debug("Restored xop:Include element on [xmlName=" + xopElement.getLocalName() + "]"); XOPContext.setXOPMessage(true); } @@ -302,7 +302,7 @@ private static void replaceXOPInclude(SOAPElement parent, SOAPElement xopIncludeElement) { - log.debug("Replace xop:Include on element [xmlName=" + parent.getLocalName() + "]"); + if(log.isDebugEnabled()) log.debug("Replace xop:Include on element [xmlName=" + parent.getLocalName() + "]"); String cid = xopIncludeElement.getAttribute("href"); byte[] data; @@ -331,7 +331,7 @@ parent.setValue(base64); parent.setAttributeNS(NS_XOP_JBOSSWS, "content-type", contentType); - log.debug("Created base64 representation for content-type " + contentType); + if(log.isDebugEnabled()) log.debug("Created base64 representation for content-type " + contentType); // cleanup the attachment part CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); @@ -345,7 +345,7 @@ if (null == removedPart) throw new WSException("Unable to remove attachment part " + cid); - log.debug("Removed attachment part " + cid); + if(log.isDebugEnabled()) log.debug("Removed attachment part " + cid); // leave soap object model in a valid state setXOPMessage(false); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/JBossXBContentAdapter.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -81,7 +81,7 @@ if( mtomDisabled && convertableType ) { String contentType = MimeUtils.resolveMimeType(object); - log.debug("Adopt " + object.getClass() + " to byte[], contentType " + contentType); + if(log.isDebugEnabled()) log.debug("Adopt " + object.getClass() + " to byte[], contentType " + contentType); DataHandler dh = new DataHandler(object, contentType); ByteArrayOutputStream bout = new ByteArrayOutputStream(); @@ -125,7 +125,7 @@ if( isRegularMessage && isSimpleType && !doTypesMatch) { String contentType = MimeUtils.resolveMimeType(targetClass); - log.debug("Adopt byte[] to " + targetClass +", contentType "+ contentType); + if(log.isDebugEnabled()) log.debug("Adopt byte[] to " + targetClass +", contentType "+ contentType); try { @@ -154,7 +154,7 @@ try { String contentType = MimeUtils.resolveMimeType(targetClass); - log.debug("Adopt DataHandler to " + targetClass +", contentType "+ contentType); + if(log.isDebugEnabled()) log.debug("Adopt DataHandler to " + targetClass +", contentType "+ contentType); DataHandler dh = new DataHandler( wrapAsDataSource(object, contentType) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/XOPMarshallerImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/XOPMarshallerImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxrpc/XOPMarshallerImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -68,7 +68,7 @@ SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); QName xmlName = new QName(elementNamespace, elementName); - log.debug("serialize: [xmlName=" + xmlName + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + "]"); String cid = soapMessage.getCidGenerator().generateFromName(xmlName.getLocalPart()); @@ -77,7 +77,7 @@ xopPart.addMimeHeader(MimeConstants.CONTENT_ID, '<'+cid+'>'); // RFC2392 requirement soapMessage.addAttachmentPart(xopPart); - log.debug("Created attachment part " +cid+", with content-type " +xopPart.getContentType()); + if(log.isDebugEnabled()) log.debug("Created attachment part " +cid+", with content-type " +xopPart.getContentType()); return "cid:" + cid; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -43,14 +43,14 @@ SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); QName xmlName = new QName(elementNamespace, elementLocalName); - log.debug("serialize: [xmlName=" + xmlName + "]"); + if(log.isDebugEnabled()) log.debug("serialize: [xmlName=" + xmlName + "]"); String cid = soapMessage.getCidGenerator().generateFromName(xmlName.getLocalPart()); AttachmentPart xopPart = soapMessage.createAttachmentPart(data); xopPart.addMimeHeader(MimeConstants.CONTENT_ID, '<' + cid + '>'); // RFC2392 requirement soapMessage.addAttachmentPart(xopPart); - log.debug("Created attachment part " + cid + ", with content-type " + xopPart.getContentType()); + if(log.isDebugEnabled()) log.debug("Created attachment part " + cid + ", with content-type " + xopPart.getContentType()); return "cid:" + cid; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -335,7 +335,7 @@ if (alwaysModify || uriScheme == null || orgAddress.indexOf("REPLACE_WITH_ACTUAL_URL") >= 0) { - log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'"); + if(log.isDebugEnabled()) log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'"); wsdlEndpoint.setAddress(serviceEndpointURL); sepMetaData.setEndpointAddress(serviceEndpointURL); @@ -345,7 +345,7 @@ } else { - log.debug("Don't replace service endpoint address '" + orgAddress + "'"); + if(log.isDebugEnabled()) log.debug("Don't replace service endpoint address '" + orgAddress + "'"); try { sepMetaData.setEndpointAddress(new URL(orgAddress).toExternalForm()); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -100,7 +100,7 @@ public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, JavaWsdlMapping javaWsdlMapping, WSSecurityConfiguration securityConfig, UnifiedServiceRefMetaData usrMetaData, ClassLoader loader) { - log.debug("START buildMetaData: [service=" + serviceQName + "]"); + if(log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceQName + "]"); try { ResourceLoaderAdapter vfsRoot = new ResourceLoaderAdapter(loader); @@ -136,7 +136,7 @@ // eagerly initialize wsMetaData.eagerInitialize(); - log.debug("END buildMetaData: " + wsMetaData); + if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData); return serviceMetaData; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -66,10 +66,10 @@ */ public UnifiedMetaData buildMetaData(JAXRPCDeployment udi) { - log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); + if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try { - // For every webservice-description build the ServiceMetaData + // For every webservice-description build the ServiceMetaData UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot); wsMetaData.setDeploymentName(udi.getCanonicalName()); wsMetaData.setClassLoader(udi.classLoader); @@ -228,7 +228,7 @@ } } - log.debug("END buildMetaData: " + wsMetaData); + if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData); return wsMetaData; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -66,7 +66,7 @@ if (wsdlURL == null) throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL); - log.debug("START buildMetaData: [service=" + serviceName + "]"); + if(log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceName + "]"); try { UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot); @@ -84,7 +84,7 @@ JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); serviceMetaData.getTypesMetaData().setSchemaModel(schemaModel); - log.debug("END buildMetaData: " + wsMetaData); + if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData); return serviceMetaData; } catch (RuntimeException rte) @@ -101,7 +101,7 @@ */ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL) { - return buildMetaData(serviceName, wsdlURL, new ResourceLoaderAdapter()); + return buildMetaData(serviceName, wsdlURL, new ResourceLoaderAdapter()); } private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions) throws IOException @@ -179,14 +179,14 @@ public void rebuildEndpointMetaData(EndpointMetaData epMetaData, Class<?> wsClass) { - log.debug("START: rebuildMetaData"); + if(log.isDebugEnabled()) log.debug("START: rebuildMetaData"); // Clear the java types, etc. resetMetaDataBuilder(epMetaData.getClassLoader()); // Nuke parameterStyle epMetaData.setParameterStyle(null); - + // Process an optional @BindingType annotation if (wsClass.isAnnotationPresent(BindingType.class)) processBindingType(epMetaData, wsClass); @@ -214,6 +214,6 @@ // Eager initialization epMetaData.eagerInitialize(); - log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData()); + if(log.isDebugEnabled()) log.debug("END: rebuildMetaData\n" + epMetaData.getServiceMetaData()); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -108,7 +108,7 @@ { if (wsClass.isAnnotationPresent(BindingType.class)) { - log.debug("processBindingType on: " + wsClass.getName()); + if(log.isDebugEnabled()) log.debug("processBindingType on: " + wsClass.getName()); BindingType anBindingType = (BindingType)wsClass.getAnnotation(BindingType.class); epMetaData.setBindingId(anBindingType.value()); } @@ -118,7 +118,7 @@ { if (wsClass.isAnnotationPresent(SOAPBinding.class)) { - log.debug("processSOAPBinding on: " + wsClass.getName()); + if(log.isDebugEnabled()) log.debug("processSOAPBinding on: " + wsClass.getName()); SOAPBinding anSoapBinding = wsClass.getAnnotation(SOAPBinding.class); SOAPBinding.Style attrStyle = anSoapBinding.style(); @@ -152,9 +152,9 @@ if (wsClass.isAnnotationPresent(SOAPMessageHandlers.class)) throw new WSException("Cannot combine @HandlerChain with @SOAPMessageHandlers"); - // The explicit handler chain on the service has priority + // The explicit handler chain on the service has priority String filename = epMetaData.getServiceMetaData().getHandlerChain(); - + HandlerChain anHandlerChain = wsClass.getAnnotation(HandlerChain.class); if (filename == null && anHandlerChain != null) filename = anHandlerChain.file(); @@ -162,9 +162,9 @@ // Nothing to do if (filename == null) return; - + URL fileURL = null; - log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); + if(log.isDebugEnabled()) log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName()); // Try the filename as URL try @@ -720,20 +720,20 @@ { if (wrapperParameter.loadWrapperBean() == null) wrapperGenerator.generate(wrapperParameter); - + Class wrapperClass = wrapperParameter.getJavaType(); javaTypes.add(wrapperClass); - + // In case there is no @XmlRootElement typeRefs.add(new TypeReference(wrapperParameter.getXmlName(), wrapperClass)); if (!opMetaData.isOneWay()) { if (wrapperOutputParameter.loadWrapperBean() == null) wrapperGenerator.generate(wrapperOutputParameter); - + wrapperClass = wrapperOutputParameter.getJavaType(); javaTypes.add(wrapperClass); - + // In case there is no @XmlRootElement typeRefs.add(new TypeReference(wrapperOutputParameter.getXmlName(), wrapperClass)); } @@ -786,13 +786,13 @@ protected void initWrapperGenerator(ClassLoader loader) { - // Use the dynamic generator by default. Otherwise reset the last + // Use the dynamic generator by default. Otherwise reset the last if (wrapperGenerator == null) wrapperGenerator = new DynamicWrapperGenerator(loader); else wrapperGenerator.reset(loader); } - + protected void resetMetaDataBuilder(ClassLoader loader) { initWrapperGenerator(loader); @@ -806,7 +806,7 @@ try { String targetNS = epMetaData.getPortTypeName().getNamespaceURI().intern(); - log.debug("JAXBContext [types=" + javaTypes + ",tns=" + targetNS + "]"); + if(log.isDebugEnabled()) log.debug("JAXBContext [types=" + javaTypes + ",tns=" + targetNS + "]"); jaxbCtx = JAXBRIContext.newInstance(javaTypes.toArray(new Class[0]), typeRefs, targetNS, false); } catch (JAXBException ex) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -53,9 +53,9 @@ */ public UnifiedMetaData buildMetaData(UnifiedDeploymentInfo udi) { - log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); + if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try - { + { UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot); wsMetaData.setDeploymentName(udi.getCanonicalName()); wsMetaData.setClassLoader(udi.classLoader); @@ -90,7 +90,7 @@ } } - log.debug("END buildMetaData: " + wsMetaData); + if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData); return wsMetaData; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -46,7 +46,7 @@ */ public UnifiedMetaData buildMetaData(UnifiedDeploymentInfo udi) { - log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); + if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try { UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.vfRoot); @@ -73,7 +73,7 @@ } } - log.debug("END buildMetaData: " + wsMetaData); + if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData); return wsMetaData; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -68,7 +68,7 @@ public Object parse(URL configURL) { - log.debug("parse: " + configURL); + if(log.isDebugEnabled()) log.debug("parse: " + configURL); Object wsConfig; try @@ -122,7 +122,7 @@ */ public CommonConfig getConfig(UnifiedVirtualFile vfsRoot, String configName, String configFile) { - log.debug("getConfig: [name=" + configName + ",url=" + configFile + "]"); + if(log.isDebugEnabled()) log.debug("getConfig: [name=" + configName + ",url=" + configFile + "]"); if (configName == null) throw new IllegalArgumentException("Config name cannot be null"); 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-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -32,6 +32,7 @@ import java.util.Map; import java.util.Observable; import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.namespace.QName; @@ -121,7 +122,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 HashMap<Method, OperationMetaData>(); + private Map<Method, OperationMetaData> opMetaDataCache = new ConcurrentHashMap<Method, OperationMetaData>(); // All of the registered types private List<Class> registeredTypes = new ArrayList<Class>(); @@ -240,7 +241,7 @@ if (use == null) { use = Use.getDefaultUse(); - log.debug("Using default encoding style: " + use); + if(log.isDebugEnabled()) log.debug("Using default encoding style: " + use); } return use; } @@ -259,7 +260,7 @@ if (style == null) { style = Style.getDefaultStyle(); - log.debug("Using default style: " + style); + if(log.isDebugEnabled()) log.debug("Using default style: " + style); } return style; } @@ -278,7 +279,7 @@ if (parameterStyle == null) { parameterStyle = ParameterStyle.WRAPPED; - log.debug("Using default parameter style: " + parameterStyle); + if(log.isDebugEnabled()) log.debug("Using default parameter style: " + parameterStyle); } return parameterStyle; } @@ -288,7 +289,7 @@ if (value != null && parameterStyle != null && !parameterStyle.equals(value)) throw new WSException("Mixed SOAP parameter styles not supported"); - log.debug("setParameterStyle: " + value); + if(log.isDebugEnabled()) log.debug("setParameterStyle: " + value); this.parameterStyle = value; } @@ -593,17 +594,17 @@ // Make sure we have a configuration if (config == null) initEndpointConfig(); - + // SOAPBinding configuration if (configurable instanceof CommonBindingProvider) { - log.debug("Configure SOAPBinding"); + if(log.isDebugEnabled()) log.debug("Configure SOAPBinding"); if (config.hasFeature(EndpointFeature.MTOM)) { CommonBindingProvider provider = (CommonBindingProvider)configurable; ((CommonSOAPBinding)provider.getCommonBinding()).setMTOMEnabled(true); - log.debug("Enable MTOM on endpoint " + this.getPortName()); + if(log.isDebugEnabled()) log.debug("Enable MTOM on endpoint " + this.getPortName()); } } } @@ -637,7 +638,7 @@ { setConfigNameInternal(configName, configFile); } - + private void setConfigNameInternal(String configName, String configFile) { if (configName == null) @@ -645,12 +646,12 @@ if (configFile != null) this.configFile = configFile; - + if (configName.equals(this.configName) == false) { this.configName = configName; - - log.debug("Reconfiguration forced, new config is '" + configName + "'"); + + if(log.isDebugEnabled()) log.debug("Reconfiguration forced, new config is '" + configName + "'"); initEndpointConfig(); configObservable.doNotify(configName); } @@ -658,20 +659,20 @@ public void initEndpointConfig() { - log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]"); + if(log.isDebugEnabled()) log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]"); JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile()); - + reconfigHandlerMetaData(); } - + private void reconfigHandlerMetaData() { - log.debug("Configure EndpointMetaData"); + if(log.isDebugEnabled()) log.debug("Configure EndpointMetaData"); List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); clearHandlers(); - + List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE); List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST); @@ -679,9 +680,9 @@ addHandlers(sepHandlers); addHandlers(postHandlers); - log.debug("Added " + preHandlers.size() + " PRE handlers"); - log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers"); - log.debug("Added " + postHandlers.size() + " POST handlers"); + if(log.isDebugEnabled()) log.debug("Added " + preHandlers.size() + " PRE handlers"); + if(log.isDebugEnabled()) log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers"); + if(log.isDebugEnabled()) log.debug("Added " + postHandlers.size() + " POST handlers"); } public List<Class> getRegisteredTypes() 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-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -2,6 +2,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** @@ -12,7 +13,7 @@ */ 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() { return extensions; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -391,7 +391,7 @@ for (int i = 0; i < propertyCount; i++) propertyValues[i] = faultBeanProperties[i].accessor().get(faultBean); - log.debug("constructing " + javaType.getSimpleName() + ": " + Arrays.toString(propertyValues)); + if(log.isDebugEnabled()) log.debug("constructing " + javaType.getSimpleName() + ": " + Arrays.toString(propertyValues)); serviceException = serviceExceptionConstructor.newInstance(propertyValues); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -211,14 +211,14 @@ // compare params by java type name if (matchParameters(method, true)) { - log.debug("Found best matching java method: " + method); + if(log.isDebugEnabled()) log.debug("Found best matching java method: " + method); isJavaMethod = true; } // compare params by assignability if (!isJavaMethod && matchParameters(method, false)) { - log.debug("Found possible matching java method: " + method); + if(log.isDebugEnabled()) log.debug("Found possible matching java method: " + method); isJavaMethod = true; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -465,7 +465,7 @@ String mimeType = scanner.scan(javaType); if (mimeType != null) { - log.debug("MTOM parameter found: " + xmlName); + if(log.isDebugEnabled()) log.debug("MTOM parameter found: " + xmlName); setXOP(true); } } @@ -504,7 +504,7 @@ } catch (Exception ex) { - log.debug("Invalid wrapper type:" + typeName, ex); + if(log.isDebugEnabled()) log.debug("Invalid wrapper type:" + typeName, ex); return false; } } 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-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -31,6 +31,7 @@ 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; @@ -68,7 +69,7 @@ private UnifiedMetaData wsMetaData; // The service endpoints - private Map<QName, EndpointMetaData> endpoints = new LinkedHashMap<QName, EndpointMetaData>(); + private Map<QName, EndpointMetaData> endpoints = new ConcurrentHashMap<QName, EndpointMetaData>(); private QName serviceName; private String serviceRefName; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/TypesMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/TypesMetaData.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/TypesMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -156,7 +156,7 @@ { tmMetaData = new TypeMappingMetaData(this, xmlType, javaTypeName); tmMetaData.setQNameScope(TypeMappingMetaData.QNAME_SCOPE_SIMPLE_TYPE); - log.debug("Adding a simpleType without jaxrpc-mapping: " + tmMetaData); + if(log.isDebugEnabled()) log.debug("Adding a simpleType without jaxrpc-mapping: " + tmMetaData); addTypeMapping(tmMetaData); } else 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-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -28,6 +28,7 @@ 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; @@ -68,10 +69,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 HashMap<String, WSDLDefinitions>(); + Map<String, WSDLDefinitions> wsdlMap = new ConcurrentHashMap<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 HashMap<String, JavaWsdlMapping>(); + Map<String, JavaWsdlMapping> jaxrpcMap = new ConcurrentHashMap<String, JavaWsdlMapping>(); // The list of service meta data private List<ServiceMetaData> services = new ArrayList<ServiceMetaData>(); // Used by eager initialization @@ -186,7 +187,7 @@ { if (eagerInitialized == false) { - log.debug("Eagerly initialize the meta data model"); + if(log.isDebugEnabled()) log.debug("Eagerly initialize the meta data model"); for (ServiceMetaData service : services) { service.eagerInitialize(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -660,7 +660,7 @@ if (type.getAnonymous()) { anonymousTypeMap.put(namespace + ":" + name, type); - log.debug("Registered as anon type: {" + namespace + ":" + name + "} -> " + type); + if(log.isDebugEnabled()) log.debug("Registered as anon type: {" + namespace + ":" + name + "} -> " + type); } return name; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -54,7 +54,7 @@ if (location != null) { - log.debug("createConfiguration from: " + location); + if(log.isDebugEnabled()) log.debug("createConfiguration from: " + location); config = WSSecurityOMFactory.newInstance().parse(location); // Get and set deployment path to the keystore file @@ -63,7 +63,7 @@ location = getResource(vfsRoot, config.getKeyStoreFile()); if (location != null) { - log.debug("Add keystore: " + location); + if(log.isDebugEnabled()) log.debug("Add keystore: " + location); config.setKeyStoreURL(location); } } @@ -73,7 +73,7 @@ location = getResource(vfsRoot, config.getTrustStoreFile()); if (location != null) { - log.debug("Add truststore: " + location); + if(log.isDebugEnabled()) log.debug("Add truststore: " + location); config.setTrustStoreURL(location); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -294,7 +294,7 @@ */ public WSDLDefinitions generate(Class endpoint) { - log.debug("generate [endpoint=" + endpoint.getName() + ",tnsURI=" + targetNamespace + ",service=" + serviceName + if(log.isDebugEnabled()) log.debug("generate [endpoint=" + endpoint.getName() + ",tnsURI=" + targetNamespace + ",service=" + serviceName + ",portType=" + portTypeName + "]"); if( umd == null) @@ -329,8 +329,8 @@ // Debug the generated wsdl StringWriter sw = new StringWriter(); new WSDLWriter(wsdlDefinitions).write(sw, Constants.DEFAULT_XML_CHARSET); - log.debug("Generated WSDL:\n" + sw.toString()); - + if(log.isDebugEnabled()) log.debug("Generated WSDL:\n" + sw.toString()); + // Debug the generated mapping file String jaxrpcMappingStr = null; if (javaWsdlMapping != null) @@ -338,7 +338,7 @@ Element root = DOMUtils.parse(javaWsdlMapping.serialize()); jaxrpcMappingStr = DOMWriter.printNode(root, true); } - log.debug("Generated Mapping:\n" + jaxrpcMappingStr); + if(log.isDebugEnabled()) log.debug("Generated Mapping:\n" + jaxrpcMappingStr); } catch (RuntimeException rte) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL11.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -72,7 +72,7 @@ */ public JavaToWSDL11() { - log.debug("Creating JavaToWSDL11 instance"); + if(log.isDebugEnabled()) log.debug("Creating JavaToWSDL11 instance"); } /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL20.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL20.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToWSDL20.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -77,7 +77,7 @@ */ public JavaToWSDL20() { - log.debug("Creating JavaToWSDL20 instance"); + if(log.isDebugEnabled()) log.debug("Creating JavaToWSDL20 instance"); } /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -170,7 +170,7 @@ URL orgURL = locs.get(nsURI); URL resURL = resolveNamespaceURI(resolver, nsURI); URL url = resURL != null ? resURL : orgURL; - log.debug("Load schema: " + nsURI + "=" + url); + if(log.isDebugEnabled()) log.debug("Load schema: " + nsURI + "=" + url); XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(), null); InputSource tmpSrc = resolver.resolveEntity(null, url.toExternalForm()); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -808,8 +808,8 @@ if (javaType == null) { - log.debug("Typemapping lookup failed for " + xmlName); - log.debug("Falling back to identifier generation"); + if(log.isDebugEnabled()) log.debug("Typemapping lookup failed for " + xmlName); + if(log.isDebugEnabled()) log.debug("Falling back to identifier generation"); String className = xmlType.getLocalPart(); if (className.charAt(0) == '>') className = className.substring(1); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -98,7 +98,7 @@ String wrapperName = pmd.getJavaTypeName(); if (log.isDebugEnabled()) - log.debug("Generating wrapper: " + wrapperName); + if(log.isDebugEnabled()) log.debug("Generating wrapper: " + wrapperName); try { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -347,7 +347,7 @@ JBossXSModelGroup group = (JBossXSModelGroup)complexType.getParticle().getTerm(); group.setParticles(particles); - log.debug("generateNewType: " + sutils.write(complexType)); + if(log.isDebugEnabled()) log.debug("generateNewType: " + sutils.write(complexType)); return complexType; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2007-02-05 11:19:25 UTC (rev 2275) @@ -101,7 +101,7 @@ if (wsdlLocation == null) throw new IllegalArgumentException("URL cannot be null"); - log.debug("parse: " + wsdlLocation.toExternalForm()); + if(log.isDebugEnabled()) log.debug("parse: " + wsdlLocation.toExternalForm()); EntityResolver entityResolver = new JBossWSEntityResolver(); WSDLDefinitions wsdlDefinitions = null; Modified: trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx =================================================================== --- trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-02-05 11:15:31 UTC (rev 2274) +++ trunk/jbossws-tests/src/main/resources/benchmark/jmeter/JBossWS_Benchmark.jmx 2007-02-05 11:19:25 UTC (rev 2275) @@ -10,7 +10,7 @@ <stringProp name="TestPlan.comments"></stringProp> </TestPlan> <hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC1-JAXWS" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC1-JAXWS" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -35,7 +35,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -45,6 +44,7 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -54,7 +54,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -64,6 +63,7 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -71,8 +71,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -80,8 +80,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -89,8 +89,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -143,7 +143,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -156,6 +155,7 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -165,7 +165,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -178,6 +177,7 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -185,8 +185,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -194,8 +194,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -203,8 +203,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -239,7 +239,7 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC3-JAXWS" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC3-JAXWS" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -257,7 +257,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -270,6 +269,7 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -279,7 +279,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -292,6 +291,7 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -299,8 +299,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -308,8 +308,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -317,8 +317,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -353,7 +353,7 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC4-JAXWS" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC4-JAXWS" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -371,7 +371,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.1-JAXWS" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -387,6 +386,7 @@ </Synthetic_1> </ns1:echoSynthetic> </env:Body></env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -396,7 +396,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -412,6 +411,7 @@ </Synthetic_1> </ns1:echoSynthetic> </env:Body></env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -419,8 +419,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -428,8 +428,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -437,8 +437,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -473,7 +473,7 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC1" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC1" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -498,7 +498,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -508,6 +507,7 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -517,7 +517,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC1.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -527,6 +526,7 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -534,8 +534,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -543,8 +543,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -552,8 +552,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -588,7 +588,7 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC2" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC2" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -606,7 +606,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -619,6 +618,7 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -628,7 +628,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC2.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -641,6 +640,7 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -648,8 +648,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -657,8 +657,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -666,8 +666,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -680,7 +680,7 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC3" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC3" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -698,7 +698,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -711,6 +710,7 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -720,7 +720,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC3.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -733,6 +732,7 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -740,8 +740,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -749,8 +749,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -758,8 +758,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -794,7 +794,7 @@ </ResultCollector> <hashTree/> </hashTree> - <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC4" enabled="true"> + <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="DOC4" enabled="false"> <longProp name="ThreadGroup.start_time">1144146988000</longProp> <stringProp name="ThreadGroup.delay"></stringProp> <stringProp name="ThreadGroup.duration"></stringProp> @@ -812,7 +812,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -828,6 +827,7 @@ </Synthetic_1> </ns1:echoSynthetic> </env:Body></env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -837,7 +837,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="DOC4.2" enabled="false"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -853,6 +852,7 @@ </Synthetic_1> </ns1:echoSynthetic> </env:Body></env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -860,8 +860,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">50</stringProp> <stringProp name="ConstantTimer.delay">100</stringProp> - <stringProp name="RandomTimer.range">50</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -869,8 +869,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -878,8 +878,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -910,7 +910,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC1.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -920,6 +919,7 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -929,7 +929,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC1.2" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -939,6 +938,7 @@ </ns1:getOrder> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -946,8 +946,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">500</stringProp> <stringProp name="ConstantTimer.delay">8000</stringProp> - <stringProp name="RandomTimer.range">500</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -955,8 +955,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -964,8 +964,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -1018,7 +1018,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC2.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1033,6 +1032,7 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1042,7 +1042,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC2.2" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1057,6 +1056,7 @@ </ns1:echoArrayOfSimpleUserType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1064,8 +1064,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">200</stringProp> <stringProp name="ConstantTimer.delay">1000</stringProp> - <stringProp name="RandomTimer.range">200</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -1073,8 +1073,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -1082,8 +1082,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -1136,7 +1136,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC3.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1149,6 +1148,7 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1158,7 +1158,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC3.2" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1171,6 +1170,7 @@ </ns1:echoSimpleType> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1178,8 +1178,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">200</stringProp> <stringProp name="ConstantTimer.delay">1000</stringProp> - <stringProp name="RandomTimer.range">200</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -1187,8 +1187,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -1196,8 +1196,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -1250,7 +1250,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC4.1" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1267,6 +1266,7 @@ </ns1:echoSynthetic> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1276,7 +1276,6 @@ <SoapSampler guiclass="SoapSamplerGui" testclass="SoapSampler" testname="RPC4.2" enabled="true"> <stringProp name="SoapSampler.SEND_SOAP_ACTION">false</stringProp> <stringProp name="SoapSampler.xml_data_file"></stringProp> - <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <stringProp name="HTTPSamper.xml_data"><env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> <env:Header/> <env:Body> @@ -1293,6 +1292,7 @@ </ns1:echoSynthetic> </env:Body> </env:Envelope></stringProp> + <stringProp name="SoapSampler.SOAP_ACTION"></stringProp> <elementProp name="HTTPsampler.Arguments" elementType="Arguments"> <collectionProp name="Arguments.arguments"/> </elementProp> @@ -1300,8 +1300,8 @@ </SoapSampler> <hashTree/> <GaussianRandomTimer guiclass="GaussianRandomTimerGui" testclass="GaussianRandomTimer" testname="Gaussian Random Timer" enabled="true"> + <stringProp name="RandomTimer.range">200</stringProp> <stringProp name="ConstantTimer.delay">1000</stringProp> - <stringProp name="RandomTimer.range">200</stringProp> </GaussianRandomTimer> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Code Assertion" enabled="true"> @@ -1309,8 +1309,8 @@ <stringProp name="49586">200</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_code</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Envelope Assertion" enabled="true"> @@ -1318,8 +1318,8 @@ <stringProp name="-1984138256">Envelope</stringProp> </collectionProp> <stringProp name="Assertion.test_field">Assertion.response_data</stringProp> + <intProp name="Assertion.test_type">2</intProp> <stringProp name="Assertion.assume_success">false</stringProp> - <intProp name="Assertion.test_type">2</intProp> </ResponseAssertion> <hashTree/> <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="false"> @@ -1381,7 +1381,7 @@ </value> <name>saveConfig</name> </objProp> - <stringProp name="filename"></stringProp> + <stringProp name="filename">/home/hbraun/Desktop/Benchmarks-1.2.0/doc2_1-JAXWS</stringProp> <boolProp name="ResultCollector.error_logging">false</boolProp> </ResultCollector> <hashTree/>

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2274 - in trunk/jbossws-tests/src/main/java/org/jboss/test/ws: jaxws/samples/xop/doclit and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-02-05 06:15:31 -0500 (Mon, 05 Feb 2007) New Revision: 2274 Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java Log: Verify binary integrity Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java 2007-02-04 20:24:44 UTC (rev 2273) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/XOPTestSupport.java 2007-02-05 11:15:31 UTC (rev 2274) @@ -88,7 +88,7 @@ public static StreamSource createTestSource() { - return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + return new StreamSource(new ByteArrayInputStream("<?xml version=\"1.0\" encoding=\"UTF-8\"?><some><nestedXml/></some>".getBytes())); } public static DataHandler createDataHandler(File imgFile) Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-04 20:24:44 UTC (rev 2273) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-05 11:15:31 UTC (rev 2274) @@ -25,13 +25,17 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.InputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import javax.activation.DataHandler; import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; import javax.xml.ws.soap.SOAPBinding; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.XOPTestSupport; +import org.jboss.ws.core.utils.IOUtils; /** * User: hbraun @@ -64,10 +68,14 @@ getBinding().setMTOMEnabled(false); DataHandler dh = new DataHandler(imgFile.toURL()); + int inBytes = dh.getInputStream().available(); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); + assertNotNull(response); assertEquals(response.getDataHandler().getContentType(), "application/octet-stream"); assertTrue("Wrong java type returned", response.getDataHandler().getContent() instanceof InputStream); + int outBytes = response.getDataHandler().getInputStream().available(); + assertTrue("num bytes are different", inBytes == outBytes); } public void testImgRoundtrip() throws Exception @@ -109,7 +117,7 @@ { getBinding().setMTOMEnabled(true); - Source src = XOPTestSupport.createTestSource(); + StreamSource src = XOPTestSupport.createTestSource(); SourceRequest request = new SourceRequest(); request.setData(src); @@ -117,6 +125,10 @@ assertNotNull(response); assertTrue(response.getData() instanceof Source); + InputStream in = ((StreamSource) response.getData()).getInputStream(); + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + IOUtils.copyStream(bout, in); + assertEquals( bout.toString(), "<?xml version=\"1.0\" encoding=\"UTF-8\"?><some><nestedXml/></some>"); } public void testSrcResponseOptimized() throws Exception

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2273 - in branches/jbossws-1.2.0: integration-jboss42 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-04 15:24:44 -0500 (Sun, 04 Feb 2007) New Revision: 2273 Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml branches/jbossws-1.2.0/integration-jboss42/build.xml branches/jbossws-1.2.0/integration-jboss50/build.xml Log: Fix AS testsuites Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml =================================================================== --- branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-02-04 19:36:14 UTC (rev 2272) +++ branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-02-04 20:24:44 UTC (rev 2273) @@ -1,50 +1,59 @@ <project name="jboss/jbossws-component-info"> - - <component id="jboss/jbossws" - licenseType="lgpl" - version="@repository.id@" - description="JBossWS an implementation of J2EE Web Services"> - - <artifact id="jbossws-core.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - <artifact id="jbossws40.sar"/> - <artifact id="jbossws42.sar"/> - <artifact id="jbossws50.sar"/> - <artifact id="jbossws50-deployer.zip"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="snapshot"/> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="2.2.0.Alpha2"/> - <compatible version="@jboss-remoting@"/> - </import> - <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> - </import> - - <export> - <include input="jbossws-core.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> + + <component id="jboss/jbossws" licenseType="lgpl" version="@repository.id@" description="JBossWS an implementation of J2EE Web Services"> + + <artifact id="jbossws-client.jar"/> + <artifact id="jbossws-core.jar"/> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + + <artifact id="jbossws40.sar"/> + <artifact id="jbossws-jboss40-integration.jar"/> + + <artifact id="jbossws42.sar"/> + <artifact id="jbossws-jboss42-integration.jar"/> + + <artifact id="jbossws50.sar"/> + <artifact id="jbossws-jboss50-integration.jar"/> + <artifact id="jbossws50-deployer.zip"/> + + <import componentref="apache-xmlsec"> + <compatible version="@apache-xmlsec@"/> + </import> + <import componentref="ibm-wsdl4j"> + <compatible version="@ibm-wsdl4j@"/> + </import> + <import componentref="javassist"> + <compatible version="@javassist@"/> + </import> + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="snapshot"/> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="2.2.0.Alpha2"/> + <compatible version="@jboss-remoting@"/> + </import> + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> + +  + <export> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + </export> + + </component> + +</project> \ No newline at end of file Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-04 19:36:14 UTC (rev 2272) +++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-02-04 20:24:44 UTC (rev 2273) @@ -153,14 +153,18 @@ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> -  +  <copy todir="${jboss42.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws-jboss42-integration.jar"/> + </fileset> </copy> </target> Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-04 19:36:14 UTC (rev 2272) +++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-02-04 20:24:44 UTC (rev 2273) @@ -162,14 +162,18 @@ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> -  +  <copy todir="${jboss50.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws-jboss50-integration.jar"/> + </fileset> </copy> </target>

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2272 - branches/jbossws-1.2.0/build/hudson/hudson-home.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-04 14:36:14 -0500 (Sun, 04 Feb 2007) New Revision: 2272 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml Log: AS tests not available in TC Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-04 19:30:13 UTC (rev 2271) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-02-04 19:36:14 UTC (rev 2272) @@ -127,7 +127,7 @@ <tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr> <tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr> <tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr> -<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>N/A</td><td>ok</td></tr> </table> ]]> </description>

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2271 - in branches/jbossws-1.2.0: jbossws-core and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-04 14:30:13 -0500 (Sun, 04 Feb 2007) New Revision: 2271 Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/jbossws-core/build.xml branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java Log: Include server stuff in client jar, the ServiceObjectFactory needs it Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-04 17:50:46 UTC (rev 2270) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-02-04 19:30:13 UTC (rev 2271) @@ -226,7 +226,6 @@ </fileset> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/core/server/**"/> <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> </fileset> @@ -311,14 +310,18 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/> -  +  <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar"/> + </fileset> </copy>  <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> @@ -353,14 +356,16 @@ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/>  - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-client.jar"/> - </fileset> + <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws14/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws14-client.jar"/> + <include name="jbossws14-core.jar"/> + <include name="jbossws14-jboss40-integration.jar"/> + </fileset> </copy>  <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> Modified: branches/jbossws-1.2.0/jbossws-core/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/build.xml 2007-02-04 17:50:46 UTC (rev 2270) +++ branches/jbossws-1.2.0/jbossws-core/build.xml 2007-02-04 19:30:13 UTC (rev 2271) @@ -146,7 +146,6 @@ <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/core/server/**"/> </fileset> <fileset dir="${core.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-04 17:50:46 UTC (rev 2270) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-02-04 19:30:13 UTC (rev 2271) @@ -177,7 +177,7 @@ endpointAddress = serviceEndpoint.getServiceEndpointInfo().getServerEndpointMetaData().getEndpointAddress(); } - catch (Exception ex) + catch (Throwable ex) { // ignore, we are probably a remote client }

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2270 - branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-04 12:50:46 -0500 (Sun, 04 Feb 2007) New Revision: 2270 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml Log: Fix TC samples classpath Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-04 14:09:28 UTC (rev 2269) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-04 17:50:46 UTC (rev 2270) @@ -226,7 +226,7 @@  <path id="test.client.classpath"> <path refid="jbossws.classpath"/> - <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> + <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/> <path refid="javac.classpath"/> </path> </target>

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2269 - branches/jbossws-1.2.0/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-04 09:09:28 -0500 (Sun, 04 Feb 2007) New Revision: 2269 Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml Log: Add jnpserver.jar to jboss50 classpath Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-04 11:34:33 UTC (rev 2268) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-04 14:09:28 UTC (rev 2269) @@ -113,6 +113,7 @@ <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/>

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2268 - branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-04 06:34:33 -0500 (Sun, 04 Feb 2007) New Revision: 2268 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml Log: Update samples build Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-03 23:48:29 UTC (rev 2267) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-04 11:34:33 UTC (rev 2268) @@ -149,8 +149,7 @@ <target name="common-classpath" depends="prepare,thirdparty"> -  - <path id="jbossws.jars.classpath"> + <path id="jbossws.classpath"> <pathelement location="${tests.lib.dir}/jbossws-core.jar"/> <pathelement location="${tests.lib.dir}/jbossws-client.jar"/> <pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/> @@ -165,7 +164,7 @@  <path id="javac.classpath"> <path refid="core.classpath"/> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> <pathelement location="${thirdparty.dir}/junit.jar"/> @@ -183,7 +182,7 @@  <path id="test.client.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> @@ -202,7 +201,7 @@  <path id="jbpm.bpel.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${thirdparty.dir}/jbpm-bpel"/>  <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> @@ -221,9 +220,12 @@ </target> <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> + + <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/> +  <path id="test.client.classpath"> - <path refid="jbossws.jars.classpath"/> + <path refid="jbossws.classpath"/> <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> <path refid="javac.classpath"/> </path> @@ -321,10 +323,7 @@  <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> - <classpath location="${tests.lib.dir}/jbossws-core.jar"/> - <classpath location="${tests.lib.dir}/jboss-jaxrpc.jar"/> - <classpath location="${tests.lib.dir}/jboss-jaxws.jar"/> - <classpath location="${tests.lib.dir}/jboss-saaj.jar"/> + <classpath refid="jbossws.classpath"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/>

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2267 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-03 18:48:29 -0500 (Sat, 03 Feb 2007) New Revision: 2267 Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml Log: Don't remove temp when setting up TC Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-02-03 22:17:14 UTC (rev 2266) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-02-03 23:48:29 UTC (rev 2267) @@ -15,9 +15,9 @@ rm -rf $WORKSPACE/apache-tomcat cp -r @hudson.home@/../apache-tomcat $WORKSPACE rm -rf $WORKSPACE/apache-tomcat/webapps/hudson* -rm -rf $WORKSPACE/apache-tomcat/work -rm -rf $WORKSPACE/apache-tomcat/temp -rm -rf $WORKSPACE/apache-tomcat/logs +rm -rf $WORKSPACE/apache-tomcat/temp/* +rm -rf $WORKSPACE/apache-tomcat/work/* +rm -rf $WORKSPACE/apache-tomcat/logs/* # # copy tomcat config

19 years, 2 months

1
0
0 / 0

JBossWS SVN: r2266 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5: workspace and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-02-03 17:17:14 -0500 (Sat, 03 Feb 2007) New Revision: 2266 Removed: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml Log: Move tomcat-users.xml to integration-tomcat Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-02-03 21:36:12 UTC (rev 2265) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/config.xml 2007-02-03 22:17:14 UTC (rev 2266) @@ -17,12 +17,12 @@ rm -rf $WORKSPACE/apache-tomcat/webapps/hudson* rm -rf $WORKSPACE/apache-tomcat/work rm -rf $WORKSPACE/apache-tomcat/temp +rm -rf $WORKSPACE/apache-tomcat/logs # # copy tomcat config # cp $WORKSPACE/server.xml $WORKSPACE/apache-tomcat/conf -cp $WORKSPACE/tomcat-users.xml $WORKSPACE/apache-tomcat/conf </command> </hudson.tasks.Shell> </builders> Deleted: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-02-03 21:36:12 UTC (rev 2265) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/workspace/tomcat-users.xml 2007-02-03 22:17:14 UTC (rev 2266) @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<tomcat-users> - <role rolename="manager"/> - <user username="manager" password="manager" roles="manager"/> -</tomcat-users>

19 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2007