You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by bu...@apache.org on 2014/09/16 14:34:20 UTC

svn commit: r922392 [23/23] - in /websites/staging/olingo/trunk/content: ./ doc/ doc/javascript/ doc/odata2/ doc/odata2/tutorials/ doc/odata4/ doc/odata4/tutorials/ doc/tutorials/

Modified: websites/staging/olingo/trunk/content/doc/tutorials/AnnotationProcessorExtension.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/AnnotationProcessorExtension.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/AnnotationProcessorExtension.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -428,7 +428,7 @@ As example for a default Tomcat 7.x inst
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/CreateWebApp.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/CreateWebApp.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/CreateWebApp.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -308,7 +308,7 @@ The table gives the list of Maven depend
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/CustomODataJPAProcessor.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/CustomODataJPAProcessor.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/CustomODataJPAProcessor.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -123,7 +123,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/DeltaQuerySupport.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/DeltaQuerySupport.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/DeltaQuerySupport.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -159,7 +159,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/ExtendingtheEDM.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/ExtendingtheEDM.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/ExtendingtheEDM.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -151,7 +151,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/HandlingClobAndBlob.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/HandlingClobAndBlob.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/HandlingClobAndBlob.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -167,7 +167,7 @@ entities. Following is the proposal on h
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/OlingoV2BasicClientSample.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/OlingoV2BasicClientSample.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/OlingoV2BasicClientSample.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -1113,7 +1113,7 @@ If the corresponding OData Service based
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_AdvancedReadWrite_Batch.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_AdvancedReadWrite_Batch.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_AdvancedReadWrite_Batch.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -197,7 +197,7 @@ In order to refer the new entity the Req
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_AdvancedRead_FilterVisitor.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_AdvancedRead_FilterVisitor.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_AdvancedRead_FilterVisitor.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -444,7 +444,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_Advanced_Service_Resolution.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_Advanced_Service_Resolution.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_Advanced_Service_Resolution.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -147,7 +147,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_BasicRead_EDM.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_BasicRead_EDM.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_BasicRead_EDM.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -107,7 +107,7 @@ To make the parser accessible from the A
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_BasicWrite.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_BasicWrite.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/Olingo_Tutorial_BasicWrite.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -210,7 +210,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/basicread.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/basicread.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/basicread.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -699,7 +699,7 @@ The implementation of the Data Provider 
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/batchClientApi.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/batchClientApi.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/batchClientApi.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -155,7 +155,7 @@ You receive a list of single response by
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/debug.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/debug.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/debug.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -271,7 +271,7 @@ is requested as described above.</p>
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/delta.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/delta.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/delta.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -207,7 +207,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/deltaClient.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/deltaClient.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/deltaClient.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -137,7 +137,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/jpafunctionimport.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/jpafunctionimport.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/jpafunctionimport.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -291,7 +291,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/jparedefinemetadata.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/jparedefinemetadata.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/jparedefinemetadata.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -166,7 +166,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/osgi.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/osgi.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/osgi.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -139,7 +139,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/read_expand.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/read_expand.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/read_expand.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -296,7 +296,7 @@ It shows how to call the <code>EntityPro
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/read_media-resource.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/read_media-resource.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/read_media-resource.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -457,7 +457,7 @@ For more details about how to use/setup 
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/doc/tutorials/servlet.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/tutorials/servlet.html (original)
+++ websites/staging/olingo/trunk/content/doc/tutorials/servlet.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -137,7 +137,7 @@ the sample project.</p>
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/documentation.html
==============================================================================
--- websites/staging/olingo/trunk/content/documentation.html (original)
+++ websites/staging/olingo/trunk/content/documentation.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -141,7 +141,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/documentation2.html
==============================================================================
--- websites/staging/olingo/trunk/content/documentation2.html (original)
+++ websites/staging/olingo/trunk/content/documentation2.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -88,9 +88,9 @@
 <hr />
 <h3 id="how-to-start">How to Start</h3>
 <ul>
-<li><a href="/doc/sample-setup.html">Sample Project Setup with Maven Archetypes</a></li>
-<li><a href="/doc/tomcat.html">Run with Tomcat</a></li>
-<li><a href="/doc/dependencies.html">Maven Dependencies</a></li>
+<li><a href="/doc/odata2/sample-setup.html">Sample Project Setup with Maven Archetypes</a></li>
+<li><a href="/doc/odata2/tomcat.html">Run with Tomcat</a></li>
+<li><a href="/doc/odata2/dependencies.html">Maven Dependencies</a></li>
 </ul>
 <hr />
 <h3 id="tutorials">Tutorials</h3>
@@ -137,15 +137,15 @@
 <hr />
 <h3 id="olingo-project-setup-contributors">Olingo Project Setup (Contributors)</h3>
 <ul>
