You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2013/08/20 20:38:37 UTC
svn commit: r1515913 [1/2] - in /logging/log4j/log4j2/trunk:
core/src/main/java/org/apache/logging/log4j/core/appender/
core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/
core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/...
Author: ggregory
Date: Tue Aug 20 18:38:36 2013
New Revision: 1515913
URL: http://svn.apache.org/r1515913
Log:
Rename PluginAttr to PluginAttribute.
Added:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
- copied, changed from r1515899, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttr.java
Removed:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttr.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/couch/CouchDBProvider.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/mongo/MongoDBProvider.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java Tue Aug 20 18:38:36 2013
@@ -33,7 +33,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.ConfigurationException;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAliases;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -165,16 +165,15 @@ public final class AsyncAppender extends
* @return The AsyncAppender.
*/
@PluginFactory
- public static AsyncAppender createAppender(
- @PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
- @PluginAttr("errorRef") @PluginAliases("error-ref") final String errorRef,
- @PluginAttr("blocking") final String blocking,
- @PluginAttr("bufferSize") final String size,
- @PluginAttr("name") final String name,
- @PluginAttr("includeLocation") final String includeLocation,
- @PluginElement("Filter") final Filter filter,
- @PluginConfiguration final Configuration config,
- @PluginAttr("ignoreExceptions") final String ignore) {
+ public static AsyncAppender createAppender(@PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
+ @PluginAttribute("errorRef") @PluginAliases("error-ref") final String errorRef,
+ @PluginAttribute("blocking") final String blocking,
+ @PluginAttribute("bufferSize") final String size,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("includeLocation") final String includeLocation,
+ @PluginElement("Filter") final Filter filter,
+ @PluginConfiguration final Configuration config,
+ @PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("No name provided for AsyncAppender");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java Tue Aug 20 18:38:36 2013
@@ -27,7 +27,7 @@ import java.nio.charset.Charset;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -78,12 +78,13 @@ public final class ConsoleAppender exten
* @return The ConsoleAppender.
*/
@PluginFactory
- public static ConsoleAppender createAppender(@PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filters") final Filter filter,
- @PluginAttr("target") final String t,
- @PluginAttr("name") final String name,
- @PluginAttr("follow") final String follow,
- @PluginAttr("ignoreExceptions") final String ignore) {
+ public static ConsoleAppender createAppender(
+ @PluginElement("Layout") Layout<? extends Serializable> layout,
+ @PluginElement("Filters") final Filter filter,
+ @PluginAttribute("target") final String t,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("follow") final String follow,
+ @PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("No name provided for ConsoleAppender");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Tue Aug 20 18:38:36 2013
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.Log
import org.apache.logging.log4j.core.config.AppenderControl;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -183,13 +183,14 @@ public final class FailoverAppender exte
* @return The FailoverAppender that was created.
*/
@PluginFactory
- public static FailoverAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("primary") final String primary,
- @PluginElement("Failovers") final String[] failovers,
- @PluginAttr("retryInterval") final String retryIntervalString,
- @PluginConfiguration final Configuration config,
- @PluginElement("Filters") final Filter filter,
- @PluginAttr("ignoreExceptions") final String ignore) {
+ public static FailoverAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("primary") final String primary,
+ @PluginElement("Failovers") final String[] failovers,
+ @PluginAttribute("retryInterval") final String retryIntervalString,
+ @PluginConfiguration final Configuration config,
+ @PluginElement("Filters") final Filter filter,
+ @PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("A name for the Appender must be specified");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java Tue Aug 20 18:38:36 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -94,18 +94,19 @@ public final class FileAppender extends
* @return The FileAppender.
*/
@PluginFactory
- public static FileAppender createAppender(@PluginAttr("fileName") final String fileName,
- @PluginAttr("append") final String append,
- @PluginAttr("locking") final String locking,
- @PluginAttr("name") final String name,
- @PluginAttr("immediateFlush") final String immediateFlush,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginAttr("bufferedIO") final String bufferedIO,
- @PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filters") final Filter filter,
- @PluginAttr("advertise") final String advertise,
- @PluginAttr("advertiseURI") final String advertiseURI,
- @PluginConfiguration final Configuration config) {
+ public static FileAppender createAppender(
+ @PluginAttribute("fileName") final String fileName,
+ @PluginAttribute("append") final String append,
+ @PluginAttribute("locking") final String locking,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("immediateFlush") final String immediateFlush,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginAttribute("bufferedIO") final String bufferedIO,
+ @PluginElement("Layout") Layout<? extends Serializable> layout,
+ @PluginElement("Filters") final Filter filter,
+ @PluginAttribute("advertise") final String advertise,
+ @PluginAttribute("advertiseURI") final String advertiseURI,
+ @PluginConfiguration final Configuration config) {
final boolean isAppend = Booleans.parseBoolean(append, true);
final boolean isLocking = Boolean.parseBoolean(locking);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java Tue Aug 20 18:38:36 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -78,19 +78,19 @@ public final class JMSQueueAppender exte
*/
@PluginFactory
public static JMSQueueAppender createAppender(
- @PluginAttr("name") final String name,
- @PluginAttr("factoryName") final String factoryName,
- @PluginAttr("providerURL") final String providerURL,
- @PluginAttr("urlPkgPrefixes") final String urlPkgPrefixes,
- @PluginAttr("securityPrincipalName") final String securityPrincipalName,
- @PluginAttr("securityCredentials") final String securityCredentials,
- @PluginAttr("factoryBindingName") final String factoryBindingName,
- @PluginAttr("queueBindingName") final String queueBindingName,
- @PluginAttr("userName") final String userName,
- @PluginAttr("password") final String password,
- @PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filter") final Filter filter,
- @PluginAttr("ignoreExceptions") final String ignore) {
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("factoryName") final String factoryName,
+ @PluginAttribute("providerURL") final String providerURL,
+ @PluginAttribute("urlPkgPrefixes") final String urlPkgPrefixes,
+ @PluginAttribute("securityPrincipalName") final String securityPrincipalName,
+ @PluginAttribute("securityCredentials") final String securityCredentials,
+ @PluginAttribute("factoryBindingName") final String factoryBindingName,
+ @PluginAttribute("queueBindingName") final String queueBindingName,
+ @PluginAttribute("userName") final String userName,
+ @PluginAttribute("password") final String password,
+ @PluginElement("Layout") Layout<? extends Serializable> layout,
+ @PluginElement("Filter") final Filter filter,
+ @PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("No name provided for JMSQueueAppender");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java Tue Aug 20 18:38:36 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -78,19 +78,19 @@ public final class JMSTopicAppender exte
*/
@PluginFactory
public static JMSTopicAppender createAppender(
- @PluginAttr("name") final String name,
- @PluginAttr("factoryName") final String factoryName,
- @PluginAttr("providerURL") final String providerURL,
- @PluginAttr("urlPkgPrefixes") final String urlPkgPrefixes,
- @PluginAttr("securityPrincipalName") final String securityPrincipalName,
- @PluginAttr("securityCredentials") final String securityCredentials,
- @PluginAttr("factoryBindingName") final String factoryBindingName,
- @PluginAttr("topicBindingName") final String topicBindingName,
- @PluginAttr("userName") final String userName,
- @PluginAttr("password") final String password,
- @PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filters") final Filter filter,
- @PluginAttr("ignoreExceptions") final String ignore) {
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("factoryName") final String factoryName,
+ @PluginAttribute("providerURL") final String providerURL,
+ @PluginAttribute("urlPkgPrefixes") final String urlPkgPrefixes,
+ @PluginAttribute("securityPrincipalName") final String securityPrincipalName,
+ @PluginAttribute("securityCredentials") final String securityCredentials,
+ @PluginAttribute("factoryBindingName") final String factoryBindingName,
+ @PluginAttribute("topicBindingName") final String topicBindingName,
+ @PluginAttribute("userName") final String userName,
+ @PluginAttribute("password") final String password,
+ @PluginElement("Layout") Layout<? extends Serializable> layout,
+ @PluginElement("Filters") final Filter filter,
+ @PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("No name provided for JMSQueueAppender");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java Tue Aug 20 18:38:36 2013
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.Lay
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -119,15 +119,15 @@ public final class RandomAccessFileAppen
*/
@PluginFactory
public static RandomAccessFileAppender createAppender(
- @PluginAttr("fileName") final String fileName,
- @PluginAttr("append") final String append,
- @PluginAttr("name") final String name,
- @PluginAttr("immediateFlush") final String immediateFlush,
- @PluginAttr("ignoreExceptions") final String ignore,
+ @PluginAttribute("fileName") final String fileName,
+ @PluginAttribute("append") final String append,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("immediateFlush") final String immediateFlush,
+ @PluginAttribute("ignoreExceptions") final String ignore,
@PluginElement("Layout") Layout<? extends Serializable> layout,
@PluginElement("Filters") final Filter filter,
- @PluginAttr("advertise") final String advertise,
- @PluginAttr("advertiseURI") final String advertiseURI,
+ @PluginAttribute("advertise") final String advertise,
+ @PluginAttribute("advertiseURI") final String advertiseURI,
@PluginConfiguration final Configuration config) {
final boolean isAppend = Booleans.parseBoolean(append, true);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java Tue Aug 20 18:38:36 2013
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.appender.rolling.TriggeringPolicy;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -122,19 +122,19 @@ public final class RollingFileAppender e
*/
@PluginFactory
public static RollingFileAppender createAppender(
- @PluginAttr("fileName") final String fileName,
- @PluginAttr("filePattern") final String filePattern,
- @PluginAttr("append") final String append,
- @PluginAttr("name") final String name,
- @PluginAttr("bufferedIO") final String bufferedIO,
- @PluginAttr("immediateFlush") final String immediateFlush,
+ @PluginAttribute("fileName") final String fileName,
+ @PluginAttribute("filePattern") final String filePattern,
+ @PluginAttribute("append") final String append,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("bufferedIO") final String bufferedIO,
+ @PluginAttribute("immediateFlush") final String immediateFlush,
@PluginElement("Policy") final TriggeringPolicy policy,
@PluginElement("Strategy") RolloverStrategy strategy,
@PluginElement("Layout") Layout<? extends Serializable> layout,
@PluginElement("Filter") final Filter filter,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginAttr("advertise") final String advertise,
- @PluginAttr("advertiseURI") final String advertiseURI,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginAttribute("advertise") final String advertise,
+ @PluginAttribute("advertiseURI") final String advertiseURI,
@PluginConfiguration final Configuration config) {
final boolean isAppend = Booleans.parseBoolean(append, true);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java Tue Aug 20 18:38:36 2013
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.appender.rolling.TriggeringPolicy;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -141,18 +141,18 @@ public final class RollingRandomAccessFi
*/
@PluginFactory
public static RollingRandomAccessFileAppender createAppender(
- @PluginAttr("fileName") final String fileName,
- @PluginAttr("filePattern") final String filePattern,
- @PluginAttr("append") final String append,
- @PluginAttr("name") final String name,
- @PluginAttr("immediateFlush") final String immediateFlush,
+ @PluginAttribute("fileName") final String fileName,
+ @PluginAttribute("filePattern") final String filePattern,
+ @PluginAttribute("append") final String append,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("immediateFlush") final String immediateFlush,
@PluginElement("Policy") final TriggeringPolicy policy,
@PluginElement("Strategy") RolloverStrategy strategy,
@PluginElement("Layout") Layout<? extends Serializable> layout,
@PluginElement("Filter") final Filter filter,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginAttr("advertise") final String advertise,
- @PluginAttr("advertiseURI") final String advertiseURI,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginAttribute("advertise") final String advertise,
+ @PluginAttribute("advertiseURI") final String advertiseURI,
@PluginConfiguration final Configuration config) {
final boolean isAppend = Booleans.parseBoolean(append, true);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java Tue Aug 20 18:38:36 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
@@ -103,23 +103,24 @@ public final class SMTPAppender extends
* @return The SMTPAppender.
*/
@PluginFactory
- public static SMTPAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("to") final String to,
- @PluginAttr("cc") final String cc,
- @PluginAttr("bcc") final String bcc,
- @PluginAttr("from") final String from,
- @PluginAttr("replyTo") final String replyTo,
- @PluginAttr("subject") final String subject,
- @PluginAttr("smtpProtocol") final String smtpProtocol,
- @PluginAttr("smtpHost") final String smtpHost,
- @PluginAttr("smtpPort") final String smtpPortNum,
- @PluginAttr("smtpUsername") final String smtpUsername,
- @PluginAttr("smtpPassword") final String smtpPassword,
- @PluginAttr("smtpDebug") final String smtpDebug,
- @PluginAttr("bufferSize") final String bufferSizeNum,
- @PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filter") Filter filter,
- @PluginAttr("ignoreExceptions") final String ignore) {
+ public static SMTPAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("to") final String to,
+ @PluginAttribute("cc") final String cc,
+ @PluginAttribute("bcc") final String bcc,
+ @PluginAttribute("from") final String from,
+ @PluginAttribute("replyTo") final String replyTo,
+ @PluginAttribute("subject") final String subject,
+ @PluginAttribute("smtpProtocol") final String smtpProtocol,
+ @PluginAttribute("smtpHost") final String smtpHost,
+ @PluginAttribute("smtpPort") final String smtpPortNum,
+ @PluginAttribute("smtpUsername") final String smtpUsername,
+ @PluginAttribute("smtpPassword") final String smtpPassword,
+ @PluginAttribute("smtpDebug") final String smtpDebug,
+ @PluginAttribute("bufferSize") final String bufferSizeNum,
+ @PluginElement("Layout") Layout<? extends Serializable> layout,
+ @PluginElement("Filter") Filter filter,
+ @PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
LOGGER.error("No name provided for SMTPAppender");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Tue Aug 20 18:38:36 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -85,18 +85,19 @@ public class SocketAppender extends Abst
* @return A SocketAppender.
*/
@PluginFactory
- public static SocketAppender createAppender(@PluginAttr("host") final String host,
- @PluginAttr("port") final String portNum,
- @PluginAttr("protocol") final String protocol,
- @PluginAttr("reconnectionDelay") final String delay,
- @PluginAttr("immediateFail") final String immediateFail,
- @PluginAttr("name") final String name,
- @PluginAttr("immediateFlush") final String immediateFlush,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filters") final Filter filter,
- @PluginAttr("advertise") final String advertise,
- @PluginConfiguration final Configuration config) {
+ public static SocketAppender createAppender(
+ @PluginAttribute("host") final String host,
+ @PluginAttribute("port") final String portNum,
+ @PluginAttribute("protocol") final String protocol,
+ @PluginAttribute("reconnectionDelay") final String delay,
+ @PluginAttribute("immediateFail") final String immediateFail,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("immediateFlush") final String immediateFlush,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginElement("Layout") Layout<? extends Serializable> layout,
+ @PluginElement("Filters") final Filter filter,
+ @PluginAttribute("advertise") final String advertise,
+ @PluginConfiguration final Configuration config) {
boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
final boolean isAdvertise = Boolean.parseBoolean(advertise);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java Tue Aug 20 18:38:36 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -87,35 +87,36 @@ public class SyslogAppender extends Sock
* @return A SyslogAppender.
*/
@PluginFactory
- public static SyslogAppender createAppender(@PluginAttr("host") final String host,
- @PluginAttr("port") final String portNum,
- @PluginAttr("protocol") final String protocol,
- @PluginAttr("reconnectionDelay") final String delay,
- @PluginAttr("immediateFail") final String immediateFail,
- @PluginAttr("name") final String name,
- @PluginAttr("immediateFlush") final String immediateFlush,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginAttr("facility") final String facility,
- @PluginAttr("id") final String id,
- @PluginAttr("enterpriseNumber") final String ein,
- @PluginAttr("includeMDC") final String includeMDC,
- @PluginAttr("mdcId") final String mdcId,
- @PluginAttr("mdcPrefix") final String mdcPrefix,
- @PluginAttr("eventPrefix") final String eventPrefix,
- @PluginAttr("newLine") final String includeNL,
- @PluginAttr("newLineEscape") final String escapeNL,
- @PluginAttr("appName") final String appName,
- @PluginAttr("messageId") final String msgId,
- @PluginAttr("mdcExcludes") final String excludes,
- @PluginAttr("mdcIncludes") final String includes,
- @PluginAttr("mdcRequired") final String required,
- @PluginAttr("format") final String format,
- @PluginElement("Filters") final Filter filter,
- @PluginConfiguration final Configuration config,
- @PluginAttr("charset") final String charsetName,
- @PluginAttr("exceptionPattern") final String exceptionPattern,
- @PluginElement("LoggerFields") final LoggerFields loggerFields,
- @PluginAttr("advertise") final String advertise) {
+ public static SyslogAppender createAppender(
+ @PluginAttribute("host") final String host,
+ @PluginAttribute("port") final String portNum,
+ @PluginAttribute("protocol") final String protocol,
+ @PluginAttribute("reconnectionDelay") final String delay,
+ @PluginAttribute("immediateFail") final String immediateFail,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("immediateFlush") final String immediateFlush,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginAttribute("facility") final String facility,
+ @PluginAttribute("id") final String id,
+ @PluginAttribute("enterpriseNumber") final String ein,
+ @PluginAttribute("includeMDC") final String includeMDC,
+ @PluginAttribute("mdcId") final String mdcId,
+ @PluginAttribute("mdcPrefix") final String mdcPrefix,
+ @PluginAttribute("eventPrefix") final String eventPrefix,
+ @PluginAttribute("newLine") final String includeNL,
+ @PluginAttribute("newLineEscape") final String escapeNL,
+ @PluginAttribute("appName") final String appName,
+ @PluginAttribute("messageId") final String msgId,
+ @PluginAttribute("mdcExcludes") final String excludes,
+ @PluginAttribute("mdcIncludes") final String includes,
+ @PluginAttribute("mdcRequired") final String required,
+ @PluginAttribute("format") final String format,
+ @PluginElement("Filters") final Filter filter,
+ @PluginConfiguration final Configuration config,
+ @PluginAttribute("charset") final String charsetName,
+ @PluginAttribute("exceptionPattern") final String exceptionPattern,
+ @PluginElement("LoggerFields") final LoggerFields loggerFields,
+ @PluginAttribute("advertise") final String advertise) {
final boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java Tue Aug 20 18:38:36 2013
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.ap
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -98,13 +98,14 @@ public final class ColumnConfig {
* @return the created column config.
*/
@PluginFactory
- public static ColumnConfig createColumnConfig(@PluginConfiguration final Configuration config,
- @PluginAttr("name") final String name,
- @PluginAttr("pattern") final String pattern,
- @PluginAttr("literal") final String literalValue,
- @PluginAttr("isEventTimestamp") final String eventTimestamp,
- @PluginAttr("isUnicode") final String unicode,
- @PluginAttr("isClob") final String clob) {
+ public static ColumnConfig createColumnConfig(
+ @PluginConfiguration final Configuration config,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("pattern") final String pattern,
+ @PluginAttribute("literal") final String literalValue,
+ @PluginAttribute("isEventTimestamp") final String eventTimestamp,
+ @PluginAttribute("isUnicode") final String unicode,
+ @PluginAttribute("isClob") final String clob) {
if (Strings.isEmpty(name)) {
LOGGER.error("The column config is not valid because it does not contain a column name.");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java Tue Aug 20 18:38:36 2013
@@ -25,7 +25,7 @@ import javax.sql.DataSource;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Strings;
import org.apache.logging.log4j.status.StatusLogger;
@@ -63,7 +63,7 @@ public final class DataSourceConnectionS
* @return the created connection source.
*/
@PluginFactory
- public static DataSourceConnectionSource createConnectionSource(@PluginAttr("jndiName") final String jndiName) {
+ public static DataSourceConnectionSource createConnectionSource(@PluginAttribute("jndiName") final String jndiName) {
if (Strings.isEmpty(jndiName)) {
LOGGER.error("No JNDI name provided.");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DriverManagerConnectionSource.java Tue Aug 20 18:38:36 2013
@@ -23,7 +23,7 @@ import java.sql.SQLException;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.NameUtil;
import org.apache.logging.log4j.core.helpers.Strings;
@@ -74,9 +74,10 @@ public final class DriverManagerConnecti
* @return the created connection source.
*/
@PluginFactory
- public static DriverManagerConnectionSource createConnectionSource(@PluginAttr("url") final String url,
- @PluginAttr("username") String username,
- @PluginAttr("password") String password) {
+ public static DriverManagerConnectionSource createConnectionSource(
+ @PluginAttribute("url") final String url,
+ @PluginAttribute("username") String username,
+ @PluginAttribute("password") String password) {
if (Strings.isEmpty(url)) {
LOGGER.error("No JDBC URL specified for the database.");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java Tue Aug 20 18:38:36 2013
@@ -25,7 +25,7 @@ import javax.sql.DataSource;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Strings;
import org.apache.logging.log4j.status.StatusLogger;
@@ -68,8 +68,9 @@ public final class FactoryMethodConnecti
* @return the created connection source.
*/
@PluginFactory
- public static FactoryMethodConnectionSource createConnectionSource(@PluginAttr("class") final String className,
- @PluginAttr("method") final String methodName) {
+ public static FactoryMethodConnectionSource createConnectionSource(
+ @PluginAttribute("class") final String className,
+ @PluginAttribute("method") final String methodName) {
if (Strings.isEmpty(className) || Strings.isEmpty(methodName)) {
LOGGER.error("No class name or method name specified for the connection factory method.");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java Tue Aug 20 18:38:36 2013
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -65,14 +65,14 @@ public final class JDBCAppender extends
* @return a new JDBC appender.
*/
@PluginFactory
- public static JDBCAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("Filter") final Filter filter,
- @PluginElement("ConnectionSource") final ConnectionSource
- connectionSource,
- @PluginAttr("bufferSize") final String bufferSize,
- @PluginAttr("tableName") final String tableName,
- @PluginElement("ColumnConfigs") final ColumnConfig[] columnConfigs) {
+ public static JDBCAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginElement("Filter") final Filter filter,
+ @PluginElement("ConnectionSource") final ConnectionSource connectionSource,
+ @PluginAttribute("bufferSize") final String bufferSize,
+ @PluginAttribute("tableName") final String tableName,
+ @PluginElement("ColumnConfigs") final ColumnConfig[] columnConfigs) {
final int bufferSizeInt = AbstractAppender.parseInt(bufferSize, 0);
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java Tue Aug 20 18:38:36 2013
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.Log
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -66,12 +66,13 @@ public final class JPAAppender extends A
* @return a new JPA appender.
*/
@PluginFactory
- public static JPAAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("Filter") final Filter filter,
- @PluginAttr("bufferSize") final String bufferSize,
- @PluginAttr("entityClassName") final String entityClassName,
- @PluginAttr("persistenceUnitName") final String persistenceUnitName) {
+ public static JPAAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginElement("Filter") final Filter filter,
+ @PluginAttribute("bufferSize") final String bufferSize,
+ @PluginAttribute("entityClassName") final String entityClassName,
+ @PluginAttribute("persistenceUnitName") final String persistenceUnitName) {
if (Strings.isEmpty(entityClassName) || Strings.isEmpty(persistenceUnitName)) {
LOGGER.error("Attributes entityClassName and persistenceUnitName are required for JPA Appender.");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java Tue Aug 20 18:38:36 2013
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.core.Fil
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -65,11 +65,12 @@ public final class NoSQLAppender extends
* @return a new NoSQL appender.
*/
@PluginFactory
- public static NoSQLAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("Filter") final Filter filter,
- @PluginAttr("bufferSize") final String bufferSize,
- @PluginElement("NoSqlProvider") final NoSQLProvider<?> provider) {
+ public static NoSQLAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginElement("Filter") final Filter filter,
+ @PluginAttribute("bufferSize") final String bufferSize,
+ @PluginElement("NoSqlProvider") final NoSQLProvider<?> provider) {
if (provider == null) {
LOGGER.error("NoSQL provider not specified for appender [{}].", name);
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/couch/CouchDBProvider.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/couch/CouchDBProvider.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/couch/CouchDBProvider.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/couch/CouchDBProvider.java Tue Aug 20 18:38:36 2013
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.db.nosql.NoSQLProvider;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.NameUtil;
import org.apache.logging.log4j.core.helpers.Strings;
@@ -79,14 +79,15 @@ public final class CouchDBProvider imple
* @return a new Apache CouchDB provider.
*/
@PluginFactory
- public static CouchDBProvider createNoSQLProvider(@PluginAttr("databaseName") final String databaseName,
- @PluginAttr("protocol") String protocol,
- @PluginAttr("server") String server,
- @PluginAttr("port") final String port,
- @PluginAttr("username") final String username,
- @PluginAttr("password") final String password,
- @PluginAttr("factoryClassName") final String factoryClassName,
- @PluginAttr("factoryMethodName") final String factoryMethodName) {
+ public static CouchDBProvider createNoSQLProvider(
+ @PluginAttribute("databaseName") final String databaseName,
+ @PluginAttribute("protocol") String protocol,
+ @PluginAttribute("server") String server,
+ @PluginAttribute("port") final String port,
+ @PluginAttribute("username") final String username,
+ @PluginAttribute("password") final String password,
+ @PluginAttribute("factoryClassName") final String factoryClassName,
+ @PluginAttribute("factoryMethodName") final String factoryMethodName) {
CouchDbClient client;
String description;
if (factoryClassName != null && factoryClassName.length() > 0 &&
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/mongo/MongoDBProvider.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/mongo/MongoDBProvider.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/mongo/MongoDBProvider.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/mongo/MongoDBProvider.java Tue Aug 20 18:38:36 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.db.nosql.NoSQLProvider;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.NameUtil;
import org.apache.logging.log4j.status.StatusLogger;
@@ -88,18 +88,17 @@ public final class MongoDBProvider imple
* @return a new MongoDB provider.
*/
@PluginFactory
- public static MongoDBProvider createNoSQLProvider(@PluginAttr("collectionName") final String collectionName,
- @PluginAttr("writeConcernConstant") final String
- writeConcernConstant,
- @PluginAttr("writeConcernConstantClass") final String
- writeConcernConstantClassName,
- @PluginAttr("databaseName") final String databaseName,
- @PluginAttr("server") final String server,
- @PluginAttr("port") final String port,
- @PluginAttr("username") final String username,
- @PluginAttr("password") final String password,
- @PluginAttr("factoryClassName") final String factoryClassName,
- @PluginAttr("factoryMethodName") final String factoryMethodName) {
+ public static MongoDBProvider createNoSQLProvider(
+ @PluginAttribute("collectionName") final String collectionName,
+ @PluginAttribute("writeConcernConstant") final String writeConcernConstant,
+ @PluginAttribute("writeConcernConstantClass") final String writeConcernConstantClassName,
+ @PluginAttribute("databaseName") final String databaseName,
+ @PluginAttribute("server") final String server,
+ @PluginAttribute("port") final String port,
+ @PluginAttribute("username") final String username,
+ @PluginAttribute("password") final String password,
+ @PluginAttribute("factoryClassName") final String factoryClassName,
+ @PluginAttribute("factoryMethodName") final String factoryMethodName) {
DB database;
String description;
if (factoryClassName != null && factoryClassName.length() > 0 &&
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java Tue Aug 20 18:38:36 2013
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.KeyValuePair;
@@ -128,8 +128,9 @@ public final class MapRewritePolicy impl
* @return The MapRewritePolicy.
*/
@PluginFactory
- public static MapRewritePolicy createPolicy(@PluginAttr("mode") final String mode,
- @PluginElement("KeyValuePair") final KeyValuePair[] pairs) {
+ public static MapRewritePolicy createPolicy(
+ @PluginAttribute("mode") final String mode,
+ @PluginElement("KeyValuePair") final KeyValuePair[] pairs) {
Mode op;
if (mode == null) {
op = Mode.Add;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java Tue Aug 20 18:38:36 2013
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -104,12 +104,13 @@ public final class RewriteAppender exten
* @return The created RewriteAppender.
*/
@PluginFactory
- public static RewriteAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
- @PluginConfiguration final Configuration config,
- @PluginElement("RewritePolicy") final RewritePolicy rewritePolicy,
- @PluginElement("Filter") final Filter filter) {
+ public static RewriteAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
+ @PluginConfiguration final Configuration config,
+ @PluginElement("RewritePolicy") final RewritePolicy rewritePolicy,
+ @PluginElement("Filter") final Filter filter) {
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
if (name == null) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java Tue Aug 20 18:38:36 2013
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.appender.rolling.helper.ZipCompressAction;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.lookup.StrSubstitutor;
@@ -361,10 +361,11 @@ public class DefaultRolloverStrategy imp
* @return A DefaultRolloverStrategy.
*/
@PluginFactory
- public static DefaultRolloverStrategy createStrategy(@PluginAttr("max") final String max,
- @PluginAttr("min") final String min,
- @PluginAttr("fileIndex") final String fileIndex,
- @PluginConfiguration final Configuration config) {
+ public static DefaultRolloverStrategy createStrategy(
+ @PluginAttribute("max") final String max,
+ @PluginAttribute("min") final String min,
+ @PluginAttribute("fileIndex") final String fileIndex,
+ @PluginConfiguration final Configuration config) {
final boolean useMax = fileIndex == null ? true : fileIndex.equalsIgnoreCase("max");
int minIndex;
if (min != null) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java Tue Aug 20 18:38:36 2013
@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.status.StatusLogger;
@@ -106,7 +106,7 @@ public class SizeBasedTriggeringPolicy i
* @return A SizeBasedTriggeringPolicy.
*/
@PluginFactory
- public static SizeBasedTriggeringPolicy createPolicy(@PluginAttr("size") final String size) {
+ public static SizeBasedTriggeringPolicy createPolicy(@PluginAttribute("size") final String size) {
final long maxSize = size == null ? MAX_FILE_SIZE : valueOf(size);
return new SizeBasedTriggeringPolicy(maxSize);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java Tue Aug 20 18:38:36 2013
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.ap
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Integers;
@@ -79,8 +79,9 @@ public final class TimeBasedTriggeringPo
* @return a TimeBasedTriggeringPolicy.
*/
@PluginFactory
- public static TimeBasedTriggeringPolicy createPolicy(@PluginAttr("interval") final String interval,
- @PluginAttr("modulate") final String modulate) {
+ public static TimeBasedTriggeringPolicy createPolicy(
+ @PluginAttribute("interval") final String interval,
+ @PluginAttribute("modulate") final String modulate) {
final int increment = Integers.parseInt(interval, 1);
final boolean mod = Boolean.parseBoolean(modulate);
return new TimeBasedTriggeringPolicy(increment, mod);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Route.java Tue Aug 20 18:38:36 2013
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.ap
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.config.plugins.PluginNode;
import org.apache.logging.log4j.status.StatusLogger;
@@ -93,9 +93,10 @@ public final class Route {
* @return A Route.
*/
@PluginFactory
- public static Route createRoute(@PluginAttr("ref") final String appenderRef,
- @PluginAttr("key") final String key,
- @PluginNode final Node node) {
+ public static Route createRoute(
+ @PluginAttribute("ref") final String appenderRef,
+ @PluginAttribute("key") final String key,
+ @PluginNode final Node node) {
if (node != null && node.hasChildren()) {
for (final Node child : node.getChildren()) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/Routes.java Tue Aug 20 18:38:36 2013
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.ap
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.status.StatusLogger;
@@ -78,8 +78,9 @@ public final class Routes {
* @return The Routes container.
*/
@PluginFactory
- public static Routes createRoutes(@PluginAttr("pattern") final String pattern,
- @PluginElement("Routes") final Route... routes) {
+ public static Routes createRoutes(
+ @PluginAttribute("pattern") final String pattern,
+ @PluginElement("Routes") final Route... routes) {
if (pattern == null) {
LOGGER.error("A pattern is required");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java Tue Aug 20 18:38:36 2013
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -177,12 +177,13 @@ public final class RoutingAppender exten
* @return The RoutingAppender
*/
@PluginFactory
- public static RoutingAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginElement("Routes") final Routes routes,
- @PluginConfiguration final Configuration config,
- @PluginElement("RewritePolicy") final RewritePolicy rewritePolicy,
- @PluginElement("Filters") final Filter filter) {
+ public static RoutingAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginElement("Routes") final Routes routes,
+ @PluginConfiguration final Configuration config,
+ @PluginElement("RewritePolicy") final RewritePolicy rewritePolicy,
+ @PluginElement("Filters") final Filter filter) {
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
if (name == null) {