Author: wikier
Date: Thu Apr 10 10:23:46 2014
New Revision: 1586261

URL: http://svn.apache.org/r1586261
Log:
MARMOTTA-488:
 * updated site to the current modules
 * TODO: remove the staging repo after the release
 * linked content from MARMOTTA-487
 * reorganized libraries
 * minor cosmetic details


Modified:
    marmotta/site/trunk/content/markdown/index.md
    marmotta/site/trunk/content/site.xml
    marmotta/site/trunk/pom.xml

Modified: marmotta/site/trunk/content/markdown/index.md
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/content/markdown/index.md?rev=1586261&r1=1586260&r2=1586261&view=diff
==============================================================================
--- marmotta/site/trunk/content/markdown/index.md (original)
+++ marmotta/site/trunk/content/markdown/index.md Thu Apr 10 10:23:46 2014
@@ -1,10 +1,10 @@
 <head><title>Home</title></head> <!-- awaiting for 
https://jira.codehaus.org/browse/DOXIA-472 -->
 
 <p id="download">
-  <a href="download.html#a3.1.0-incubating" class="download">
+  <a href="download.html#a3.2.0-incubating" class="download">
     download<br/>
     <strong>Apache Marmotta</strong><br/>
-    3.1.0-incubating
+    3.2.0
   </a>
   <iframe 
src="http://platform.twitter.com/widgets/follow_button.html?screen_name=ApacheMarmotta";
 allowtransparency="true" frameborder="0" scrolling="no"></iframe>
 </p>
