Merge from master

fit/pom.xml

@@ -23,25 +23,26 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>olingo-odata4-fit-incubating</artifactId>
+  <artifactId>olingo-fit-incubating</artifactId>
   <packaging>jar</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
     <groupId>org.apache.olingo</groupId>
-    <artifactId>olingo-odata4-lib-incubating</artifactId>
+    <artifactId>olingo-parent-incubating</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
+	
   <dependencies>
     <dependency>
       <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-odata4-server-core-incubating</artifactId>
+      <artifactId>olingo-server-core-incubating</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-odata4-client-core-incubating</artifactId>
+      <artifactId>olingo-client-core-incubating</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>

lib/client-api/pom.xml

@@ -23,13 +23,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>olingo-odata4-client-api-incubating</artifactId>
+  <artifactId>olingo-client-api-incubating</artifactId>
   <packaging>jar</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
     <groupId>org.apache.olingo</groupId>
-    <artifactId>olingo-odata4-lib-incubating</artifactId>
+    <artifactId>olingo-lib-incubating</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
@@ -37,7 +37,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.olingo</groupId>
-      <artifactId>olingo-odata4-commons-api-incubating</artifactId>
+      <artifactId>olingo-commons-api-incubating</artifactId>
       <version>${project.version}</version>
     </dependency>
 

lib/client-api/src/main/java/org/apache/olingo/client/api/Configuration.java

@@ -16,16 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
+
+import org.apache.olingo.client.api.format.ODataFormat;
+import org.apache.olingo.client.api.format.ODataMediaFormat;
+import org.apache.olingo.client.api.format.ODataPubFormat;
+import org.apache.olingo.client.api.format.ODataValueFormat;
+import org.apache.olingo.client.api.http.HttpClientFactory;
+import org.apache.olingo.client.api.http.HttpUriRequestFactory;
 
-import org.apache.olingo.odata4.client.api.http.HttpUriRequestFactory;
-import org.apache.olingo.odata4.client.api.http.HttpClientFactory;
 import java.io.Serializable;
 import java.util.concurrent.ExecutorService;
