logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1364224 - in /logging/log4j/log4j2/trunk: api/pom.xml core/pom.xml flume-ng/pom.xml jcl-bridge/pom.xml log4j12-api/pom.xml pom.xml slf4j-impl/pom.xml src/site/site.vm
Date Sun, 22 Jul 2012 08:13:02 GMT
Author: rgoers
Date: Sun Jul 22 08:13:02 2012
New Revision: 1364224

URL: http://svn.apache.org/viewvc?rev=1364224&view=rev
Log:
Change heading of project documentation for each component

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

Modified: logging/log4j/log4j2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/api/pom.xml Sun Jul 22 08:13:02 2012
@@ -29,7 +29,8 @@
   <name>Log4J API</name>
   <description>The Log4J API</description>
   <properties>
-    <log4j.parent.dir>${basedir}/..</log4j.parent.dir>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>API Documentation</docLabel>
   </properties>
   <dependencies>
     <dependency>
@@ -68,11 +69,11 @@
         <version>2.7</version>
         <configuration>
           <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
-          <configLocation>${log4j.parent.dir}/checkstyle.xml</configLocation>
-          <suppressionsLocation>${log4j.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
+          <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+          <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
           <enableRulesSummary>false</enableRulesSummary>
           <propertyExpansion>basedir=${basedir}</propertyExpansion>
-          <propertyExpansion>licensedir=${log4j.parent.dir}/checkstyle-header.txt</propertyExpansion>
+          <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>
@@ -120,7 +121,7 @@
         <configuration>
           <threshold>Normal</threshold>
           <effort>Default</effort>
-          <excludeFilterFile>${log4j.parent.dir}/findbugs-exclude-filter.xml</excludeFilterFile>
+          <excludeFilterFile>${log4jParentDir}/findbugs-exclude-filter.xml</excludeFilterFile>
         </configuration>
       </plugin>
       <plugin>

Modified: logging/log4j/log4j2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Sun Jul 22 08:13:02 2012
@@ -29,7 +29,8 @@
   <name>Log4J Core</name>
   <description>Log4 Implementation.</description>
   <properties>
-    <log4j.parent.dir>${basedir}/..</log4j.parent.dir>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>Core Documentation</docLabel>
   </properties>
   <dependencies>
     <dependency>
@@ -169,11 +170,11 @@
         <version>2.7</version>
         <configuration>
           <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
-          <configLocation>${log4j.parent.dir}/checkstyle.xml</configLocation>
-          <suppressionsLocation>${log4j.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
+          <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+          <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
           <enableRulesSummary>false</enableRulesSummary>
           <propertyExpansion>basedir=${basedir}</propertyExpansion>
-          <propertyExpansion>licensedir=${log4j.parent.dir}/checkstyle-header.txt</propertyExpansion>
+          <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>

Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Sun Jul 22 08:13:02 2012
@@ -29,7 +29,8 @@
   <name>Log4J Flume NG</name>
   <description>Log4j 2.0 Flume Appender</description>
   <properties>
-    <log4j.parent.dir>${basedir}/..</log4j.parent.dir>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>Flume Documentation</docLabel>
   </properties>
   <dependencies>
     <dependency>
@@ -107,11 +108,11 @@
         <version>2.7</version>
         <configuration>
           <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
-          <configLocation>${log4j.parent.dir}/checkstyle.xml</configLocation>
-          <suppressionsLocation>${log4j.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
+          <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+          <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
           <enableRulesSummary>false</enableRulesSummary>
           <propertyExpansion>basedir=${basedir}</propertyExpansion>
-          <propertyExpansion>licensedir=${log4j.parent.dir}/checkstyle-header.txt</propertyExpansion>
+          <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>

Modified: logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/pom.xml?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/pom.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/pom.xml Sun Jul 22 08:13:02 2012
@@ -31,7 +31,8 @@
   <name>Log4J Commons Logging</name>
   <description>Log4j 2.0 Commons Logging Adapter</description>
   <properties>
-    <log4j.parent.dir>${basedir}/..</log4j.parent.dir>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>JCL Bridge Documentation</docLabel>
   </properties>
   <dependencies>
      <dependency>
@@ -79,11 +80,11 @@
             <version>2.7</version>
             <configuration>
               <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
-              <configLocation>${log4j.parent.dir}/checkstyle.xml</configLocation>
-              <suppressionsLocation>${log4j.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
+              <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+              <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
               <enableRulesSummary>false</enableRulesSummary>
               <propertyExpansion>basedir=${basedir}</propertyExpansion>
-              <propertyExpansion>licensedir=${log4j.parent.dir}/checkstyle-header.txt</propertyExpansion>
+              <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
             </configuration>
           </plugin>
           <plugin>

Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Sun Jul 22 08:13:02 2012
@@ -29,7 +29,8 @@
   <name>Log4J Compatibility API</name>
   <description>The Log4J Compatibility API</description>
   <properties>
-    <log4j.parent.dir>${basedir}/..</log4j.parent.dir>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>Log4j 1.2 Documentation</docLabel>
   </properties>
   <dependencies>
     <dependency>
@@ -76,11 +77,11 @@
             <version>2.7</version>
             <configuration>
               <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
-              <configLocation>${log4j.parent.dir}/checkstyle.xml</configLocation>
-              <suppressionsLocation>${log4j.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
+              <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+              <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
               <enableRulesSummary>false</enableRulesSummary>
               <propertyExpansion>basedir=${basedir}</propertyExpansion>
-              <propertyExpansion>licensedir=${log4j.parent.dir}/checkstyle-header.txt</propertyExpansion>
+              <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
             </configuration>
           </plugin>
           <plugin>

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Sun Jul 22 08:13:02 2012
@@ -89,7 +89,7 @@
   <properties>
     <slf4j.version>1.6.4</slf4j.version>
     <logback.version>1.0.0</logback.version>
-    <log4j.parent.dir>${basedir}</log4j.parent.dir>
+    <log4jParentDir>${basedir}</log4jParentDir>
     <Log4jReleaseVersion>2.0-alpha1</Log4jReleaseVersion>
     <!-- Configuration properties for the OSGi maven-bundle-plugin -->
     <osgi.symbolicName>org.apache.commons.${project.artifactId}</osgi.symbolicName>
@@ -101,6 +101,7 @@
     <manifestfile>target/osgi/MANIFEST.MF</manifestfile>
     <maven.compile.source>1.5</maven.compile.source>
     <maven.compile.target>1.5</maven.compile.target>
+    <docLabel>Site Documentation</docLabel>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -238,7 +239,31 @@
           </archive>
         </configuration>
       </plugin>
-
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.5</version>
+        <executions>
+          <execution>
+            <id>copy-sitecss</id>
+            <!-- fetch site.xml before creating site documentation -->
+            <phase>pre-site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/site/css</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${log4jParentDir}/src/site/resources/css</directory>
+                  <includes>
+                    <include>**/site.css</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
@@ -257,7 +282,7 @@
           <moduleExcludes>
             <xdoc>navigation.xml,changes.xml</xdoc>
           </moduleExcludes>
-          <templateDirectory>${log4j.parent.dir}/src/site</templateDirectory>
+          <templateDirectory>${log4jParentDir}/src/site</templateDirectory>
           <template>site.vm</template>
         </configuration>
       </plugin>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Sun Jul 22 08:13:02 2012
@@ -29,7 +29,8 @@
   <name>SLF4J Binding</name>
   <description>Binding between SLF4J API and Log4J2 Core</description>
   <properties>
-    <log4j.parent.dir>${basedir}/..</log4j.parent.dir>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>SLF4J Documentation</docLabel>
   </properties>
   <dependencies>
     <dependency>
@@ -83,11 +84,11 @@
             <version>2.7</version>
             <configuration>
               <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
-              <configLocation>${log4j.parent.dir}/checkstyle.xml</configLocation>
-              <suppressionsLocation>${log4j.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
+              <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+              <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
               <enableRulesSummary>false</enableRulesSummary>
               <propertyExpansion>basedir=${basedir}</propertyExpansion>
-              <propertyExpansion>licensedir=${log4j.parent.dir}/checkstyle-header.txt</propertyExpansion>
+              <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
             </configuration>
           </plugin>
           <plugin>

Modified: logging/log4j/log4j2/trunk/src/site/site.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.vm?rev=1364224&r1=1364223&r2=1364224&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/site.vm Sun Jul 22 08:13:02 2012
@@ -312,12 +312,30 @@
                 #set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width
+ $height + "/>" )
             ##
                 #if ( $position == "left" )
-                <h3>$img $menu.name</h3>
+                    #if ( $menu.name.equals("Project Documentation"))
+                        #if ( $docLabel )
+                            #set ( $menuName = $docLabel )
+                        #else
+                            #set ($menuName = $menu.name )
+                        #end
+                        <h3>$menuName</h3>
+                    #else
+                        <h3>$img $menu.name</h3>
+                    #end
                 #else
                 <h3>$menu.name $img</h3>
                 #end
             #else
-            <h3>$menu.name</h3>
+                #if ( $menu.name.equals("Project Documentation"))
+                    #if ( $docLabel )
+                        #set ( $menuName = $docLabel )
+                    #else
+                        #set ($menuName = $menu.name )
+                    #end
+                <h3>$menuName</h3>
+                #else
+                <h3>$menu.name</h3>
+                #end
             #end
         #end
         #if ( $menu.items && $menu.items.size() > 0 )



Mime
View raw message