olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [48/55] [abbrv] olingo-odata4 git commit: [OLINGO-659] Removed v4 from package and class names
Date Tue, 08 Sep 2015 16:40:05 GMT
[OLINGO-659] Removed v4 from package and class names


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

Branch: refs/heads/OLINGO-562_SpringExtension
Commit: 78a9539e365c88c5e17040ecc48a320d13e4368c
Parents: 2a718c1
Author: Michael Bolz <michael.bolz@sap.com>
Authored: Tue Sep 1 11:21:06 2015 +0200
Committer: Michael Bolz <michael.bolz@sap.com>
Committed: Tue Sep 1 14:44:42 2015 +0200

----------------------------------------------------------------------
 fit/src/it/demo/pom.xml                         |  107 ++
 fit/src/it/demo/verify.groovy                   |   20 +
 fit/src/it/demoV4/pom.xml                       |  107 --
 fit/src/it/demoV4/verify.groovy                 |   20 -
 fit/src/it/openType/pom.xml                     |  107 ++
 fit/src/it/openType/verify.groovy               |   20 +
 fit/src/it/openTypeV4/pom.xml                   |  107 --
 fit/src/it/openTypeV4/verify.groovy             |   20 -
 fit/src/it/staticService/pom.xml                |  107 ++
 fit/src/it/staticService/verify.groovy          |   20 +
 fit/src/it/staticServiceV4/pom.xml              |  107 --
 fit/src/it/staticServiceV4/verify.groovy        |   20 -
 .../org/apache/olingo/fit/AbstractServices.java |    4 +-
 .../main/java/org/apache/olingo/fit/Demo.java   |  174 +++
 .../org/apache/olingo/fit/KeyAsSegment.java     |  159 ++
 .../java/org/apache/olingo/fit/NorthWind.java   |   45 +
 .../org/apache/olingo/fit/NorthWindExt.java     |   46 +
 .../main/java/org/apache/olingo/fit/OAuth2.java |   35 +
 .../java/org/apache/olingo/fit/OpenType.java    |  140 ++
 .../java/org/apache/olingo/fit/Services.java    | 1448 ++++++++++++++++++
 .../main/java/org/apache/olingo/fit/V4Demo.java |  174 ---
 .../org/apache/olingo/fit/V4KeyAsSegment.java   |  159 --
 .../java/org/apache/olingo/fit/V4NorthWind.java |   45 -
 .../org/apache/olingo/fit/V4NorthWindExt.java   |   46 -
 .../java/org/apache/olingo/fit/V4OAuth2.java    |   35 -
 .../java/org/apache/olingo/fit/V4OpenType.java  |  140 --
 .../java/org/apache/olingo/fit/V4Services.java  | 1448 ------------------
 .../org/apache/olingo/fit/V4Vocabularies.java   |   83 -
 .../org/apache/olingo/fit/Vocabularies.java     |   81 +
 .../olingo/fit/base/AbstractTestITCase.java     |  172 +++
 .../apache/olingo/fit/base/AsyncTestITCase.java |  168 ++
 .../olingo/fit/base/AuthBatchTestITCase.java    |  119 ++
 .../apache/olingo/fit/base/BatchTestITCase.java |  647 ++++++++
 .../base/BoundOperationInvokeTestITCase.java    |  459 ++++++
 .../olingo/fit/base/ConformanceTestITCase.java  |  415 +++++
 .../apache/olingo/fit/base/DeltaTestITCase.java |   86 ++
 .../olingo/fit/base/DerivedTypeTestITCase.java  |  150 ++
 .../olingo/fit/base/EntityCreateTestITCase.java |  191 +++
 .../fit/base/EntityRetrieveTestITCase.java      |  378 +++++
 .../olingo/fit/base/EntitySetTestITCase.java    |  178 +++
 .../olingo/fit/base/EntityUpdateTestITCase.java |  185 +++
 .../fit/base/ErrorResponseTestITCase.java       |   62 +
 .../fit/base/FilterFactoryTestITCase.java       |   62 +
 .../base/JSONFormatConformanceTestITCase.java   |  333 ++++
 .../olingo/fit/base/KeyAsSegmentTestITCase.java |  127 ++
 .../olingo/fit/base/MediaEntityTestITCase.java  |  183 +++
 .../olingo/fit/base/MetadataTestITCase.java     |  146 ++
 .../olingo/fit/base/OAuth2TestITCase.java       |  145 ++
 .../olingo/fit/base/OpenTypeTestITCase.java     |  190 +++
 .../base/OperationImportInvokeTestITCase.java   |  294 ++++
 .../olingo/fit/base/PropertyTestITCase.java     |  211 +++
 .../fit/base/PropertyValueTestITCase.java       |  138 ++
 .../olingo/fit/base/QueryOptionsTestITCase.java |  246 +++
 .../fit/base/ServiceDocumentTestITCase.java     |   63 +
 .../olingo/fit/base/SingletonTestITCase.java    |  135 ++
 .../fit/proxy/APIBasicDesignTestITCase.java     |  626 ++++++++
 .../olingo/fit/proxy/AbstractTestITCase.java    |  149 ++
 .../olingo/fit/proxy/AsyncTestITCase.java       |  103 ++
 .../fit/proxy/AuthEntityCreateTestITCase.java   |   52 +
 .../fit/proxy/AuthEntityRetrieveTestITCase.java |   37 +
 .../proxy/BoundOperationInvokeTestITCase.java   |  121 ++
 .../olingo/fit/proxy/ContextTestITCase.java     |  101 ++
 .../olingo/fit/proxy/DerivedTypeTestITCase.java |   95 ++
 .../fit/proxy/EntityCreateTestITCase.java       |  382 +++++
 .../fit/proxy/EntityRetrieveTestITCase.java     |  173 +++
 .../olingo/fit/proxy/EntitySetTestITCase.java   |   76 +
 .../fit/proxy/EntityUpdateTestITCase.java       |  193 +++
 .../olingo/fit/proxy/FilterTestITCase.java      |  101 ++
 .../fit/proxy/KeyAsSegmentTestITCase.java       |   73 +
 .../olingo/fit/proxy/MediaEntityTestITCase.java |  121 ++
 ...TransactionalAuthEntityCreateTestITCase.java |   51 +
 .../NonTransactionalEntityCreateTestITCase.java |   49 +
 .../NonTransactionalEntityUpdateTestITCase.java |   48 +
 .../NonTransactionalMediaEntityTestITCase.java  |   49 +
 .../olingo/fit/proxy/OpenTypeTestITCase.java    |  156 ++
 .../proxy/OperationImportInvokeTestITCase.java  |  107 ++
 .../olingo/fit/proxy/PropertyTestITCase.java    |   57 +
 .../olingo/fit/proxy/SingletonTestITCase.java   |   77 +
 .../UnauthorizedEntityCreateTestITCase.java     |   56 +
 .../apache/olingo/fit/proxy/demo/Service.java   |  138 ++
 .../proxy/demo/odatademo/Advertisements.java    |   40 +
 .../fit/proxy/demo/odatademo/Categories.java    |   40 +
 .../fit/proxy/demo/odatademo/DemoService.java   |   79 +
 .../fit/proxy/demo/odatademo/PersonDetails.java |   40 +
 .../fit/proxy/demo/odatademo/Persons.java       |   40 +
 .../proxy/demo/odatademo/ProductDetails.java    |   40 +
 .../fit/proxy/demo/odatademo/Products.java      |   40 +
 .../fit/proxy/demo/odatademo/Suppliers.java     |   40 +
 .../fit/proxy/demo/odatademo/package-info.java  |   20 +
 .../fit/proxy/demo/odatademo/types/Address.java |  140 ++
 .../demo/odatademo/types/AddressCollection.java |   41 +
 .../AddressCollectionComposableInvoker.java     |   32 +
 .../types/AddressComposableInvoker.java         |  108 ++
 .../demo/odatademo/types/Advertisement.java     |  123 ++
 .../types/AdvertisementCollection.java          |   41 +
 ...dvertisementCollectionComposableInvoker.java |   32 +
 .../types/AdvertisementComposableInvoker.java   |   96 ++
 .../proxy/demo/odatademo/types/Category.java    |  100 ++
 .../odatademo/types/CategoryCollection.java     |   41 +
 .../CategoryCollectionComposableInvoker.java    |   32 +
 .../types/CategoryComposableInvoker.java        |   78 +
 .../proxy/demo/odatademo/types/Customer.java    |  146 ++
 .../odatademo/types/CustomerCollection.java     |   41 +
 .../CustomerCollectionComposableInvoker.java    |   32 +
 .../types/CustomerComposableInvoker.java        |   92 ++
 .../proxy/demo/odatademo/types/Employee.java    |  184 +++
 .../odatademo/types/EmployeeCollection.java     |   41 +
 .../EmployeeCollectionComposableInvoker.java    |   32 +
 .../types/EmployeeComposableInvoker.java        |  122 ++
 .../demo/odatademo/types/FeaturedProduct.java   |  285 ++++
 .../types/FeaturedProductCollection.java        |   41 +
 ...turedProductCollectionComposableInvoker.java |   32 +
 .../types/FeaturedProductComposableInvoker.java |  182 +++
 .../fit/proxy/demo/odatademo/types/Person.java  |   99 ++
 .../demo/odatademo/types/PersonCollection.java  |   41 +
 .../PersonCollectionComposableInvoker.java      |   32 +
 .../types/PersonComposableInvoker.java          |   77 +
 .../demo/odatademo/types/PersonDetail.java      |  176 +++
 .../odatademo/types/PersonDetailCollection.java |   41 +
 ...PersonDetailCollectionComposableInvoker.java |   32 +
 .../types/PersonDetailComposableInvoker.java    |  137 ++
 .../fit/proxy/demo/odatademo/types/Product.java |  231 +++
 .../demo/odatademo/types/ProductCollection.java |   41 +
 .../ProductCollectionComposableInvoker.java     |   32 +
 .../types/ProductComposableInvoker.java         |  172 +++
 .../demo/odatademo/types/ProductDetail.java     |  100 ++
 .../types/ProductDetailCollection.java          |   41 +
 ...roductDetailCollectionComposableInvoker.java |   32 +
 .../types/ProductDetailComposableInvoker.java   |   77 +
 .../proxy/demo/odatademo/types/Supplier.java    |  156 ++
 .../odatademo/types/SupplierCollection.java     |   41 +
 .../SupplierCollectionComposableInvoker.java    |   32 +
 .../types/SupplierComposableInvoker.java        |  122 ++
 .../demo/odatademo/types/package-info.java      |   20 +
 .../olingo/fit/proxy/opentype/Service.java      |  139 ++
 .../opentypesservice/DefaultContainer.java      |   61 +
 .../odata/services/opentypesservice/Row.java    |   40 +
 .../services/opentypesservice/RowIndex.java     |   40 +
 .../services/opentypesservice/package-info.java |   20 +
 .../opentypesservice/types/AccountInfo.java     |   84 +
 .../types/AccountInfoCollection.java            |   41 +
 .../AccountInfoCollectionComposableInvoker.java |   32 +
 .../types/AccountInfoComposableInvoker.java     |   66 +
 .../services/opentypesservice/types/Color.java  |   44 +
 .../opentypesservice/types/ContactDetails.java  |  273 ++++
 .../types/ContactDetailsCollection.java         |   41 +
 ...ntactDetailsCollectionComposableInvoker.java |   32 +
 .../types/ContactDetailsComposableInvoker.java  |  213 +++
 .../opentypesservice/types/IndexedRow.java      |   93 ++
 .../types/IndexedRowCollection.java             |   41 +
 .../IndexedRowCollectionComposableInvoker.java  |   32 +
 .../types/IndexedRowComposableInvoker.java      |   53 +
 .../services/opentypesservice/types/Row.java    |   68 +
 .../opentypesservice/types/RowCollection.java   |   41 +
 .../types/RowCollectionComposableInvoker.java   |   32 +
 .../types/RowComposableInvoker.java             |   53 +
 .../opentypesservice/types/RowIndex.java        |   82 +
 .../types/RowIndexCollection.java               |   41 +
 .../RowIndexCollectionComposableInvoker.java    |   32 +
 .../types/RowIndexComposableInvoker.java        |   64 +
 .../opentypesservice/types/package-info.java    |   20 +
 .../olingo/fit/proxy/staticservice/Service.java |  245 +++
 .../services/odatawcfservice/Accounts.java      |   41 +
 .../services/odatawcfservice/Customers.java     |   41 +
 .../services/odatawcfservice/Departments.java   |   42 +
 .../services/odatawcfservice/Employees.java     |   41 +
 .../odatawcfservice/InMemoryEntities.java       |  226 +++
 .../services/odatawcfservice/OrderDetails.java  |   43 +
 .../odata/services/odatawcfservice/Orders.java  |   41 +
 .../odata/services/odatawcfservice/People.java  |   41 +
 .../odatawcfservice/ProductDetails.java         |   43 +
 .../odatawcfservice/ProductReviews.java         |   43 +
 .../services/odatawcfservice/Products.java      |   41 +
 .../services/odatawcfservice/StoredPIs.java     |   41 +
 .../odatawcfservice/SubscriptionTemplates.java  |   42 +
 .../services/odatawcfservice/package-info.java  |   20 +
 .../odatawcfservice/types/AccessLevel.java      |   46 +
 .../services/odatawcfservice/types/Account.java |  226 +++
 .../types/AccountCollection.java                |   41 +
 .../AccountCollectionComposableInvoker.java     |   32 +
 .../types/AccountComposableInvoker.java         |  156 ++
 .../odatawcfservice/types/AccountInfo.java      |   84 +
 .../types/AccountInfoCollection.java            |   41 +
 .../AccountInfoCollectionComposableInvoker.java |   32 +
 .../types/AccountInfoComposableInvoker.java     |   66 +
 .../services/odatawcfservice/types/Address.java |  102 ++
 .../types/AddressCollection.java                |   41 +
 .../AddressCollectionComposableInvoker.java     |   32 +
 .../types/AddressComposableInvoker.java         |   78 +
 .../services/odatawcfservice/types/Asset.java   |  105 ++
 .../odatawcfservice/types/AssetCollection.java  |   41 +
 .../types/AssetCollectionComposableInvoker.java |   32 +
 .../types/AssetComposableInvoker.java           |   82 +
 .../services/odatawcfservice/types/Club.java    |   86 ++
 .../odatawcfservice/types/ClubCollection.java   |   41 +
 .../types/ClubCollectionComposableInvoker.java  |   32 +
 .../types/ClubComposableInvoker.java            |   67 +
 .../services/odatawcfservice/types/Color.java   |   44 +
 .../services/odatawcfservice/types/Company.java |  232 +++
 .../odatawcfservice/types/CompanyAddress.java   |  136 ++
 .../types/CompanyAddressCollection.java         |   41 +
 ...mpanyAddressCollectionComposableInvoker.java |   32 +
 .../types/CompanyAddressComposableInvoker.java  |   93 ++
 .../odatawcfservice/types/CompanyCategory.java  |   45 +
 .../types/CompanyCollection.java                |   41 +
 .../CompanyCollectionComposableInvoker.java     |   32 +
 .../types/CompanyComposableInvoker.java         |  170 ++
 .../odatawcfservice/types/CreditCardPI.java     |  303 ++++
 .../types/CreditCardPICollection.java           |   41 +
 ...CreditCardPICollectionComposableInvoker.java |   32 +
 .../types/CreditCardPIComposableInvoker.java    |  206 +++
 .../odatawcfservice/types/CreditRecord.java     |  125 ++
 .../types/CreditRecordCollection.java           |   41 +
 ...CreditRecordCollectionComposableInvoker.java |   32 +
 .../types/CreditRecordComposableInvoker.java    |   97 ++
 .../odatawcfservice/types/Customer.java         |  357 +++++
 .../types/CustomerCollection.java               |   41 +
 .../CustomerCollectionComposableInvoker.java    |   32 +
 .../types/CustomerComposableInvoker.java        |  241 +++
 .../odatawcfservice/types/Department.java       |  120 ++
 .../types/DepartmentCollection.java             |   41 +
 .../DepartmentCollectionComposableInvoker.java  |   32 +
 .../types/DepartmentComposableInvoker.java      |   94 ++
 .../odatawcfservice/types/Employee.java         |  321 ++++
 .../types/EmployeeCollection.java               |   41 +
 .../EmployeeCollectionComposableInvoker.java    |   32 +
 .../types/EmployeeComposableInvoker.java        |  213 +++
 .../odatawcfservice/types/GiftCard.java         |  152 ++
 .../types/GiftCardCollection.java               |   41 +
 .../GiftCardCollectionComposableInvoker.java    |   32 +
 .../types/GiftCardComposableInvoker.java        |  112 ++
 .../odatawcfservice/types/HomeAddress.java      |  136 ++
 .../types/HomeAddressCollection.java            |   41 +
 .../HomeAddressCollectionComposableInvoker.java |   32 +
 .../types/HomeAddressComposableInvoker.java     |   93 ++
 .../services/odatawcfservice/types/IsBoss.java  |   31 +
 .../odatawcfservice/types/LabourUnion.java      |   87 ++
 .../types/LabourUnionCollection.java            |   41 +
 .../LabourUnionCollectionComposableInvoker.java |   32 +
 .../types/LabourUnionComposableInvoker.java     |   67 +
 .../services/odatawcfservice/types/Order.java   |  174 +++
 .../odatawcfservice/types/OrderCollection.java  |   41 +
 .../types/OrderCollectionComposableInvoker.java |   32 +
 .../types/OrderComposableInvoker.java           |  136 ++
 .../odatawcfservice/types/OrderDetail.java      |  180 +++
 .../types/OrderDetailCollection.java            |   41 +
 .../OrderDetailCollectionComposableInvoker.java |   32 +
 .../types/OrderDetailComposableInvoker.java     |  139 ++
 .../odatawcfservice/types/OrderDetailKey.java   |   53 +
 .../types/PaymentInstrument.java                |  165 ++
 .../types/PaymentInstrumentCollection.java      |   41 +
 ...ntInstrumentCollectionComposableInvoker.java |   32 +
 .../PaymentInstrumentComposableInvoker.java     |  132 ++
 .../services/odatawcfservice/types/Person.java  |  240 +++
 .../odatawcfservice/types/PersonCollection.java |   41 +
 .../PersonCollectionComposableInvoker.java      |   32 +
 .../types/PersonComposableInvoker.java          |  171 +++
 .../services/odatawcfservice/types/Product.java |  266 ++++
 .../types/ProductCollection.java                |   53 +
 .../ProductCollectionComposableInvoker.java     |   32 +
 .../types/ProductComposableInvoker.java         |  193 +++
 .../odatawcfservice/types/ProductDetail.java    |  172 +++
 .../types/ProductDetailCollection.java          |   41 +
 ...roductDetailCollectionComposableInvoker.java |   32 +
 .../types/ProductDetailComposableInvoker.java   |  124 ++
 .../odatawcfservice/types/ProductDetailKey.java |   53 +
 .../odatawcfservice/types/ProductReview.java    |  168 ++
 .../types/ProductReviewCollection.java          |   41 +
 ...roductReviewCollectionComposableInvoker.java |   32 +
 .../types/ProductReviewComposableInvoker.java   |  130 ++
 .../odatawcfservice/types/ProductReviewKey.java |   75 +
 .../odatawcfservice/types/PublicCompany.java    |  345 +++++
 .../types/PublicCompanyCollection.java          |   41 +
 ...ublicCompanyCollectionComposableInvoker.java |   32 +
 .../types/PublicCompanyComposableInvoker.java   |  232 +++
 .../odatawcfservice/types/Statement.java        |  124 ++
 .../types/StatementCollection.java              |   41 +
 .../StatementCollectionComposableInvoker.java   |   32 +
 .../types/StatementComposableInvoker.java       |   97 ++
 .../odatawcfservice/types/StoredPI.java         |  124 ++
 .../types/StoredPICollection.java               |   41 +
 .../StoredPICollectionComposableInvoker.java    |   32 +
 .../types/StoredPIComposableInvoker.java        |   97 ++
 .../odatawcfservice/types/Subscription.java     |  144 ++
 .../types/SubscriptionCollection.java           |   41 +
 ...SubscriptionCollectionComposableInvoker.java |   32 +
 .../types/SubscriptionComposableInvoker.java    |  112 ++
 .../odatawcfservice/types/package-info.java     |   20 +
 .../fit/proxy/v4/APIBasicDesignTestITCase.java  |  622 --------
 .../olingo/fit/proxy/v4/AbstractTestITCase.java |  149 --
 .../olingo/fit/proxy/v4/AsyncTestITCase.java    |  101 --
 .../proxy/v4/AuthEntityCreateTestITCase.java    |   52 -
 .../proxy/v4/AuthEntityRetrieveTestITCase.java  |   37 -
 .../v4/BoundOperationInvokeTestITCase.java      |  119 --
 .../olingo/fit/proxy/v4/ContextTestITCase.java  |  101 --
 .../fit/proxy/v4/DerivedTypeTestITCase.java     |   94 --
 .../fit/proxy/v4/EntityCreateTestITCase.java    |  380 -----
 .../fit/proxy/v4/EntityRetrieveTestITCase.java  |  173 ---
 .../fit/proxy/v4/EntitySetTestITCase.java       |   75 -
 .../fit/proxy/v4/EntityUpdateTestITCase.java    |  193 ---
 .../olingo/fit/proxy/v4/FilterTestITCase.java   |  101 --
 .../fit/proxy/v4/KeyAsSegmentTestITCase.java    |   73 -
 .../fit/proxy/v4/MediaEntityTestITCase.java     |  121 --
 ...TransactionalAuthEntityCreateTestITCase.java |   51 -
 .../NonTransactionalEntityCreateTestITCase.java |   49 -
 .../NonTransactionalEntityUpdateTestITCase.java |   48 -
 .../NonTransactionalMediaEntityTestITCase.java  |   49 -
 .../olingo/fit/proxy/v4/OpenTypeTestITCase.java |  156 --
 .../v4/OperationImportInvokeTestITCase.java     |  104 --
 .../olingo/fit/proxy/v4/PropertyTestITCase.java |   57 -
 .../fit/proxy/v4/SingletonTestITCase.java       |   77 -
 .../v4/UnauthorizedEntityCreateTestITCase.java  |   56 -
 .../olingo/fit/proxy/v4/demo/Service.java       |  127 --
 .../proxy/v4/demo/odatademo/Advertisements.java |   38 -
 .../fit/proxy/v4/demo/odatademo/Categories.java |   38 -
 .../proxy/v4/demo/odatademo/DemoService.java    |   79 -
 .../proxy/v4/demo/odatademo/PersonDetails.java  |   38 -
 .../fit/proxy/v4/demo/odatademo/Persons.java    |   38 -
 .../proxy/v4/demo/odatademo/ProductDetails.java |   38 -
 .../fit/proxy/v4/demo/odatademo/Products.java   |   38 -
 .../fit/proxy/v4/demo/odatademo/Suppliers.java  |   38 -
 .../proxy/v4/demo/odatademo/package-info.java   |   20 -
 .../proxy/v4/demo/odatademo/types/Address.java  |  140 --
 .../demo/odatademo/types/AddressCollection.java |   41 -
 .../AddressCollectionComposableInvoker.java     |   32 -
 .../types/AddressComposableInvoker.java         |  108 --
 .../v4/demo/odatademo/types/Advertisement.java  |  123 --
 .../types/AdvertisementCollection.java          |   41 -
 ...dvertisementCollectionComposableInvoker.java |   32 -
 .../types/AdvertisementComposableInvoker.java   |   96 --
 .../proxy/v4/demo/odatademo/types/Category.java |  100 --
 .../odatademo/types/CategoryCollection.java     |   41 -
 .../CategoryCollectionComposableInvoker.java    |   32 -
 .../types/CategoryComposableInvoker.java        |   78 -
 .../proxy/v4/demo/odatademo/types/Customer.java |  146 --
 .../odatademo/types/CustomerCollection.java     |   41 -
 .../CustomerCollectionComposableInvoker.java    |   32 -
 .../types/CustomerComposableInvoker.java        |   92 --
 .../proxy/v4/demo/odatademo/types/Employee.java |  184 ---
 .../odatademo/types/EmployeeCollection.java     |   41 -
 .../EmployeeCollectionComposableInvoker.java    |   32 -
 .../types/EmployeeComposableInvoker.java        |  122 --
 .../demo/odatademo/types/FeaturedProduct.java   |  285 ----
 .../types/FeaturedProductCollection.java        |   41 -
 ...turedProductCollectionComposableInvoker.java |   32 -
 .../types/FeaturedProductComposableInvoker.java |  182 ---
 .../proxy/v4/demo/odatademo/types/Person.java   |   99 --
 .../demo/odatademo/types/PersonCollection.java  |   41 -
 .../PersonCollectionComposableInvoker.java      |   32 -
 .../types/PersonComposableInvoker.java          |   77 -
 .../v4/demo/odatademo/types/PersonDetail.java   |  176 ---
 .../odatademo/types/PersonDetailCollection.java |   41 -
 ...PersonDetailCollectionComposableInvoker.java |   32 -
 .../types/PersonDetailComposableInvoker.java    |  137 --
 .../proxy/v4/demo/odatademo/types/Product.java  |  231 ---
 .../demo/odatademo/types/ProductCollection.java |   41 -
 .../ProductCollectionComposableInvoker.java     |   32 -
 .../types/ProductComposableInvoker.java         |  172 ---
 .../v4/demo/odatademo/types/ProductDetail.java  |  100 --
 .../types/ProductDetailCollection.java          |   41 -
 ...roductDetailCollectionComposableInvoker.java |   32 -
 .../types/ProductDetailComposableInvoker.java   |   77 -
 .../proxy/v4/demo/odatademo/types/Supplier.java |  156 --
 .../odatademo/types/SupplierCollection.java     |   41 -
 .../SupplierCollectionComposableInvoker.java    |   32 -
 .../types/SupplierComposableInvoker.java        |  122 --
 .../v4/demo/odatademo/types/package-info.java   |   20 -
 .../olingo/fit/proxy/v4/opentype/Service.java   |  133 --
 .../opentypesservicev4/DefaultContainer.java    |   61 -
 .../odata/services/opentypesservicev4/Row.java  |   39 -
 .../services/opentypesservicev4/RowIndex.java   |   39 -
 .../opentypesservicev4/package-info.java        |   20 -
 .../opentypesservicev4/types/AccountInfo.java   |   84 -
 .../types/AccountInfoCollection.java            |   41 -
 .../AccountInfoCollectionComposableInvoker.java |   32 -
 .../types/AccountInfoComposableInvoker.java     |   66 -
 .../opentypesservicev4/types/Color.java         |   44 -
 .../types/ContactDetails.java                   |  273 ----
 .../types/ContactDetailsCollection.java         |   41 -
 ...ntactDetailsCollectionComposableInvoker.java |   32 -
 .../types/ContactDetailsComposableInvoker.java  |  213 ---
 .../opentypesservicev4/types/IndexedRow.java    |   93 --
 .../types/IndexedRowCollection.java             |   41 -
 .../IndexedRowCollectionComposableInvoker.java  |   32 -
 .../types/IndexedRowComposableInvoker.java      |   53 -
 .../services/opentypesservicev4/types/Row.java  |   68 -
 .../opentypesservicev4/types/RowCollection.java |   41 -
 .../types/RowCollectionComposableInvoker.java   |   32 -
 .../types/RowComposableInvoker.java             |   53 -
 .../opentypesservicev4/types/RowIndex.java      |   82 -
 .../types/RowIndexCollection.java               |   41 -
 .../RowIndexCollectionComposableInvoker.java    |   32 -
 .../types/RowIndexComposableInvoker.java        |   64 -
 .../opentypesservicev4/types/package-info.java  |   20 -
 .../fit/proxy/v4/staticservice/Service.java     |  215 ---
 .../services/odatawcfservice/Accounts.java      |   39 -
 .../services/odatawcfservice/Customers.java     |   39 -
 .../services/odatawcfservice/Departments.java   |   39 -
 .../services/odatawcfservice/Employees.java     |   39 -
 .../odatawcfservice/InMemoryEntities.java       |  214 ---
 .../services/odatawcfservice/OrderDetails.java  |   40 -
 .../odata/services/odatawcfservice/Orders.java  |   39 -
 .../odata/services/odatawcfservice/People.java  |   39 -
 .../odatawcfservice/ProductDetails.java         |   40 -
 .../odatawcfservice/ProductReviews.java         |   40 -
 .../services/odatawcfservice/Products.java      |   39 -
 .../services/odatawcfservice/StoredPIs.java     |   39 -
 .../odatawcfservice/SubscriptionTemplates.java  |   39 -
 .../services/odatawcfservice/package-info.java  |   20 -
 .../odatawcfservice/types/AccessLevel.java      |   46 -
 .../services/odatawcfservice/types/Account.java |  226 ---
 .../types/AccountCollection.java                |   41 -
 .../AccountCollectionComposableInvoker.java     |   32 -
 .../types/AccountComposableInvoker.java         |  156 --
 .../odatawcfservice/types/AccountInfo.java      |   84 -
 .../types/AccountInfoCollection.java            |   41 -
 .../AccountInfoCollectionComposableInvoker.java |   32 -
 .../types/AccountInfoComposableInvoker.java     |   66 -
 .../services/odatawcfservice/types/Address.java |  102 --
 .../types/AddressCollection.java                |   41 -
 .../AddressCollectionComposableInvoker.java     |   32 -
 .../types/AddressComposableInvoker.java         |   78 -
 .../services/odatawcfservice/types/Asset.java   |  105 --
 .../odatawcfservice/types/AssetCollection.java  |   41 -
 .../types/AssetCollectionComposableInvoker.java |   32 -
 .../types/AssetComposableInvoker.java           |   82 -
 .../services/odatawcfservice/types/Club.java    |   86 --
 .../odatawcfservice/types/ClubCollection.java   |   41 -
 .../types/ClubCollectionComposableInvoker.java  |   32 -
 .../types/ClubComposableInvoker.java            |   67 -
 .../services/odatawcfservice/types/Color.java   |   44 -
 .../services/odatawcfservice/types/Company.java |  232 ---
 .../odatawcfservice/types/CompanyAddress.java   |  136 --
 .../types/CompanyAddressCollection.java         |   41 -
 ...mpanyAddressCollectionComposableInvoker.java |   32 -
 .../types/CompanyAddressComposableInvoker.java  |   93 --
 .../odatawcfservice/types/CompanyCategory.java  |   45 -
 .../types/CompanyCollection.java                |   41 -
 .../CompanyCollectionComposableInvoker.java     |   32 -
 .../types/CompanyComposableInvoker.java         |  170 --
 .../odatawcfservice/types/CreditCardPI.java     |  303 ----
 .../types/CreditCardPICollection.java           |   41 -
 ...CreditCardPICollectionComposableInvoker.java |   32 -
 .../types/CreditCardPIComposableInvoker.java    |  206 ---
 .../odatawcfservice/types/CreditRecord.java     |  125 --
 .../types/CreditRecordCollection.java           |   41 -
 ...CreditRecordCollectionComposableInvoker.java |   32 -
 .../types/CreditRecordComposableInvoker.java    |   97 --
 .../odatawcfservice/types/Customer.java         |  357 -----
 .../types/CustomerCollection.java               |   41 -
 .../CustomerCollectionComposableInvoker.java    |   32 -
 .../types/CustomerComposableInvoker.java        |  241 ---
 .../odatawcfservice/types/Department.java       |  120 --
 .../types/DepartmentCollection.java             |   41 -
 .../DepartmentCollectionComposableInvoker.java  |   32 -
 .../types/DepartmentComposableInvoker.java      |   94 --
 .../odatawcfservice/types/Employee.java         |  321 ----
 .../types/EmployeeCollection.java               |   41 -
 .../EmployeeCollectionComposableInvoker.java    |   32 -
 .../types/EmployeeComposableInvoker.java        |  213 ---
 .../odatawcfservice/types/GiftCard.java         |  152 --
 .../types/GiftCardCollection.java               |   41 -
 .../GiftCardCollectionComposableInvoker.java    |   32 -
 .../types/GiftCardComposableInvoker.java        |  112 --
 .../odatawcfservice/types/HomeAddress.java      |  136 --
 .../types/HomeAddressCollection.java            |   41 -
 .../HomeAddressCollectionComposableInvoker.java |   32 -
 .../types/HomeAddressComposableInvoker.java     |   93 --
 .../services/odatawcfservice/types/IsBoss.java  |   31 -
 .../odatawcfservice/types/LabourUnion.java      |   87 --
 .../types/LabourUnionCollection.java            |   41 -
 .../LabourUnionCollectionComposableInvoker.java |   32 -
 .../types/LabourUnionComposableInvoker.java     |   67 -
 .../services/odatawcfservice/types/Order.java   |  174 ---
 .../odatawcfservice/types/OrderCollection.java  |   41 -
 .../types/OrderCollectionComposableInvoker.java |   32 -
 .../types/OrderComposableInvoker.java           |  136 --
 .../odatawcfservice/types/OrderDetail.java      |  180 ---
 .../types/OrderDetailCollection.java            |   41 -
 .../OrderDetailCollectionComposableInvoker.java |   32 -
 .../types/OrderDetailComposableInvoker.java     |  139 --
 .../odatawcfservice/types/OrderDetailKey.java   |   53 -
 .../types/PaymentInstrument.java                |  165 --
 .../types/PaymentInstrumentCollection.java      |   41 -
 ...ntInstrumentCollectionComposableInvoker.java |   32 -
 .../PaymentInstrumentComposableInvoker.java     |  132 --
 .../services/odatawcfservice/types/Person.java  |  240 ---
 .../odatawcfservice/types/PersonCollection.java |   41 -
 .../PersonCollectionComposableInvoker.java      |   32 -
 .../types/PersonComposableInvoker.java          |  171 ---
 .../services/odatawcfservice/types/Product.java |  266 ----
 .../types/ProductCollection.java                |   53 -
 .../ProductCollectionComposableInvoker.java     |   32 -
 .../types/ProductComposableInvoker.java         |  193 ---
 .../odatawcfservice/types/ProductDetail.java    |  172 ---
 .../types/ProductDetailCollection.java          |   41 -
 ...roductDetailCollectionComposableInvoker.java |   32 -
 .../types/ProductDetailComposableInvoker.java   |  124 --
 .../odatawcfservice/types/ProductDetailKey.java |   53 -
 .../odatawcfservice/types/ProductReview.java    |  168 --
 .../types/ProductReviewCollection.java          |   41 -
 ...roductReviewCollectionComposableInvoker.java |   32 -
 .../types/ProductReviewComposableInvoker.java   |  130 --
 .../odatawcfservice/types/ProductReviewKey.java |   75 -
 .../odatawcfservice/types/PublicCompany.java    |  345 -----
 .../types/PublicCompanyCollection.java          |   41 -
 ...ublicCompanyCollectionComposableInvoker.java |   32 -
 .../types/PublicCompanyComposableInvoker.java   |  232 ---
 .../odatawcfservice/types/Statement.java        |  124 --
 .../types/StatementCollection.java              |   41 -
 .../StatementCollectionComposableInvoker.java   |   32 -
 .../types/StatementComposableInvoker.java       |   97 --
 .../odatawcfservice/types/StoredPI.java         |  124 --
 .../types/StoredPICollection.java               |   41 -
 .../StoredPICollectionComposableInvoker.java    |   32 -
 .../types/StoredPIComposableInvoker.java        |   97 --
 .../odatawcfservice/types/Subscription.java     |  144 --
 .../types/SubscriptionCollection.java           |   41 -
 ...SubscriptionCollectionComposableInvoker.java |   32 -
 .../types/SubscriptionComposableInvoker.java    |  112 --
 .../odatawcfservice/types/package-info.java     |   20 -
 .../fit/tecsvc/client/BatchClientITCase.java    |    2 +-
 .../olingo/fit/v4/AbstractTestITCase.java       |  172 ---
 .../apache/olingo/fit/v4/AsyncTestITCase.java   |  168 --
 .../olingo/fit/v4/AuthBatchTestITCase.java      |  119 --
 .../apache/olingo/fit/v4/BatchTestITCase.java   |  647 --------
 .../fit/v4/BoundOperationInvokeTestITCase.java  |  459 ------
 .../olingo/fit/v4/ConformanceTestITCase.java    |  415 -----
 .../apache/olingo/fit/v4/DeltaTestITCase.java   |   86 --
 .../olingo/fit/v4/DerivedTypeTestITCase.java    |  150 --
 .../olingo/fit/v4/EntityCreateTestITCase.java   |  191 ---
 .../olingo/fit/v4/EntityRetrieveTestITCase.java |  378 -----
 .../olingo/fit/v4/EntitySetTestITCase.java      |  178 ---
 .../olingo/fit/v4/EntityUpdateTestITCase.java   |  185 ---
 .../olingo/fit/v4/ErrorResponseTestITCase.java  |   62 -
 .../olingo/fit/v4/FilterFactoryTestITCase.java  |   62 -
 .../fit/v4/JSONFormatConformanceTestITCase.java |  333 ----
 .../olingo/fit/v4/KeyAsSegmentTestITCase.java   |  127 --
 .../olingo/fit/v4/MediaEntityTestITCase.java    |  183 ---
 .../olingo/fit/v4/MetadataTestITCase.java       |  146 --
 .../apache/olingo/fit/v4/OAuth2TestITCase.java  |  145 --
 .../olingo/fit/v4/OpenTypeTestITCase.java       |  190 ---
 .../fit/v4/OperationImportInvokeTestITCase.java |  294 ----
 .../olingo/fit/v4/PropertyTestITCase.java       |  203 ---
 .../olingo/fit/v4/PropertyValueTestITCase.java  |  138 --
 .../olingo/fit/v4/QueryOptionsTestITCase.java   |  246 ---
 .../fit/v4/ServiceDocumentTestITCase.java       |   63 -
 .../olingo/fit/v4/SingletonTestITCase.java      |  135 --
 pom.xml                                         |   10 +-
 549 files changed, 28512 insertions(+), 28391 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/demo/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/demo/pom.xml b/fit/src/it/demo/pom.xml
