logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1470168 - in /logging/log4j/log4j2/trunk: api/src/site/ core/src/site/ flume-ng/src/site/ jcl-bridge/src/site/ log4j-to-slf4j/src/site/ log4j12-api/src/site/ slf4j-impl/src/site/ src/site/ taglib/src/site/ web/src/site/
Date Sat, 20 Apr 2013 14:55:41 GMT
Author: rgoers
Date: Sat Apr 20 14:55:41 2013
New Revision: 1470168

URL: http://svn.apache.org/r1470168
Log:
LOG4J2-199 - Fix Site Navigation

Modified:
    logging/log4j/log4j2/trunk/api/src/site/site.xml
    logging/log4j/log4j2/trunk/core/src/site/site.xml
    logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml
    logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml
    logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml
    logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml
    logging/log4j/log4j2/trunk/src/site/site.vm
    logging/log4j/log4j2/trunk/taglib/src/site/site.xml
    logging/log4j/log4j2/trunk/web/src/site/site.xml

Modified: logging/log4j/log4j2/trunk/api/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/api/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -22,6 +22,28 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
   </body>
 </project>

Modified: logging/log4j/log4j2/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -22,6 +22,28 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
   </body>
 </project>

Modified: logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -22,6 +22,28 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
   </body>
 </project>

Modified: logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -22,6 +22,28 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
   </body>
 </project>

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -22,6 +22,28 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
   </body>
 </project>

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -22,6 +22,28 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
   </body>
 </project>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -22,6 +22,28 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
   </body>
 </project>

Modified: logging/log4j/log4j2/trunk/src/site/site.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.vm?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/site.vm Sat Apr 20 14:55:41 2013
@@ -156,7 +156,7 @@
 	#end
 #end
 ##
-#macro ( menuItem $item )
+#macro ( menuItem $item $isComponentDocumentation )
 	#set ( $collapse = "none" )
 	#set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
 	#set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
@@ -184,33 +184,51 @@
 	#if ($thisProjectDir == $PathTool.getDirectoryComponent( $item.href ))
 	#set ($active = " active")
 	#end
-	<li class="$collapse$active">
-	#link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border
$item.width $item.height )
-	#if ( $item && $item.items && $item.items.size() > 0 )
-		#if ( $collapse == "expanded" )
-			<ul>
-				#foreach( $subitem in $item.items )
-					#menuItem( $subitem )
-				#end
-			</ul>
+	#if (${project.artifactId} != "log4j" && $isComponentDocumentation && 
+				($item.href == "team-list.html" || $item.href == "mail-lists.html" 
+				|| $item.href == "issue-tracking.html" || $item.href == "license.html" 
+				|| $item.href == "source-repository.html"))
+	<!-- Removing overall project item $item.name from component-specific menu -->
+	#else
+		#set ($thisItemName = $item.name)
+		#if (${project.artifactId} != "log4j" && $isComponentDocumentation )
+		#set ($thisItemName = $item.name.replace("Project Information", "Component Project"))
+		#set ($thisItemName = $item.name.replace("Project", "Component"))
+		#end
+		<li class="$collapse$active">
+		#link($currentItemHref $thisItemName $item.target $item.img $item.position $item.alt $item.border
$item.width $item.height )
+		#if ( $item && $item.items && $item.items.size() > 0 )
+			#if ( $collapse == "expanded" )
+				<ul>
+					#foreach( $subitem in $item.items )
+						#menuItem( $subitem $isComponentDocumentation )
+					#end
+				</ul>
+			#end
 		#end
-	#end
-	</li>
+		</li>
+ 	#end
 #end
 ##
 #macro ( mainMenu $menus )
 	#foreach( $menu in $menus )
 		<ul class="nav nav-list">
-		#if ( $menu.name )
+		#set ($isComponentDocumentation = false)
+ 		#if ( $menu.name )
+			#set ( $menuName = $menu.name )
+			#if ( $menuName == "Project Documentation" )
+			#set ( $menuName = "Component Documentation" )
+			#set ($isComponentDocumentation = true)
+			#end
 			#if ( $menu.img )
-			 <li class="nav-header"><i class="$menu.img"></i>$menu.name</li>
+			 <li class="nav-header"><i class="$menu.img"></i>$menuName</li>
 			#else
-			 <li class="nav-header">$menu.name</li>
+			 <li class="nav-header">$menuName</li>
 			#end
 		#end
 		#if ( $menu.items && $menu.items.size() > 0 )
 			#foreach( $item in $menu.items )
-				#menuItem( $item )
+				#menuItem( $item $isComponentDocumentation )
 			#end
 		#end
 		</ul>

Modified: logging/log4j/log4j2/trunk/taglib/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/taglib/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/taglib/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/taglib/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -31,7 +31,29 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
     <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache,
the Apache feather logo, and the
       Apache Logging project logo are trademarks of The Apache Software Foundation.</div>
     </footer>

Modified: logging/log4j/log4j2/trunk/web/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/site/site.xml?rev=1470168&r1=1470167&r2=1470168&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/web/src/site/site.xml Sat Apr 20 14:55:41 2013
@@ -31,7 +31,29 @@
       <item name="Logging Services" href="http://logging.apache.org/"/>
       <item name="Log4j" href="../index.html"/>
     </links>
+
+    <!-- Component-specific reports -->
     <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
     <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache,
the Apache feather logo, and the
       Apache Logging project logo are trademarks of The Apache Software Foundation.</div>
     </footer>



Mime
View raw message