svn commit: r892470 - in /websites/staging/olingo/trunk/content: ./ doc/tutorials/jparedefinemetadata.html

[bu...@apache.org]

Author: buildbot
Date: Thu Jan  2 06:54:59 2014
New Revision: 892470

Log:
Staging update by buildbot for olingo

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

Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jan  2 06:54:59 2014
@@ -1 +1 @@
-1554742
+1554750

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 Thu Jan  2 06:54:59 2014
@@ -99,13 +99,10 @@
     <span class="s-Atom">&lt;</span><span class="p">!</span><span class="s-Atom">--</span>
       <span class="nv">Licensed</span> <span class="s-Atom">to</span> <span class="s-Atom">the</span> <span class="nv">Apache</span> <span class="nv">Software</span> <span class="nv">Foundation</span> <span class="p">(</span><span class="nv">ASF</span><span class="p">)</span> <span class="s-Atom">under</span> <span class="s-Atom">one</span> <span class="s-Atom">or</span> <span class="s-Atom">more</span> <span class="s-Atom">contributor</span> <span class="s-Atom">license</span> <span class="s-Atom">agreements</span><span class="p">.</span> <span class="nv">See</span> <span class="s-Atom">the</span> <span class="nv">NOTICE</span> <span class="s-Atom">file</span> <span class="s-Atom">distributed</span> <span class="s-Atom">with</span> <span class="s-Atom">this</span> <span class="s-Atom">work</span> <span class="s-Atom">for</span>
               <span class="s-Atom">additional</span> <span class="s-Atom">information</span> <span class="s-Atom">regarding</span> <span class="s-Atom">copyright</span> <span class="s-Atom">ownership</span><span class="p">.</span> <span class="nv">The</span> <span class="nv">ASF</span> <span class="s-Atom">licenses</span> <span class="s-Atom">this</span> <span class="s-Atom">file</span> <span class="s-Atom">to</span> <span class="s-Atom">you</span> <span class="s-Atom">under</span> <span class="s-Atom">the</span> <span class="nv">Apache</span> <span class="nv">License</span><span class="p">,</span> <span class="nv">Version</span> <span class="m">2</span><span class="p">.</span><span class="m">0</span> <span class="p">(</span><span class="s-Atom">the</span> <span class="s2">&quot;License&quot;</span><span class="p">);</span>
-              <span class="s-Atom">you</span> <span class="s-Atom">may</span> <span class="o">not</span> <span class="s-Atom">use</span> <span class="s-Atom">this</span> <span class="s-Atom">file</span> <span class="s-Atom">except</span> <span class="s-Atom">in</span> <span class="s-Atom">compliance</span> <span class="s-Atom">with</span> <span class="s-Atom">the</span> <span class="nv">License</span><span class="p">.</span> <span class="nv">You</span> <span class="s-Atom">may</span> <span class="s-Atom">obtain</span> <span class="s-Atom">a</span> <span class="s-Atom">copy</span> <span class="s-Atom">of</span> <span class="s-Atom">the</span> <span class="nv">License</span> <span class="s-Atom">at</span>
+              <span class="s-Atom">you</span> <span class="s-Atom">may</span> <span class="o">not</span> <span class="s-Atom">use</span> <span class="s-Atom">this</span> <span class="s-Atom">file</span> <span class="s-Atom">except</span> <span class="s-Atom">in</span> <span class="s-Atom">compliance</span> <span class="s-Atom">with</span> <span class="s-Atom">the</span> <span class="nv">License</span><span class="p">.</span> <span class="nv">You</span> <span class="s-Atom">may</span> <span class="s-Atom">obtain</span> <span class="s-Atom">a</span> <span class="s-Atom">copy</span> <span class="s-Atom">of</span> <span class="s-Atom">the</span> <span class="nv">License</span> <span class="s-Atom">at</span> <span class="nn">http</span><span class="p">:</span><span class="o">//</span><span class="s-Atom">www</span><span class="p">.</span><span class="s-Atom">apache</span><span class="p">.</span><span class="s-Atom">org</span><span class="o">/</span><span class="s-Atom">licenses</span><sp
 an class="o">/</span><span class="nv">LICENSE</span><span class="o">-</span><span class="m">2</span><span class="p">.</span><span class="m">0</span>
 
