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 2016/04/21 05:59:22 UTC

olingo-odata4 git commit: [OLINGO-925] Fixed import in tutorials

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 4ff0e6974 -> 84cc52cd8


[OLINGO-925] Fixed import in tutorials


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/84cc52cd
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/84cc52cd
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/84cc52cd

Branch: refs/heads/master
Commit: 84cc52cd84151a021c47849daee524e54a10feb2
Parents: 4ff0e69
Author: Michael Bolz <mi...@sap.com>
Authored: Thu Apr 21 05:57:45 2016 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Thu Apr 21 05:57:45 2016 +0200

----------------------------------------------------------------------
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 .../src/main/java/myservice/mynamespace/web/DemoServlet.java       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/web/DemoServlet.java
index fc2aec8..c390a75 100644
--- a/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -38,7 +38,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 3040f0e..122d9cf 100644
--- a/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p10_media/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpSession;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 85939c7..d3b4a48 100644
--- a/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -37,7 +37,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p12_deep_insert/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p12_deep_insert/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p12_deep_insert/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 9f06d36..2cd8577 100644
--- a/samples/tutorials/p12_deep_insert/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p12_deep_insert/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpSession;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p12_deep_insert_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p12_deep_insert_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p12_deep_insert_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 9f06d36..2cd8577 100644
--- a/samples/tutorials/p12_deep_insert_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p12_deep_insert_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpSession;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p1_read/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p1_read/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p1_read/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 486770c..c9d3f7f 100755
--- a/samples/tutorials/p1_read/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p1_read/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -32,7 +32,7 @@ import myservice.mynamespace.service.DemoEntityCollectionProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p2_readep/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p2_readep/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p2_readep/src/main/java/myservice/mynamespace/web/DemoServlet.java
index fe5cdbb..1758cf4 100755
--- a/samples/tutorials/p2_readep/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p2_readep/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 2e7b65f..dd481d3 100755
--- a/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p3_write/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p4_navigation/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p4_navigation/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p4_navigation/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 5c828e5..43623f3 100755
--- a/samples/tutorials/p4_navigation/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p4_navigation/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/web/DemoServlet.java
index fe5cdbb..1758cf4 100755
--- a/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p5_queryoptions-tcs/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 5c828e5..43623f3 100755
--- a/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p6_queryoptions-es/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/web/DemoServlet.java
index fe5cdbb..1758cf4 100644
--- a/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p7_queryoptions-o/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/web/DemoServlet.java
index fe5cdbb..1758cf4 100644
--- a/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p9_action/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p9_action/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p9_action/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 190da4f..f9b0d3a 100644
--- a/samples/tutorials/p9_action/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p9_action/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -37,7 +37,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/p9_action_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p9_action_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/p9_action_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
index 3040f0e..122d9cf 100644
--- a/samples/tutorials/p9_action_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/p9_action_preparation/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpSession;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/84cc52cd/samples/tutorials/pe_streaming/src/main/java/myservice/mynamespace/web/DemoServlet.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/pe_streaming/src/main/java/myservice/mynamespace/web/DemoServlet.java b/samples/tutorials/pe_streaming/src/main/java/myservice/mynamespace/web/DemoServlet.java
index fe5cdbb..1758cf4 100755
--- a/samples/tutorials/pe_streaming/src/main/java/myservice/mynamespace/web/DemoServlet.java
+++ b/samples/tutorials/pe_streaming/src/main/java/myservice/mynamespace/web/DemoServlet.java
@@ -36,7 +36,7 @@ import myservice.mynamespace.service.DemoPrimitiveProcessor;
 import org.apache.olingo.server.api.OData;
 import org.apache.olingo.server.api.ODataHttpHandler;
 import org.apache.olingo.server.api.ServiceMetadata;
-import org.apache.olingo.server.api.edmx.EdmxReference;
+import org.apache.olingo.commons.api.edmx.EdmxReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;