svn commit: r959863 - in /websites/staging/olingo/trunk/content: ./ doc/odata2/tutorials/servlet.html

[bu...@apache.org]

Author: buildbot
Date: Tue Jul 28 08:15:17 2015
New Revision: 959863

Log:
Staging update by buildbot for olingo

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

Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jul 28 08:15:17 2015
@@ -1 +1 @@
-1692348
+1693024

Modified: websites/staging/olingo/trunk/content/doc/odata2/tutorials/servlet.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata2/tutorials/servlet.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata2/tutorials/servlet.html Tue Jul 28 08:15:17 2015
@@ -114,8 +114,8 @@ modifications.</p>
 dependencies. A simple way is to exclude them with Maven:</p>
 <div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.olingo:olingo<span class="nt">&lt;/groupId&gt;</span>
-  <span class="nt">&lt;artifactId&gt;</span>odata2-core-incubating<span class="nt">&lt;/artifactId&gt;</span>
-  <span class="nt">&lt;version&gt;</span>1.2.0<span class="nt">&lt;/version&gt;</span>
+  <span class="nt">&lt;artifactId&gt;</span>odata2-core<span class="nt">&lt;/artifactId&gt;</span>
+  <span class="nt">&lt;version&gt;</span>2.0.4<span class="nt">&lt;/version&gt;</span>
   <span class="nt">&lt;exclusions&gt;</span>
     <span class="nt">&lt;exclusion&gt;</span>  
       <span class="nt">&lt;groupId&gt;</span>javax.ws.rs<span class="nt">&lt;/groupId&gt;</span>
@@ -129,10 +129,9 @@ dependencies. A simple way is to exclude
 <p>A JAX-RS implementation dependency like Apache CXF is not required 
 for runtime.</p>
 <h3 id="adopt-webxml">Adopt web.xml<a class="headerlink" href="#adopt-webxml" title="Permanent link">&para;</a></h3>
-<p>For using the servlet based approach only a new Servlet must be 
-configured in web.xml file:</p>
+<p>For using the servlet based approach a Servlet must be configured in web.xml file (and probably an old servlet replaced):</p>
 <div class="codehilite"><pre><span class="nt">&lt;servlet&gt;</span>
-    <span class="nt">&lt;servlet-name&gt;</span>NonJaxRSReferenceScenarioServlet<span class="nt">&lt;/servlet-name&gt;</span>
+    <span class="nt">&lt;servlet-name&gt;</span>ReferenceScenarioServlet<span class="nt">&lt;/servlet-name&gt;</span>
     <span class="nt">&lt;servlet-class&gt;</span>org.apache.olingo.odata2.core.servlet.ODataServlet<span class="nt">&lt;/servlet-class&gt;</span>
     <span class="nt">&lt;init-param&gt;</span>
         <span class="nt">&lt;param-name&gt;</span>org.apache.olingo.odata2.service.factory<span class="nt">&lt;/param-name&gt;</span>
@@ -140,11 +139,15 @@ configured in web.xml file:</p>
     <span class="nt">&lt;/init-param&gt;</span>
     <span class="nt">&lt;load-on-startup&gt;</span>1<span class="nt">&lt;/load-on-startup&gt;</span>
 <span class="nt">&lt;/servlet&gt;</span>
+
+<span class="nt">&lt;servlet-mapping&gt;</span>
+    <span class="nt">&lt;servlet-name&gt;</span>ReferenceScenarioServlet<span class="nt">&lt;/servlet-name&gt;</span>
+    <span class="nt">&lt;url-pattern&gt;</span>/ReferenceScenario.svc/*<span class="nt">&lt;/url-pattern&gt;</span>
+<span class="nt">&lt;/servlet-mapping&gt;</span>
 </pre></div>
 
 
-<p>Ensure that all runtime dependencies to Apache CXF are removed from 
-the sample project.</p>
+<p>Ensure that all runtime dependencies to Apache CXF are removed from the sample project.</p>
 <p>After this modification the service should work like before.</p><div align="center">
 <p>Copyright © 2013-2015, The Apache Software Foundation<br>
 				                Apache Olingo, Olingo, Apache, the Apache feather, and