Author: lukaszlenart
Date: Wed Apr 25 19:25:03 2012
New Revision: 1330502
URL: http://svn.apache.org/viewvc?rev=1330502&view=rev
Log:
Improves logging messages
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=1330502&r1=1330501&r2=1330502&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Wed Apr 25 19:25:03 2012
@@ -316,20 +316,20 @@ public class BeanSelectionProvider imple
String foundName = props.getProperty(key, DEFAULT_BEAN_NAME);
if (builder.contains(type, foundName)) {
if (LOG.isInfoEnabled()) {
- LOG.info("Choosing bean (#1) for (#2)", foundName,
type.getName());
+ LOG.info("Choosing bean (#0) for (#1)", foundName,
type.getName());
}
builder.alias(type, foundName, Container.DEFAULT_NAME);
} else {
try {
Class cls = ClassLoaderUtil.loadClass(foundName,
this.getClass());
if (LOG.isDebugEnabled()) {
- LOG.debug("Choosing bean (#1) for (#2)",
cls.getName(), type.getName());
+ LOG.debug("Choosing bean (#0) for (#1)",
cls.getName(), type.getName());
}
builder.factory(type, cls, scope);
} catch (ClassNotFoundException ex) {
// Perhaps a spring bean id, so we'll delegate to the
object factory at runtime
if (LOG.isDebugEnabled()) {
- LOG.debug("Choosing bean (#1) for (#2) to be loaded
from the ObjectFactory", foundName, type.getName());
+ LOG.debug("Choosing bean (#0) for (#1) to be loaded
from the ObjectFactory", foundName, type.getName());
}
if (DEFAULT_BEAN_NAME.equals(foundName)) {
// Probably an optional bean, will ignore
@@ -344,7 +344,7 @@ public class BeanSelectionProvider imple
}
} else {
if (LOG.isWarnEnabled()) {
- LOG.warn("Unable to alias bean type (#1), default mapping
already assigned.", type.getName());
+ LOG.warn("Unable to alias bean type (#0), default mapping
already assigned.", type.getName());
}
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java?rev=1330502&r1=1330501&r2=1330502&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
Wed Apr 25 19:25:03 2012
@@ -104,7 +104,7 @@ public class PrepareOperations {
dispatcher.cleanUpRequest(request);
} catch (IOException e) {
if (LOG.isWarnEnabled()) {
- LOG.warn("Cannot clean up the request, some files can still
remain in #1 after upload!", e,
+ LOG.warn("Cannot clean up the request, some files can still
remain in #0 after upload!", e,
StrutsConstants.STRUTS_MULTIPART_SAVEDIR);
}
} finally {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java?rev=1330502&r1=1330501&r2=1330502&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
Wed Apr 25 19:25:03 2012
@@ -72,7 +72,7 @@ public class CheckboxInterceptor extends
iterator.remove();
if (values != null && values instanceof String[] &&
((String[])values).length > 1) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Bypassing automatic checkbox detection due
to multiple checkboxes of the same name: #1", name);
+ LOG.debug("Bypassing automatic checkbox detection
due to multiple checkboxes of the same name: #0", name);
}
continue;
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java?rev=1330502&r1=1330501&r2=1330502&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ObjectFactory.java
Wed Apr 25 19:25:03 2012
@@ -265,7 +265,7 @@ public class ObjectFactory implements Se
*/
public TypeConverter buildConverter(Class<? extends TypeConverter>
converterClass) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating converter of type [#1]",
converterClass.getCanonicalName());
+ LOG.debug("Creating converter of type [#0]",
converterClass.getCanonicalName());
}
return container.getInstance(converterClass);
}
@@ -279,7 +279,7 @@ public class ObjectFactory implements Se
*/
public TypeConverter buildConverter(Class<? extends TypeConverter>
converterClass, String name) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating converter of type [#1] with name [#2]",
converterClass.getCanonicalName(), name);
+ LOG.debug("Creating converter of type [#0] with name [#1]",
converterClass.getCanonicalName(), name);
}
return container.getInstance(converterClass, name);
}
@@ -292,11 +292,11 @@ public class ObjectFactory implements Se
*/
public TypeConverter buildConverter(String name) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating converter with name [#1]", name);
+ LOG.debug("Creating converter with name [#0]", name);
}
TypeConverter instance = container.getInstance(TypeConverter.class,
name);
if (LOG.isDebugEnabled()) {
- LOG.debug("Converter of Type [#1] with name [#2], created!",
instance.getClass().getCanonicalName(), name);
+ LOG.debug("Converter of Type [#0] with name [#1], created!",
instance.getClass().getCanonicalName(), name);
}
return instance;
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java?rev=1330502&r1=1330501&r2=1330502&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerUtils.java
Wed Apr 25 19:25:03 2012
@@ -24,12 +24,12 @@ public class LoggerUtils {
* Formats messages using parameters. For example, the call:
*
* <pre>
- * format("foo #1", "bob");
+ * format("foo #0 #1", "bob", "joe");
* </pre>
*
* will return:
* <pre>
- * foo bob
+ * foo bob joe
* </pre>
*
* @param msg The message