new file mode 100644
index 0000000..0cfa319
--- /dev/null
+++ b/fit/src/it/demo/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>pojogen-maven-plugin-v4test</artifactId>
+  <groupId>org.apache.olingo</groupId>
+  <version>@project.version@</version>
+  <name>${project.artifactId}</name>
+  <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>
+
+  <properties>
+    <project.source>1.6</project.source>
+    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <dependencies>
+    <dependency>
+      <artifactId>pojogen-maven-plugin</artifactId>
+      <groupId>org.apache.olingo</groupId>
+      <version>@project.version@</version>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <artifactId>odata-client-proxy</artifactId>
+      <groupId>org.apache.olingo</groupId>
+      <version>@project.version@</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler.plugin.version}</version>
+        <configuration>
+          <source>${project.source}</source>
+          <target>${project.source}</target>
+          <showWarnings>true</showWarnings>
+          <showDeprecation>true</showDeprecation>
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>pojogen-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <configuration>
+              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+              <serviceRootURL>http://localhost:9180/stub/StaticService/V40/Demo.svc</serviceRootURL>
+              <basePackage>org.apache.olingo.fit.proxy.v4.demo</basePackage>
+            </configuration>
+            <id>v4pojoGen</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>v4pojoGen</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/demo/verify.groovy
----------------------------------------------------------------------
diff --git a/fit/src/it/demo/verify.groovy b/fit/src/it/demo/verify.groovy
new file mode 100644
index 0000000..02f0407
--- /dev/null
+++ b/fit/src/it/demo/verify.groovy
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/org/apache/olingo/fit/proxy/v4" );
+assert basepkg.isDirectory() && basepkg.listFiles().length>0;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/demoV4/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/demoV4/pom.xml b/fit/src/it/demoV4/pom.xml
deleted file mode 100644
index 0cfa319..0000000
--- a/fit/src/it/demoV4/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>pojogen-maven-plugin-v4test</artifactId>
-  <groupId>org.apache.olingo</groupId>
-  <version>@project.version@</version>
-  <name>${project.artifactId}</name>
-  <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>
-
-  <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  
-  <dependencies>
-    <dependency>
-      <artifactId>pojogen-maven-plugin</artifactId>
-      <groupId>org.apache.olingo</groupId>
-      <version>@project.version@</version>
-      <scope>runtime</scope>
-    </dependency>
-    
-    <dependency>
-      <artifactId>odata-client-proxy</artifactId>
-      <groupId>org.apache.olingo</groupId>
-      <version>@project.version@</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler.plugin.version}</version>
-        <configuration>
-          <source>${project.source}</source>
-          <target>${project.source}</target>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>true</showDeprecation>
-          <compilerArgument>-Xlint:unchecked</compilerArgument>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/generated-sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>pojogen-maven-plugin</artifactId>
-        <version>@project.version@</version>
-        <executions>
-          <execution>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
-              <serviceRootURL>http://localhost:9180/stub/StaticService/V40/Demo.svc</serviceRootURL>
-              <basePackage>org.apache.olingo.fit.proxy.v4.demo</basePackage>
-            </configuration>
-            <id>v4pojoGen</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>v4pojoGen</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/demoV4/verify.groovy
----------------------------------------------------------------------
diff --git a/fit/src/it/demoV4/verify.groovy b/fit/src/it/demoV4/verify.groovy
deleted file mode 100644
index 02f0407..0000000
--- a/fit/src/it/demoV4/verify.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/org/apache/olingo/fit/proxy/v4" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/openType/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/openType/pom.xml b/fit/src/it/openType/pom.xml
new file mode 100644
index 0000000..3ae5c84
--- /dev/null
+++ b/fit/src/it/openType/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>pojogen-maven-plugin-v4test</artifactId>
+  <groupId>org.apache.olingo</groupId>
+  <version>@project.version@</version>
+  <name>${project.artifactId}</name>
+  <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
+
+  <properties>
+    <project.source>1.6</project.source>
+    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <dependencies>
+    <dependency>
+      <artifactId>pojogen-maven-plugin</artifactId>
+      <groupId>org.apache.olingo</groupId>
+      <version>@project.version@</version>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <artifactId>odata-client-proxy</artifactId>
+      <groupId>org.apache.olingo</groupId>
+      <version>@project.version@</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler.plugin.version}</version>
+        <configuration>
+          <source>${project.source}</source>
+          <target>${project.source}</target>
+          <showWarnings>true</showWarnings>
+          <showDeprecation>true</showDeprecation>
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>pojogen-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <configuration>
+              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+              <serviceRootURL>http://localhost:9180/stub/StaticService/V40/OpenType.svc</serviceRootURL>
+              <basePackage>org.apache.olingo.fit.proxy.v4.opentype</basePackage>
+            </configuration>
+            <id>v4pojoGen</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>v4pojoGen</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/openType/verify.groovy
----------------------------------------------------------------------
diff --git a/fit/src/it/openType/verify.groovy b/fit/src/it/openType/verify.groovy
new file mode 100644
index 0000000..02f0407
--- /dev/null
+++ b/fit/src/it/openType/verify.groovy
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/org/apache/olingo/fit/proxy/v4" );
+assert basepkg.isDirectory() && basepkg.listFiles().length>0;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/openTypeV4/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/openTypeV4/pom.xml b/fit/src/it/openTypeV4/pom.xml
deleted file mode 100644
index 3ae5c84..0000000
--- a/fit/src/it/openTypeV4/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>pojogen-maven-plugin-v4test</artifactId>
-  <groupId>org.apache.olingo</groupId>
-  <version>@project.version@</version>
-  <name>${project.artifactId}</name>
-  <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
-
-  <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  
-  <dependencies>
-    <dependency>
-      <artifactId>pojogen-maven-plugin</artifactId>
-      <groupId>org.apache.olingo</groupId>
-      <version>@project.version@</version>
-      <scope>runtime</scope>
-    </dependency>
-    
-    <dependency>
-      <artifactId>odata-client-proxy</artifactId>
-      <groupId>org.apache.olingo</groupId>
-      <version>@project.version@</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler.plugin.version}</version>
-        <configuration>
-          <source>${project.source}</source>
-          <target>${project.source}</target>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>true</showDeprecation>
-          <compilerArgument>-Xlint:unchecked</compilerArgument>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/generated-sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>pojogen-maven-plugin</artifactId>
-        <version>@project.version@</version>
-        <executions>
-          <execution>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
-              <serviceRootURL>http://localhost:9180/stub/StaticService/V40/OpenType.svc</serviceRootURL>
-              <basePackage>org.apache.olingo.fit.proxy.v4.opentype</basePackage>
-            </configuration>
-            <id>v4pojoGen</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>v4pojoGen</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/openTypeV4/verify.groovy
----------------------------------------------------------------------
diff --git a/fit/src/it/openTypeV4/verify.groovy b/fit/src/it/openTypeV4/verify.groovy
deleted file mode 100644
index 02f0407..0000000
--- a/fit/src/it/openTypeV4/verify.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/org/apache/olingo/fit/proxy/v4" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/staticService/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/staticService/pom.xml b/fit/src/it/staticService/pom.xml
new file mode 100644
index 0000000..424a17f
--- /dev/null
+++ b/fit/src/it/staticService/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>pojogen-maven-plugin-v4test</artifactId>
+  <groupId>org.apache.olingo</groupId>
+  <version>@project.version@</version>
+  <name>${project.artifactId}</name>
+  <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>
+
+  <properties>
+    <project.source>1.6</project.source>
+    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <dependencies>
+    <dependency>
+      <artifactId>pojogen-maven-plugin</artifactId>
+      <groupId>org.apache.olingo</groupId>
+      <version>@project.version@</version>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <artifactId>odata-client-proxy</artifactId>
+      <groupId>org.apache.olingo</groupId>
+      <version>@project.version@</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler.plugin.version}</version>
+        <configuration>
+          <source>${project.source}</source>
+          <target>${project.source}</target>
+          <showWarnings>true</showWarnings>
+          <showDeprecation>true</showDeprecation>
+          <compilerArgument>-Xlint:unchecked</compilerArgument>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
+      <plugin>
+        <groupId>@project.groupId@</groupId>
+        <artifactId>pojogen-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <configuration>
+              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+              <serviceRootURL>http://localhost:9180/stub/StaticService/V40/Static.svc</serviceRootURL>
+              <basePackage>org.apache.olingo.fit.proxy.v4.staticservice</basePackage>
+            </configuration>
+            <id>v4pojoGen</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>v4pojoGen</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/staticService/verify.groovy
----------------------------------------------------------------------
diff --git a/fit/src/it/staticService/verify.groovy b/fit/src/it/staticService/verify.groovy
new file mode 100644
index 0000000..02f0407
--- /dev/null
+++ b/fit/src/it/staticService/verify.groovy
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/org/apache/olingo/fit/proxy/v4" );
+assert basepkg.isDirectory() && basepkg.listFiles().length>0;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/staticServiceV4/pom.xml
----------------------------------------------------------------------
diff --git a/fit/src/it/staticServiceV4/pom.xml b/fit/src/it/staticServiceV4/pom.xml
deleted file mode 100644
index 424a17f..0000000
--- a/fit/src/it/staticServiceV4/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>pojogen-maven-plugin-v4test</artifactId>
-  <groupId>org.apache.olingo</groupId>
-  <version>@project.version@</version>
-  <name>${project.artifactId}</name>
-  <description>A simple IT verifying the basic use case of pojogen-maven-plugin.</description>
-
-  <properties>
-    <project.source>1.6</project.source>
-    <compiler.plugin.version>3.2</compiler.plugin.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  
-  <dependencies>
-    <dependency>
-      <artifactId>pojogen-maven-plugin</artifactId>
-      <groupId>org.apache.olingo</groupId>
-      <version>@project.version@</version>
-      <scope>runtime</scope>
-    </dependency>
-    
-    <dependency>
-      <artifactId>odata-client-proxy</artifactId>
-      <groupId>org.apache.olingo</groupId>
-      <version>@project.version@</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${compiler.plugin.version}</version>
-        <configuration>
-          <source>${project.source}</source>
-          <target>${project.source}</target>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>true</showDeprecation>
-          <compilerArgument>-Xlint:unchecked</compilerArgument>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/generated-sources</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>pojogen-maven-plugin</artifactId>
-        <version>@project.version@</version>
-        <executions>
-          <execution>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
-              <serviceRootURL>http://localhost:9180/stub/StaticService/V40/Static.svc</serviceRootURL>
-              <basePackage>org.apache.olingo.fit.proxy.v4.staticservice</basePackage>
-            </configuration>
-            <id>v4pojoGen</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>v4pojoGen</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/it/staticServiceV4/verify.groovy
----------------------------------------------------------------------
diff --git a/fit/src/it/staticServiceV4/verify.groovy b/fit/src/it/staticServiceV4/verify.groovy
deleted file mode 100644
index 02f0407..0000000
--- a/fit/src/it/staticServiceV4/verify.groovy
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/org/apache/olingo/fit/proxy/v4" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
index 8dae5c3..72a6061 100644
--- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
+++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java
@@ -684,7 +684,7 @@ public abstract class AbstractServices {
 
       final String location;
 
-      if ((this instanceof V4KeyAsSegment)) {
+      if ((this instanceof KeyAsSegment)) {
         location = uriInfo.getRequestUri().toASCIIString() + "/" + entityKey;
 
         final Link editLink = new Link();
@@ -1223,7 +1223,7 @@ public abstract class AbstractServices {
       }
       final Entity entry = container.getPayload();
 
-      if ((this instanceof V4KeyAsSegment)) {
+      if ((this instanceof KeyAsSegment)) {
         final Link editLink = new Link();
         editLink.setRel("edit");
         editLink.setTitle(entitySetName);

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/main/java/org/apache/olingo/fit/Demo.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/Demo.java b/fit/src/main/java/org/apache/olingo/fit/Demo.java
new file mode 100644
index 0000000..c591f01
--- /dev/null
+++ b/fit/src/main/java/org/apache/olingo/fit/Demo.java
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.fit;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
+import org.apache.olingo.fit.metadata.Metadata;
+import org.apache.olingo.fit.methods.PATCH;
+import org.apache.olingo.fit.utils.Accept;
+import org.apache.olingo.fit.utils.ConstantKey;
+import org.apache.olingo.fit.utils.Constants;
+import org.apache.olingo.fit.utils.FSManager;
+import org.springframework.stereotype.Service;
+
+@Service
+@Path("/V40/Demo.svc")
+public class Demo extends Services {
+
+  public Demo() throws IOException {
+    super(new Metadata(FSManager.instance(ODataServiceVersion.V40).
+        readRes("demo" + StringUtils.capitalize(Constants.get(ConstantKey.METADATA)), Accept.XML)));
+  }
+
+  private Response replaceServiceName(final Response response) {
+    try {
+      final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
+          replaceAll("Static\\.svc", "Demo.svc");
+
+      final Response.ResponseBuilder builder = Response.status(response.getStatus());
+      for (String headerName : response.getHeaders().keySet()) {
+        for (Object headerValue : response.getHeaders().get(headerName)) {
+          builder.header(headerName, headerValue);
+        }
+      }
+
+      final InputStream toBeStreamedBack = IOUtils.toInputStream(content, Constants.ENCODING);
+      final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      IOUtils.copy(toBeStreamedBack, baos);
+      IOUtils.closeQuietly(toBeStreamedBack);
+
+      builder.header("Content-Length", baos.size());
+      builder.entity(new ByteArrayInputStream(baos.toByteArray()));
+
+      return builder.build();
+    } catch (Exception e) {
+      return response;
+    }
+  }
+
+  @GET
+  @Path("/$metadata")
+  @Produces(MediaType.APPLICATION_XML)
+  @Override
+  public Response getMetadata() {
+    return super.getMetadata(
+        "demo" + StringUtils.capitalize(Constants.get(ConstantKey.METADATA)));
+  }
+
+  @GET
+  @Path("/{entitySetName}({entityId})")
+  @Override
+  public Response getEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId,
+      @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+      @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+      @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
+
+    return replaceServiceName(super.getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
+        accept, entitySetName, entityId, format, expand, select));
+  }
+
+  @GET
+  @Path("/{entitySetName}({entityId})/$value")
+  @Override
+  public Response getMediaEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId) {
+
+    return super.getMediaEntity(uriInfo, accept, entitySetName, entityId);
+  }
+
+  @POST
+  @Path("/{entitySetName}")
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
+  @Override
+  public Response postNewEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+      @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+      @PathParam("entitySetName") final String entitySetName,
+      final String entity) {
+
+    return replaceServiceName(super.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity));
+  }
+
+  @PATCH
+  @Path("/{entitySetName}({entityId})")
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Override
+  public Response patchEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+      @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+      @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId,
+      final String changes) {
+
+    return replaceServiceName(super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId,
+        changes));
+  }
+
+  @PUT
+  @Produces({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.WILDCARD, MediaType.APPLICATION_OCTET_STREAM })
+  @Path("/{entitySetName}({entityId})/$value")
+  @Override
+  public Response replaceMediaEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId,
+      @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+      final String value) {
+
+    return super.replaceMediaEntity(uriInfo, prefer, entitySetName, entityId, format, value);
+  }
+}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java
new file mode 100644
index 0000000..ef8ffa5
--- /dev/null
+++ b/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.fit;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.olingo.fit.methods.PATCH;
+import org.apache.olingo.fit.utils.Constants;
+import org.springframework.stereotype.Service;
+
+@Service
+@Path("/V40/KeyAsSegment.svc")
+public class KeyAsSegment extends Services {
+
+  public KeyAsSegment() throws IOException {
+    super();
+  }
+
+  private Response replaceServiceName(final Response response) {
+    try {
+      final String content = IOUtils.toString((InputStream) response.getEntity(), Constants.ENCODING).
+          replaceAll("Static\\.svc", "KeyAsSegment.svc");
+
+      final Response.ResponseBuilder builder = Response.status(response.getStatus());
+      for (String headerName : response.getHeaders().keySet()) {
+        for (Object headerValue : response.getHeaders().get(headerName)) {
+          builder.header(headerName, headerValue);
+        }
+      }
+
+      final InputStream toBeStreamedBack = IOUtils.toInputStream(content, Constants.ENCODING);
+      final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      IOUtils.copy(toBeStreamedBack, baos);
+      IOUtils.closeQuietly(toBeStreamedBack);
+
+      builder.header("Content-Length", baos.size());
+      builder.entity(new ByteArrayInputStream(baos.toByteArray()));
+
+      return builder.build();
+    } catch (Exception e) {
+      return response;
+    }
+  }
+
+  @GET
+  @Path("/{entitySetName}/{entityId}")
+  @Override
+  public Response getEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId,
+      @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format,
+      @QueryParam("$expand") @DefaultValue(StringUtils.EMPTY) final String expand,
+      @QueryParam("$select") @DefaultValue(StringUtils.EMPTY) final String select) {
+
+    return replaceServiceName(super.getEntityInternal(uriInfo.getRequestUri().toASCIIString(),
+        accept, entitySetName, entityId, format, expand, select));
+  }
+
+  @DELETE
+  @Path("/{entitySetName}/{entityId}")
+  @Override
+  public Response removeEntity(
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId) {
+
+    return replaceServiceName(super.removeEntity(entitySetName, entityId));
+  }
+
+  @PATCH
+  @Path("/{entitySetName}/{entityId}")
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Override
+  public Response patchEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+      @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+      @HeaderParam("If-Match") @DefaultValue(StringUtils.EMPTY) final String ifMatch,
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId,
+      final String changes) {
+
+    return replaceServiceName(super.patchEntity(uriInfo, accept, contentType, prefer, ifMatch, entitySetName, entityId,
+        changes));
+  }
+
+  @PUT
+  @Path("/{entitySetName}/{entityId}")
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  public Response putNewEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+      @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+      @PathParam("entitySetName") final String entitySetName,
+      @PathParam("entityId") final String entityId,
+      final String entity) {
+
+    return replaceServiceName(super
+        .replaceEntity(uriInfo, accept, contentType, prefer, entitySetName, entityId, entity));
+  }
+
+  @POST
+  @Path("/{entitySetName}")
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON })
+  @Consumes({ MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM })
+  @Override
+  public Response postNewEntity(
+      @Context final UriInfo uriInfo,
+      @HeaderParam("Accept") @DefaultValue(StringUtils.EMPTY) final String accept,
+      @HeaderParam("Content-Type") @DefaultValue(StringUtils.EMPTY) final String contentType,
+      @HeaderParam("Prefer") @DefaultValue(StringUtils.EMPTY) final String prefer,
+      @PathParam("entitySetName") final String entitySetName,
+      final String entity) {
+
+    return replaceServiceName(super.postNewEntity(uriInfo, accept, contentType, prefer, entitySetName, entity));
+  }
+}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/main/java/org/apache/olingo/fit/NorthWind.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/NorthWind.java b/fit/src/main/java/org/apache/olingo/fit/NorthWind.java
new file mode 100644
index 0000000..f5acaed
--- /dev/null
+++ b/fit/src/main/java/org/apache/olingo/fit/NorthWind.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.fit;
+
+import java.io.IOException;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import org.apache.cxf.interceptor.InInterceptors;
+import org.apache.olingo.fit.rest.XHTTPMethodInterceptor;
+import org.apache.olingo.fit.utils.ConstantKey;
+import org.apache.olingo.fit.utils.Constants;
+import org.springframework.stereotype.Service;
+
+@Service
+@Path("/V40/NorthWind.svc")
+@InInterceptors(classes = XHTTPMethodInterceptor.class)
+public class NorthWind extends Services {
+
+  public NorthWind() throws IOException {
+    super();
+  }
+
+  @Override
+  public Response getMetadata() {
+    return getMetadata("northwind-" + Constants.get(ConstantKey.METADATA));
+  }
+}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java b/fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java
new file mode 100644
index 0000000..61e0df6
--- /dev/null
+++ b/fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.fit;
+
+import java.io.IOException;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import org.apache.cxf.interceptor.InInterceptors;
+import org.apache.olingo.fit.rest.ResolvingReferencesInterceptor;
+import org.apache.olingo.fit.rest.XHTTPMethodInterceptor;
+import org.apache.olingo.fit.utils.ConstantKey;
+import org.apache.olingo.fit.utils.Constants;
+import org.springframework.stereotype.Service;
+
+@Service
+@Path("/V40/NorthWindExt.svc")
+@InInterceptors(classes = { XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class })
+public class NorthWindExt extends Services {
+
+  public NorthWindExt() throws IOException {
+    super();
+  }
+
+  @Override
+  public Response getMetadata() {
+    return getMetadata("northwindExt-" + Constants.get(ConstantKey.METADATA));
+  }
+}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/78a9539e/fit/src/main/java/org/apache/olingo/fit/OAuth2.java
----------------------------------------------------------------------
diff --git a/fit/src/main/java/org/apache/olingo/fit/OAuth2.java b/fit/src/main/java/org/apache/olingo/fit/OAuth2.java
new file mode 100644
index 0000000..9b2c9f1
--- /dev/null
+++ b/fit/src/main/java/org/apache/olingo/fit/OAuth2.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.fit;
+
+import java.io.IOException;
+
+import javax.ws.rs.Path;
+
+import org.springframework.stereotype.Service;
+
+@Service
+@Path("/V40/OAuth2.svc")
+public class OAuth2 extends Services {
+
+  public OAuth2() throws IOException {
+    super();
+  }
+
+}


Mime
View raw message