-<li><a href="/doc/maven.html">Git and Maven Support</a></li>
-<li><a href="/doc/eclipse.html">Eclipse IDE Support</a></li>
+<li><a href="/doc/odata2/maven.html">Git and Maven Support</a></li>
+<li><a href="/doc/odata2/eclipse.html">Eclipse IDE Support</a></li>
 <li><a href="doc/release.html">Release Documentation</a></li>
 </ul><div align="center">
 <p>Copyright © 2013-2014, The Apache Software Foundation<br>
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/download.html
==============================================================================
--- websites/staging/olingo/trunk/content/download.html (original)
+++ websites/staging/olingo/trunk/content/download.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -84,73 +84,27 @@
 
 			</div><!--/.nav-collapse -->
         </div><!--/.container-fluid -->
-      </div><!-- Main component for a primary marketing message or call to action --><h1 id="download-odata-20-java-library">Download OData 2.0 Java Library</h1>
-<p>Apache Olingo OData2 is a collection of Java libraries for 
+      </div><!-- Main component for a primary marketing message or call to action --><h1 id="downloads-for-apache-olingo">Downloads for Apache Olingo</h1>
+<h3 id="download-apache-olingo-odata-20-java-library">Download Apache Olingo OData 2.0 Java Library</h3>
+<p>Apache Olingo OData2 is a collection of Java libraries for
 implementing <a href="http://odata.org">OData V2</a> protocol clients or servers.</p>
-<h3 id="release-200-2014-07-11">Release 2.0.0 (2014-07-11)</h3>
-<p><a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/">Full download page</a>, <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12314520&amp;version=12327170">release notes</a></p>
-<p>The Apache Olingo OData2 2.0.0 release is a major release. </p>
-<h3 id="commodity-packages">Commodity Packages</h3>
-<table>
-<thead>
-<tr>
-<th>Package</th>
-<th>zip</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Olingo OData2 Library</td>
-<td><a href="http://www.apache.org/dyn/closer.cgi/olingo/odata2/rel-2.0.0/olingo-odata2-dist-lib-2.0.0-lib.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-lib-2.0.0-lib.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-lib-2.0.0-lib.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-lib-2.0.0-lib.zip.asc">pgp</a>)</td>
-<td>All you need to implement an OData V2 client or server.</td>
-</tr>
-<tr>
-<td>Olingo OData2 Sources</td>
-<td><a href="http://www.apache.org/dyn/closer.cgi/olingo/odata2/rel-2.0.0/olingo-odata2-parent-2.0.0-source-release.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-parent-2.0.0-source-release.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-parent-2.0.0-source-release.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-parent-2.0.0-source-release.zip.asc">pgp</a>)</td>
-<td>Olingo OData2 source code.</td>
-</tr>
-<tr>
-<td>Olingo OData2 Docs</td>
-<td><a href="http://www.apache.org/dyn/closer.cgi/olingo/odata2/rel-2.0.0/olingo-odata2-dist-javadoc-2.0.0-javadoc.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-javadoc-2.0.0-javadoc.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-javadoc-2.0.0-javadoc.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-javadoc-2.0.0-javadoc.zip.asc">pgp</a>)</td>
-<td>Documentation and JavaDoc.</td>
-</tr>
-<tr>
-<td>Olingo OData2 JPA Processor</td>
-<td><a href="http://www.apache.org/dyn/closer.cgi/olingo/odata2/rel-2.0.0/olingo-odata2-dist-jpa-2.0.0-jpa.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-jpa-2.0.0-jpa.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-jpa-2.0.0-jpa.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-jpa-2.0.0-jpa.zip.asc">pgp</a>)</td>
-<td>All you need to expose your JPA model as OData service.</td>
-</tr>
-<tr>
-<td>Olingo OData2 Java Annotation Processor</td>
-<td><a href="http://www.apache.org/dyn/closer.cgi/olingo/odata2/rel-2.0.0/olingo-odata2-dist-janos-2.0.0-janos.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-janos-2.0.0-janos.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-janos-2.0.0-janos.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-janos-2.0.0-janos.zip.asc">pgp</a>)</td>
-<td>Use Java Annotations for an easy OData service.</td>
-</tr>
-<tr>
-<td>Olingo OData2 Reference Scenario</td>
-<td><a href="http://www.apache.org/dyn/closer.cgi/olingo/odata2/rel-2.0.0/olingo-odata2-dist-ref-2.0.0-ref.zip">Download</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-ref-2.0.0-ref.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-ref-2.0.0-ref.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata2/rel-2.0.0/olingo-odata2-dist-ref-2.0.0-ref.zip.asc">pgp</a>)</td>
-<td>Deployable WAR files with reference scenario services using <a href="http://cxf.apache.org">Apache CXF</a>.</td>
-</tr>
-</tbody>
-</table>
-<h3 id="maven">Maven</h3>
-<p>Apache Olingo OData2 artifacts are available at <a href="http://search.maven.org/#search|ga|1|org.apache.olingo">Maven Central</a>. For POM dependencies see <a href="/doc/maven.html">here</a>.</p>
-<h3 id="older-releases">Older Releases</h3>
-<p>For older releases please refer to <a href="http://archive.apache.org/dist/olingo/">Archives</a> 
-or you can get them <a href="doc/maven.html">using Maven</a>.</p>
-<h3 id="verify-authenticity-of-downloads-package">Verify Authenticity of Downloads package</h3>
-<p>While downloading the packages, make yourself familiar 
-on how to verify their integrity, authenticity and provenience 
-according to the Apache Software Foundation best practices.
-Please make sure you check the following resources:</p>
-<ul>
-<li><a href="verification.html">Artifact verification</a> details</li>
-<li>Developers and release managers PGP keys are publicly available <a href="http://apache.org/dist/incubator/olingo/KEYS">here</a>.</li>
-</ul><div align="center">
+<p><a href="/doc/odata2/download.html">Download options for latest release 2.0.0 (2014-07-11)</a></p>
+<h5 id="maven">Maven</h5>
+<p>Apache Olingo OData2 artifacts are available at <a href="http://search.maven.org/#search|ga|1|org.apache.olingo">Maven Central</a>. For POM dependencies see <a href="/doc/odata2/maven.html">here</a>.</p>
+<h3 id="download-apache-olingo-odata-40-java-library">Download Apache Olingo OData 4.0 Java Library</h3>
+<p>Apache Olingo OData4 is a collection of Java libraries for
+implementing <a href="http://odata.org">OData V4</a> protocol clients (Android/Java) or servers.</p>
+<p><a href="/doc/odata4/download.html">Download options for latest release 4.0.0-beta-01 (to be announced)</a></p>
+<h5 id="maven_1">Maven</h5>
+<p>Apache Olingo OData4 artifacts are available at <a href="http://search.maven.org/#search|ga|1|org.apache.olingo">Maven Central</a>. For POM dependencies see <a href="/doc/odata4/maven.html">here</a>.</p>
+<h3 id="download-olingo-odata-client-for-javascript-library">Download Olingo OData Client for JavaScript Library</h3>
+<p>The Olingo OData Client for JavaScript (odatajs) is a library written in JavaScript that enables browser based frontend applications to easily use the OData protocol for communication with application servers.</p>
+<p><a href="/doc/javascript/download.html">Download options for latest release 4.0.0-beta-01 (2014-09-15)</a></p><div align="center">
 <p>Copyright © 2013-2014, The Apache Software Foundation<br>
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/index.html
==============================================================================
--- websites/staging/olingo/trunk/content/index.html (original)
+++ websites/staging/olingo/trunk/content/index.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -104,7 +104,7 @@ features like the support of JPA persist
 </p>
 <p>
   <a class="btn btn-lg btn-primary" style="float: right; margin-left:10px" href="/doc/javascript/index.html" role="button">JavaScript</a>
