You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/07/28 10:15:05 UTC

svn commit: r1693024 - /olingo/site/trunk/content/doc/odata2/tutorials/servlet.mdtext

Author: mibo
Date: Tue Jul 28 08:15:05 2015
New Revision: 1693024

URL: http://svn.apache.org/r1693024
Log:
updated ODataServlet

Modified:
    olingo/site/trunk/content/doc/odata2/tutorials/servlet.mdtext

Modified: olingo/site/trunk/content/doc/odata2/tutorials/servlet.mdtext
URL: http://svn.apache.org/viewvc/olingo/site/trunk/content/doc/odata2/tutorials/servlet.mdtext?rev=1693024&r1=1693023&r2=1693024&view=diff
==============================================================================
--- olingo/site/trunk/content/doc/odata2/tutorials/servlet.mdtext (original)
+++ olingo/site/trunk/content/doc/odata2/tutorials/servlet.mdtext Tue Jul 28 08:15:05 2015
@@ -40,8 +40,8 @@ dependencies. A simple way is to exclude
 
     <dependency>
       <groupId>org.apache.olingo:olingo</groupId>
-      <artifactId>odata2-core-incubating</artifactId>
-      <version>1.2.0</version>
+      <artifactId>odata2-core</artifactId>
+      <version>2.0.4</version>
       <exclusions>
         <exclusion>  
           <groupId>javax.ws.rs</groupId>
@@ -55,11 +55,10 @@ for runtime.
 
 ### Adopt web.xml
 
-For using the servlet based approach only a new Servlet must be 
-configured in web.xml file:
+For using the servlet based approach a Servlet must be configured in web.xml file (and probably an old servlet replaced):
 
     <servlet>
-        <servlet-name>NonJaxRSReferenceScenarioServlet</servlet-name>
+        <servlet-name>ReferenceScenarioServlet</servlet-name>
         <servlet-class>org.apache.olingo.odata2.core.servlet.ODataServlet</servlet-class>
         <init-param>
             <param-name>org.apache.olingo.odata2.service.factory</param-name>
@@ -68,7 +67,12 @@ configured in web.xml file:
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-Ensure that all runtime dependencies to Apache CXF are removed from 
-the sample project.
+    <servlet-mapping>
+        <servlet-name>ReferenceScenarioServlet</servlet-name>
+        <url-pattern>/ReferenceScenario.svc/*</url-pattern>
+    </servlet-mapping>
+
+
+Ensure that all runtime dependencies to Apache CXF are removed from the sample project.
 
 After this modification the service should work like before.