You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/03/16 08:35:23 UTC

[3/3] git commit: [OLINGO-191] change package name: part 2 of 1.client.api.edm.xml->client.api.edm.xml.shared, 2, client.api.edm.xml.v4->client.api.edm.xml.

[OLINGO-191] change package name: part 2 of 1.client.api.edm.xml->client.api.edm.xml.shared, 2, client.api.edm.xml.v4->client.api.edm.xml.


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

Branch: refs/heads/olingo191
Commit: a56e6f429f427e31bcf6c839160a162aa43aed5a
Parents: 2870fdc
Author: challenh <ch...@apache.org>
Authored: Sun Mar 16 15:34:23 2014 +0800
Committer: challenh <ch...@apache.org>
Committed: Sun Mar 16 15:34:23 2014 +0800

----------------------------------------------------------------------
 .../olingo/client/api/edm/xml/Action.java       | 37 +++++++++++
 .../olingo/client/api/edm/xml/ActionImport.java | 24 ++++++++
 .../client/api/edm/xml/AnnotatedEdmItem.java    | 24 ++++++++
 .../olingo/client/api/edm/xml/Annotation.java   | 33 ++++++++++
 .../olingo/client/api/edm/xml/Annotations.java  | 30 +++++++++
 .../client/api/edm/xml/BindingTarget.java       | 28 +++++++++
 .../olingo/client/api/edm/xml/CSDLElement.java  | 37 +++++++++++
 .../olingo/client/api/edm/xml/ComplexType.java  | 43 +++++++++++++
 .../apache/olingo/client/api/edm/xml/Edmx.java  | 26 ++++++++
 .../client/api/edm/xml/EntityContainer.java     | 44 ++++++++++++++
 .../olingo/client/api/edm/xml/EntitySet.java    | 24 ++++++++
 .../olingo/client/api/edm/xml/EntityType.java   | 23 +++++++
 .../olingo/client/api/edm/xml/Function.java     | 24 ++++++++
 .../client/api/edm/xml/FunctionImport.java      | 28 +++++++++
 .../olingo/client/api/edm/xml/Include.java      | 26 ++++++++
 .../client/api/edm/xml/IncludeAnnotations.java  | 28 +++++++++
 .../client/api/edm/xml/NavigationProperty.java  | 40 ++++++++++++
 .../api/edm/xml/NavigationPropertyBinding.java  | 27 +++++++++
 .../client/api/edm/xml/OperationImport.java     | 28 +++++++++
 .../olingo/client/api/edm/xml/Parameter.java    | 24 ++++++++
 .../olingo/client/api/edm/xml/Property.java     | 25 ++++++++
 .../olingo/client/api/edm/xml/Reference.java    | 33 ++++++++++
 .../api/edm/xml/ReferentialConstraint.java      | 27 +++++++++
 .../olingo/client/api/edm/xml/ReturnType.java   | 34 +++++++++++
 .../olingo/client/api/edm/xml/Schema.java       | 64 ++++++++++++++++++++
 .../olingo/client/api/edm/xml/Singleton.java    | 25 ++++++++
 .../apache/olingo/client/api/edm/xml/Term.java  | 44 ++++++++++++++
 .../client/api/edm/xml/TypeDefinition.java      | 40 ++++++++++++
 .../olingo/client/api/edm/xml/XMLMetadata.java  | 36 +++++++++++
 .../edm/xml/annotation/ConstExprConstruct.java  | 56 +++++++++++++++++
 .../edm/xml/annotation/DynExprConstruct.java    | 23 +++++++
 .../api/edm/xml/annotation/ExprConstruct.java   | 23 +++++++
 .../olingo/client/api/edm/xml/v4/Action.java    | 37 -----------
 .../client/api/edm/xml/v4/ActionImport.java     | 24 --------
 .../client/api/edm/xml/v4/AnnotatedEdmItem.java | 24 --------
 .../client/api/edm/xml/v4/Annotation.java       | 33 ----------
 .../client/api/edm/xml/v4/Annotations.java      | 30 ---------
 .../client/api/edm/xml/v4/BindingTarget.java    | 28 ---------
 .../client/api/edm/xml/v4/CSDLElement.java      | 37 -----------
 .../client/api/edm/xml/v4/ComplexType.java      | 43 -------------
 .../olingo/client/api/edm/xml/v4/Edmx.java      | 26 --------
 .../client/api/edm/xml/v4/EntityContainer.java  | 44 --------------
 .../olingo/client/api/edm/xml/v4/EntitySet.java | 24 --------
 .../client/api/edm/xml/v4/EntityType.java       | 23 -------
 .../olingo/client/api/edm/xml/v4/Function.java  | 24 --------
 .../client/api/edm/xml/v4/FunctionImport.java   | 28 ---------
 .../olingo/client/api/edm/xml/v4/Include.java   | 26 --------
 .../api/edm/xml/v4/IncludeAnnotations.java      | 28 ---------
 .../api/edm/xml/v4/NavigationProperty.java      | 40 ------------
 .../edm/xml/v4/NavigationPropertyBinding.java   | 27 ---------
 .../client/api/edm/xml/v4/OperationImport.java  | 28 ---------
 .../olingo/client/api/edm/xml/v4/Parameter.java | 24 --------
 .../olingo/client/api/edm/xml/v4/Property.java  | 25 --------
 .../olingo/client/api/edm/xml/v4/Reference.java | 33 ----------
 .../api/edm/xml/v4/ReferentialConstraint.java   | 27 ---------
 .../client/api/edm/xml/v4/ReturnType.java       | 34 -----------
 .../olingo/client/api/edm/xml/v4/Schema.java    | 64 --------------------
 .../olingo/client/api/edm/xml/v4/Singleton.java | 25 --------
 .../olingo/client/api/edm/xml/v4/Term.java      | 44 --------------
 .../client/api/edm/xml/v4/TypeDefinition.java   | 40 ------------
 .../client/api/edm/xml/v4/XMLMetadata.java      | 36 -----------
 .../xml/v4/annotation/ConstExprConstruct.java   | 56 -----------------
 .../edm/xml/v4/annotation/DynExprConstruct.java | 23 -------
 .../edm/xml/v4/annotation/ExprConstruct.java    | 23 -------
 .../client/api/op/ODataV4Deserializer.java      |  2 +-
 .../client/core/edm/EdmServiceMetadataImpl.java |  8 +--
 .../client/core/edm/shared/EdmActionImpl.java   |  2 +-
 .../core/edm/shared/EdmActionImportImpl.java    |  2 +-
 .../core/edm/shared/EdmBindingTargetImpl.java   |  4 +-
 .../client/core/edm/shared/EdmClientImpl.java   | 26 ++++----
 .../core/edm/shared/EdmComplexTypeImpl.java     |  4 +-
 .../core/edm/shared/EdmEntityContainerImpl.java | 36 +++++------
 .../core/edm/shared/EdmEntitySetImpl.java       |  2 +-
 .../client/core/edm/shared/EdmFunctionImpl.java |  2 +-
 .../core/edm/shared/EdmFunctionImportImpl.java  |  2 +-
 .../edm/shared/EdmNavigationPropertyImpl.java   |  4 +-
 .../core/edm/shared/EdmOperationImpl.java       |  2 +-
 .../core/edm/shared/EdmReturnTypeImpl.java      |  2 +-
 .../client/core/edm/shared/EdmSchemaImpl.java   | 18 +++---
 .../core/edm/shared/EdmSingletonImpl.java       |  2 +-
 .../edm/shared/EdmStructuredTypeHelperImpl.java |  2 +-
 .../core/edm/shared/EdmTypeDefinitionImpl.java  |  2 +-
 .../client/core/edm/v3/ReturnTypeProxy.java     |  2 +-
 .../core/edm/xml/AbstractAnnotatedEdmItem.java  |  4 +-
 .../olingo/client/core/edm/xml/ActionImpl.java  |  6 +-
 .../client/core/edm/xml/ActionImportImpl.java   |  2 +-
 .../client/core/edm/xml/AnnotationImpl.java     |  6 +-
 .../client/core/edm/xml/AnnotationsImpl.java    |  2 +-
 .../client/core/edm/xml/ComplexTypeImpl.java    |  8 +--
 .../client/core/edm/xml/DataServicesImpl.java   |  2 +-
 .../olingo/client/core/edm/xml/EdmxImpl.java    |  4 +-
 .../core/edm/xml/EntityContainerImpl.java       | 14 ++---
 .../client/core/edm/xml/EntitySetImpl.java      |  6 +-
 .../client/core/edm/xml/EntityTypeImpl.java     |  8 +--
 .../client/core/edm/xml/EnumTypeImpl.java       |  4 +-
 .../client/core/edm/xml/FunctionImpl.java       |  2 +-
 .../client/core/edm/xml/FunctionImportImpl.java |  4 +-
 .../core/edm/xml/IncludeAnnotationsImpl.java    |  2 +-
 .../olingo/client/core/edm/xml/IncludeImpl.java |  2 +-
 .../olingo/client/core/edm/xml/MemberImpl.java  |  4 +-
 .../edm/xml/NavigationPropertyBindingImpl.java  |  2 +-
 .../core/edm/xml/NavigationPropertyImpl.java    |  6 +-
 .../client/core/edm/xml/ParameterImpl.java      |  2 +-
 .../client/core/edm/xml/PropertyImpl.java       |  4 +-
 .../client/core/edm/xml/ReferenceImpl.java      |  8 +--
 .../core/edm/xml/ReferentialConstraintImpl.java |  2 +-
 .../client/core/edm/xml/ReturnTypeImpl.java     |  2 +-
 .../olingo/client/core/edm/xml/SchemaImpl.java  | 20 +++---
 .../client/core/edm/xml/SingletonImpl.java      |  4 +-
 .../client/core/edm/xml/TermDeserializer.java   |  2 +-
 .../olingo/client/core/edm/xml/TermImpl.java    |  4 +-
 .../client/core/edm/xml/TypeDefinitionImpl.java |  4 +-
 .../client/core/edm/xml/XMLMetadataImpl.java    |  8 +--
 .../annotation/AnnotatedDynExprConstruct.java   |  4 +-
 .../client/core/edm/xml/annotation/Apply.java   |  3 +-
 .../client/core/edm/xml/annotation/Cast.java    |  2 +-
 .../core/edm/xml/annotation/Collection.java     |  2 +-
 .../xml/annotation/ConstExprConstructImpl.java  |  2 +-
 .../xml/annotation/DynExprConstructImpl.java    |  2 +-
 .../xml/annotation/DynExprDoubleParamOp.java    |  2 +-
 .../xml/annotation/DynExprSingleParamOp.java    |  2 +-
 .../edm/xml/annotation/ExprConstructImpl.java   |  2 +-
 .../client/core/edm/xml/annotation/If.java      |  2 +-
 .../client/core/edm/xml/annotation/IsOf.java    |  2 +-
 .../core/edm/xml/annotation/LabeledElement.java |  2 +-
 .../core/edm/xml/annotation/PropertyValue.java  |  2 +-
 .../client/core/edm/xml/annotation/UrlRef.java  |  2 +-
 .../core/op/impl/ODataV4DeserializerImpl.java   |  2 +-
 .../olingo/client/core/v4/MetadataTest.java     | 20 +++---
 129 files changed, 1190 insertions(+), 1191 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java