@@ -13,12 +13,10 @@
 
 Apache Marmotta is an Open Platform for [Linked 
Data](http://www.w3.org/DesignIssues/LinkedData.html).
 
-
 The goal of Apache Marmotta is to provide an open implementation of a [Linked 
Data  Platform](http://www.w3.org/TR/ldp/) 
 that can be used, extended and deployed easily by organizations who want 
 to publish Linked Data or build custom applications on Linked Data.
 
-
 Right now the project is graduating from the incubator as a new Top Level 
Project
 in the Apache Software Foundation. Since entering the 
[incubator](http://incubator.apache.org) in December 2012, the
 [team](team-list.html) has worked really hard to move the codebase to the 
Apache infrastructure
@@ -35,9 +33,9 @@ subscribe to our [mailing lists](mail-li
  * [RDF triple store](kiwi/) with [transactions](kiwi/transactions.html), 
    [versioning](kiwi/versioning.html) and 
    [rule-base reasoning](kiwi/reasoner.html)
- * SPARQL and [LDPath](ldpath/) query languages
- * Transparent [Linked Data Caching](ldcache/)
- * Integrated [security](platform/security-module.html) mechanisms 
+ * [SPARQL](platform/sparql-module.html), [LDP](platform/ldp-module.html) and 
[LDPath](ldpath) query
+ * Transparent [Linked Data Caching](ldcache)
+ * Integrated basic [security](platform/security-module.html) mechanisms 
 
 ## Background 
 
@@ -47,5 +45,5 @@ or Apache Solr to offer some advanced se
 code and some related libraries have been set aside to incubate Marmotta 
within the The Apache Software 
 Foundation. LMF still keeps exactly the same functionality, but now bundling 
Marmotta too.
 
-Apache Marmotta joined ASF Incubator in December 2012, graduating as a Top 
Level Project in November 2013.
+Apache Marmotta joined ASF Incubator in December 2012, graduated as a Top 
Level Project in November 2013.
 

Modified: marmotta/site/trunk/content/site.xml
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/content/site.xml?rev=1586261&r1=1586260&r2=1586261&view=diff
==============================================================================
--- marmotta/site/trunk/content/site.xml (original)
+++ marmotta/site/trunk/content/site.xml Thu Apr 10 10:23:46 2014
@@ -83,42 +83,43 @@
         <menu name="Platform">
             <item name="Introduction" href="platform/index.html" />
             <item name="Core Module" href="platform/core-module.html" />
+            <item name="SPARQL Module" href="platform/sparql-module.html" />
+            <item name="LDP Module" href="platform/ldp-module.html" />
             <item name="Backends" href="platform/backends.html" />
             <item name="LDCache Module" href="platform/ldcache-module.html" />
             <item name="LDPath Module" href="platform/ldpath-module.html" />
             <item name="Reasoner Module" href="platform/reasoner-module.html" 
/>
             <item name="Security Module" href="platform/security-module.html" 
/>
-            <item name="SPARQL Module" href="platform/sparql-module.html" />
             <item name="User Module" href="platform/user-module.html" />
             <item name="Versioning Module" 
href="platform/versioning-module.html" />
             <item name="Cloud Setup" href="platform/cloud.html" />
-            <item name="Client Library" href="client-library.html" />
-        </menu>
-        <menu name="KiWi Triple Store">
-            <item name="Introduction" href="kiwi/index.html" />
-            <item name="Store" href="kiwi/triplestore.html" />
-            <item name="Transactions" href="kiwi/transactions.html" />
-            <item name="SPARQL" href="kiwi/sparql.html" />
-            <item name="Triple Table" href="kiwi/tripletable.html" />
-            <item name="Reasoner" href="kiwi/reasoner.html" />
-            <item name="Versioning" href="kiwi/versioning.html" />
-            <item name="KiWi Loader" href="kiwi/loader.html" />
-            <item name="Context Aware" href="kiwi/contextaware.html" />
         </menu>
         <menu name="Libraries">
-            <item name="LDClient" href="ldclient/" collapse="true">
+            <item name="Client Library" href="client-library.html" />
+            <item name="KiWi Triple Store" href="kiwi" collapse="true">
+                <item name="Introduction" href="kiwi/index.html" />
+                <item name="Store" href="kiwi/triplestore.html" />
+                <item name="Transactions" href="kiwi/transactions.html" />
+                <item name="SPARQL" href="kiwi/sparql.html" />
+                <item name="Triple Table" href="kiwi/tripletable.html" />
+                <item name="Reasoner" href="kiwi/reasoner.html" />
+                <item name="Versioning" href="kiwi/versioning.html" />
+                <item name="KiWi Loader" href="kiwi/loader.html" />
+                <item name="Context Aware" href="kiwi/contextaware.html" />
+            </item>
+            <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="ldcache/" collapse="true">
+            <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="ldpath/" collapse="true">
+            <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" />

Modified: marmotta/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/marmotta/site/trunk/pom.xml?rev=1586261&r1=1586260&r2=1586261&view=diff
==============================================================================
--- marmotta/site/trunk/pom.xml (original)
+++ marmotta/site/trunk/pom.xml Thu Apr 10 10:23:46 2014
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.apache.marmotta</groupId>
         <artifactId>marmotta-parent</artifactId>
-        <version>3.1.0-incubating</version>
+        <version>3.2.0</version>
     </parent>
 
     <groupId>org.apache.marmotta</groupId>
@@ -67,6 +67,22 @@
             </snapshots>
         </repository>
         <repository>
+            <!-- this repo needs to be removed one the release has been 
published -->
+            <id>orgapachemarmotta-1008</id>
+            <name>Apache Staging Repository for 3.2.0</name>
+            
<url>https://repository.apache.org/content/repositories/orgapachemarmotta-1008</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+                <updatePolicy>never</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots>
+        </repository>
+        <repository>
             <id>apache.snapshots</id>
             <name>Apache Snapshots Repository</name>
             
<url>https://repository.apache.org/content/repositories/snapshots/</url>
@@ -740,13 +756,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.marmotta</groupId>
-            <artifactId>kiwi-transactions</artifactId>
+            <artifactId>marmotta-sail-transactions</artifactId>
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
         <dependency>
             <groupId>org.apache.marmotta</groupId>
-            <artifactId>kiwi-tripletable</artifactId>
+            <artifactId>marmotta-util-tripletable</artifactId>
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
@@ -882,7 +898,13 @@
         -->
         <dependency>
             <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-ldcache</artifactId>
+            <artifactId>marmotta-ldp</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.marmotta</groupId>
+            <artifactId>marmotta-ldcache-common</artifactId>
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
@@ -894,7 +916,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-reasoner</artifactId>
+            <artifactId>marmotta-reasoner-kiwi</artifactId>
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
@@ -918,7 +940,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.marmotta</groupId>
-            <artifactId>marmotta-versioning</artifactId>
+            <artifactId>marmotta-versioning-common</artifactId>
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>


Reply via email to