olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject git commit: [OLINGO-457] Fixed paths
Date Fri, 10 Oct 2014 09:07:41 GMT
Repository: olingo-odata4
Updated Branches:
  refs/heads/master ef0553a02 -> 42043f464


[OLINGO-457] Fixed paths


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

Branch: refs/heads/master
Commit: 42043f4643dfa302eab2ba1048431b311ea7e1df
Parents: ef0553a
Author: Michael Bolz <michael.bolz@sap.com>
Authored: Fri Oct 10 11:01:49 2014 +0200
Committer: Michael Bolz <michael.bolz@sap.com>
Committed: Fri Oct 10 11:01:49 2014 +0200

----------------------------------------------------------------------
 .../test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java  | 4 ++--
 fit/src/test/java/org/apache/olingo/fit/tecsvc/TecSvcConst.java  | 2 +-
 .../core/serializer/xml/MetadataDocumentXmlSerializer.java       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/42043f46/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
index f4cbf4d..3b219b0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
@@ -56,8 +56,8 @@ public abstract class AbstractBaseTestITCase {
   public static void init()
       throws LifecycleException, IOException, InstantiationException, IllegalAccessException,
ClassNotFoundException {
     TomcatTestServer.init(9080)
-        .addServlet(TechnicalServlet.class, "/olingo-server-tecsvc/odata.svc/*")
-        .addServlet(StaticContent.class, "/olingo-server-tecsvc/v4.0/cs02/vocabularies/Org.OData.Core.V1.xml")
+        .addServlet(TechnicalServlet.class, "/odata-server-tecsvc/odata.svc/*")
+        .addServlet(StaticContent.class, "/odata-server-tecsvc/v4.0/cs02/vocabularies/Org.OData.Core.V1.xml")
         .addWebApp()
         .start();
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/42043f46/fit/src/test/java/org/apache/olingo/fit/tecsvc/TecSvcConst.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/TecSvcConst.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/TecSvcConst.java
index 933c8b8..cdc58a3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/TecSvcConst.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/TecSvcConst.java
@@ -20,6 +20,6 @@ package org.apache.olingo.fit.tecsvc;
 
 public class TecSvcConst {
 
-  public final static String BASE_URI = "http://localhost:9080/olingo-server-tecsvc/odata.svc";
+  public final static String BASE_URI = "http://localhost:9080/odata-server-tecsvc/odata.svc";
   
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/42043f46/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 f25289b..d07360c 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
@@ -536,7 +536,7 @@ public class MetadataDocumentXmlSerializer {
     // <http://docs.oasis-open.org/odata/odata/v4.0/cs02/vocabularies/Org.OData.Core.V1.xml>
     // is an external site we don't want to query each time an EDM-enabled client is used.
     writer.writeAttribute("Uri",
-        "http://localhost:9080/olingo-server-tecsvc/v4.0/cs02/vocabularies/Org.OData.Core.V1.xml");
+        "http://localhost:9080/odata-server-tecsvc/v4.0/cs02/vocabularies/Org.OData.Core.V1.xml");
     writer.writeEmptyElement(NS_EDMX, "Include");
     writer.writeAttribute(XML_NAMESPACE, "Org.OData.Core.V1");
     writer.writeAttribute(XML_ALIAS, "Core");


Mime
View raw message