Author: jason.greene(a)jboss.com
Date: 2007-02-23 15:08:48 -0500 (Fri, 23 Feb 2007)
New Revision: 2453
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
Log:
Merge logging changes and code style fix for ExtensibleMetaData
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-23
20:07:59 UTC (rev 2452)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-23
20:08:48 UTC (rev 2453)
@@ -240,7 +240,7 @@
if (use == null)
{
use = Use.getDefaultUse();
- log.debug("Using default encoding style: " + use);
+ if(log.isDebugEnabled()) log.debug("Using default encoding style: " +
use);
}
return use;
}
@@ -259,7 +259,7 @@
if (style == null)
{
style = Style.getDefaultStyle();
- log.debug("Using default style: " + style);
+ if(log.isDebugEnabled()) log.debug("Using default style: " + style);
}
return style;
}
@@ -278,7 +278,7 @@
if (parameterStyle == null)
{
parameterStyle = ParameterStyle.WRAPPED;
- log.debug("Using default parameter style: " + parameterStyle);
+ if(log.isDebugEnabled()) log.debug("Using default parameter style: " +
parameterStyle);
}
return parameterStyle;
}
@@ -288,7 +288,7 @@
if (value != null && parameterStyle != null &&
!parameterStyle.equals(value))
throw new WSException("Mixed SOAP parameter styles not supported");
- log.debug("setParameterStyle: " + value);
+ if(log.isDebugEnabled()) log.debug("setParameterStyle: " + value);
this.parameterStyle = value;
}
@@ -600,13 +600,13 @@
// SOAPBinding configuration
if (configurable instanceof CommonBindingProvider)
{
- log.debug("Configure SOAPBinding");
+ if(log.isDebugEnabled()) log.debug("Configure SOAPBinding");
if (config.hasFeature(EndpointFeature.MTOM))
{
CommonBindingProvider provider = (CommonBindingProvider)configurable;
((CommonSOAPBinding)provider.getCommonBinding()).setMTOMEnabled(true);
- log.debug("Enable MTOM on endpoint " + this.getPortName());
+ if(log.isDebugEnabled()) log.debug("Enable MTOM on endpoint " +
this.getPortName());
}
}
}
@@ -640,7 +640,7 @@
{
setConfigNameInternal(configName, configFile);
}
-
+
private void setConfigNameInternal(String configName, String configFile)
{
if (configName == null)
@@ -648,12 +648,12 @@
if (configFile != null)
this.configFile = configFile;
-
+
if (configName.equals(this.configName) == false)
{
this.configName = configName;
-
- log.debug("Reconfiguration forced, new config is '" + configName +
"'");
+
+ if(log.isDebugEnabled()) log.debug("Reconfiguration forced, new config is
'" + configName + "'");
initEndpointConfig();
configObservable.doNotify(configName);
}
@@ -661,16 +661,16 @@
public void initEndpointConfig()
{
- log.debug("Create new config [name=" + getConfigName() +
",file=" + getConfigFile() + "]");
+ if(log.isDebugEnabled()) log.debug("Create new config [name=" +
getConfigName() + ",file=" + getConfigFile() + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
-
+
reconfigHandlerMetaData();
}
private void reconfigHandlerMetaData()
{
- log.debug("Configure EndpointMetaData");
+ if(log.isDebugEnabled()) log.debug("Configure EndpointMetaData");
List<HandlerMetaData> sepHandlers =
getHandlerMetaData(HandlerType.ENDPOINT);
clearHandlers();
@@ -682,9 +682,9 @@
addHandlers(sepHandlers);
addHandlers(postHandlers);
- log.debug("Added " + preHandlers.size() + " PRE handlers");
- log.debug("Added " + sepHandlers.size() + " ENDPOINT
handlers");
- log.debug("Added " + postHandlers.size() + " POST handlers");
+ if(log.isDebugEnabled()) log.debug("Added " + preHandlers.size() + "
PRE handlers");
+ if(log.isDebugEnabled()) log.debug("Added " + sepHandlers.size() + "
ENDPOINT handlers");
+ if(log.isDebugEnabled()) log.debug("Added " + postHandlers.size() +
" POST handlers");
}
public List<Class> getRegisteredTypes()
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java 2007-02-23
20:07:59 UTC (rev 2452)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ExtensibleMetaData.java 2007-02-23
20:08:48 UTC (rev 2453)
@@ -3,26 +3,28 @@
import java.util.HashMap;
import java.util.Map;
-
/**
* Base class for UMD elements that are extensible.
*
* @author Heiko Braun, <heiko(a)openj.net>
* @since 21-Mar-2006
*/
-public abstract class ExtensibleMetaData {
-
+public abstract class ExtensibleMetaData
+{
private Map<String, MetaDataExtension> extensions = new HashMap<String,
MetaDataExtension>();
- public Map<String, MetaDataExtension> getExtensions() {
+ public Map<String, MetaDataExtension> getExtensions()
+ {
return extensions;
}
- public void addExtension(MetaDataExtension ext) {
+ public void addExtension(MetaDataExtension ext)
+ {
getExtensions().put(ext.getExtensionNameSpace(), ext);
}
- public MetaDataExtension getExtension(String namespace) {
+ public MetaDataExtension getExtension(String namespace)
+ {
return getExtensions().get(namespace);
}
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-23
20:07:59 UTC (rev 2452)
+++
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-02-23
20:08:48 UTC (rev 2453)
@@ -186,7 +186,7 @@
{
if (eagerInitialized == false)
{
- log.debug("Eagerly initialize the meta data model");
+ if(log.isDebugEnabled()) log.debug("Eagerly initialize the meta data
model");
for (ServiceMetaData service : services)
{
service.eagerInitialize();
Show replies by date