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 2014/09/27 05:31:26 UTC
[1/3] git commit: Move Java Lookup docs before JNDI Lookup docs.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 604e1024b -> 0091f1a93
Move Java Lookup docs before JNDI Lookup docs.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e6ddad16
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e6ddad16
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e6ddad16
Branch: refs/heads/master
Commit: e6ddad16dcedf48c677a1b40710134632c9e4108
Parents: ccbcc53
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 26 23:30:14 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 26 23:30:14 2014 -0400
----------------------------------------------------------------------
src/site/xdoc/manual/lookups.xml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e6ddad16/src/site/xdoc/manual/lookups.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/lookups.xml b/src/site/xdoc/manual/lookups.xml
index 0137550..6206206 100644
--- a/src/site/xdoc/manual/lookups.xml
+++ b/src/site/xdoc/manual/lookups.xml
@@ -82,19 +82,6 @@
</PatternLayout>
</File>]]></pre>
</subsection>
- <subsection name="JndiLookup">
- <a name="JndiLookup"/>
- <p>
- The JndiLookup allows variables to be retrieved via JNDI. By default the key will be prefixed with
- java:comp/env/, however if the key contains a ":" no prefix will be added.
- </p>
- <pre class="prettyprint linenums"><![CDATA[
-<File name="Application" fileName="application.log">
- <PatternLayout>
- <pattern>%d %p %c{1.} [%t] $${jndi:logging/context-name} %m%n</pattern>
- </PatternLayout>
-</File>]]></pre>
- </subsection>
<subsection name="JavaLookup">
<a name="JavaLookup"/>
<p>
@@ -159,6 +146,19 @@
</PatternLayout>
</File>]]></pre>
</subsection>
+ <subsection name="JndiLookup">
+ <a name="JndiLookup"/>
+ <p>
+ The JndiLookup allows variables to be retrieved via JNDI. By default the key will be prefixed with
+ java:comp/env/, however if the key contains a ":" no prefix will be added.
+ </p>
+ <pre class="prettyprint linenums"><![CDATA[
+<File name="Application" fileName="application.log">
+ <PatternLayout>
+ <pattern>%d %p %c{1.} [%t] $${jndi:logging/context-name} %m%n</pattern>
+ </PatternLayout>
+</File>]]></pre>
+ </subsection>
<subsection name="MapLookup">
<a name="MapLookup"/>
<p>
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by gg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c7c19c4d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c7c19c4d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c7c19c4d
Branch: refs/heads/master
Commit: c7c19c4dcc0a4e2064534bdee9e0b920e18334d4
Parents: e6ddad1 604e102
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 26 23:30:39 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 26 23:30:39 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: Add Java Lookup to nav menu.
Posted by gg...@apache.org.
Add Java Lookup to nav menu.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0091f1a9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0091f1a9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0091f1a9
Branch: refs/heads/master
Commit: 0091f1a93876cedaed4be957571a55dfc905b3f0
Parents: c7c19c4
Author: Gary Gregory <ga...@gmail.com>
Authored: Fri Sep 26 23:31:20 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Fri Sep 26 23:31:20 2014 -0400
----------------------------------------------------------------------
src/site/site.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0091f1a9/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index ffcc5d1..bd69766 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -97,6 +97,7 @@
<item name="Context Map" href="/manual/lookups.html#ContextMapLookup"/>
<item name="Date" href="/manual/lookups.html#DateLookcup"/>
<item name="Environment" href="/manual/lookups.html#EnvironmentLookup"/>
+ <item name="Java" href="/manual/lookups.html#JavaLookup"/>
<item name="JNDI" href="/manual/lookups.html#JndiLookup"/>
<item name="Map" href="/manual/lookups.html#MapLookup"/>
<item name="Structured Data" href="/manual/lookups.html#StructuredDataLookup"/>