-       <span class="nn">http</span><span class="p">:</span><span class="o">//</span><span class="s-Atom">www</span><span class="p">.</span><span class="s-Atom">apache</span><span class="p">.</span><span class="s-Atom">org</span><span class="o">/</span><span class="s-Atom">licenses</span><span class="o">/</span><span class="nv">LICENSE</span><span class="o">-</span><span class="m">2</span><span class="p">.</span><span class="m">0</span>
-
-      <span class="nv">Unless</span> <span class="s-Atom">required</span> <span class="s-Atom">by</span> <span class="s-Atom">applicable</span> <span class="s-Atom">law</span> <span class="s-Atom">or</span> <span class="s-Atom">agreed</span> <span class="s-Atom">to</span> <span class="s-Atom">in</span> <span class="s-Atom">writing</span><span class="p">,</span> <span class="s-Atom">software</span> <span class="s-Atom">distributed</span> <span class="s-Atom">under</span> <span class="s-Atom">the</span> <span class="nv">License</span> <span class="o">is</span> <span class="s-Atom">distributed</span> <span class="s-Atom">on</span> <span class="s-Atom">an</span> <span class="s2">&quot;AS IS&quot;</span> <span class="nv">BASIS</span><span class="p">,</span> <span class="nv">WITHOUT</span> <span class="nv">WARRANTIES</span> <span class="nv">OR</span> 
-      <span class="nv">CONDITIONS</span> <span class="nv">OF</span> <span class="nv">ANYKIND</span><span class="p">,</span> <span class="s-Atom">either</span> <span class="s-Atom">express</span> <span class="s-Atom">or</span> <span class="s-Atom">implied</span><span class="p">.</span>  
-      <span class="nv">See</span> <span class="s-Atom">the</span> <span class="nv">License</span> <span class="s-Atom">for</span> <span class="s-Atom">the</span> <span class="s-Atom">specific</span> <span class="s-Atom">language</span> <span class="s-Atom">governing</span> <span class="s-Atom">permissions</span> <span class="s-Atom">and</span> <span class="s-Atom">limitations</span> <span class="s-Atom">under</span> <span class="s-Atom">the</span> <span class="nv">License</span><span class="p">.</span>
+              <span class="nv">Unless</span> <span class="s-Atom">required</span> <span class="s-Atom">by</span> <span class="s-Atom">applicable</span> <span class="s-Atom">law</span> <span class="s-Atom">or</span> <span class="s-Atom">agreed</span> <span class="s-Atom">to</span> <span class="s-Atom">in</span> <span class="s-Atom">writing</span><span class="p">,</span> <span class="s-Atom">software</span> <span class="s-Atom">distributed</span> <span class="s-Atom">under</span> <span class="s-Atom">the</span> <span class="nv">License</span> <span class="o">is</span> <span class="s-Atom">distributed</span> <span class="s-Atom">on</span> <span class="s-Atom">an</span> <span class="s2">&quot;AS IS&quot;</span> <span class="nv">BASIS</span><span class="p">,</span> <span class="nv">WITHOUT</span> <span class="nv">WARRANTIES</span> <span class="nv">OR</span> 
+              <span class="nv">CONDITIONS</span> <span class="nv">OF</span> <span class="nv">ANYKIND</span><span class="p">,</span> <span class="s-Atom">either</span> <span class="s-Atom">express</span> <span class="s-Atom">or</span> <span class="s-Atom">implied</span><span class="p">.</span> <span class="nv">See</span> <span class="s-Atom">the</span> <span class="nv">License</span> <span class="s-Atom">for</span> <span class="s-Atom">the</span> <span class="s-Atom">specific</span> <span class="s-Atom">language</span> <span class="s-Atom">governing</span> <span class="s-Atom">permissions</span> <span class="s-Atom">and</span> <span class="s-Atom">limitations</span> <span class="s-Atom">under</span> <span class="s-Atom">the</span> <span class="nv">License</span><span class="p">.</span>
     <span class="p">--&gt;</span>
     <span class="o">&lt;</span><span class="nn">xs</span><span class="p">:</span><span class="s-Atom">schema</span> <span class="s-Atom">attributeFormDefault=</span><span class="s2">&quot;unqualified&quot;</span>
         <span class="s-Atom">elementFormDefault=</span><span class="s2">&quot;qualified&quot;</span> <span class="nn">xmlns</span><span class="p">:</span><span class="s-Atom">xs=</span><span class="s2">&quot;http://www.w3.org/2001/XMLSchema&quot;</span>
