[OLINGO-266] fit metadata and service document
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e57edd71 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e57edd71 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e57edd71 Branch: refs/heads/olingo-266-tecsvc Commit: e57edd71dd9b8d9e3b68b0a856d74d2e4a2051a5 Parents: 7dc4481 Author: Stephan Klevenz <[email protected]> Authored: Mon May 26 10:58:11 2014 +0200 Committer: Stephan Klevenz <[email protected]> Committed: Mon May 26 10:58:11 2014 +0200 ---------------------------------------------------------------------- .../org/apache/olingo/fit/tecsvc/BasicITCase.java | 2 -- .../olingo/server/core/ODataHttpHandlerImpl.java | 4 ++-- .../xml/MetadataDocumentXmlSerializer.java | 18 +++++++++--------- pom.xml | 5 ----- 4 files changed, 11 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e57edd71/fit/src/test/java/org/apache/olingo/fit/tecsvc/BasicITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/BasicITCase.java index 8a610b5..462272f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/BasicITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/BasicITCase.java @@ -27,7 +27,6 @@ import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.edm.Edm; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; public class BasicITCase { @@ -50,7 +49,6 @@ public class BasicITCase { } @Test - @Ignore public void readMetadata() { EdmMetadataRequest request = odata.getRetrieveRequestFactory().getMetadataRequest(BASE_URI + "/$metadata"); assertNotNull(request); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e57edd71/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java index 3703e6b..577728c 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java @@ -49,8 +49,8 @@ public class ODataHttpHandlerImpl implements ODataHttpHandler { private ODataHandler handler; - public ODataHttpHandlerImpl(final OData server, final Edm edm) { - handler = new ODataHandler(server, edm); + public ODataHttpHandlerImpl(final OData odata, final Edm edm) { + handler = new ODataHandler(odata, edm); } @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e57edd71/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java index a8629d8..999cb36 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java @@ -529,14 +529,14 @@ public class MetadataDocumentXmlSerializer { } private void appendReference(final XMLStreamWriter writer) throws XMLStreamException { - writer.writeStartElement(NS_EDMX, "Reference"); - // TODO: Where is this value comming from? - writer.writeAttribute("Uri", "http://docs.oasis-open.org/odata/odata/v4.0/cs02/vocabularies/Org.OData.Core.V1.xml";); - writer.writeEmptyElement(NS_EDMX, "Include"); - // TODO: Where is this value comming from? - writer.writeAttribute(XML_NAMESPACE, "Org.OData.Core.V1"); - // TODO: Where is this value comming from? - writer.writeAttribute(XML_ALIAS, "Core"); - writer.writeEndElement(); +// writer.writeStartElement(NS_EDMX, "Reference"); +// // TODO: Where is this value comming from? +// writer.writeAttribute("Uri", "http://docs.oasis-open.org/odata/odata/v4.0/cs02/vocabularies/Org.OData.Core.V1.xml";); +// writer.writeEmptyElement(NS_EDMX, "Include"); +// // TODO: Where is this value comming from? +// writer.writeAttribute(XML_NAMESPACE, "Org.OData.Core.V1"); +// // TODO: Where is this value comming from? +// writer.writeAttribute(XML_ALIAS, "Core"); +// writer.writeEndElement(); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e57edd71/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f98ae4a..d68815e 100644 --- a/pom.xml +++ b/pom.xml @@ -374,11 +374,6 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> </plugin> - <plugin> - <groupId>com.keyboardsamurais.maven</groupId> - <artifactId>maven-timestamp-plugin</artifactId> - <version>1.0</version> - </plugin> </plugins> </pluginManagement>