new file mode 100644
index 0000000..a2bb160
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java
@@ -0,0 +1,37 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.apache.olingo.client.api.edm.xml.shared.Named;
+
+public interface Action extends Named {
+
+  boolean isBound();
+
+  String getEntitySetPath();
+
+  List<Parameter> getParameters();
+
+  Parameter getParameter(String name);
+
+  ReturnType getReturnType();
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java
new file mode 100644
index 0000000..7ae6a21
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java
@@ -0,0 +1,24 @@
+/*
+ * 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;
+
+public interface ActionImport extends OperationImport {
+
+  String getAction();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/AnnotatedEdmItem.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/AnnotatedEdmItem.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/AnnotatedEdmItem.java
new file mode 100644
index 0000000..8cdeb4f
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/AnnotatedEdmItem.java
@@ -0,0 +1,24 @@
+/*
+ * 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;
+
+public interface AnnotatedEdmItem {
+
+  Annotation getAnnotation();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java
new file mode 100644
index 0000000..0fd181a
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+import org.apache.olingo.client.api.edm.xml.annotation.DynExprConstruct;
+import org.apache.olingo.client.api.edm.xml.annotation.ConstExprConstruct;
+
+public interface Annotation {
+
+  String getTerm();
+
+  String getQualifier();
+
+  ConstExprConstruct getConstExpr();
+
+  DynExprConstruct getDynExpr();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java
new file mode 100644
index 0000000..3eaa9ac
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java
@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.apache.olingo.client.api.edm.xml.shared.CommonAnnotations;
+
+public interface Annotations extends CommonAnnotations {
+
+  List<? extends Annotation> getAnnotations();
+
+  Annotation getAnnotation(String term);
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java
new file mode 100644
index 0000000..1384b91
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.apache.olingo.client.api.edm.xml.shared.Named;
+
+public interface BindingTarget extends Named, AnnotatedEdmItem {
+
+  List<? extends NavigationPropertyBinding> getNavigationPropertyBindings();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CSDLElement.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CSDLElement.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CSDLElement.java
new file mode 100644
index 0000000..649419b
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/CSDLElement.java
@@ -0,0 +1,37 @@
+/*
+ * 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;
+
+public enum CSDLElement {
+
+  ActionImport,
+  ComplexType,
+  EntityContainer,
+  EntitySet,
+  EntityType,
+  EnumType,
+  FunctionImport,
+  Member,
+  NavigationProperty,
+  Property,
+  Singleton,
+  Term,
+  TypeDefinition
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java
new file mode 100644
index 0000000..819ddbd
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java
@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+import java.util.List;
+
+public interface ComplexType extends org.apache.olingo.client.api.edm.xml.shared.ComplexType, AnnotatedEdmItem {
+
+  boolean isAbstractEntityType();
+
+  String getBaseType();
+
+  boolean isOpenType();
+
+  @Override
+  Property getProperty(String name);
+
+  @Override
+  List<Property> getProperties();
+
+  @Override
+  NavigationProperty getNavigationProperty(String name);
+
+  @Override
+  List<NavigationProperty> getNavigationProperties();
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java
new file mode 100644
index 0000000..4c56e1a
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+import java.util.List;
+
+public interface Edmx extends org.apache.olingo.client.api.edm.xml.shared.Edmx {
+
+  List<Reference> getReferences();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java
new file mode 100644
index 0000000..a3061db
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java
@@ -0,0 +1,44 @@
+/*
+ * 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;
+
+import java.util.List;
+
+public interface EntityContainer extends org.apache.olingo.client.api.edm.xml.shared.EntityContainer {
+
+  EntitySet getEntitySet(String name);
+
+  List<EntitySet> getEntitySets();
+
+  List<Singleton> getSingletons();
+
+  Singleton getSingleton(String name);
+
+  ActionImport getActionImport(String name);
+
+  List<ActionImport> getActionImports(String name);
+
+  List<ActionImport> getActionImports();
+
+  FunctionImport getFunctionImport(String name);
+
+  List<FunctionImport> getFunctionImports(String name);
+
+  List<FunctionImport> getFunctionImports();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java
new file mode 100644
index 0000000..74e3abf
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java
@@ -0,0 +1,24 @@
+/*
+ * 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;
+
+public interface EntitySet extends org.apache.olingo.client.api.edm.xml.shared.EntitySet, BindingTarget {
+
+  boolean isIncludeInServiceDocument();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityType.java
new file mode 100644
index 0000000..329a27f
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/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;
+
+public interface EntityType extends org.apache.olingo.client.api.edm.xml.shared.EntityType, ComplexType {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java
new file mode 100644
index 0000000..31b99e8
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java
@@ -0,0 +1,24 @@
+/*
+ * 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;
+
+public interface Function extends Action {
+
+  boolean isComposable();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java
new file mode 100644
index 0000000..4837e84
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+import org.apache.olingo.client.api.edm.xml.shared.CommonFunctionImport;
+
+public interface FunctionImport extends OperationImport, CommonFunctionImport {
+
+  String getFunction();
+
+  boolean isIncludeInServiceDocument();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Include.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Include.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Include.java
new file mode 100644
index 0000000..0b6d06d
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Include.java
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+public interface Include {
+
+  String getAlias();
+
+  String getNamespace();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/IncludeAnnotations.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/IncludeAnnotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/IncludeAnnotations.java
new file mode 100644
index 0000000..adb6205
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/IncludeAnnotations.java
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+public interface IncludeAnnotations {
+
+  String getQualifier();
+
+  String getTargeyNamespace();
+
+  String getTermNamespace();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java
new file mode 100644
index 0000000..d924c75
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java
@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+import org.apache.olingo.client.api.edm.xml.shared.OnDelete;
+
+import java.util.List;
+
+public interface NavigationProperty
+        extends org.apache.olingo.client.api.edm.xml.shared.CommonNavigationProperty, AnnotatedEdmItem {
+
+  String getType();
+
+  boolean isNullable();
+
+  String getPartner();
+
+  boolean isContainsTarget();
+
+  List<ReferentialConstraint> getReferentialConstraints();
+
+  OnDelete getOnDelete();
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java
new file mode 100644
index 0000000..6dda47d
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+public interface NavigationPropertyBinding {
+
+  String getPath();
+
+  String getTarget();
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java
new file mode 100644
index 0000000..0d0c7f9
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+import org.apache.olingo.client.api.edm.xml.shared.Named;
+
+public interface OperationImport extends Named, AnnotatedEdmItem {
+
+  String getEntitySet();
+
+  void setEntitySet(String entitySet);
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java
new file mode 100644
index 0000000..9e78a06
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java
@@ -0,0 +1,24 @@
+/*
+ * 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;
+
+public interface Parameter extends org.apache.olingo.client.api.edm.xml.shared.CommonParameter {
+
+  String getSrid();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java
new file mode 100644
index 0000000..bd14a71
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+import org.apache.olingo.client.api.edm.xml.shared.CommonProperty;
+
+public interface Property extends CommonProperty, AnnotatedEdmItem {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java
new file mode 100644
index 0000000..6d662c4
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+import java.net.URI;
+import java.util.List;
+
+public interface Reference {
+
+  URI getUri();
+
+  List<Include> getIncludes();
+
+  List<IncludeAnnotations> getIncludeAnnotations();
+
+  List<Annotation> getAnnotations();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java
new file mode 100644
index 0000000..53fcc16
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+public interface ReferentialConstraint {
+
+  String getProperty();
+
+  String getReferencedProperty();
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java
new file mode 100644
index 0000000..d9a89c1
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java
@@ -0,0 +1,34 @@
+/*
+ * 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;
+
+public interface ReturnType {
+
+  Integer getMaxLength();
+
+  Integer getPrecision();
+
+  Integer getScale();
+
+  String getSrid();
+
+  String getType();
+
+  boolean isNullable();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java
new file mode 100644
index 0000000..0dc97e3
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java
@@ -0,0 +1,64 @@
+/*
+ * 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;
+
+import java.util.List;
+
+public interface Schema extends org.apache.olingo.client.api.edm.xml.shared.Schema, AnnotatedEdmItem {
+
+  @Override
+  List<EntityContainer> getEntityContainers();
+
+  EntityContainer getEntityContainer();
+
+  @Override
+  ComplexType getComplexType(String name);
+
+  @Override
+  List<ComplexType> getComplexTypes();
+
+  @Override
+  EntityType getEntityType(String name);
+
+  @Override
+  List<EntityType> getEntityTypes();
+
+  List<Action> getActions();
+
+  List<Action> getActions(String name);
+
+  List<Annotation> getAnnotations();
+
+  List<Function> getFunctions();
+
+  List<Function> getFunctions(String name);
+
+  List<Term> getTerms();
+
+  TypeDefinition getTypeDefinition(String name);
+
+  List<TypeDefinition> getTypeDefinitions();
+
+  @Override
+  List<Annotations> getAnnotationsList();
+
+  @Override
+  Annotations getAnnotationsList(String target);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java
new file mode 100644
index 0000000..08180ba
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java
@@ -0,0 +1,25 @@
+/*
+ * 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;
+
+import org.apache.olingo.client.api.edm.xml.shared.EntitySet;
+
+public interface Singleton extends EntitySet, BindingTarget {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java
new file mode 100644
index 0000000..3e810c7
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java
@@ -0,0 +1,44 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.apache.olingo.client.api.edm.xml.shared.Named;
+
+public interface Term extends Named {
+
+  List<CSDLElement> getAppliesTo();
+
+  String getBaseTerm();
+
+  String getDefaultValue();
+
+  Integer getMaxLength();
+
+  Integer getPrecision();
+
+  Integer getScale();
+
+  String getSrid();
+
+  String getType();
+
+  boolean isNullable();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java
new file mode 100644
index 0000000..6b5d669
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java
@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.apache.olingo.client.api.edm.xml.shared.Named;
+
+public interface TypeDefinition extends Named {
+
+  List<Annotation> getAnnotations();
+
+  Integer getMaxLength();
+
+  Integer getPrecision();
+
+  Integer getScale();
+
+  String getSrid();
+
+  String getUnderlyingType();
+
+  boolean isUnicode();
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java
new file mode 100644
index 0000000..f6c9ee2
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+import java.util.List;
+
+public interface XMLMetadata extends org.apache.olingo.client.api.edm.xml.shared.XMLMetadata {
+
+  @Override
+  List<Schema> getSchemas();
+
+  @Override
+  Schema getSchema(int index);
+
+  @Override
+  Schema getSchema(String key);
+
+  List<Reference> getReferences();
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstExprConstruct.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstExprConstruct.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstExprConstruct.java
new file mode 100644
index 0000000..d158752
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ConstExprConstruct.java
@@ -0,0 +1,56 @@
+/*
+ * 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.annotation;
+
+public interface ConstExprConstruct extends ExprConstruct {
+
+  public enum Type {
+
+    Binary,
+    Bool,
+    Date,
+    DateTimeOffset,
+    Decimal,
+    Duration,
+    EnumMember,
+    Float,
+    Guid,
+    Int,
+    String,
+    TimeOfDay;
+
+    public static Type fromString(final String value) {
+      Type result = null;
+      try {
+        result = valueOf(value);
+      } catch (IllegalArgumentException e) {
+        // ignore
+      }
+      return result;
+    }
+  }
+
+  Type getType();
+
+  void setType(Type type);
+
+  String getValue();
+
+  void setValue(String value);
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynExprConstruct.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynExprConstruct.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynExprConstruct.java
new file mode 100644
index 0000000..e217a56
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/DynExprConstruct.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.annotation;
+
+public interface DynExprConstruct extends ExprConstruct {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ExprConstruct.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ExprConstruct.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ExprConstruct.java
new file mode 100644
index 0000000..1a83fe0
--- /dev/null
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/ExprConstruct.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.annotation;
+
+public interface ExprConstruct {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java
deleted file mode 100644
index 0f43790..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-import org.apache.olingo.client.api.edm.xml.shared.Named;
-
-public interface Action extends Named {
-
-  boolean isBound();
-
-  String getEntitySetPath();
-
-  List<Parameter> getParameters();
-
-  Parameter getParameter(String name);
-
-  ReturnType getReturnType();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ActionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ActionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ActionImport.java
deleted file mode 100644
index 3cf9713..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ActionImport.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 ActionImport extends OperationImport {
-
-  String getAction();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/AnnotatedEdmItem.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/AnnotatedEdmItem.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/AnnotatedEdmItem.java
deleted file mode 100644
index e488629..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/AnnotatedEdmItem.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 AnnotatedEdmItem {
-
-  Annotation getAnnotation();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotation.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotation.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotation.java
deleted file mode 100644
index b70e729..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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;
-
-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 {
-
-  String getTerm();
-
-  String getQualifier();
-
-  ConstExprConstruct getConstExpr();
-
-  DynExprConstruct getDynExpr();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java
deleted file mode 100644
index d93ec6d..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-import org.apache.olingo.client.api.edm.xml.shared.CommonAnnotations;
-
-public interface Annotations extends CommonAnnotations {
-
-  List<? extends Annotation> getAnnotations();
-
-  Annotation getAnnotation(String term);
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java
deleted file mode 100644
index a53c9b6..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-import org.apache.olingo.client.api.edm.xml.shared.Named;
-
-public interface BindingTarget extends Named, AnnotatedEdmItem {
-
-  List<? extends NavigationPropertyBinding> getNavigationPropertyBindings();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/CSDLElement.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/CSDLElement.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/CSDLElement.java
deleted file mode 100644
index 18489e7..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/CSDLElement.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 enum CSDLElement {
-
-  ActionImport,
-  ComplexType,
-  EntityContainer,
-  EntitySet,
-  EntityType,
-  EnumType,
-  FunctionImport,
-  Member,
-  NavigationProperty,
-  Property,
-  Singleton,
-  Term,
-  TypeDefinition
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java
deleted file mode 100644
index 8004211..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ComplexType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-public interface ComplexType extends org.apache.olingo.client.api.edm.xml.shared.ComplexType, AnnotatedEdmItem {
-
-  boolean isAbstractEntityType();
-
-  String getBaseType();
-
-  boolean isOpenType();
-
-  @Override
-  Property getProperty(String name);
-
-  @Override
-  List<Property> getProperties();
-
-  @Override
-  NavigationProperty getNavigationProperty(String name);
-
-  @Override
-  List<NavigationProperty> getNavigationProperties();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Edmx.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Edmx.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Edmx.java
deleted file mode 100644
index b6cfd53..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Edmx.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-public interface Edmx extends org.apache.olingo.client.api.edm.xml.shared.Edmx {
-
-  List<Reference> getReferences();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityContainer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityContainer.java
deleted file mode 100644
index 9d3dabd..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityContainer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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;
-
-import java.util.List;
-
-public interface EntityContainer extends org.apache.olingo.client.api.edm.xml.shared.EntityContainer {
-
-  EntitySet getEntitySet(String name);
-
-  List<EntitySet> getEntitySets();
-
-  List<Singleton> getSingletons();
-
-  Singleton getSingleton(String name);
-
-  ActionImport getActionImport(String name);
-
-  List<ActionImport> getActionImports(String name);
-
-  List<ActionImport> getActionImports();
-
-  FunctionImport getFunctionImport(String name);
-
-  List<FunctionImport> getFunctionImports(String name);
-
-  List<FunctionImport> getFunctionImports();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntitySet.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntitySet.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntitySet.java
deleted file mode 100644
index 4c38d38..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntitySet.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 EntitySet extends org.apache.olingo.client.api.edm.xml.shared.EntitySet, BindingTarget {
-
-  boolean isIncludeInServiceDocument();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityType.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityType.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityType.java
deleted file mode 100644
index 84336ce..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/EntityType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.shared.EntityType, ComplexType {
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Function.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Function.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Function.java
deleted file mode 100644
index e097c6b..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Function.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 Function extends Action {
-
-  boolean isComposable();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/FunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/FunctionImport.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/FunctionImport.java
deleted file mode 100644
index 7f2eb98..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/FunctionImport.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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;
-
-import org.apache.olingo.client.api.edm.xml.shared.CommonFunctionImport;
-
-public interface FunctionImport extends OperationImport, CommonFunctionImport {
-
-  String getFunction();
-
-  boolean isIncludeInServiceDocument();
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a56e6f42/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Include.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Include.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Include.java
deleted file mode 100644
index 96708e4..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Include.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 Include {
-
-  String getAlias();
-
-  String getNamespace();
-}