@@ -115,11 +112,13 @@
         <span class="o">&lt;</span><span class="nn">xs</span><span class="p">:</span><span class="s-Atom">element</span> <span class="s-Atom">name=</span><span class="s2">&quot;JPAEDMMappingModel&quot;</span><span class="o">&gt;</span>
             <span class="o">&lt;</span><span class="nn">xs</span><span class="p">:</span><span class="s-Atom">annotation</span><span class="o">&gt;</span>
                 <span class="o">&lt;</span><span class="nn">xs</span><span class="p">:</span><span class="s-Atom">documentation</span> <span class="nn">xml</span><span class="p">:</span><span class="s-Atom">lang=</span><span class="s2">&quot;en&quot;</span><span class="o">&gt;</span>
-                      <span class="nv">Java</span> <span class="nv">Persistence</span> <span class="p">(</span><span class="nv">JPA</span><span class="p">)</span> <span class="o">-</span>
-                      <span class="nv">Entity</span> <span class="nv">Data</span> <span class="nv">Model</span> <span class="p">(</span><span class="nv">EDM</span><span class="p">)</span> <span class="nv">Mapping</span> <span class="s-Atom">schema</span><span class="p">.</span> <span class="nv">The</span> <span class="s-Atom">schema</span> <span class="s-Atom">defines</span> <span class="s-Atom">a</span> <span class="s-Atom">mapping</span> <span class="s-Atom">model</span> <span class="s-Atom">to</span> <span class="s-Atom">describe</span> <span class="nv">EDM</span> <span class="s-Atom">names</span> <span class="s-Atom">for</span> <span class="s-Atom">entity</span> <span class="s-Atom">types</span><span class="p">,</span> <span class="s-Atom">entity</span> <span class="s-Atom">sets</span><span class="p">,</span> <span class="s-Atom">entity</span> <span class="s-Atom">properties</span><span class="p">,</span> <span class="s-Atom">entity</span> <span class="s-Atom">navigation</span> 
 <span class="s-Atom">properties</span><span class="p">.</span>
