You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/10/29 12:19:57 UTC

svn commit: r1536668 - in /incubator/marmotta/site/trunk: ./ content/ content/markdown/kiwi/ content/markdown/ldcache/ content/markdown/ldclient/ content/markdown/ldpath/ content/markdown/platform/

Author: jakob
Date: Tue Oct 29 11:19:56 2013
New Revision: 1536668

URL: http://svn.apache.org/r1536668
Log:
MARMOTTA-347: workaround by removing dependency to marmotta-reactor
did some restructuring in the menu.

Added:
    incubator/marmotta/site/trunk/content/markdown/kiwi/index.md.vm
      - copied unchanged from r1535304, incubator/marmotta/site/trunk/content/markdown/kiwi/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/ldcache/index.md.vm
      - copied unchanged from r1535304, incubator/marmotta/site/trunk/content/markdown/ldcache/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/ldclient/index.md.vm
      - copied unchanged from r1535304, incubator/marmotta/site/trunk/content/markdown/ldclient/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/ldpath/index.md.vm
      - copied unchanged from r1535304, incubator/marmotta/site/trunk/content/markdown/ldpath/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/platform/index.md.vm
      - copied unchanged from r1535304, incubator/marmotta/site/trunk/content/markdown/platform/introduction.md.vm
Removed:
    incubator/marmotta/site/trunk/content/markdown/kiwi/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/ldcache/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/ldclient/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/ldpath/introduction.md.vm
    incubator/marmotta/site/trunk/content/markdown/platform/introduction.md.vm
Modified:
    incubator/marmotta/site/trunk/content/site.xml
    incubator/marmotta/site/trunk/pom.xml

Modified: incubator/marmotta/site/trunk/content/site.xml
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/site.xml?rev=1536668&r1=1536667&r2=1536668&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/site.xml (original)
+++ incubator/marmotta/site/trunk/content/site.xml Tue Oct 29 11:19:56 2013
@@ -47,7 +47,7 @@
             </twitter>
             <ohloh>
                 <projectId>623297</projectId>
-                <widget>factoids</widget>
+                <widget>stats</widget>
             </ohloh>
             -->
         </fluidoSkin>
@@ -75,7 +75,7 @@
             <item name="Privacy" href="privacy.html" />
         </menu>
         <menu name="Platform">
-            <item name="Introduction" href="platform/introduction.html" />
+            <item name="Introduction" href="platform/index.html" />
             <item name="Core Module" href="platform/core-module.html" />
             <item name="LDCache Module" href="platform/ldcache-module.html" />
             <item name="LDPath Module" href="platform/ldpath-module.html" />
@@ -85,10 +85,9 @@
             <item name="User Module" href="platform/user-module.html" />
             <item name="Versioning Module" href="platform/versioning-module.html" />
             <item name="Client Library" href="client-library.html" />
-            <item name="Sesame Tools" href="sesame.html" />
         </menu>
         <menu name="KiWi Triple Store">
-            <item name="Introduction" href="kiwi/introduction.html"/>
+            <item name="Introduction" href="kiwi/index.html"/>
             <item name="Store" href="kiwi/triplestore.html"/>
             <item name="Transactions" href="kiwi/transactions.html"/>
             <item name="Triple Table" href="kiwi/tripletable.html"/>
@@ -96,26 +95,27 @@
             <item name="Versioning" href="kiwi/versioning.html"/>
         </menu>
         <menu name="Libraries">
-            <item name="LDClient" href="#" collapse="true">
-                <item name="Introduction" href="ldclient/introduction.html"/>
+            <item name="LDClient" href="ldclient/" collapse="true">
+                <item name="Introduction" href="ldclient/index.html"/>
                 <item name="Usage" href="ldclient/usage.html"/>
                 <item name="Modules" href="ldclient/modules.html"/>
                 <item name="Data Providers" href="ldclient/dataproviders.html"/>
             </item>
-            <item  name="LDCache" href="#" collapse="true">
-                <item name="Introduction" href="ldcache/introduction.html"/>
+            <item  name="LDCache" href="ldcache/" collapse="true">
+                <item name="Introduction" href="ldcache/index.html"/>
                 <item name="Usage" href="ldcache/usage.html"/>
                 <item name="Backends" href="ldcache/backends.html"/>
                 <item name="Wrappers" href="ldcache/wrappers.html"/>
             </item>
-            <item name="LDPath" href="#" collapse="true">
-                <item name="Introduction" href="ldpath/introduction.html"/>
+            <item name="LDPath" href="ldpath/" collapse="true">
+                <item name="Introduction" href="ldpath/index.html"/>
                 <item name="Language" href="ldpath/language.html"/>
                 <item name="Usage" href="ldpath/usage.html"/>
                 <item name="Backends" href="ldpath/backends.html"/>
                 <item name="Functions" href="ldpath/functions.html"/>
                 <item name="Template" href="ldpath/template.html"/>
             </item>
+            <item name="Sesame Tools" href="sesame.html" />
         </menu>
         <menu name="Project" ref="reports" inherit="top" />
         <menu name="The ASF">

Modified: incubator/marmotta/site/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/pom.xml?rev=1536668&r1=1536667&r2=1536668&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/pom.xml (original)
+++ incubator/marmotta/site/trunk/pom.xml Tue Oct 29 11:19:56 2013
@@ -229,12 +229,17 @@
                 <configuration>
                     <includeDependencySources>true</includeDependencySources>
                     <includeTransitiveDependencySources>false</includeTransitiveDependencySources>
+                    <dependencySourceExcludes>
+                        <!-- test-sources are not deployed to the repo -->
+                        <dependencySourceExclude>*:*:jar:test-sources:*</dependencySourceExclude>
+                    </dependencySourceExcludes>
                     <failOnError>false</failOnError>
                     <javadocVersion>1.7</javadocVersion>
                     <excludePackageNames>javax*:junit*:org.hamcrest*:org.junit*</excludePackageNames>
                     <stylesheetfile>content/resources/apidocs/javadoc.css</stylesheetfile>
                     <tags>
                         <tag>
+                            <!-- javadoc processing for @HTTP tags -->
                             <name>HTTP</name>
                             <placement>m</placement>
                             <head>HTTP Status Codes</head>
@@ -723,12 +728,14 @@
     </mailingLists>
 
     <dependencies>
+<!-- workaround for MARMOTTA-347
         <dependency>
             <groupId>org.apache.marmotta</groupId>
             <artifactId>marmotta-reactor</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
+-->
         <dependency>
             <groupId>org.apache.marmotta</groupId>
             <artifactId>kiwi-triplestore</artifactId>