You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2011/10/29 02:17:59 UTC
svn commit: r1190706 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: hadoop-auth/src/site/ hadoop-auth/src/site/resources/ hadoop-auth/src/site/resources/css/ hadoop-common/ hadoop-common/src/site/ hadoop-common/src/site/apt/

Author: tomwhite
Date: Sat Oct 29 00:17:58 2011
New Revision: 1190706

URL: http://svn.apache.org/viewvc?rev=1190706&view=rev
Log:
Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763.

Added:
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/resources/
      - copied from r1190703, hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/site/resources/
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/resources/css/
      - copied from r1190703, hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/site/resources/css/
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/resources/css/site.css
      - copied unchanged from r1190703, hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/site/resources/css/site.css
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/
      - copied from r1190703, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/
      - copied from r1190703, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
      - copied unchanged from r1190703, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
Modified:
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/site.xml
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml

Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/site.xml?rev=1190706&r1=1190705&r2=1190706&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/site.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/site/site.xml Sat Oct 29 00:17:58 2011
@@ -13,16 +13,10 @@
 -->
 <project name="Hadoop Auth">
 
-  <version position="right"/>
-
-  <bannerLeft>
-    <name>&nbsp;</name>
-  </bannerLeft>
-
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-stylus-skin</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </skin>
 
   <body>

Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1190706&r1=1190705&r2=1190706&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Sat Oct 29 00:17:58 2011
@@ -447,6 +447,8 @@ Release 0.23.0 - Unreleased
     HADOOP-7446. Implement CRC32C native code using SSE4.2 instructions.
     (Kihwal Lee and todd via todd)
 
+    HADOOP-7763. Add top-level navigation to APT docs. (tomwhite)
+
   BUG FIXES
 
     HADOOP-7740. Fixed security audit logger configuration. (Arpit Gupta via Eric Yang)

Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml?rev=1190706&r1=1190705&r2=1190706&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml Sat Oct 29 00:17:58 2011
@@ -347,6 +347,18 @@
               </target>
             </configuration>
           </execution>
+          <execution>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy file="src/main/resources/core-default.xml" todir="src/site/resources"/>
+                <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
+              </tasks>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>