Author: jason.greene(a)jboss.com Date: 2007-02-23 15:20:22 -0500 (Fri, 23 Feb 2007) New Revision: 2456 Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java Log: Merge more missing logging changes Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-02-23 20:11:35 UTC (rev 2455) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/SOAPArraySerializer.java 2007-02-23 20:20:22 UTC (rev 2456) @@ -61,7 +61,7 @@ */ public Result 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()); @@ -88,7 +88,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) { @@ -134,7 +134,7 @@ } buffer.append("</" + Constants.PREFIX_SOAP11_ENC + ":Array>"); - log.debug("serialized: " + buffer); + if(log.isDebugEnabled()) log.debug("serialized: " + buffer); return stringToResult(buffer.toString()); } catch (RuntimeException e) Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-23 20:11:35 UTC (rev 2455) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-02-23 20:20:22 UTC (rev 2456) @@ -65,7 +65,7 @@ @Override public Result 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 + "]"); Result result = null; try @@ -76,7 +76,7 @@ JAXBContextCache contextCache = JAXBContextCache.getContextCache(); JAXBContext jaxbContext = contextCache.getInstance(javaType); - + Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); @@ -87,7 +87,7 @@ result = new BufferedStreamResult(); marshaller.marshal(new JAXBElement(xmlName, javaType, value), result); - log.debug("serialized: " + result); + if(log.isDebugEnabled()) log.debug("serialized: " + result); } catch (Exception ex) { Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-23 20:11:35 UTC (rev 2455) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/WebServiceContextJSE.java 2007-02-23 20:20:22 UTC (rev 2456) @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.xml.ws.handler.MessageContext; -import org.jboss.logging.Logger; import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; /** @@ -39,9 +38,6 @@ */ public class WebServiceContextJSE extends AbstractWebServiceContext { - // provide logging - private Logger log = Logger.getLogger(WebServiceContextJSE.class); - private HttpServletRequest httpRequest; public WebServiceContextJSE(MessageContext messageContext) Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-23 20:11:35 UTC (rev 2455) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2007-02-23 20:20:22 UTC (rev 2456) @@ -162,7 +162,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(); } @@ -170,7 +170,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); } @@ -235,6 +235,7 @@ Config operationConfig = getConfig(config, port, operation); log.debug("WS-Security config: " + operationConfig); + // Nothing to process if (operationConfig == null) return; @@ -284,7 +285,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 { @@ -297,7 +298,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); }