Return-Path: 
 <oak-commits-return-4376-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org
Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 39E141099F
	for <apmail-jackrabbit-oak-commits-archive@minotaur.apache.org>;
 Thu,  1 Aug 2013 11:23:40 +0000 (UTC)
Received: (qmail 14489 invoked by uid 500); 1 Aug 2013 11:23:40 -0000
Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org
Received: (qmail 14445 invoked by uid 500); 1 Aug 2013 11:23:34 -0000
Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:oak-commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:oak-commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:oak-commits@jackrabbit.apache.org>
List-Id: <oak-commits.jackrabbit.apache.org>
Reply-To: oak-dev@jackrabbit.apache.org
Delivered-To: mailing list oak-commits@jackrabbit.apache.org
Received: (qmail 14434 invoked by uid 99); 1 Aug 2013 11:23:31 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 11:23:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 11:23:28 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C6735238890D;
	Thu,  1 Aug 2013 11:23:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1509173 - in /jackrabbit/oak/trunk: oak-doc/pom.xml
 oak-doc/src/site/markdown/api.md oak-doc/src/site/site.xml oak-parent/pom.xml
Date: Thu, 01 Aug 2013 11:23:07 -0000
To: oak-commits@jackrabbit.apache.org
From: mduerig@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130801112307.C6735238890D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mduerig
Date: Thu Aug  1 11:23:07 2013
New Revision: 1509173

URL: http://svn.apache.org/r1509173
Log:
OAK-301 Document Oak
- proper id for site distribution
- generate and link javadoc

Removed:
    jackrabbit/oak/trunk/oak-doc/src/site/markdown/api.md
Modified:
    jackrabbit/oak/trunk/oak-doc/pom.xml
    jackrabbit/oak/trunk/oak-doc/src/site/site.xml
    jackrabbit/oak/trunk/oak-parent/pom.xml

Modified: jackrabbit/oak/trunk/oak-doc/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/pom.xml?rev=1509173&r1=1509172&r2=1509173&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-doc/pom.xml Thu Aug  1 11:23:07 2013
@@ -37,6 +37,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
+          <generateReports>true</generateReports>
+          <skip>false</skip>
           <skipDeploy>false</skipDeploy>
         </configuration>
       </plugin>
@@ -45,7 +47,7 @@
 
   <distributionManagement>
     <site>
-      <id>testi</id>
+      <id>jackrabbit.oak.site-deploy</id>
       <url>${project.baseUri}/target/site-deploy</url>
     </site>
   </distributionManagement>

Modified: jackrabbit/oak/trunk/oak-doc/src/site/site.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/site.xml?rev=1509173&r1=1509172&r2=1509173&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/site.xml (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/site.xml Thu Aug  1 11:23:07 2013
@@ -44,7 +44,7 @@ under the License.
     <menu name="Developing Oak">
       <item href="dev_getting_started.html" name="Getting Started" />
       <item href="participating.html" name="Participating" />
-      <item href="api.html" name="API docs" />
+      <item href="apidocs/index.html" name="API docs" />
     </menu>
     <menu name="Links">
     </menu>

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1509173&r1=1509172&r2=1509173&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Thu Aug  1 11:23:07 2013
@@ -226,6 +226,7 @@
           <version>3.3</version>
           <configuration>
             <generateReports>false</generateReports>
+            <skip>true</skip>
             <skipDeploy>true</skipDeploy>
           </configuration>
           <dependencies>
@@ -238,6 +239,24 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>aggregate</id>
+            <goals>
+              <goal>aggregate</goal>
+            </goals>
+            <phase>site</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <reportOutputDirectory>${basedir}/oak-doc/target/site</reportOutputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
   <dependencyManagement>