-                      <span class="nv">By</span> <span class="s-Atom">default</span> <span class="s-Atom">the</span> <span class="s-Atom">names</span> <span class="s-Atom">of</span> <span class="nv">Java</span> <span class="nv">Persistence</span> <span class="s-Atom">entity</span> <span class="s-Atom">types</span><span class="p">,</span> <span class="s-Atom">entity</span> <span class="s-Atom">attributes</span> <span class="s-Atom">and</span> <span class="s-Atom">entity</span> <span class="s-Atom">relationships</span> <span class="s-Atom">are</span> <span class="s-Atom">transformed</span> <span class="s-Atom">into</span> <span class="s-Atom">their</span> <span class="s-Atom">corresponding</span> <span class="nv">EDM</span> <span class="s-Atom">names</span><span class="p">.</span> 
-                      <span class="nv">To</span> <span class="s-Atom">override</span> <span class="s-Atom">the</span> <span class="s-Atom">default</span> <span class="s-Atom">names</span> <span class="s-Atom">the</span> <span class="s-Atom">mapping</span> <span class="s-Atom">model</span> <span class="o">is</span> <span class="s-Atom">defined</span><span class="p">.</span>
-                      <span class="nv">Note</span><span class="p">:-</span> <span class="nv">Define</span> <span class="s-Atom">the</span> <span class="s-Atom">mapping</span> <span class="s-Atom">model</span> <span class="s-Atom">for</span> <span class="s-Atom">only</span> <span class="s-Atom">those</span> <span class="s-Atom">default</span> <span class="s-Atom">names</span> <span class="s-Atom">that</span> <span class="s-Atom">needs</span> <span class="s-Atom">to</span> <span class="s-Atom">be</span> <span class="s-Atom">overridden</span><span class="p">.</span>
+                    <span class="nv">Java</span> <span class="nv">Persistence</span> <span class="p">(</span><span class="nv">JPA</span><span class="p">)</span> <span class="o">-</span>
+                    <span class="nv">Entity</span> <span class="nv">Data</span> <span class="nv">Model</span> <span class="p">(</span><span class="nv">EDM</span><span class="p">)</span> <span class="nv">Mapping</span> <span class="s-Atom">schema</span><span class="p">.</span> <span class="nv">The</span> <span class="s-Atom">schema</span> <span class="s-Atom">defines</span> <span class="s-Atom">a</span> <span class="s-Atom">mapping</span> <span class="s-Atom">model</span> <span class="s-Atom">to</span> <span class="s-Atom">describe</span> <span class="nv">EDM</span> <span class="s-Atom">names</span> <span class="s-Atom">for</span> <span class="s-Atom">entity</span> <span class="s-Atom">types</span><span class="p">,</span> <span class="s-Atom">entity</span> <span class="s-Atom">sets</span><span class="p">,</span>
+                                        <span class="s-Atom">entity</span> <span class="s-Atom">properties</span><span class="p">,</span> <span class="s-Atom">entity</span> <span class="s-Atom">navigation</span> <span class="s-Atom">properties</span><span class="p">.</span> <span class="nv">By</span> <span class="s-Atom">default</span> <span class="s-Atom">the</span> <span class="s-Atom">names</span> <span class="s-Atom">of</span> <span class="nv">Java</span> <span class="nv">Persistence</span> <span class="s-Atom">entity</span> <span class="s-Atom">types</span><span class="p">,</span> <span class="s-Atom">entity</span> <span class="s-Atom">attributes</span> 
+                                        <span class="s-Atom">and</span> <span class="s-Atom">entity</span> <span class="s-Atom">relationships</span> <span class="s-Atom">are</span> <span class="s-Atom">transformed</span> <span class="s-Atom">into</span> <span class="s-Atom">their</span> <span class="s-Atom">corresponding</span> <span class="nv">EDM</span> <span class="s-Atom">names</span><span class="p">.</span> <span class="nv">To</span> <span class="s-Atom">override</span> <span class="s-Atom">the</span> <span class="s-Atom">default</span> <span class="s-Atom">names</span> <span class="s-Atom">the</span> <span class="s-Atom">mapping</span> <span class="s-Atom">model</span>
+                                        <span class="o">is</span> <span class="s-Atom">defined</span><span class="p">.</span>
+
+              <span class="o">*</span><span class="nv">Note</span><span class="s-Atom">*:-</span> <span class="nv">Define</span> <span class="s-Atom">the</span> <span class="s-Atom">mapping</span> <span class="s-Atom">model</span> <span class="s-Atom">for</span> <span class="s-Atom">only</span> <span class="s-Atom">those</span> <span class="s-Atom">default</span> <span class="s-Atom">names</span> <span class="s-Atom">that</span> <span class="s-Atom">needs</span> <span class="s-Atom">to</span> <span class="s-Atom">be</span> <span class="s-Atom">overridden</span><span class="p">.</span>
 
                 <span class="s-Atom">&lt;/</span><span class="nn">xs</span><span class="p">:</span><span class="s-Atom">documentation</span><span class="o">&gt;</span>
             <span class="s-Atom">&lt;/</span><span class="nn">xs</span><span class="p">:</span><span class="s-Atom">annotation</span><span class="o">&gt;</span>