-import org.apache.olingo.odata4.client.api.format.ODataFormat;
-import org.apache.olingo.odata4.client.api.format.ODataMediaFormat;
-import org.apache.olingo.odata4.client.api.format.ODataPubFormat;
-import org.apache.olingo.odata4.client.api.format.ODataValueFormat;
 
 /**
  * Configuration wrapper.

lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
 import javax.xml.XMLConstants;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java

@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
-import org.apache.olingo.odata4.client.api.op.ODataBinder;
-import org.apache.olingo.odata4.client.api.op.ODataDeserializer;
-import org.apache.olingo.odata4.client.api.op.ODataReader;
-import org.apache.olingo.odata4.client.api.op.ODataSerializer;
-import org.apache.olingo.odata4.client.api.uri.URIBuilder;
-import org.apache.olingo.odata4.client.api.uri.filter.FilterFactory;
-import org.apache.olingo.odata4.commons.api.edm.constants.ODataServiceVersion;
+import org.apache.olingo.client.api.op.ODataBinder;
+import org.apache.olingo.client.api.op.ODataDeserializer;
+import org.apache.olingo.client.api.op.ODataReader;
+import org.apache.olingo.client.api.op.ODataSerializer;
+import org.apache.olingo.client.api.uri.URIBuilder;
+import org.apache.olingo.client.api.uri.filter.FilterFactory;
+import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 
 public interface ODataClient {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/ODataConstants.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
 import javax.xml.XMLConstants;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/ODataError.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
 /**
  * OData error.

lib/client-api/src/main/java/org/apache/olingo/client/api/ODataV3Client.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
-import org.apache.olingo.odata4.client.api.op.ODataV3Deserializer;
-import org.apache.olingo.odata4.client.api.uri.V3URIBuilder;
-import org.apache.olingo.odata4.client.api.uri.filter.V3FilterFactory;
+import org.apache.olingo.client.api.op.ODataV3Deserializer;
+import org.apache.olingo.client.api.uri.V3URIBuilder;
+import org.apache.olingo.client.api.uri.filter.V3FilterFactory;
 
 public interface ODataV3Client extends ODataClient {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/ODataV4Client.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
-import org.apache.olingo.odata4.client.api.op.ODataV4Deserializer;
-import org.apache.olingo.odata4.client.api.uri.V4URIBuilder;
-import org.apache.olingo.odata4.client.api.uri.filter.V4FilterFactory;
+import org.apache.olingo.client.api.op.ODataV4Deserializer;
+import org.apache.olingo.client.api.uri.V4URIBuilder;
+import org.apache.olingo.client.api.uri.filter.V4FilterFactory;
 
 public interface ODataV4Client extends ODataClient {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/UnsupportedInV3Exception.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
-import org.apache.olingo.odata4.commons.api.edm.EdmException;
+import org.apache.olingo.commons.api.edm.EdmException;
 
 public class UnsupportedInV3Exception extends EdmException {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/V3Configuration.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
 public interface V3Configuration extends Configuration {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/V4Configuration.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.olingo.odata4.client.api;
+package org.apache.olingo.client.api;
 
 public interface V4Configuration extends Configuration {
   

lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.data;
+package org.apache.olingo.client.api.data;
 
 import java.net.URI;
 import java.util.List;
@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * REST resource for an <tt>ODataServiceDocument</tt>.
  *
- * @see org.apache.olingo.odata4.client.api.domain.ODataServiceDocument
+ * @see org.apache.olingo.client.api.domain.ODataServiceDocument
  */
 public interface ServiceDocument {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocumentItem.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.olingo.odata4.client.api.data;
+package org.apache.olingo.client.api.data;
 
 public interface ServiceDocumentItem {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/AnnotationProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 public interface AnnotationProperty extends Property {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/ClientException.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 public class ClientException extends Exception {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/ComplexValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 import java.util.List;
 import java.util.Map;

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/Entity.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 import java.util.List;
 import java.util.Map;

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/EntitySet.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/NavigationProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 public interface NavigationProperty extends Property {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/Property.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 public interface Property {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/Reader.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 import java.io.InputStream;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/StructuralProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/deserializer/Value.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.deserializer;
+package org.apache.olingo.client.api.deserializer;
 
 public interface Value {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/EdmSimpleType.java

@@ -16,20 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.math.BigDecimal;
 import java.net.URI;
 import java.util.UUID;
-import org.apache.olingo.odata4.client.api.domain.geospatial.Geospatial;
-import org.apache.olingo.odata4.client.api.domain.geospatial.GeospatialCollection;
-import org.apache.olingo.odata4.client.api.domain.geospatial.LineString;
-import org.apache.olingo.odata4.client.api.domain.geospatial.MultiLineString;
-import org.apache.olingo.odata4.client.api.domain.geospatial.MultiPoint;
-import org.apache.olingo.odata4.client.api.domain.geospatial.MultiPolygon;
-import org.apache.olingo.odata4.client.api.domain.geospatial.Point;
-import org.apache.olingo.odata4.client.api.domain.geospatial.Polygon;
-import org.apache.olingo.odata4.commons.api.edm.constants.ODataServiceVersion;
+
+import org.apache.olingo.client.api.domain.geospatial.Geospatial;
+import org.apache.olingo.client.api.domain.geospatial.GeospatialCollection;
+import org.apache.olingo.client.api.domain.geospatial.LineString;
+import org.apache.olingo.client.api.domain.geospatial.MultiLineString;
+import org.apache.olingo.client.api.domain.geospatial.MultiPoint;
+import org.apache.olingo.client.api.domain.geospatial.MultiPolygon;
+import org.apache.olingo.client.api.domain.geospatial.Point;
+import org.apache.olingo.client.api.domain.geospatial.Polygon;
+import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 
 /**
  * Represent the primitive types of the Entity Data Model (EDM).

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataCollectionValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.util.ArrayList;
 import java.util.Iterator;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataComplexValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataDuration.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.io.Serializable;
 import javax.xml.datatype.DatatypeConfigurationException;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataGeospatialValue.java

@@ -16,26 +16,28 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
-import org.apache.olingo.odata4.client.api.Constants;
-import org.apache.olingo.odata4.client.api.ODataClient;
-import org.apache.olingo.odata4.client.api.domain.geospatial.Geospatial;
-import org.apache.olingo.odata4.client.api.domain.geospatial.GeospatialCollection;
-import org.apache.olingo.odata4.client.api.domain.geospatial.LineString;
-import org.apache.olingo.odata4.client.api.domain.geospatial.MultiLineString;
-import org.apache.olingo.odata4.client.api.domain.geospatial.MultiPoint;
-import org.apache.olingo.odata4.client.api.domain.geospatial.MultiPolygon;
-import org.apache.olingo.odata4.client.api.domain.geospatial.Point;
-import org.apache.olingo.odata4.client.api.domain.geospatial.Polygon;
-import org.apache.olingo.odata4.client.api.utils.XMLUtils;
+
+import org.apache.olingo.client.api.Constants;
+import org.apache.olingo.client.api.ODataClient;
+import org.apache.olingo.client.api.domain.geospatial.Geospatial;
+import org.apache.olingo.client.api.domain.geospatial.GeospatialCollection;
+import org.apache.olingo.client.api.domain.geospatial.LineString;
+import org.apache.olingo.client.api.domain.geospatial.MultiLineString;
+import org.apache.olingo.client.api.domain.geospatial.MultiPoint;
+import org.apache.olingo.client.api.domain.geospatial.MultiPolygon;
+import org.apache.olingo.client.api.domain.geospatial.Point;
+import org.apache.olingo.client.api.domain.geospatial.Polygon;
+import org.apache.olingo.client.api.utils.XMLUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInvokeResult.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 /**
  * Marker interface for any OData domain object that can be returned by an operation invocation.

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPrimitiveValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.math.BigDecimal;
 import java.net.URI;
@@ -24,15 +24,17 @@ import java.sql.Timestamp;
 import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.UUID;
+
 import javax.xml.datatype.Duration;
+
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.olingo.odata4.client.api.ODataClient;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
-import org.apache.olingo.odata4.client.api.domain.ODataDuration;
-import org.apache.olingo.odata4.client.api.domain.ODataTimestamp;
-import org.apache.olingo.odata4.client.api.domain.ODataValue;
+import org.apache.olingo.client.api.ODataClient;
+import org.apache.olingo.client.api.domain.EdmSimpleType;
+import org.apache.olingo.client.api.domain.ODataDuration;
+import org.apache.olingo.client.api.domain.ODataTimestamp;
+import org.apache.olingo.client.api.domain.ODataValue;
 
 /**
  * OData primitive property value.

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.io.Serializable;
 import org.apache.commons.lang3.builder.EqualsBuilder;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataServiceDocument.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.net.URI;
 import java.util.Collection;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataTimestamp.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.io.Serializable;
 import java.sql.Timestamp;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain;
+package org.apache.olingo.client.api.domain;
 
 import java.io.Serializable;
 import org.apache.commons.lang3.builder.EqualsBuilder;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/ComposedGeospatial.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.util.ArrayList;
 import java.util.Iterator;

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/Geospatial.java

@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.io.Serializable;
+
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 /**
  * Base class for all geospatial info.

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/GeospatialCollection.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 /**
  * Wrapper for a collection of geospatials info.

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/LineString.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 public class LineString extends ComposedGeospatial<Point> {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/MultiLineString.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 public class MultiLineString extends ComposedGeospatial<LineString> {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/MultiPoint.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 public class MultiPoint extends ComposedGeospatial<Point> {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/MultiPolygon.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 public class MultiPolygon extends ComposedGeospatial<Polygon> {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/Point.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 public class Point extends Geospatial {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/geospatial/Polygon.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.domain.geospatial;
+package org.apache.olingo.client.api.domain.geospatial;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.domain.EdmSimpleType;
+
+import org.apache.olingo.client.api.domain.EdmSimpleType;
 
 /**
  * Polygon.

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonAnnotations.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public abstract interface CommonAnnotations {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonFunctionImport.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface CommonFunctionImport extends Named {
 }

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonNavigationProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface CommonNavigationProperty extends Named {
 }

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonParameter.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface CommonParameter extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CommonProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface CommonProperty extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface Edmx {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityKey.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface EntitySet extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface EntityType extends ComplexType {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EnumType.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Member.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface Member {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Named.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDelete.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface OnDelete {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public enum OnDeleteAction {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/PropertyRef.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 public interface PropertyRef extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml;
+package org.apache.olingo.client.api.edm.xml;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.CommonAnnotations;
+
+import org.apache.olingo.client.api.edm.xml.CommonAnnotations;
 
 public interface Annotations extends CommonAnnotations {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.Named;
+
+import org.apache.olingo.client.api.edm.xml.Named;
 
 public interface Association extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationEnd.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
-import org.apache.olingo.odata4.client.api.edm.xml.OnDelete;
+import org.apache.olingo.client.api.edm.xml.OnDelete;
 
 public interface AssociationEnd {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.Named;
+
+import org.apache.olingo.client.api.edm.xml.Named;
 
 public interface AssociationSet extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSetEnd.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 public interface AssociationSetEnd {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/FunctionImport.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.util.List;
 
-public interface FunctionImport extends org.apache.olingo.odata4.client.api.edm.xml.CommonFunctionImport {
+public interface FunctionImport extends org.apache.olingo.client.api.edm.xml.CommonFunctionImport {
 
   String getReturnType();
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/NavigationProperty.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
-public interface NavigationProperty extends org.apache.olingo.odata4.client.api.edm.xml.CommonNavigationProperty {
+public interface NavigationProperty extends org.apache.olingo.client.api.edm.xml.CommonNavigationProperty {
 
   String getRelationship();
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Parameter.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
-public interface Parameter extends org.apache.olingo.odata4.client.api.edm.xml.CommonParameter {
+public interface Parameter extends org.apache.olingo.client.api.edm.xml.CommonParameter {
 
   ParameterMode getMode();
 }

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ParameterMode.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 public enum ParameterMode {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
-import org.apache.olingo.odata4.client.api.edm.xml.CommonProperty;
+import org.apache.olingo.client.api.edm.xml.CommonProperty;
+import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
 import org.apache.olingo.odata4.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.odata4.commons.api.edm.constants.EdmContentKind;
 import org.apache.olingo.odata4.client.api.edm.StoreGeneratedPattern;
 
 public interface Property extends CommonProperty {

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/PropertyValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraint.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 public interface ReferentialConstraint {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.PropertyRef;
+
+import org.apache.olingo.client.api.edm.xml.PropertyRef;
 
 public interface ReferentialConstraintRole {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/TypeAnnotation.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.util.List;
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Using.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 public interface Using {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ValueAnnotation.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ValueTerm.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v3;
+package org.apache.olingo.client.api.edm.xml.v3;
 
-import org.apache.olingo.odata4.client.api.edm.xml.Named;
+import org.apache.olingo.client.api.edm.xml.Named;
 
 public interface ValueTerm extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.Named;
+
+import org.apache.olingo.client.api.edm.xml.Named;
 
 public interface Action extends Named {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ActionImport.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 public interface ActionImport extends OperationImport {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/AnnotatedEdmItem.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 public interface AnnotatedEdmItem {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotation.java

@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
-import org.apache.olingo.odata4.client.api.edm.xml.v4.annotation.ConstExprConstruct;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.annotation.DynExprConstruct;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.ConstExprConstruct;
+import org.apache.olingo.client.api.edm.xml.v4.annotation.DynExprConstruct;
 
 public interface Annotation {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.CommonAnnotations;
+
+import org.apache.olingo.client.api.edm.xml.CommonAnnotations;
 
 public interface Annotations extends CommonAnnotations {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.Named;
+
+import org.apache.olingo.client.api.edm.xml.Named;
 
 public interface BindingTarget extends Named, AnnotatedEdmItem {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/CSDLElement.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 public enum CSDLElement {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 import java.util.List;
 
-public interface ComplexType extends org.apache.olingo.odata4.client.api.edm.xml.ComplexType, AnnotatedEdmItem {
+public interface ComplexType extends org.apache.olingo.client.api.edm.xml.ComplexType, AnnotatedEdmItem {
 
   boolean isAbstractEntityType();
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Edmx.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 import java.util.List;
 
-public interface Edmx extends org.apache.olingo.odata4.client.api.edm.xml.Edmx {
+public interface Edmx extends org.apache.olingo.client.api.edm.xml.Edmx {
 
   List<Reference> getReferences();
 }

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityContainer.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 import java.util.List;
 
-public interface EntityContainer extends org.apache.olingo.odata4.client.api.edm.xml.EntityContainer {
+public interface EntityContainer extends org.apache.olingo.client.api.edm.xml.EntityContainer {
 
   EntitySet getEntitySet(String name);
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntitySet.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
-public interface EntitySet extends org.apache.olingo.odata4.client.api.edm.xml.EntitySet, BindingTarget {
+public interface EntitySet extends org.apache.olingo.client.api.edm.xml.EntitySet, BindingTarget {
 
   boolean isIncludeInServiceDocument();
 }

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityType.java

@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.client.api.edm.xml.v4;
+
+public interface EntityType extends org.apache.olingo.client.api.edm.xml.EntityType, ComplexType {
+
+}

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Function.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 public interface Function extends Action {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/FunctionImport.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
-import org.apache.olingo.odata4.client.api.edm.xml.CommonFunctionImport;
+import org.apache.olingo.client.api.edm.xml.CommonFunctionImport;
 
 public interface FunctionImport extends OperationImport, CommonFunctionImport {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Include.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 public interface Include {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/IncludeAnnotations.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
 
 public interface IncludeAnnotations {
 

lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/NavigationProperty.java

@@ -16,13 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
+package org.apache.olingo.client.api.edm.xml.v4;
+
+import org.apache.olingo.client.api.edm.xml.OnDelete;
 
-import org.apache.olingo.odata4.client.api.edm.xml.OnDelete;
 import java.util.List;
 
 public interface NavigationProperty
-        extends org.apache.olingo.odata4.client.api.edm.xml.CommonNavigationProperty, AnnotatedEdmItem {
+        extends org.apache.olingo.client.api.edm.xml.CommonNavigationProperty, AnnotatedEdmItem {
 
   String getType();