Author: buildbot
Date: Tue Apr 28 11:36:25 2015
New Revision: 949478

Log:
Staging update by buildbot for olingo

Modified:
    websites/staging/olingo/trunk/content/   (props changed)
    
websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html

Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Apr 28 11:36:25 2015
@@ -1 +1 @@
-1676492
+1676495

Modified: 
websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html
==============================================================================
--- 
websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html
 (original)
+++ 
websites/staging/olingo/trunk/content/doc/odata4/tutorials/read/tutorial_read.html
 Tue Apr 28 11:36:25 2015
@@ -104,10 +104,30 @@ Furthermore, for building with maven, we
 <p><img alt="projectLayout" src="EclipseProjectTree.png" title="The project 
layout" /></p>
 <p>At the end of this tutorial, you’ll have written an OData service and 
you’ll be able to invoke the following URL in a browser:</p>
 <p>http://localhost:8080/DemoService/DemoService.svc/Products</p>
-<p>And the browser will display the following little collection of data:
-<img alt="productCollection" src="productCollectionPayload.png" title="The 
product collection" /></p>
-<p><code>json
-{"@odata.context":"$metadata#Products","value":[{"ID":1,"Name":"Notebook Basic 
15","Description":"Notebook Basic, 1.7GHz - 15 XGA - 1024MB DDR2 SDRAM - 
40GB"},{"ID":2,"Name":"1UMTS PDA","Description":"Ultrafast 3G UMTS/HSDPA Pocket 
PC, supports GSM network"},{"ID":3,"Name":"Ergo Screen","Description":"17 
Optimum Resolution 1024 x 768 @ 85Hz, resolution 1280 x 960"}]}</code></p>
+<p>And the browser will display the following little collection of data:</p>
+<div class="codehilite"><pre><span class="p">{</span>
+  &quot;<span class="p">@</span><span class="n">odata</span><span 
class="p">.</span><span class="n">context</span>&quot;<span class="p">:</span> 
&quot;$<span class="n">metadata</span>#<span 
class="n">Products</span>&quot;<span class="p">,</span>
+  &quot;<span class="n">value</span>&quot;<span class="p">:</span> <span 
class="p">[</span>
+    <span class="p">{</span>
+      &quot;<span class="n">ID</span>&quot;<span class="p">:</span> 1<span 
class="p">,</span>
+      &quot;<span class="n">Name</span>&quot;<span class="p">:</span> 
&quot;<span class="n">Notebook</span> <span class="n">Basic</span> 
15&quot;<span class="p">,</span>
+      &quot;<span class="n">Description</span>&quot;<span class="p">:</span> 
&quot;<span class="n">Notebook</span> <span class="n">Basic</span><span 
class="p">,</span> 1<span class="p">.</span>7<span class="n">GHz</span> <span 
class="o">-</span> 15 <span class="n">XGA</span> <span class="o">-</span> 
1024<span class="n">MB</span> <span class="n">DDR2</span> <span 
class="n">SDRAM</span> <span class="o">-</span> 40<span 
class="n">GB</span>&quot;
+    <span class="p">},</span>
+    <span class="p">{</span>
+      &quot;<span class="n">ID</span>&quot;<span class="p">:</span> 2<span 
class="p">,</span>
+      &quot;<span class="n">Name</span>&quot;<span class="p">:</span> 
&quot;1<span class="n">UMTS</span> <span class="n">PDA</span>&quot;<span 
class="p">,</span>
+      &quot;<span class="n">Description</span>&quot;<span class="p">:</span> 
&quot;<span class="n">Ultrafast</span> 3<span class="n">G</span> <span 
class="n">UMTS</span><span class="o">/</span><span class="n">HSDPA</span> <span 
class="n">Pocket</span> <span class="n">PC</span><span class="p">,</span> <span 
class="n">supports</span> <span class="n">GSM</span> <span 
class="n">network</span>&quot;
+    <span class="p">},</span>
+    <span class="p">{</span>
+      &quot;<span class="n">ID</span>&quot;<span class="p">:</span> 3<span 
class="p">,</span>
+      &quot;<span class="n">Name</span>&quot;<span class="p">:</span> 
&quot;<span class="n">Ergo</span> <span class="n">Screen</span>&quot;<span 
class="p">,</span>
+      &quot;<span class="n">Description</span>&quot;<span class="p">:</span> 
&quot;17 <span class="n">Optimum</span> <span class="n">Resolution</span> 1024 
<span class="n">x</span> 768 <span class="p">@</span> 85<span 
class="n">Hz</span><span class="p">,</span> <span class="n">resolution</span> 
1280 <span class="n">x</span> 960&quot;
+    <span class="p">}</span>
+  <span class="p">]</span>
+<span class="p">}</span>
+</pre></div>
+
+
 <p><strong>Table of Contents</strong></p>
 <ol>
 <li>Prerequisites</li>
@@ -171,65 +191,64 @@ If you’re using this wizard for the
 In the pom.xml file, we specify the dependencies and Maven will take care to 
download them to our local maven repository.
 Furthermore, the pom.xml file tells Maven which output we want to have as 
result of our build. In our case, this is a war file.</p>
 <p>In our example, the pom.xml file looks as follows:</p>
-<p>```xml
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>my.group.id</groupId>
-    <artifactId>DemoService</artifactId>
-    <packaging>war</packaging>
-    <version>0.0.1</version></p>
-<div class="codehilite"><pre><span class="nt">&lt;name&gt;</span>DemoService 
Maven Webapp<span class="nt">&lt;/name&gt;</span>
-
-<span class="nt">&lt;properties&gt;</span>
-    <span class="nt">&lt;javax</span><span class="err">.version</span><span 
class="nt">&gt;</span>2.5<span class="nt">&lt;/javax.version&gt;</span>
-    <span class="nt">&lt;odata</span><span class="err">.version</span><span 
class="nt">&gt;</span>4.0.0-beta-02<span 
class="nt">&lt;/odata.version&gt;</span>
-    <span class="nt">&lt;slf4j</span><span class="err">.version</span><span 
class="nt">&gt;</span>1.7.7<span class="nt">&lt;/slf4j.version&gt;</span>
-<span class="nt">&lt;/properties&gt;</span>
-
-<span class="nt">&lt;dependencies&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-        <span class="nt">&lt;groupId&gt;</span>javax.servlet<span 
class="nt">&lt;/groupId&gt;</span>
-        <span class="nt">&lt;artifactId&gt;</span>servlet-api<span 
class="nt">&lt;/artifactId&gt;</span>
-        <span class="nt">&lt;version&gt;</span><span class="cp">${</span><span 
class="n">javax</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
-        <span class="nt">&lt;scope&gt;</span>provided<span 
class="nt">&lt;/scope&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-
-    <span class="nt">&lt;dependency&gt;</span>
-        <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
-        <span class="nt">&lt;artifactId&gt;</span>odata-server-api<span 
class="nt">&lt;/artifactId&gt;</span>
-        <span class="nt">&lt;version&gt;</span><span class="cp">${</span><span 
class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-        <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
-        <span class="nt">&lt;artifactId&gt;</span>odata-server-core<span 
class="nt">&lt;/artifactId&gt;</span>
-        <span class="nt">&lt;version&gt;</span><span class="cp">${</span><span 
class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
-        <span class="nt">&lt;scope&gt;</span>runtime<span 
class="nt">&lt;/scope&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-
-    <span class="nt">&lt;dependency&gt;</span>
-        <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
-        <span class="nt">&lt;artifactId&gt;</span>odata-commons-api<span 
class="nt">&lt;/artifactId&gt;</span>
-        <span class="nt">&lt;version&gt;</span><span class="cp">${</span><span 
class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-    <span class="nt">&lt;dependency&gt;</span>
-        <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
-        <span class="nt">&lt;artifactId&gt;</span>odata-commons-core<span 
class="nt">&lt;/artifactId&gt;</span>
-        <span class="nt">&lt;version&gt;</span><span class="cp">${</span><span 
class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-
-    <span class="nt">&lt;dependency&gt;</span>
-        <span class="nt">&lt;groupId&gt;</span>org.slf4j<span 
class="nt">&lt;/groupId&gt;</span>
-        <span class="nt">&lt;artifactId&gt;</span>slf4j-simple<span 
class="nt">&lt;/artifactId&gt;</span>
-        <span class="nt">&lt;version&gt;</span><span class="cp">${</span><span 
class="n">slf4j</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
-        <span class="nt">&lt;scope&gt;</span>runtime<span 
class="nt">&lt;/scope&gt;</span>
-    <span class="nt">&lt;/dependency&gt;</span>
-<span class="nt">&lt;/dependencies&gt;</span>
+<div class="codehilite"><pre><span class="nt">&lt;project</span> <span 
class="na">xmlns=</span><span 
class="s">&quot;http://maven.apache.org/POM/4.0.0&quot;</span> <span 
class="na">xmlns:xsi=</span><span 
class="s">&quot;http://www.w3.org/2001/XMLSchema-instance&quot;</span>
+    <span class="na">xsi:schemaLocation=</span><span 
class="s">&quot;http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd&quot;</span><span 
class="nt">&gt;</span>
+    <span class="nt">&lt;modelVersion&gt;</span>4.0.0<span 
class="nt">&lt;/modelVersion&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>my.group.id<span 
class="nt">&lt;/groupId&gt;</span>
+    <span class="nt">&lt;artifactId&gt;</span>DemoService<span 
class="nt">&lt;/artifactId&gt;</span>
+    <span class="nt">&lt;packaging&gt;</span>war<span 
class="nt">&lt;/packaging&gt;</span>
+    <span class="nt">&lt;version&gt;</span>0.0.1<span 
class="nt">&lt;/version&gt;</span>
+
+    <span class="nt">&lt;name&gt;</span>DemoService Maven Webapp<span 
class="nt">&lt;/name&gt;</span>
+
+    <span class="nt">&lt;properties&gt;</span>
+        <span class="nt">&lt;javax</span><span 
class="err">.version</span><span class="nt">&gt;</span>2.5<span 
class="nt">&lt;/javax.version&gt;</span>
+        <span class="nt">&lt;odata</span><span 
class="err">.version</span><span class="nt">&gt;</span>4.0.0-beta-02<span 
class="nt">&lt;/odata.version&gt;</span>
+        <span class="nt">&lt;slf4j</span><span 
class="err">.version</span><span class="nt">&gt;</span>1.7.7<span 
class="nt">&lt;/slf4j.version&gt;</span>
+    <span class="nt">&lt;/properties&gt;</span>
+
+    <span class="nt">&lt;dependencies&gt;</span>
+        <span class="nt">&lt;dependency&gt;</span>
+            <span class="nt">&lt;groupId&gt;</span>javax.servlet<span 
class="nt">&lt;/groupId&gt;</span>
+            <span class="nt">&lt;artifactId&gt;</span>servlet-api<span 
class="nt">&lt;/artifactId&gt;</span>
+            <span class="nt">&lt;version&gt;</span><span 
class="cp">${</span><span class="n">javax</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
+            <span class="nt">&lt;scope&gt;</span>provided<span 
class="nt">&lt;/scope&gt;</span>
+        <span class="nt">&lt;/dependency&gt;</span>
+
+        <span class="nt">&lt;dependency&gt;</span>
+            <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
+            <span class="nt">&lt;artifactId&gt;</span>odata-server-api<span 
class="nt">&lt;/artifactId&gt;</span>
+            <span class="nt">&lt;version&gt;</span><span 
class="cp">${</span><span class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
+        <span class="nt">&lt;/dependency&gt;</span>
+        <span class="nt">&lt;dependency&gt;</span>
+            <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
+            <span class="nt">&lt;artifactId&gt;</span>odata-server-core<span 
class="nt">&lt;/artifactId&gt;</span>
+            <span class="nt">&lt;version&gt;</span><span 
class="cp">${</span><span class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
+            <span class="nt">&lt;scope&gt;</span>runtime<span 
class="nt">&lt;/scope&gt;</span>
+        <span class="nt">&lt;/dependency&gt;</span>
+
+        <span class="nt">&lt;dependency&gt;</span>
+            <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
+            <span class="nt">&lt;artifactId&gt;</span>odata-commons-api<span 
class="nt">&lt;/artifactId&gt;</span>
+            <span class="nt">&lt;version&gt;</span><span 
class="cp">${</span><span class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
+        <span class="nt">&lt;/dependency&gt;</span>
+        <span class="nt">&lt;dependency&gt;</span>
+            <span class="nt">&lt;groupId&gt;</span>org.apache.olingo<span 
class="nt">&lt;/groupId&gt;</span>
+            <span class="nt">&lt;artifactId&gt;</span>odata-commons-core<span 
class="nt">&lt;/artifactId&gt;</span>
+            <span class="nt">&lt;version&gt;</span><span 
class="cp">${</span><span class="n">odata</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
+        <span class="nt">&lt;/dependency&gt;</span>
+
+        <span class="nt">&lt;dependency&gt;</span>
+            <span class="nt">&lt;groupId&gt;</span>org.slf4j<span 
class="nt">&lt;/groupId&gt;</span>
+            <span class="nt">&lt;artifactId&gt;</span>slf4j-simple<span 
class="nt">&lt;/artifactId&gt;</span>
+            <span class="nt">&lt;version&gt;</span><span 
class="cp">${</span><span class="n">slf4j</span><span class="o">.</span><span 
class="n">version</span><span class="cp">}</span><span 
class="nt">&lt;/version&gt;</span>
+            <span class="nt">&lt;scope&gt;</span>runtime<span 
class="nt">&lt;/scope&gt;</span>
+        <span class="nt">&lt;/dependency&gt;</span>
+    <span class="nt">&lt;/dependencies&gt;</span>
+<span class="nt">&lt;/project&gt;</span>
 </pre></div>
 
 
-<p></project>
-```</p>
 <p><strong>Check Java build path</strong></p>
 <p>In order to check the Build path settings, open the context menu on the 
project and choose
 <em>Build Path -&gt; Configure Build Path…</em></p>
@@ -275,8 +294,10 @@ From context menu on project node, choos
 <p>According to the OData specification, an OData service has to declare its 
structure in the so-called <em>metadata document</em>.
 This document defines the contract, such that the user of the service knows 
which requests can be executed, the structure of the result and how the service 
can be navigated.</p>
 <p>The metadata document can be invoked via the following URI:</p>
-<p><code>html
- &lt;serviceroot&gt;/$metadata</code></p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span 
class="n">serviceroot</span><span class="o">&gt;/</span>$<span 
class="n">metadata</span>
+</pre></div>
+
+
 <p>Furthermore, OData specifies the usage of the so-called service document
 Here, the user can see which Entity Collections are offered by an OData 
service.</p>
 <p>The service document can be invoked via the following URI:</p>


Reply via email to