-  <a class="btn btn-lg btn-primary" style="float: right; margin-left:10px" href="/documentation.html" role="button">Java</a>
+  <a class="btn btn-lg btn-primary" style="float: right; margin-left:10px" href="/doc/odata2/index.html" role="button">Java</a>
   <!-- TODO change style via bootstrap -->
   <span style="-webkit-user-select: none;
 background-color: rgb(66, 139, 202);
@@ -167,7 +167,7 @@ width: 131.0625px">read more »</span>
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/sitemap.html
==============================================================================
--- websites/staging/olingo/trunk/content/sitemap.html (original)
+++ websites/staging/olingo/trunk/content/sitemap.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -96,7 +96,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/support.html
==============================================================================
--- websites/staging/olingo/trunk/content/support.html (original)
+++ websites/staging/olingo/trunk/content/support.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -131,7 +131,7 @@
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript

Modified: websites/staging/olingo/trunk/content/verification.html
==============================================================================
--- websites/staging/olingo/trunk/content/verification.html (original)
+++ websites/staging/olingo/trunk/content/verification.html Tue Sep 16 12:34:18 2014
@@ -64,7 +64,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Download <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                      <li><a href="/download.html">Download OData 2.0 Java</a></li>
+                      <li><a href="/doc/odata2/download.html">Download OData 2.0 Java</a></li>
                       <li><a href="/doc/javascript/download.html">Download OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -72,7 +72,7 @@
               <li class="dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
                   <ul class="dropdown-menu">
-                    <li><a href="/documentation.html">Documentation OData 2.0 Java</a></li>
+                    <li><a href="/doc/odata2/index.html">Documentation OData 2.0 Java</a></li>
                     <li><a href="/doc/javascript/index.html">Documentation OData 4.0 JavaScript</a></li>
                   </ul>
               </li>
@@ -115,7 +115,7 @@ rather than from a mirror. Then verify t
 				                Apache Olingo, Olingo, Apache, the Apache feather, and
 				the Apache Olingo project logo are trademarks of the Apache Software
 				Foundation.</p>
-        <small><a href="/doc/privacy.html">Privacy</a></small>
+        <small><a href="/doc/odata2/privacy.html">Privacy</a></small>
       </div>
     </div><!-- /container -->
     <!-- Bootstrap core JavaScript