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 2015/04/28 14:30:22 UTC
svn commit: r949485 - in /websites/staging/olingo/trunk/content: ./ doc/odata4/tutorials/read/tutorial_read.html

Author: buildbot
Date: Tue Apr 28 12:30:22 2015
New Revision: 949485

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 12:30:22 2015
@@ -1 +1 @@
-1676498
+1676514

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 12:30:22 2015
@@ -106,22 +106,22 @@ Furthermore, for building with maven, we
 <p>http://localhost:8080/DemoService/DemoService.svc/Products</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="nt">&quot;@odata.context&quot;</span><span class="p">:</span> <span class="s2">&quot;$metadata#Products&quot;</span><span class="p">,</span>
+  <span class="nt">&quot;value&quot;</span><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="nt">&quot;ID&quot;</span><span class="p">:</span> <span class="mi">1</span><span class="p">,</span>
+      <span class="nt">&quot;Name&quot;</span><span class="p">:</span> <span class="s2">&quot;Notebook Basic 15&quot;</span><span class="p">,</span>
+      <span class="nt">&quot;Description&quot;</span><span class="p">:</span> <span class="s2">&quot;Notebook Basic, 1.7GHz - 15 XGA - 1024MB DDR2 SDRAM - 40GB&quot;</span>
     <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="nt">&quot;ID&quot;</span><span class="p">:</span> <span class="mi">2</span><span class="p">,</span>
+      <span class="nt">&quot;Name&quot;</span><span class="p">:</span> <span class="s2">&quot;1UMTS PDA&quot;</span><span class="p">,</span>
+      <span class="nt">&quot;Description&quot;</span><span class="p">:</span> <span class="s2">&quot;Ultrafast 3G UMTS/HSDPA Pocket PC, supports GSM network&quot;</span>
     <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="nt">&quot;ID&quot;</span><span class="p">:</span> <span class="mi">3</span><span class="p">,</span>
+      <span class="nt">&quot;Name&quot;</span><span class="p">:</span> <span class="s2">&quot;Ergo Screen&quot;</span><span class="p">,</span>
+      <span class="nt">&quot;Description&quot;</span><span class="p">:</span> <span class="s2">&quot;17 Optimum Resolution 1024 x 768 @ 85Hz, resolution 1280 x 960&quot;</span>
     <span class="p">}</span>
   <span class="p">]</span>
 <span class="p">}</span>
@@ -202,46 +202,46 @@ Furthermore, the pom.xml file tells Mave
     <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;javax.version&gt;</span>2.5<span class="nt">&lt;/javax.version&gt;</span>
+        <span class="nt">&lt;odata.version&gt;</span>4.0.0-beta-02<span class="nt">&lt;/odata.version&gt;</span>
+        <span class="nt">&lt;slf4j.version&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;version&gt;</span>${javax.version}<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;version&gt;</span>${odata.version}<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;version&gt;</span>${odata.version}<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;version&gt;</span>${odata.version}<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;version&gt;</span>${odata.version}<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;version&gt;</span>${slf4j.version}<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>