Author: mattsicker
Date: Tue Jun 10 01:05:58 2014
New Revision: 1601540
URL: http://svn.apache.org/r1601540
Log:
Remove unnecessary annotation (SensitivePluginAttribute).
Removed:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/SensitivePluginAttribute.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/SensitivePluginAttributeVisitor.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAliases.java
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDBProvider.java
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDBProvider.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAliases.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAliases.java?rev=1601540&r1=1601539&r2=1601540&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAliases.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAliases.java
Tue Jun 10 01:05:58 2014
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPol
import java.lang.annotation.Target;
/**
- * Identifies a list of aliases for a {@link Plugin}, {@link PluginAttribute},
or {@link SensitivePluginAttribute}.
+ * Identifies a list of aliases for a {@link Plugin} or {@link
PluginAttribute}.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
Modified:
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDBProvider.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDBProvider.java?rev=1601540&r1=1601539&r2=1601540&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDBProvider.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/couchdb/CouchDBProvider.java
Tue Jun 10 01:05:58 2014
@@ -23,7 +23,6 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.config.plugins.Plugin;
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.SensitivePluginAttribute;
import org.apache.logging.log4j.core.util.Loader;
import org.apache.logging.log4j.core.util.NameUtil;
import org.apache.logging.log4j.nosql.appender.NoSQLProvider;
@@ -87,7 +86,7 @@ public final class CouchDBProvider imple
@PluginAttribute("server") String server,
@PluginAttribute("port") final String port,
@PluginAttribute("username") final String username,
- @SensitivePluginAttribute("password") final String password,
+ @PluginAttribute(value = "password", sensitive = true) final
String password,
@PluginAttribute("factoryClassName") final String factoryClassName,
@PluginAttribute("factoryMethodName") final String
factoryMethodName) {
CouchDbClient client;
Modified:
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDBProvider.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDBProvider.java?rev=1601540&r1=1601539&r2=1601540&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDBProvider.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDBProvider.java
Tue Jun 10 01:05:58 2014
@@ -20,22 +20,20 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.List;
+import com.mongodb.DB;
+import com.mongodb.MongoClient;
+import com.mongodb.ServerAddress;
+import com.mongodb.WriteConcern;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
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.SensitivePluginAttribute;
import org.apache.logging.log4j.core.util.Loader;
import org.apache.logging.log4j.core.util.NameUtil;
import org.apache.logging.log4j.nosql.appender.NoSQLProvider;
import org.apache.logging.log4j.status.StatusLogger;
-import com.mongodb.DB;
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
-import com.mongodb.WriteConcern;
-
/**
* The MongoDB implementation of {@link NoSQLProvider}.
*/
@@ -98,7 +96,7 @@ public final class MongoDBProvider imple
@PluginAttribute("server") final String server,
@PluginAttribute("port") final String port,
@PluginAttribute("username") final String username,
- @SensitivePluginAttribute("password") final String password,
+ @PluginAttribute(value = "password", sensitive = true) final
String password,
@PluginAttribute("factoryClassName") final String factoryClassName,
@PluginAttribute("factoryMethodName") final String
factoryMethodName) {
DB database;
