http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json index bb07a1a..abb1570 100644 --- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json +++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments", + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments", "value": [{ "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument", "@odata.id": "Accounts(101)/MyPaymentInstruments(101901)", @@ -8,12 +8,12 @@ "FriendlyName": "101 first PI", "[email protected]": "#DateTimeOffset", "CreatedDate": "2014-04-09T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI" }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI", "@odata.id": "Accounts(101)/MyPaymentInstruments(101902)", @@ -28,14 +28,14 @@ "Balance": 100.0, "[email protected]": "#DateTimeOffset", "ExperationDate": "2022-11-01T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI", "@odata.id": "Accounts(101)/MyPaymentInstruments(101903)", @@ -50,13 +50,13 @@ "Balance": 300.0, "[email protected]": "#DateTimeOffset", "ExperationDate": "2022-10-02T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" }] }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml index 0c74062..4e6fbd7 100644 --- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml +++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml @@ -19,15 +19,15 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments"> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments"> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id> <title/> <updated>2014-04-14T12:45:33Z</updated> <entry> <category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/> <id/> <title/> <updated>2014-04-14T12:45:33Z</updated> @@ -44,10 +44,10 @@ </entry> <entry> <category term="#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> <id/> <title/> <updated>2014-04-14T12:45:33Z</updated> @@ -69,10 +69,10 @@ </entry> <entry> <category term="#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> <id/> <title/> <updated>2014-04-14T12:45:33Z</updated> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/entity.full.json b/fit/src/main/resources/V40/Accounts/102/entity.full.json index 1682135..13f7c16 100644 --- a/fit/src/main/resources/V40/Accounts/102/entity.full.json +++ b/fit/src/main/resources/V40/Accounts/102/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Account", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)", "AccountID": 102, "Country": "US", "AccountInfo": { @@ -11,24 +11,24 @@ "LastName": "Green", "MiddleName": "Hood" }, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess", "#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI": { "title": "Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/entity.xml b/fit/src/main/resources/V40/Accounts/102/entity.xml index 0b9cc63..538fcea 100644 --- a/fit/src/main/resources/V40/Accounts/102/entity.xml +++ b/fit/src/main/resources/V40/Accounts/102/entity.xml @@ -19,28 +19,28 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Account" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard"; type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments"; type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions"; type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess"; type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess"/> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard"; type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments"; type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions"; type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess"; type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess"/> <title/> <updated>2014-04-14T12:45:00Z</updated> <author> <name/> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"; + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"; title="Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"; + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"; title="Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"; + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"; title="Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/> <content type="application/xml"> <m:properties> <d:AccountID m:type="Int32">102</d:AccountID> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json index cf9d18a..e12ba87 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json +++ b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity", + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity", "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.GiftCard", "@odata.id": "Accounts(102)/MyGiftCard", "@odata.editLink": "Accounts(102)/MyGiftCard", @@ -10,6 +10,6 @@ "ExperationDate": "2013-12-30T00:00:00Z", "#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml index b1927b3..5757156 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml +++ b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml @@ -19,7 +19,7 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity"> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity"> <category term="#Microsoft.Test.OData.Services.ODataWCFService.GiftCard" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> <id /> <title /> @@ -27,9 +27,9 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"; + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"; title="Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/> <content type="application/xml"> <m:properties> <d:GiftCardID m:type="Int32">301</d:GiftCardID> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json index 70c96de..533c3ef 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json +++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity", + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity", "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument", "@odata.id": "Accounts(102)/MyPaymentInstruments(102901)", "@odata.editLink": "Accounts(102)/MyPaymentInstruments(102901)", @@ -7,10 +7,10 @@ "FriendlyName": "102 first PI", "[email protected]": "#DateTimeOffset", "CreatedDate": "2014-04-09T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI" } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml index e519217..8d9fbd0 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml +++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml @@ -19,11 +19,11 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity"> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity"> <category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/> <id/> <title/> <updated>2014-04-14T12:47:37Z</updated> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json index d6082db..32631c5 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json +++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity", + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity", "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument", "@odata.id": "Accounts(102)/MyPaymentInstruments(102902)", "@odata.editLink": "Accounts(102)/MyPaymentInstruments(102902)", @@ -7,10 +7,10 @@ "FriendlyName": "102 first PI", "[email protected]": "#DateTimeOffset", "CreatedDate": "2014-04-09T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI" } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml index 7a056c4..4b5ce67 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml +++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml @@ -19,11 +19,11 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity"> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity"> <category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI"/> <id/> <title/> <updated>2014-04-14T12:47:37Z</updated> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json index d056b5e..c4cb9ae 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json +++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments", + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments", "value": [{ "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument", "@odata.id": "Accounts(102)/MyPaymentInstruments(102901)", @@ -8,12 +8,12 @@ "FriendlyName": "102 first PI", "[email protected]": "#DateTimeOffset", "CreatedDate": "2014-04-09T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI" }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI", "@odata.id": "Accounts(102)/MyPaymentInstruments(102902)", @@ -28,14 +28,14 @@ "Balance": 100.0, "[email protected]": "#DateTimeOffset", "ExperationDate": "2022-11-01T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI", "@odata.id": "Accounts(102)/MyPaymentInstruments(102903)", @@ -50,13 +50,13 @@ "Balance": 300.0, "[email protected]": "#DateTimeOffset", "ExperationDate": "2022-10-02T00:00:00Z", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords" }] } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml index 5defbc3..3d04100 100644 --- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml +++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml @@ -19,15 +19,15 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments"> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments"> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id> <title/> <updated>2014-04-14T12:45:33Z</updated> <entry> <category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/> <id/> <title/> <updated>2014-04-14T12:45:33Z</updated> @@ -44,10 +44,10 @@ </entry> <entry> <category term="#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> <id/> <title/> <updated>2014-04-14T12:45:33Z</updated> @@ -69,10 +69,10 @@ </entry> <entry> <category term="#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI"; type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements"; type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI"; type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords"; type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/> <id/> <title/> <updated>2014-04-14T12:45:33Z</updated> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json index 4730781..fea3fad 100644 --- a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json +++ b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json @@ -1,7 +1,7 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity";, "@odata.type": "#ODataDemo.Advertisement", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)", "@odata.editLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)", "@odata.mediaEditLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/$value", "@odata.mediaContentType": "*/*", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml index 72a8cc6..49a4ae8 100644 --- a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml +++ b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)</id> <category term="#ODataDemo.Advertisement" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> <link rel="edit" title="Advertisement" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)"/> <link rel="http://docs.oasis-open.org/odata/ns/relatedlinks/FeaturedProduct"; type="application/xml" title="FeaturedProduct" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct/$ref"/> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Advertisements/feed.full.json b/fit/src/main/resources/V40/Advertisements/feed.full.json index 3d0a90e..1ede6bc 100644 --- a/fit/src/main/resources/V40/Advertisements/feed.full.json +++ b/fit/src/main/resources/V40/Advertisements/feed.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements";, "value": [{ "@odata.type": "#ODataDemo.Advertisement", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)", "@odata.editLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)", "@odata.mediaEditLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/$value", "@odata.mediaContentType": "*/*", @@ -16,7 +16,7 @@ "[email protected]": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct" }, { "@odata.type": "#ODataDemo.Advertisement", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)", "@odata.editLink": "Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)", "@odata.mediaEditLink": "Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)/$value", "@odata.mediaContentType": "*/*", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Advertisements/feed.xml b/fit/src/main/resources/V40/Advertisements/feed.xml index 874ffe9..bd661b8 100644 --- a/fit/src/main/resources/V40/Advertisements/feed.xml +++ b/fit/src/main/resources/V40/Advertisements/feed.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements</id> <title type="text">Advertisements</title> <updated>2014-05-07T13:39:27Z</updated> <link rel="self" title="Advertisements" href="Advertisements"/> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)</id> <category term="#ODataDemo.Advertisement" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> <link rel="edit" title="Advertisement" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)"/> <link rel="http://docs.oasis-open.org/odata/ns/relatedlinks/FeaturedProduct"; type="application/xml" title="FeaturedProduct" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct/$ref"/> @@ -44,7 +44,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)</id> <category term="#ODataDemo.Advertisement" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> <link rel="edit" title="Advertisement" href="Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)"/> <link rel="http://docs.oasis-open.org/odata/ns/relatedlinks/FeaturedProduct"; type="application/xml" title="FeaturedProduct" href="Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)/FeaturedProduct/$ref"/> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Boss/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Boss/entity.full.json b/fit/src/main/resources/V40/Boss/entity.full.json index 5444c2c..91e5b64 100644 --- a/fit/src/main/resources/V40/Boss/entity.full.json +++ b/fit/src/main/resources/V40/Boss/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Boss";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Boss";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss";, - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer";, + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss";, + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer";, "@Microsoft.Test.OData.Services.ODataWCFService.IsBoss": true, "PersonID": 2, "FirstName": "Jill", @@ -30,19 +30,19 @@ "Birthday": "1983-01-15T00:00:00Z", "[email protected]": "#Duration", "TimeBetweenLastTwoOrders": "PT0.0000002S", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent";, "[email protected]": false, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company";, "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"; + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"; }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"; + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"; } }
