JBossWS SVN: r10668 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-08 10:57:14 -0400 (Tue, 08 Sep 2009)
New Revision: 10668
Modified:
framework/trunk/hudson/jboss/bin/runjboss.sh
Log:
fixing syntaxt typo
Modified: framework/trunk/hudson/jboss/bin/runjboss.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/runjboss.sh 2009-09-08 13:16:59 UTC (rev 10667)
+++ framework/trunk/hudson/jboss/bin/runjboss.sh 2009-09-08 14:57:14 UTC (rev 10668)
@@ -116,7 +116,7 @@
if [ -d "/data/tmp" ]; then
JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=/data/tmp"
-else if [ -d "/tmp" ]; then
+elif [ -d "/tmp" ]; then
JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=/tmp"
else
echo "Cannot detect temporary directory";
15 years, 6 months
- 1
- 0
JBossWS SVN: r10658 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-04 13:18:38 -0400 (Fri, 04 Sep 2009)
New Revision: 10658
Modified:
stack/native/trunk/pom.xml
Log:
Moving to snapshots
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-09-04 17:08:23 UTC (rev 10657)
+++ stack/native/trunk/pom.xml 2009-09-04 17:18:38 UTC (rev 10658)
@@ -47,9 +47,9 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.2.0.GA</jbossws.common.version>
+ <jbossws.common.version>1.2.1-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.2.1-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.2.0.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.2.1-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss500.version>3.2.0.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.2.0.GA</jbossws.jboss501.version>
<jbossws.jboss510.version>3.2.0.GA</jbossws.jboss510.version>
15 years, 6 months
- 1
- 0
JBossWS SVN: r10657 - in stack/native/trunk/modules/core/src/main/java/org/jboss: ws/core/client and 22 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-04 13:08:23 -0400 (Fri, 04 Sep 2009)
New Revision: 10657
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsInvocationHandler.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
Log:
[JBWS-2750] skip debug logs when debug level is not enabled
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -317,12 +317,14 @@
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);
}
}
}
@@ -485,9 +487,11 @@
protected void addAttachmentParts(MessageAbstraction reqMessage)
{
+ boolean debugEnabled = log.isDebugEnabled();
for (AttachmentPart part : attachmentParts)
{
- log.debug("Adding attachment part: " + part.getContentId());
+ if (debugEnabled)
+ log.debug("Adding attachment part: " + part.getContentId());
reqMessage.addAttachmentPart(part);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -244,7 +244,8 @@
}
catch (IllegalArgumentException ex)
{
- log.debug("Ignore: " + ex.getMessage());
+ if (log.isDebugEnabled())
+ log.debug("Ignore: " + ex.getMessage());
}
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -138,7 +138,8 @@
public MessageAbstraction bindRequestMessage(OperationMetaData opMetaData, EndpointInvocation epInv, Map<QName, UnboundHeader> unboundHeaders)
throws BindingException
{
- if (log.isDebugEnabled())
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
log.debug("bindRequestMessage: " + opMetaData.getQName());
try
@@ -184,7 +185,7 @@
QName opQName = opMetaData.getQName();
Name opName = new NameImpl(namespaceRegistry.registerQName(opQName));
- if (log.isDebugEnabled())
+ if (debugEnabled)
log.debug("Create RPC body element: " + opName);
soapBodyElement = new SOAPBodyElementRpc(opName);
@@ -242,7 +243,8 @@
xmlName = namespaceRegistry.registerQName(xmlName);
Name soapName = new NameImpl(xmlName.getLocalPart(), xmlName.getPrefix(), xmlName.getNamespaceURI());
- log.debug("Add unboundHeader element: " + soapName);
+ if (debugEnabled)
+ log.debug("Add unboundHeader element: " + soapName);
SOAPContentElement contentElement = new SOAPHeaderElementImpl(soapName);
contentElement.setParamMetaData(unboundHeader.toParameterMetaData(opMetaData));
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -186,8 +186,7 @@
public Object getReturnValue()
{
- if (log.isDebugEnabled())
- log.debug("getReturnValue");
+ log.debug("getReturnValue");
Object paramValue = returnValue;
ParameterMetaData paramMetaData = opMetaData.getReturnParameter();
if (paramMetaData != null)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/ServiceObjectFactory.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -103,7 +103,8 @@
for (QName q : narrowedEndpoints)
{
EndpointMetaData removed = serviceMetaData.removeEndpoint(q);
- log.debug("Narrowed endpoint " + q + "(" + removed + ")");
+ if (log.isDebugEnabled())
+ log.debug("Narrowed endpoint " + q + "(" + removed + ")");
}
}
else
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -92,17 +92,20 @@
TypeMapping typeMapping = serContext.getTypeMapping();
Iterator it = detail.getDetailEntries();
+ boolean debugEnabled = log.isDebugEnabled();
while (it.hasNext())
{
DetailEntry deElement = (DetailEntry)it.next();
QName xmlName = deElement.getElementQName();
- log.debug("Processing detail entry: " + xmlName);
+ if (debugEnabled)
+ log.debug("Processing detail entry: " + xmlName);
OperationMetaData opMetaData = msgContext.getOperationMetaData();
FaultMetaData faultMetaData = opMetaData.getFault(xmlName);
if (faultMetaData != null)
{
- log.debug("Deserialize fault: " + faultMetaData);
+ if (debugEnabled)
+ log.debug("Deserialize fault: " + faultMetaData);
QName xmlType = faultMetaData.getXmlType();
Class<?> faultBeanClass = faultMetaData.getFaultBean();
@@ -149,7 +152,10 @@
}
}
else
- log.debug("Cannot find fault meta data for: " + xmlName);
+ {
+ if (debugEnabled)
+ log.debug("Cannot find fault meta data for: " + xmlName);
+ }
}
}
@@ -278,7 +284,10 @@
detail.addChildElement(detailEntry);
}
else
- log.debug("Cannot obtain fault meta data for: " + exClass);
+ {
+ if (log.isDebugEnabled())
+ log.debug("Cannot obtain fault meta data for: " + exClass);
+ }
return soapMessage;
}
@@ -359,7 +368,8 @@
Result result = ser.serialize(xmlName, xmlType, faultObject, serContext, null);
XMLFragment xmlFragment = new XMLFragment(result);
String xmlStr = xmlFragment.toXMLString();
- log.debug("Fault detail: " + xmlStr);
+ if (log.isDebugEnabled())
+ log.debug("Fault detail: " + xmlStr);
Element domElement = xmlFragment.toElement();
SOAPFactoryImpl soapFactory = new SOAPFactoryImpl();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingImpl.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -89,7 +89,8 @@
public void setHandlerChain(List<Handler> handlerChain)
{
- log.debug("setHandlerChain: " + handlerChain);
+ if (log.isDebugEnabled())
+ log.debug("setHandlerChain: " + handlerChain);
jaxwsHandlerChain.clear();
jaxwsHandlerChain.addAll(handlerChain);
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPBindingJAXWS.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -66,7 +66,8 @@
public EndpointInvocation unbindRequestMessage(OperationMetaData opMetaData, MessageAbstraction reqMessage) throws BindingException
{
- log.debug("unbindRequestMessage: " + opMetaData.getQName());
+ if (log.isDebugEnabled())
+ log.debug("unbindRequestMessage: " + opMetaData.getQName());
try
{
// Construct the endpoint invocation object
@@ -95,7 +96,8 @@
public MessageAbstraction bindResponseMessage(OperationMetaData opMetaData, EndpointInvocation epInv) throws BindingException
{
- log.debug("bindResponseMessage: " + opMetaData.getQName());
+ if (log.isDebugEnabled())
+ log.debug("bindResponseMessage: " + opMetaData.getQName());
try
{
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/HTTPMessageUnMarshaller.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -72,8 +72,6 @@
private MimeHeaders getMimeHeaders(Map<String, Object> metadata)
{
- log.debug("getMimeHeaders from: " + metadata);
-
MimeHeaders headers = new MimeHeaders();
for (String key : metadata.keySet())
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -177,7 +177,8 @@
SOAPBodyImpl soapBody = (SOAPBodyImpl)resMsg.getSOAPBody();
SOAPElement soapElement = soapBody.getBodyElement();
- 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: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/NativeServiceRefBinderJAXWS.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -117,7 +117,8 @@
String targetClassName = (targetClass != null ? targetClass.getName() : null);
String externalName = encCtx.getNameInNamespace() + "/" + encName;
- log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]");
+ if (log.isDebugEnabled())
+ log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]");
String serviceImplClass = null;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactoryJAXWS.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -96,7 +96,8 @@
if (Service.class.getName().equals(targetClassName))
targetClassName = serviceImplClass;
- log.debug("[name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]");
+ if (log.isDebugEnabled())
+ log.debug("[name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]");
// Load the service class
ClassLoader ctxLoader = SecurityActions.getContextClassLoader();
@@ -106,7 +107,8 @@
if (Service.class.isAssignableFrom(serviceClass) == false)
throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service");
- log.debug("Loaded Service '" + serviceClass.getName() + "' from: " + serviceClass.getProtectionDomain().getCodeSource());
+ if (log.isDebugEnabled())
+ log.debug("Loaded Service '" + serviceClass.getName() + "' from: " + serviceClass.getProtectionDomain().getCodeSource());
// Receives either a javax.xml.ws.Service or a dynamic proxy
Object target;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerChainExecutor.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -83,7 +83,8 @@
sortedChain.add(handler);
}
- log.debug("Create a handler executor: " + sortedChain);
+ if (log.isDebugEnabled())
+ log.debug("Create a handler executor: " + sortedChain);
for (Handler handler : sortedChain)
{
handlers.add(handler);
@@ -122,7 +123,9 @@
if (handlers.size() > 0)
{
- log.debug("Enter: handle" + (isOutbound ? "Out" : "In ") + "BoundMessage");
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("Enter: handle" + (isOutbound ? "Out" : "In ") + "BoundMessage");
int index = getFirstHandler();
Handler currHandler = null;
@@ -162,7 +165,8 @@
if (doNext == false)
falseIndex = index;
- log.debug("Exit: handle" + (isOutbound ? "Out" : "In ") + "BoundMessage with status: " + doNext);
+ if (debugEnabled)
+ log.debug("Exit: handle" + (isOutbound ? "Out" : "In ") + "BoundMessage with status: " + doNext);
}
}
@@ -179,7 +183,9 @@
if (handlers.size() > 0)
{
- log.debug("Enter: handle" + (isOutbound ? "Out" : "In ") + "BoundFault");
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("Enter: handle" + (isOutbound ? "Out" : "In ") + "BoundFault");
if (msgContext instanceof SOAPMessageContext)
{
@@ -235,7 +241,8 @@
}
finally
{
- log.debug("Exit: handle" + (isOutbound ? "Out" : "In ") + "BoundFault with status: " + doNext);
+ if (debugEnabled)
+ log.debug("Exit: handle" + (isOutbound ? "Out" : "In ") + "BoundFault with status: " + doNext);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -74,7 +74,8 @@
public boolean callRequestHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type)
{
- log.debug("callRequestHandlerChain: " + type);
+ if (log.isDebugEnabled())
+ log.debug("callRequestHandlerChain: " + type);
// Initialize the handler chain
if (isInitialized() == false)
@@ -99,7 +100,8 @@
public boolean callResponseHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type)
{
- log.debug("callResponseHandlerChain: " + type);
+ if (log.isDebugEnabled())
+ log.debug("callResponseHandlerChain: " + type);
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
boolean status = (executor != null ? executor.handleMessage(msgContext) : true);
@@ -113,7 +115,8 @@
public void closeHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type)
{
- log.debug("closeHandlerChain");
+ if (log.isDebugEnabled())
+ log.debug("closeHandlerChain");
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
if (executor != null)
@@ -125,7 +128,8 @@
public boolean callFaultHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type, Exception ex)
{
- log.debug("callFaultHandlerChain: " + type);
+ if (log.isDebugEnabled())
+ log.debug("callFaultHandlerChain: " + type);
HandlerChainExecutor executor = getExecutor(type);
MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext();
boolean status = (executor != null ? executor.handleFault(msgContext, ex) : true);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -110,7 +110,8 @@
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> handlers = new ArrayList<Handler>();
for (ScopedHandler scopedHandler : getHandlerMap(type))
@@ -123,7 +124,8 @@
public void initServiceHandlerChain(ServiceMetaData serviceMetaData)
{
- log.debug("initServiceHandlerChain: " + serviceMetaData.getServiceName());
+ if (log.isDebugEnabled())
+ log.debug("initServiceHandlerChain: " + serviceMetaData.getServiceName());
// clear all exisisting handler to avoid double registration
List<ScopedHandler> handlerMap = getHandlerMap(HandlerType.ENDPOINT);
@@ -136,7 +138,8 @@
public void initHandlerChain(EndpointConfigMetaData epConfigMetaData, HandlerType type, boolean clearExistingHandlers)
{
- log.debug("initHandlerChain: " + type);
+ if (log.isDebugEnabled())
+ log.debug("initHandlerChain: " + type);
List<ScopedHandler> handlerMap = getHandlerMap(type);
@@ -185,7 +188,8 @@
private boolean addHandler(HandlerMetaDataJAXWS hmd, Handler handler, HandlerType type)
{
- log.debug("addHandler: " + hmd);
+ if (log.isDebugEnabled())
+ log.debug("addHandler: " + hmd);
List<ScopedHandler> handlerMap = getHandlerMap(type);
ScopedHandler scopedHandler = new ScopedHandler(handler);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -88,7 +88,8 @@
String endpointAddress = sepMetaData.getEndpointAddress();
out.println(endpointAddress);
- log.debug("Resolved " + pcLink + " to: " + endpointAddress);
+ if (log.isDebugEnabled())
+ log.debug("Resolved " + pcLink + " to: " + endpointAddress);
out.close();
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -96,7 +96,8 @@
File impResourceFile = new File(impResourcePath);
String wsdlPublishLoc = epMetaData.getServiceMetaData().getWsdlPublishLocation();
- log.debug("Importing resource file: " + impResourceFile.getCanonicalPath());
+ if (log.isDebugEnabled())
+ log.debug("Importing resource file: " + impResourceFile.getCanonicalPath());
String wsdlLocFilePath = wsdlLocFile.getParentFile().getCanonicalPath();
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
@@ -225,7 +226,8 @@
if (!newLocation.equals(orgLocation))
{
locationAttr.setNodeValue(newLocation);
- log.debug("Mapping address from '" + orgLocation + "' to '" + newLocation + "'");
+ if (log.isDebugEnabled())
+ log.debug("Mapping address from '" + orgLocation + "' to '" + newLocation + "'");
}
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/DOMContent.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -57,7 +57,8 @@
log.debug("getXMLFragment from DOM");
DOMSource domSource = new DOMSource(container);
XMLFragment fragment = new XMLFragment(domSource);
- log.debug("xmlFragment: " + fragment);
+ if (log.isDebugEnabled())
+ log.debug("xmlFragment: " + fragment);
SOAPContent xmlValid = new XMLContent(container);
xmlValid.setXMLFragment(fragment);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/HRefInlineHandler.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -58,7 +58,9 @@
public void processHRefs() throws SOAPException
{
String bodyStr = DOMWriter.printNode(soapBody, true);
- log.debug("Begin processHRefs:\n" + bodyStr);
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("Begin processHRefs:\n" + bodyStr);
SOAPBodyElement soapBodyElement = soapBody.getBodyElement();
processElement(soapBodyElement);
@@ -78,7 +80,8 @@
}
bodyStr = DOMWriter.printNode(soapBody, true);
- log.debug("End processHRefs:\n" + bodyStr);
+ if (debugEnabled)
+ log.debug("End processHRefs:\n" + bodyStr);
}
private void processElement(SOAPElement soapElement) throws SOAPException
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -210,7 +210,9 @@
}
ContentType contentType = getContentType(mimeHeaders);
- log.debug("createMessage: [contentType=" + contentType + "]");
+ if (log.isDebugEnabled()) {
+ log.debug("createMessage: [contentType=" + contentType + "]");
+ }
SOAPMessageImpl soapMessage = new SOAPMessageImpl();
String encoding = contentType.getParameterList().get("charset");
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/ObjectContent.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -135,7 +135,9 @@
QName xmlType = container.getXmlType();
Class javaType = container.getJavaType();
- log.debug("getXMLFragment from Object [xmlType=" + xmlType + ",javaType=" + javaType + "]");
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("getXMLFragment from Object [xmlType=" + xmlType + ",javaType=" + javaType + "]");
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext == null)
@@ -166,7 +168,8 @@
Result result = ser.serialize(container, serContext);
xmlFragment = new XMLFragment(result);
- log.debug("xmlFragment: " + xmlFragment);
+ if (debugEnabled)
+ log.debug("xmlFragment: " + xmlFragment);
}
catch (BindingException e)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -133,8 +133,11 @@
State prevState = soapContent.getState();
if (nextState != prevState)
{
- log.debug("-----------------------------------");
- log.debug("Transitioning from " + prevState + " to " + nextState);
+ if (log.isDebugEnabled())
+ {
+ log.debug("-----------------------------------");
+ log.debug("Transitioning from " + prevState + " to " + nextState);
+ }
lockDOMExpansion = true;
soapContent = soapContent.transitionTo(nextState);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -54,6 +54,7 @@
{
OperationMetaData opMetaData = null;
+ boolean debugEnabled = log.isDebugEnabled();
// Dispatch based on wsa:Action
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
AddressingProperties inProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND);
@@ -65,7 +66,8 @@
if (wsaAction.equals(opAux.getSOAPAction()))
{
opMetaData = opAux;
- log.debug("Use wsa:Action dispatch: " + wsaAction);
+ if (debugEnabled)
+ log.debug("Use wsa:Action dispatch: " + wsaAction);
break;
}
}
@@ -134,7 +136,8 @@
}
}
- log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null));
+ if (debugEnabled)
+ log.debug("getDispatchDestination: " + (opMetaData != null ? opMetaData.getQName() : null));
return opMetaData;
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -100,8 +100,6 @@
private MimeHeaders getMimeHeaders(Map<String, Object> metadata)
{
- log.debug("getMimeHeaders from: " + metadata);
-
MimeHeaders headers = new MimeHeaders();
for (String key : metadata.keySet())
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -155,7 +155,9 @@
QName xmlType = container.getXmlType();
Class javaType = container.getJavaType();
- log.debug("getObjectValue [xmlType=" + xmlType + ",javaType=" + javaType + "]");
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("getObjectValue [xmlType=" + xmlType + ",javaType=" + javaType + "]");
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
if (msgContext == null)
@@ -218,7 +220,8 @@
try
{
String contentType = MimeUtils.resolveMimeType(javaType);
- log.debug("Adopt DataHandler to " + javaType + ", contentType " + contentType);
+ if (debugEnabled)
+ log.debug("Adopt DataHandler to " + javaType + ", contentType " + contentType);
DataSource ds = new SwapableMemoryDataSource(((DataHandler)obj).getInputStream(), contentType);
DataHandler dh = new DataHandler(ds);
@@ -249,7 +252,8 @@
throw new WSException(e);
}
- log.debug("objectValue: " + (obj != null ? obj.getClass().getName() : null));
+ if (debugEnabled)
+ log.debug("objectValue: " + (obj != null ? obj.getClass().getName() : null));
return obj;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/transport/jms/AbstractJMSTransportSupport.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -93,7 +93,8 @@
return;
}
- log.debug("Incomming SOAP message: " + msgStr);
+ if (log.isDebugEnabled())
+ log.debug("Incomming SOAP message: " + msgStr);
String fromName = null;
Destination destination = message.getJMSDestination();
@@ -107,7 +108,8 @@
processSOAPMessage(fromName, inputStream, outputStream);
msgStr = new String(outputStream.toByteArray());
- log.debug("Outgoing SOAP message: " + msgStr);
+ if (log.isDebugEnabled())
+ log.debug("Outgoing SOAP message: " + msgStr);
if (msgStr.length() > 0)
{
@@ -149,20 +151,24 @@
EndpointAssociation.setEndpoint(endpoint);
try
{
- log.debug("dipatchMessage: " + endpoint.getName());
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("dipatchMessage: " + endpoint.getName());
// [JBWS-1324]: workaround to prevent message processing before endpoint is started
EndpointState state = endpoint.getState();
ObjectName name = endpoint.getName();
long startTime = System.currentTimeMillis();
- log.debug(name + " is in state: " + state);
+ if (debugEnabled)
+ log.debug(name + " is in state: " + state);
while (state != EndpointState.STARTED && (System.currentTimeMillis() - startTime < 60000))
{
try
{
Thread.sleep(1000);
state = endpoint.getState();
- log.debug(name + " is now in state: " + state);
+ if (debugEnabled)
+ log.debug(name + " is now in state: " + state);
}
catch (InterruptedException e)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -142,7 +142,8 @@
InputStream stream = null;
try
{
- log.debug("loadStore: " + storeURL);
+ if (log.isDebugEnabled())
+ log.debug("loadStore: " + storeURL);
stream = storeURL.openStream();
if (stream == null)
throw new WSSecurityException("Cannot load store from: " + storeURL);
@@ -225,7 +226,9 @@
private String execPasswordCmd(String keyStorePasswordCmd) throws WSSecurityException
{
- log.debug("Executing cmd: " + keyStorePasswordCmd);
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("Executing cmd: " + keyStorePasswordCmd);
try
{
String password = null;
@@ -252,7 +255,8 @@
reader.close();
stderr.close();
}
- log.debug("Command exited with: " + status);
+ if (debugEnabled)
+ log.debug("Command exited with: " + status);
return password;
}
catch (Exception e)
@@ -272,7 +276,8 @@
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 = SecurityActions.getContextClassLoader();
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -160,7 +160,8 @@
public void encodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig, String user, String password) throws SOAPException
{
Config config = getActualConfig(configuration, operationConfig);
- log.debug("WS-Security config: " + config);
+ if (log.isDebugEnabled())
+ log.debug("WS-Security config: " + config);
// Nothing to process
if (config == null)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/Signature.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -63,7 +63,8 @@
catch (Exception e)
{
//log exception and ignore, KeyInfo might not reference a security token
- log.debug("KeyInfo does not contain any reference to a binary security token.", e);
+ if (log.isDebugEnabled())
+ log.debug("KeyInfo does not contain any reference to a binary security token.", e);
}
}
catch (XMLSecurityException e)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/RMClientSequence.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -99,7 +99,8 @@
if (host == null)
{
host = InetAddress.getLocalHost().getCanonicalHostName();
- logger.debug("Backports server configuration omits host configuration - using autodetected " + host);
+ if (logger.isDebugEnabled())
+ logger.debug("Backports server configuration omits host configuration - using autodetected " + host);
}
String port = wsrmConfig.getBackPortsServer().getPort();
String path = PATH_PREFIX + UUIDGenerator.generateRandomUUIDString();
@@ -122,8 +123,11 @@
{
// we can't use objectLock in the method - possible deadlock
this.countOfUnassignedMessagesAvailable.addAndGet(1);
- logger.debug("Expected sequence expiration in " + ((System.currentTimeMillis() - this.creationTime) / 1000) + "seconds");
- logger.debug("Unassigned message available in callback handler");
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("Expected sequence expiration in " + ((System.currentTimeMillis() - this.creationTime) / 1000) + "seconds");
+ logger.debug("Unassigned message available in callback handler");
+ }
}
public final RMConfig getRMConfig()
@@ -144,13 +148,15 @@
public final void setFinal()
{
this.isFinal = true;
- logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final");
+ if (logger.isDebugEnabled())
+ logger.debug("Sequence " + this.outgoingSequenceId + " state changed to final");
}
public final void ackRequested(boolean requested)
{
this.inboundMessageAckRequested.set(requested);
- logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages);
+ if (logger.isDebugEnabled())
+ logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages);
}
public final boolean isAckRequested()
@@ -161,13 +167,15 @@
public final void addReceivedInboundMessage(long messageId)
{
this.receivedInboundMessages.add(messageId);
- logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId);
+ if (logger.isDebugEnabled())
+ logger.debug("Inbound Sequence: " + this.incomingSequenceId + ", received message no. " + messageId);
}
public final void addReceivedOutboundMessage(long messageId)
{
this.acknowledgedOutboundMessages.add(messageId);
- logger.debug("Outbound Sequence: " + this.outgoingSequenceId + ", message no. " + messageId + " acknowledged by server");
+ if (logger.isDebugEnabled())
+ logger.debug("Outbound Sequence: " + this.outgoingSequenceId + ", message no. " + messageId + " acknowledged by server");
}
public final void setOutboundId(String outboundId)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandlerAbstractBase.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -59,7 +59,8 @@
{
msg.serializeTo(soapMessage);
data.put(msgQN, msg);
- log.debug(msgQN.getLocalPart() + " WSRM message was serialized to payload");
+ if (log.isDebugEnabled())
+ log.debug(msgQN.getLocalPart() + " WSRM message was serialized to payload");
}
}
@@ -73,7 +74,8 @@
wsrmMsg.deserializeFrom(soapMessage);
messages.add(msgQN);
data.put(msgQN, wsrmMsg);
- log.debug(msgQN.getLocalPart() + " WSRM message was deserialized from payload");
+ if (log.isDebugEnabled())
+ log.debug(msgQN.getLocalPart() + " WSRM message was deserialized from payload");
}
}
catch (RMException ignore) {}
@@ -86,7 +88,8 @@
{
msg.serializeTo(soapMessage);
data.put(msgQN, msg);
- log.debug(msgQN.getLocalPart() + " WSRM message was serialized to payload");
+ if (log.isDebugEnabled())
+ log.debug(msgQN.getLocalPart() + " WSRM message was serialized to payload");
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -342,7 +342,8 @@
{
if (inv.getJavaMethod() != null)
{
- logger.debug("Invoking method: " + inv.getJavaMethod().getName());
+ if (logger.isDebugEnabled())
+ logger.debug("Invoking method: " + inv.getJavaMethod().getName());
this.delegate.invoke(ep, inv);
}
else
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -175,20 +175,23 @@
}
this.receivedInboundMessages.add(messageId);
- logger.debug("Inbound Sequence: " + this.inboundId + ", received message no. " + messageId);
+ if (logger.isDebugEnabled())
+ logger.debug("Inbound Sequence: " + this.inboundId + ", received message no. " + messageId);
}
}
public final void addReceivedOutboundMessage(long messageId)
{
this.acknowledgedOutboundMessages.add(messageId);
- logger.debug("Outbound Sequence: " + this.outboundId + ", message no. " + messageId + " acknowledged by server");
+ if (logger.isDebugEnabled())
+ logger.debug("Outbound Sequence: " + this.outboundId + ", message no. " + messageId + " acknowledged by server");
}
public final void ackRequested(boolean requested)
{
this.inboundMessageAckRequested = requested;
- logger.debug("Inbound Sequence: " + this.inboundId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages);
+ if (logger.isDebugEnabled())
+ logger.debug("Inbound Sequence: " + this.inboundId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages);
}
public final long newMessageNumber()
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsInvocationHandler.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsInvocationHandler.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsInvocationHandler.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -122,7 +122,8 @@
if (handler.getHandledPath().equals(requestPath))
{
handlerExists = true;
- LOG.debug("Handling request path: " + requestPath);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Handling request path: " + requestPath);
handler.handle(message);
break;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -97,7 +97,8 @@
// Bind and start to accept incoming connections.
Channel c = bootstrap.bind(new InetSocketAddress(this.port));
channelGroup.add(c);
- LOG.debug("WS-RM Backports Server started on port: " + this.port);
+ if (LOG.isDebugEnabled())
+ LOG.debug("WS-RM Backports Server started on port: " + this.port);
}
catch (Exception e)
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -55,7 +55,8 @@
{
super();
this.handledPath = handledPath;
- logger.debug("Registered callback handler listening on '" + handledPath + "' request path");
+ if (logger.isDebugEnabled())
+ logger.debug("Registered callback handler listening on '" + handledPath + "' request path");
}
public Throwable getFault(String messageId)
@@ -82,7 +83,8 @@
if (begin != -1)
{
String messageId = requestMessage.substring(begin, end);
- logger.debug("Arrived message id: " + messageId);
+ if (logger.isDebugEnabled())
+ logger.debug("Arrived message id: " + messageId);
this.arrivedMessages.put(messageId, message);
}
else
@@ -116,7 +118,8 @@
{
try
{
- logger.debug("waiting for response with message id: " + messageId);
+ if (logger.isDebugEnabled())
+ logger.debug("waiting for response with message id: " + messageId);
instanceLock.wait(100);
}
catch (InterruptedException ie)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -328,7 +328,8 @@
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);
@@ -338,7 +339,8 @@
}
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: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -69,7 +69,8 @@
*/
public UnifiedMetaData buildMetaData(ArchiveDeployment dep)
{
- log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
+ if (log.isDebugEnabled())
+ log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
{
// For every webservice-description build the ServiceMetaData
@@ -230,7 +231,8 @@
}
}
- log.debug("END buildMetaData: " + wsMetaData);
+ if (log.isDebugEnabled())
+ log.debug("END buildMetaData: " + wsMetaData);
return wsMetaData;
}
catch (RuntimeException rte)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -150,12 +150,14 @@
String bindingId = sepMetaData.getBindingId();
if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId))
{
- log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP11HTTP_MTOM_BINDING);
+ if (log.isDebugEnabled())
+ log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP11HTTP_MTOM_BINDING);
sepMetaData.setBindingId(SOAPBinding.SOAP11HTTP_MTOM_BINDING);
}
else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId))
{
- log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP12HTTP_MTOM_BINDING);
+ if (log.isDebugEnabled())
+ log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP12HTTP_MTOM_BINDING);
sepMetaData.setBindingId(SOAPBinding.SOAP12HTTP_MTOM_BINDING);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -72,7 +72,8 @@
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);
@@ -97,7 +98,8 @@
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)
@@ -206,7 +208,8 @@
if(epMetaData.matches(portComp))
{
- log.debug("Processing service-ref contribution on portType: "+epMetaData.getPortTypeName());
+ if (log.isDebugEnabled())
+ log.debug("Processing service-ref contribution on portType: "+epMetaData.getPortTypeName());
// process MTOM overrides
if(portComp.getEnableMTOM())
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -121,7 +121,8 @@
{
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());
}
@@ -131,7 +132,8 @@
{
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();
@@ -186,7 +188,9 @@
public static UnifiedHandlerChainsMetaData getHandlerChainsMetaData(Class<?> wsClass, String filename)
{
URL fileURL = null;
- log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName());
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("processHandlerChain [" + filename + "] on: " + wsClass.getName());
// Try the filename as URL
try
@@ -216,8 +220,11 @@
// Try the filename as Resource
if (fileURL == null)
{
- log.debug(wsClass.getProtectionDomain().getCodeSource());
- log.debug(wsClass.getClassLoader());
+ if (debugEnabled)
+ {
+ log.debug(wsClass.getProtectionDomain().getCodeSource());
+ log.debug(wsClass.getClassLoader());
+ }
fileURL = wsClass.getClassLoader().getResource(filename);
}
@@ -239,7 +246,8 @@
if (fileURL == null)
throw new WSException("Cannot resolve handler file '" + filename + "' on " + wsClass.getName());
- log.debug("Loading handler chain: " + fileURL);
+ if (debugEnabled)
+ log.debug("Loading handler chain: " + fileURL);
UnifiedHandlerChainsMetaData handlerChainsMetaData = null;
try
@@ -891,7 +899,8 @@
String partName = mimePart.getPartName();
if (paramMetaData.getPartName().equals(partName))
{
- log.debug("Identified 'mime:content' binding: " + partName + ", mimeTypes=" + mimePart.getMimeTypes());
+ if (log.isDebugEnabled())
+ log.debug("Identified 'mime:content' binding: " + partName + ", mimeTypes=" + mimePart.getMimeTypes());
paramMetaData.setSwA(true);
paramMetaData.setMimeTypes(mimePart.getMimeTypes());
break;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -51,7 +51,8 @@
*/
public UnifiedMetaData buildMetaData(ArchiveDeployment dep)
{
- log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
+ if (log.isDebugEnabled())
+ log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
{
UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
@@ -91,7 +92,8 @@
}
}
- log.debug("END buildMetaData: " + wsMetaData);
+ if (log.isDebugEnabled())
+ log.debug("END buildMetaData: " + wsMetaData);
return wsMetaData;
}
catch (RuntimeException rte)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -43,7 +43,8 @@
*/
public UnifiedMetaData buildMetaData(ArchiveDeployment dep)
{
- log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
+ if (log.isDebugEnabled())
+ log.debug("START buildMetaData: [name=" + dep.getCanonicalName() + "]");
try
{
UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile());
@@ -61,7 +62,8 @@
JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, beanClass, shortName);
}
- log.debug("END buildMetaData: " + wsMetaData);
+ if (log.isDebugEnabled())
+ log.debug("END buildMetaData: " + wsMetaData);
return wsMetaData;
}
catch (RuntimeException rte)
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -252,7 +252,8 @@
// PortQName overrides
if (portComp.getWsdlPort() != null)
{
- log.debug("Override EndpointMetaData portName " + sepMetaData.getPortName() + " with " + portComp.getWsdlPort());
+ if (log.isDebugEnabled())
+ log.debug("Override EndpointMetaData portName " + sepMetaData.getPortName() + " with " + portComp.getWsdlPort());
sepMetaData.setPortName(portComp.getWsdlPort());
}
@@ -264,7 +265,8 @@
{
for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers())
{
- log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName());
+ if (log.isDebugEnabled())
+ log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName());
HandlerMetaDataJAXWS hmd = HandlerMetaDataJAXWS.newInstance(uhmd, HandlerType.ENDPOINT);
sepMetaData.addHandler(hmd);
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -117,9 +117,12 @@
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");
+ log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
+ log.debug("Added " + postHandlers.size() + " POST handlers");
+ }
}
public EndpointMetaData getEndpointMetaData()
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -261,7 +261,8 @@
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;
}
@@ -280,7 +281,8 @@
if (style == null)
{
style = Style.getDefaultStyle();
- log.debug("Using default style: " + style);
+ if (log.isDebugEnabled())
+ log.debug("Using default style: " + style);
}
return style;
}
@@ -290,7 +292,8 @@
if (value != null && style != null && !style.equals(value))
throw new WSException("Mixed styles not supported");
- log.trace("setStyle: " + value);
+ if (log.isTraceEnabled())
+ log.trace("setStyle: " + value);
this.style = value;
}
@@ -299,7 +302,8 @@
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;
}
@@ -309,7 +313,8 @@
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;
}
@@ -737,7 +742,8 @@
{
CommonBindingProvider provider = (CommonBindingProvider)configurable;
((CommonSOAPBinding)provider.getCommonBinding()).setMTOMEnabled(true);
- log.debug("Enable MTOM on endpoint " + getPortName());
+ if (log.isDebugEnabled())
+ log.debug("Enable MTOM on endpoint " + getPortName());
}
}
else if (configurable instanceof DispatchBinding)
@@ -818,7 +824,8 @@
if (configName.equals(getEndpointConfigMetaData().getConfigName()) == false || configFile.equals(getEndpointConfigMetaData().getConfigFile()) == false)
{
- log.debug("Reconfiguration forced, new config is '" + configName + "' file is '" + configFile + "'");
+ if (log.isDebugEnabled())
+ log.debug("Reconfiguration forced, new config is '" + configName + "' file is '" + configFile + "'");
this.configMetaData = createEndpointConfigMetaData(configName, configFile);
configObservable.doNotify(configName);
@@ -863,7 +870,8 @@
String configName = toInitialise.getConfigName();
String configFile = toInitialise.getConfigFile();
- log.debug("Create new config [name=" + configName + ",file=" + configFile + "]");
+ if (log.isDebugEnabled())
+ log.debug("Create new config [name=" + configName + ",file=" + configFile + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
List<RMPortConfig> rmPortMetaData = null;
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -394,7 +394,8 @@
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 = (Exception)serviceExceptionConstructor.newInstance(propertyValues);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -371,7 +371,7 @@
public void setSOAPArrayCompType(QName compXmlType)
{
- if (compXmlType != null && !compXmlType.equals(soapArrayCompType))
+ if (log.isDebugEnabled() && compXmlType != null && !compXmlType.equals(soapArrayCompType))
{
String logmsg = "SOAPArrayCompType: [xmlType=" + xmlType + ",compType=" + compXmlType + "]";
log.debug((soapArrayCompType == null ? "set" : "reset") + logmsg);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -66,7 +66,8 @@
WSSecurityConfiguration config = null;
if (configLocation != null)
{
- log.debug("createConfiguration from: " + configLocation);
+ if (log.isDebugEnabled())
+ log.debug("createConfiguration from: " + configLocation);
config = WSSecurityOMFactory.newInstance().parse(configLocation);
initKeystorePath(vfsRoot, config);
@@ -74,7 +75,8 @@
else
{
// an exception might be better here...
- log.trace("Unable to load ws-security config ("+resourceName+"). Security processing will be disabled");
+ if (log.isTraceEnabled())
+ log.trace("Unable to load ws-security config ("+resourceName+"). Security processing will be disabled");
}
return config;
@@ -87,7 +89,8 @@
if (config.getKeyStoreFile() != null)
{
keystoreLocation = getResource(vfsRoot, config.getKeyStoreFile(), true);
- log.debug("Add keystore: " + keystoreLocation);
+ if (log.isDebugEnabled())
+ log.debug("Add keystore: " + keystoreLocation);
config.setKeyStoreURL(keystoreLocation);
}
@@ -95,7 +98,8 @@
if (config.getTrustStoreFile() != null)
{
truststoreLocation = getResource(vfsRoot, config.getTrustStoreFile(), true);
- log.debug("Add truststore: " + truststoreLocation);
+ if (log.isDebugEnabled())
+ log.debug("Add truststore: " + truststoreLocation);
config.setTrustStoreURL(truststoreLocation);
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -161,6 +161,7 @@
int index = 0;
SchemaGrammar[] gs = new SchemaGrammar[locs.size()];
Iterator<String> it = locs.keySet().iterator();
+ boolean debugEnabled = log.isDebugEnabled();
while (it.hasNext())
{
InputStream in = null;
@@ -171,7 +172,8 @@
URL resURL = resolveNamespaceURI(resolver, nsURI);
URL url = resURL != null ? resURL : orgURL;
- log.debug("Load schema: " + nsURI + "=" + url);
+ if (debugEnabled)
+ log.debug("Load schema: " + nsURI + "=" + url);
XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(), null);
InputSource tmpSrc = resolver.resolveEntity(null, url.toExternalForm());
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -920,8 +920,11 @@
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);
+ log.debug("Falling back to identifier generation");
+ }
String className = xmlType.getLocalPart();
if (className.charAt(0) == '>')
className = className.substring(1);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SourceWrapperGenerator.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -104,7 +104,8 @@
}
String wrapperName = parameterMD.getJavaTypeName();
- log.debug("Generating wrapper: " + wrapperName);
+ if (log.isDebugEnabled())
+ log.debug("Generating wrapper: " + wrapperName);
try
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -48,7 +48,8 @@
// assert ArchiveDeployment
if(! (deployment instanceof ArchiveDeployment) )
{
- log.debug("JAXBIntroDeploymentAspect doesn't work on " + deployment.getClass());
+ if (log.isDebugEnabled())
+ log.debug("JAXBIntroDeploymentAspect doesn't work on " + deployment.getClass());
return;
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -186,7 +186,8 @@
private void doPost(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException
{
- log.debug("doPost: " + req.getRequestURI());
+ if (log.isDebugEnabled())
+ log.debug("doPost: " + req.getRequestURI());
ServletInputStream in = req.getInputStream();
ServletOutputStream out = res.getOutputStream();
@@ -232,7 +233,8 @@
public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext invContext)
{
- log.debug("handleRequest: " + endpoint.getName());
+ if (log.isDebugEnabled())
+ log.debug("handleRequest: " + endpoint.getName());
ServerEndpointMetaData sepMetaData = endpoint.getAttachment(ServerEndpointMetaData.class);
if (sepMetaData == null)
@@ -366,7 +368,8 @@
}
if (wsaTo != null)
{
- log.debug("Sending response to addressing destination: " + wsaTo);
+ if (log.isDebugEnabled())
+ log.debug("Sending response to addressing destination: " + wsaTo);
SOAPMessage soapMessage = (SOAPMessage)resMessage;
new SOAPConnectionImpl().callOneWay(soapMessage, wsaTo);
}
@@ -414,6 +417,7 @@
throw new IllegalStateException("Cannot obtain endpoint meta data");
long beginProcessing = 0;
+ boolean debugEnabled = log.isDebugEnabled();
try
{
EndpointState state = ep.getState();
@@ -424,7 +428,8 @@
throw new CommonSOAPFaultException(faultCode, faultString);
}
- log.debug("BEGIN handleRequest: " + ep.getName());
+ if (debugEnabled)
+ log.debug("BEGIN handleRequest: " + ep.getName());
beginProcessing = initRequestMetrics(ep);
MimeHeaders headers = (headerSource != null ? headerSource.getMimeHeaders() : null);
@@ -517,7 +522,8 @@
log.error("Cannot process metrics", ex);
}
- log.debug("END handleRequest: " + ep.getName());
+ if (debugEnabled)
+ log.debug("END handleRequest: " + ep.getName());
}
}
@@ -571,7 +577,8 @@
public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context)
{
- log.debug("handleWSDLRequest: " + endpoint.getName());
+ if (log.isDebugEnabled())
+ log.debug("handleWSDLRequest: " + endpoint.getName());
try
{
@@ -617,7 +624,8 @@
if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
wsdlHost = serverConfig.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);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-09-04 17:01:24 UTC (rev 10656)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-09-04 17:08:23 UTC (rev 10657)
@@ -188,7 +188,8 @@
wsdlWriter.writeWSDL(subdef, fw);
fw.close();
- log.debug("WSDL import published to: " + targetURL);
+ if (log.isDebugEnabled())
+ log.debug("WSDL import published to: " + targetURL);
// recursively publish imports
publishWsdlImports(targetURL, subdef, published);
@@ -261,7 +262,8 @@
if (fos != null) fos.close();
}
- log.debug("XMLSchema import published to: " + xsdURL);
+ if (log.isDebugEnabled())
+ log.debug("XMLSchema import published to: " + xsdURL);
// recursively publish imports
Element subdoc = DOMUtils.parse(xsdURL.openStream());
@@ -326,7 +328,8 @@
if (wsdlLocation == null)
throw new IllegalStateException("Cannot obtain wsdl location for: " + serviceMetaData.getServiceName());
- log.debug("Publish WSDL file: " + wsdlLocation);
+ if (log.isDebugEnabled())
+ log.debug("Publish WSDL file: " + wsdlLocation);
// Only file URLs are supported in <wsdl-publish-location>
String publishLocation = serviceMetaData.getWsdlPublishLocation();
15 years, 6 months
- 1
- 0
JBossWS SVN: r10656 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-04 13:01:24 -0400 (Fri, 04 Sep 2009)
New Revision: 10656
Modified:
framework/trunk/pom.xml
Log:
Using common snapshot
Modified: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml 2009-09-04 17:00:53 UTC (rev 10655)
+++ framework/trunk/pom.xml 2009-09-04 17:01:24 UTC (rev 10656)
@@ -27,7 +27,7 @@
<jaxrpc.api.version>1.1</jaxrpc.api.version>
<jaxws.api.version>2.1</jaxws.api.version>
<jboss.web.version>2.1.3.GA</jboss.web.version>
- <jbossws.common.version>1.2.0.GA</jbossws.common.version>
+ <jbossws.common.version>1.2.1-SNAPSHOT</jbossws.common.version>
<jbossws.spi.version>1.2.0.GA</jbossws.spi.version>
<jbossxb.version>2.0.1.GA</jbossxb.version>
</properties>
15 years, 6 months
- 1
- 0
JBossWS SVN: r10655 - in framework/trunk/src/main/java/org/jboss/wsf/framework: deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-04 13:00:53 -0400 (Fri, 04 Sep 2009)
New Revision: 10655
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
Log:
[JBWS-2750] skip debug logs when debug level is not enabled
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-09-04 17:00:03 UTC (rev 10654)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-09-04 17:00:53 UTC (rev 10655)
@@ -67,7 +67,9 @@
*/
public <T> T getSPI(Class<T> spiType)
{
- log.debug("provide SPI '" + spiType + "'");
+ boolean debugEnabled = log.isDebugEnabled();
+ if (debugEnabled)
+ log.debug("provide SPI '" + spiType + "'");
T returnType = null;
@@ -149,7 +151,8 @@
throw new WSFException("Failed to provide SPI '" + spiType + "'");
// help debugging
- log.debug(spiType + " Implementation: " + returnType);
+ if (debugEnabled)
+ log.debug(spiType + " Implementation: " + returnType);
return returnType;
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2009-09-04 17:00:03 UTC (rev 10654)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2009-09-04 17:00:53 UTC (rev 10655)
@@ -114,7 +114,8 @@
}
else
{
- log.debug("Cannot get " + resourcePath + " from root file, trying with additional metadata files", e);
+ if (log.isDebugEnabled())
+ log.debug("Cannot get " + resourcePath + " from root file, trying with additional metadata files", e);
}
}
@@ -142,7 +143,8 @@
}
catch (IOException e)
{
- log.debug("Cannot get " + resourcePath + " from " + uvf, e);
+ if (log.isDebugEnabled())
+ log.debug("Cannot get " + resourcePath + " from " + uvf, e);
}
}
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java 2009-09-04 17:00:03 UTC (rev 10654)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java 2009-09-04 17:00:53 UTC (rev 10655)
@@ -57,7 +57,8 @@
public DeploymentAspectManager getDeploymentAspectManager(String beanName)
{
- log.debug("DeploymentAspectManager for: " + beanName);
+ if (log.isDebugEnabled())
+ log.debug("DeploymentAspectManager for: " + beanName);
return new KernelAwareSPIFactory().getKernelProvidedSPI(beanName, DeploymentAspectManager.class);
}
}
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2009-09-04 17:00:03 UTC (rev 10654)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2009-09-04 17:00:53 UTC (rev 10655)
@@ -40,7 +40,8 @@
public void start(Endpoint ep)
{
- log.debug("Start: " + ep.getName());
+ if (log.isDebugEnabled())
+ log.debug("Start: " + ep.getName());
EndpointState state = ep.getState();
if (state != EndpointState.UNDEFINED)
@@ -63,7 +64,8 @@
public void stop(Endpoint ep)
{
- log.debug("Stop: " + ep.getName());
+ if (log.isDebugEnabled())
+ log.debug("Stop: " + ep.getName());
EndpointState state = ep.getState();
if (state != EndpointState.STARTED)
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2009-09-04 17:00:03 UTC (rev 10654)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2009-09-04 17:00:53 UTC (rev 10655)
@@ -78,12 +78,15 @@
depAspects.clear();
depAspects.addAll(aspects);
- // Debug the aspect list
- StringBuilder builder = new StringBuilder("setDeploymentAspects on " + name);
- for (DeploymentAspect aspect : aspects)
- builder.append("\n " + aspect.getClass().getName() + " provides: " + aspect.getProvidesAsSet() + " requires: " + aspect.getRequiresAsSet());
-
- log.debug(builder);
+ if (log.isDebugEnabled())
+ {
+ // Debug the aspect list
+ StringBuilder builder = new StringBuilder("setDeploymentAspects on " + name);
+ for (DeploymentAspect aspect : aspects)
+ builder.append("\n " + aspect.getClass().getName() + " provides: " + aspect.getProvidesAsSet() + " requires: " + aspect.getRequiresAsSet());
+
+ log.debug(builder);
+ }
}
/**
@@ -165,7 +168,8 @@
{
String name = aspect.getClass().getName();
name = name.substring(name.lastIndexOf(".") + 1);
- log.debug("[" + this.name + "]" + name + ":" + method);
+ if (log.isDebugEnabled())
+ log.debug("[" + this.name + "]" + name + ":" + method);
}
}
15 years, 6 months
- 1
- 0
JBossWS SVN: r10654 - in common/trunk/src/main/java/org/jboss: wsf/common and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-04 13:00:03 -0400 (Fri, 04 Sep 2009)
New Revision: 10654
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
Log:
[JBWS-2750] skip debug logs when debug level is not enabled
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-09-03 09:09:14 UTC (rev 10653)
+++ common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2009-09-04 17:00:03 UTC (rev 10654)
@@ -111,7 +111,10 @@
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: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-09-03 09:09:14 UTC (rev 10653)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2009-09-04 17:00:03 UTC (rev 10654)
@@ -113,6 +113,7 @@
EntityResolver entityResolver = null;
ClassLoader loader = SecurityActions.getContextClassLoader();
+ boolean debugEnabled = log.isDebugEnabled();
for (String resolver : resolvers)
{
try
@@ -122,7 +123,8 @@
}
catch (Exception ex)
{
- log.debug("Cannot load: " + resolver);
+ if (debugEnabled)
+ log.debug("Cannot load: " + resolver);
}
}
Modified: common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2009-09-03 09:09:14 UTC (rev 10653)
+++ common/trunk/src/main/java/org/jboss/wsf/common/injection/InjectionHelper.java 2009-09-04 17:00:03 UTC (rev 10654)
@@ -169,7 +169,8 @@
if (methods.size() > 0)
{
final Method method = methods.iterator().next();
- LOG.debug("Calling @PostConstruct annotated method: " + method);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Calling @PostConstruct annotated method: " + method);
try
{
invokeMethod(instance, method, null);
@@ -199,7 +200,8 @@
if (methods.size() > 0)
{
final Method method = methods.iterator().next();
- LOG.debug("Calling @PreDestroy annotated method: " + method);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Calling @PreDestroy annotated method: " + method);
try
{
invokeMethod(instance, method, null);
@@ -393,7 +395,8 @@
private static void inject(final Object instance, final Method method, final String jndiName, final Context ctx)
{
final Object value = lookup(jndiName, ctx);
- LOG.debug("Injecting method: " + method);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Injecting method: " + method);
invokeMethod(instance, method, new Object[] {value});
}
@@ -408,7 +411,8 @@
private static void inject(final Object instance, final Field field, final String jndiName, final Context ctx)
{
final Object value = lookup(jndiName, ctx);
- LOG.debug("Injecting field: " + field);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Injecting field: " + field);
setField(instance, field, value);
}
15 years, 6 months
- 1
- 0
JBossWS SVN: r10653 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark: test/basic and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-03 05:09:14 -0400 (Thu, 03 Sep 2009)
New Revision: 10653
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java
Log:
Making server address configurable
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-09-03 08:22:43 UTC (rev 10652)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/Runner.java 2009-09-03 09:09:14 UTC (rev 10653)
@@ -53,8 +53,10 @@
private static long sleep = 1500;
private static boolean verbose = false;
-
+ private static String address = "localhost:8080";
+
+
public static class BenchmarkCallable implements Callable<Result> {
private final BenchmarkTest test;
@@ -94,7 +96,7 @@
private static BenchmarkTest parseArguments(String[] args) throws Exception
{
- String shortOpts = "t:r:s:i:vh";
+ String shortOpts = "t:r:s:i:a:vh";
LongOpt[] longOpts =
{
new LongOpt("deployment", LongOpt.REQUIRED_ARGUMENT, null, 'd'),
@@ -102,6 +104,7 @@
new LongOpt("runs", LongOpt.REQUIRED_ARGUMENT, null, 'r'),
new LongOpt("sleep", LongOpt.REQUIRED_ARGUMENT, null, 's'),
new LongOpt("iterations", LongOpt.REQUIRED_ARGUMENT, null, 'i'),
+ new LongOpt("address", LongOpt.REQUIRED_ARGUMENT, null, 'a'),
new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'),
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h')
};
@@ -124,6 +127,9 @@
case 'i':
iterations = Integer.parseInt(getopt.getOptarg());
break;
+ case 'a':
+ address = getopt.getOptarg();
+ break;
case 'v':
verbose = true;
break;
@@ -167,6 +173,7 @@
out.println(" -h, --help Show this help message");
out.println(" -v, --verbose Show verbose results");
out.println(" -s, --sleep=<time-in-ms> How many millisecs to wait between runs");
+ out.println(" -a, --address=<host:port> Server host:port");
out.println(" -r, --runs=<number-of-runs> How many runs to do");
out.println(" -i, --iterations=<num-of-iters> How many iterations to do in each run");
out.println(" -t, --threads=<number-of-threads> How many concurrent threads to create");
@@ -235,5 +242,10 @@
System.out.println("------------------------------------");
}
+
+ public static String getServerAddress()
+ {
+ return address;
+ }
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java 2009-09-03 08:22:43 UTC (rev 10652)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/benchmark/test/basic/BasicTest.java 2009-09-03 09:09:14 UTC (rev 10653)
@@ -27,7 +27,7 @@
import javax.xml.ws.Service;
import org.jboss.test.ws.jaxws.benchmark.BenchmarkTest;
-import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.test.ws.jaxws.benchmark.Runner;
/**
*
@@ -37,7 +37,7 @@
*/
public class BasicTest implements BenchmarkTest
{
- private String endpointURL = "http://" + JBossWSTestHelper.getServerHost() + ":8080/jaxws-benchmark-basic/EndpointImpl";
+ private String endpointURL = "http://" + Runner.getServerAddress() + "/jaxws-benchmark-basic/EndpointImpl";
private String targetNS = "http://basic.test.benchmark.jaxws.ws.test.jboss.org/";
public Object prepare() throws Exception
15 years, 6 months
- 1
- 0
JBossWS SVN: r10652 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-03 04:22:43 -0400 (Thu, 03 Sep 2009)
New Revision: 10652
Modified:
stack/cxf/trunk/pom.xml
Log:
Moving to framework snapshot
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-09-03 07:54:44 UTC (rev 10651)
+++ stack/cxf/trunk/pom.xml 2009-09-03 08:22:43 UTC (rev 10652)
@@ -44,7 +44,7 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.2.0.GA</jbossws.common.version>
- <jbossws.framework.version>3.2.0.GA</jbossws.framework.version>
+ <jbossws.framework.version>3.2.1-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.2.0.GA</jbossws.spi.version>
<jbossws.jboss500.version>3.2.0.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.2.0.GA</jbossws.jboss501.version>
15 years, 6 months
- 1
- 0
JBossWS SVN: r10651 - framework/trunk/hudson.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-09-03 03:54:44 -0400 (Thu, 03 Sep 2009)
New Revision: 10651
Modified:
framework/trunk/hudson/ant.properties.example
Log:
Update 5.2.0 name
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2009-09-02 15:06:51 UTC (rev 10650)
+++ framework/trunk/hudson/ant.properties.example 2009-09-03 07:54:44 UTC (rev 10651)
@@ -39,7 +39,7 @@
hudson.jboss510.rev=HEAD
hudson.jboss520.url=http://anonsvn.jboss.org/repos/jbossas/branches/Branc...
-hudson.jboss520.build=jboss-5.2.0.Beta
+hudson.jboss520.build=jboss-5.2.0.Beta1
hudson.jboss520.rev=HEAD
hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/trunk
15 years, 6 months
- 1
- 0