You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/10/05 01:13:47 UTC
[1/2] git commit: Add javadoc for @since 2.1.
Repository: logging-log4j2
Updated Branches:
refs/heads/master ac843dadb -> f4333b7f8
Add javadoc for @since 2.1.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/783b6f07
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/783b6f07
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/783b6f07
Branch: refs/heads/master
Commit: 783b6f07fffd07d6a0068c872cf384fbcd45a6c2
Parents: ac843da
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 18:07:51 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 18:07:51 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/Level.java | 3 +++
.../java/org/apache/logging/log4j/util/ProviderUtil.java | 11 +++++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/783b6f07/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
index a4db5b6..268ef6b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
@@ -97,6 +97,9 @@ public final class Level implements Comparable<Level>, Serializable {
ALL = new Level("ALL", StandardLevel.ALL.intLevel());
}
+ /**
+ * @since 2.1
+ */
public static final String CATEGORY = "Level";
private final String name;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/783b6f07/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
index a7ef248..a2ff4f8 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
@@ -50,6 +50,12 @@ public final class ProviderUtil {
private static final Logger LOGGER = StatusLogger.getLogger();
protected static final Collection<Provider> PROVIDERS = new HashSet<Provider>();
+
+ /**
+ * Guards the ProviderUtil singleton instance from lazy initialization. This is primarily used for OSGi support.
+ *
+ * @since 2.1
+ */
protected static final Lock STARTUP_LOCK = new ReentrantLock();
// STARTUP_LOCK guards INSTANCE for lazy initialization; this allows the OSGi Activator to pause the startup and
// wait for a Provider to be installed. See LOG4J2-373
@@ -98,6 +104,11 @@ public final class ProviderUtil {
return !PROVIDERS.isEmpty();
}
+ /**
+ * Lazily initializes the ProviderUtil singleton.
+ *
+ * @since 2.1
+ */
protected static void lazyInit() {
//noinspection DoubleCheckedLocking
if (INSTANCE == null) {
[2/2] git commit: Add javadoc link to log4j-jul.
Posted by ma...@apache.org.
Add javadoc link to log4j-jul.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f4333b7f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f4333b7f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f4333b7f
Branch: refs/heads/master
Commit: f4333b7f880b059d1fb4807b2cd3b0762a43e541
Parents: 783b6f0
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 18:13:45 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 18:13:45 2014 -0500
----------------------------------------------------------------------
src/site/xdoc/javadoc.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f4333b7f/src/site/xdoc/javadoc.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/javadoc.xml b/src/site/xdoc/javadoc.xml
index 66f171b..d60be15 100644
--- a/src/site/xdoc/javadoc.xml
+++ b/src/site/xdoc/javadoc.xml
@@ -75,6 +75,11 @@
<td>A bridge that permits applications written against the SLF4J API to log using Log4j 2.</td>
</tr>
<tr>
+ <td><a href="log4j-jul/apidocs/index.html">Java Util Logging Adapter</a></td>
+ <td>A bridge that permits applications written against the <code>java.util.logging</code> API to log using
+ Log4j 2.</td>
+ </tr>
+ <tr>
<td><a href="log4j-1.2-api/apidocs/index.html">Log4j 1.2 API Bridge</a></td>
<td>A bridge that permits applications written against the Log4j 1.2.x API to log using Log4j 2.</td>
</tr>