olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [24/28] olingo-odata4 git commit: [OLINGO-695] Merged with master
Date Fri, 19 Jun 2015 16:23:17 GMT
[OLINGO-695] Merged with master


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

Branch: refs/heads/OLINGO-695_OSGi-Support
Commit: 74fddd1df72bf14b14fa9f3e28cbf832f6c86350
Parents: 9e75563 431938c
Author: Michael Bolz <michael.bolz@sap.com>
Authored: Fri Jun 19 07:44:04 2015 +0200
Committer: Michael Bolz <michael.bolz@sap.com>
Committed: Fri Jun 19 07:44:04 2015 +0200

----------------------------------------------------------------------
 fit/pom.xml                                     |  12 +-
 .../org/apache/olingo/fit/AbstractServices.java |  10 +-
 .../fit/serializer/FITAtomDeserializer.java     |   2 +-
 .../olingo/fit/utils/AbstractUtilities.java     |  14 +-
 .../org/apache/olingo/fit/utils/FSManager.java  |   6 +-
 .../olingo/fit/AbstractBaseTestITCase.java      |   2 +-
 .../fit/tecsvc/client/ActionImportITCase.java   | 197 +++--
 .../olingo/fit/tecsvc/client/BasicITCase.java   | 145 +--
 .../fit/tecsvc/client/BatchClientITCase.java    |  64 +-
 .../fit/tecsvc/client/ConditionalITCase.java    |  22 +
 .../tecsvc/client/FilterSystemQueryITCase.java  | 247 +++---
 .../tecsvc/client/PrimitiveComplexITCase.java   |  99 ++-
 .../tecsvc/client/SystemQueryOptionITCase.java  |  50 +-
 lib/client-api/pom.xml                          |   1 +
 .../apache/olingo/client/api/ODataClient.java   |   2 +-
 .../api/domain/ClientEntitySetIterator.java     |   2 +-
 .../serialization/ClientODataDeserializer.java  |   2 -
 .../api/serialization/ODataDeserializer.java    |  65 ++
 .../ODataDeserializerException.java             |  38 +
 .../client/api/serialization/ODataReader.java   |   1 -
 .../api/serialization/ODataSerializer.java      |  33 +
 .../serialization/ODataSerializerException.java |  38 +
 .../client/api/serialization/ODataWriter.java   |   1 -
 .../olingo/client/api/uri/URIBuilder.java       |   6 +
 lib/client-core/pom.xml                         |   1 +
 .../olingo/client/core/ODataClientImpl.java     |   6 +-
 .../header/ODataErrorResponseChecker.java       |   2 +-
 .../cud/ODataEntityCreateRequestImpl.java       |   4 +-
 .../cud/ODataEntityUpdateRequestImpl.java       |   4 +-
 .../cud/ODataPropertyUpdateRequestImpl.java     |   4 +-
 .../cud/ODataReferenceAddingRequestImpl.java    |   2 +-
 .../invoke/AbstractODataInvokeRequest.java      |   4 +-
 .../request/retrieve/ODataDeltaRequestImpl.java |   2 +-
 .../retrieve/ODataEntityRequestImpl.java        |   2 +-
 .../retrieve/ODataEntitySetRequestImpl.java     |   2 +-
 .../retrieve/ODataPropertyRequestImpl.java      |   2 +-
 .../request/retrieve/ODataRawRequestImpl.java   |   2 +-
 .../ODataServiceDocumentRequestImpl.java        |   2 +-
 .../ODataMediaEntityCreateRequestImpl.java      |   2 +-
 .../ODataMediaEntityUpdateRequestImpl.java      |   2 +-
 .../data/JSONServiceDocumentDeserializer.java   |   4 +-
 .../data/XMLServiceDocumentDeserializer.java    |   4 +-
 .../core/serialization/AbstractAtomDealer.java  |  97 +++
 .../core/serialization/AtomDeserializer.java    | 873 +++++++++++++++++++
 .../serialization/AtomGeoValueDeserializer.java | 269 ++++++
 .../serialization/AtomGeoValueSerializer.java   | 223 +++++
 .../core/serialization/AtomSerializer.java      | 570 ++++++++++++
 .../ClientODataDeserializerImpl.java            |   7 +-
 .../core/serialization/ContextURLParser.java    | 118 +++
 .../serialization/JsonDeltaDeserializer.java    | 100 +++
 .../core/serialization/JsonDeserializer.java    | 421 +++++++++
 .../serialization/JsonEntityDeserializer.java   | 229 +++++
 .../serialization/JsonEntitySerializer.java     | 135 +++
 .../JsonEntitySetDeserializer.java              | 120 +++
 .../serialization/JsonEntitySetSerializer.java  |  92 ++
 .../serialization/JsonGeoValueDeserializer.java | 262 ++++++
 .../serialization/JsonGeoValueSerializer.java   | 184 ++++
 .../JsonODataErrorDeserializer.java             |  87 ++
 .../JsonODataErrorDetailDeserializer.java       |  58 ++
 .../serialization/JsonPropertyDeserializer.java | 114 +++
 .../serialization/JsonPropertySerializer.java   |  93 ++
 .../core/serialization/JsonSerializer.java      | 376 ++++++++
 .../core/serialization/ODataBinderImpl.java     |   3 +-
 .../core/serialization/ODataReaderImpl.java     |   2 +-
 .../core/serialization/ODataWriterImpl.java     |   2 +-
 .../olingo/client/core/uri/URIBuilderImpl.java  |   6 +
 .../serialization/AtomDeserializerTest.java     | 329 +++++++
 .../serialization/ContextURLParserTest.java     | 256 ++++++
 .../olingo/client/core/v4/EntitySetTest.java    |   2 +-
 .../apache/olingo/client/core/v4/ErrorTest.java |   2 +-
 .../olingo/client/core/v4/PropertyTest.java     |   4 +-
 .../client/core/v4/ServiceDocumentTest.java     |   2 +-
 lib/commons-api/pom.xml                         |   1 +
 .../commons/api/data/AbstractODataObject.java   |   4 +-
 .../commons/api/edm/provider/CsdlNamed.java     |   3 +-
 .../olingo/commons/api/http/HttpHeader.java     |  15 +-
 .../api/serialization/ODataDeserializer.java    |  65 --
 .../ODataDeserializerException.java             |  38 -
 .../api/serialization/ODataSerializer.java      |  33 -
 .../serialization/ODataSerializerException.java |  38 -
 lib/commons-core/pom.xml                        |   1 +
 .../core/serialization/AbstractAtomDealer.java  |  97 ---
 .../core/serialization/AtomDeserializer.java    | 873 -------------------
 .../serialization/AtomGeoValueDeserializer.java | 269 ------
 .../serialization/AtomGeoValueSerializer.java   | 223 -----
 .../core/serialization/AtomSerializer.java      | 570 ------------
 .../core/serialization/ContextURLParser.java    | 118 ---
 .../serialization/JsonDeltaDeserializer.java    | 100 ---
 .../core/serialization/JsonDeserializer.java    | 421 ---------
 .../serialization/JsonEntityDeserializer.java   | 229 -----
 .../serialization/JsonEntitySerializer.java     | 135 ---
 .../JsonEntitySetDeserializer.java              | 120 ---
 .../serialization/JsonEntitySetSerializer.java  |  92 --
 .../serialization/JsonGeoValueDeserializer.java | 262 ------
 .../serialization/JsonGeoValueSerializer.java   | 184 ----
 .../JsonODataErrorDeserializer.java             |  87 --
 .../JsonODataErrorDetailDeserializer.java       |  58 --
 .../serialization/JsonPropertyDeserializer.java | 114 ---
 .../serialization/JsonPropertySerializer.java   |  93 --
 .../core/serialization/JsonSerializer.java      | 376 --------
 .../serialization/AtomDeserializerTest.java     | 328 -------
 .../serialization/ContextURLParserTest.java     | 255 ------
 lib/server-api/pom.xml                          |   1 +
 .../org/apache/olingo/server/api/OData.java     |   8 +
 .../api/deserializer/DeserializerException.java |   2 +-
 .../deserializer/FixedFormatDeserializer.java   |  10 +-
 .../deserializer/batch/ODataResponsePart.java   |  29 +-
 .../olingo/server/api/prefer/Preferences.java   | 107 +++
 .../server/api/prefer/PreferencesApplied.java   | 164 ++++
 .../CountComplexCollectionProcessor.java        |   2 +-
 .../CountEntityCollectionProcessor.java         |   2 +-
 .../CountPrimitiveCollectionProcessor.java      |   2 +-
 .../api/processor/MediaEntityProcessor.java     |  13 +-
 .../api/processor/PrimitiveValueProcessor.java  |  29 +-
 .../apache/olingo/server/api/uri/UriInfo.java   |  19 +-
 .../olingo/server/api/uri/UriInfoEntityId.java  |  13 +-
 .../olingo/server/api/uri/UriInfoMetadata.java  |   4 +-
 .../olingo/server/api/uri/UriParameter.java     |  11 +-
 .../server/api/uri/UriResourceFunction.java     |   2 +-
 .../server/api/uri/UriResourceLambdaAll.java    |   5 +-
 .../server/api/uri/UriResourceLambdaAny.java    |   4 +-
 .../api/uri/UriResourceLambdaVariable.java      |   3 +-
 .../server/api/uri/UriResourceNavigation.java   |   2 +-
 .../api/prefer/PreferencesAppliedTest.java      |  67 ++
 .../server/core/requests/DataRequest.java       |   2 +-
 lib/server-core/pom.xml                         |   1 +
 .../olingo/server/core/ODataDispatcher.java     |   8 +-
 .../apache/olingo/server/core/ODataImpl.java    |   8 +
 .../core/batchhandler/BatchPartHandler.java     |  14 +-
 .../FixedFormatDeserializerImpl.java            |  32 +-
 .../json/ODataJsonDeserializer.java             |   8 +-
 .../olingo/server/core/prefer/PreferParser.java | 150 ++++
 .../server/core/prefer/PreferencesImpl.java     | 117 +++
 .../core/uri/UriResourceLambdaAnyImpl.java      |   2 +-
 .../core/uri/UriResourceWithKeysImpl.java       |  17 +-
 .../server-core-exceptions-i18n.properties      |   2 +-
 .../FixedFormatDeserializerTest.java            |  27 +-
 .../server/core/prefer/PreferencesTest.java     | 168 ++++
 .../apache/olingo/server/tecsvc/Encoder.java    | 132 ---
 .../processor/TechnicalActionProcessor.java     | 180 ++--
 .../processor/TechnicalBatchProcessor.java      |  26 +-
 .../processor/TechnicalEntityProcessor.java     |  91 +-
 .../TechnicalPrimitiveComplexProcessor.java     | 234 ++---
 .../ExpandSystemQueryOptionHandler.java         |  17 +-
 .../options/ServerSidePagingHandler.java        | 119 ++-
 .../olingo/server/core/ODataHandlerTest.java    |   6 +-
 .../ODataDeserializerEntityCollectionTest.java  |   2 +-
 .../json/ODataJsonDeserializerEntityTest.java   |   6 +-
 .../json/ODataJsonSerializerTest.java           |  17 +-
 .../server/core/uri/UriResourceImplTest.java    |   2 +-
 .../core/uri/testutil/FilterTreeToText.java     |   2 +-
 .../core/uri/testutil/ResourceValidator.java    |   2 +-
 pom.xml                                         |   1 +
 samples/pom.xml                                 |   7 +
 .../server/sample/processor/CarsProcessor.java  |  16 +
 samples/tutorials/p1_read/pom.xml               |  79 ++
 .../mynamespace/service/DemoEdmProvider.java    | 153 ++++
 .../service/DemoEntityCollectionProcessor.java  | 129 +++
 .../myservice/mynamespace/web/DemoServlet.java  |  67 ++
 .../p1_read/src/main/webapp/WEB-INF/web.xml     |  40 +
 .../tutorials/p1_read/src/main/webapp/index.jsp |  26 +
 samples/tutorials/p2_readep/pom.xml             |  79 ++
 .../myservice/mynamespace/data/Storage.java     | 125 +++
 .../mynamespace/service/DemoEdmProvider.java    | 153 ++++
 .../service/DemoEntityCollectionProcessor.java  |  90 ++
 .../service/DemoEntityProcessor.java            | 126 +++
 .../service/DemoPrimitiveProcessor.java         | 147 ++++
 .../java/myservice/mynamespace/util/Util.java   | 105 +++
 .../myservice/mynamespace/web/DemoServlet.java  |  76 ++
 .../p2_readep/src/main/webapp/WEB-INF/web.xml   |  40 +
 .../p2_readep/src/main/webapp/index.jsp         |  26 +
 samples/tutorials/p3_write/pom.xml              |  79 ++
 .../myservice/mynamespace/data/Storage.java     | 263 ++++++
 .../mynamespace/service/DemoEdmProvider.java    | 157 ++++
 .../service/DemoEntityCollectionProcessor.java  |  93 ++
 .../service/DemoEntityProcessor.java            | 190 ++++
 .../service/DemoPrimitiveProcessor.java         | 146 ++++
 .../java/myservice/mynamespace/util/Util.java   | 121 +++
 .../myservice/mynamespace/web/DemoServlet.java  |  73 ++
 .../p3_write/src/main/webapp/WEB-INF/web.xml    |  40 +
 .../p3_write/src/main/webapp/index.jsp          |  26 +
 samples/tutorials/pom.xml                       |  54 ++
 182 files changed, 9884 insertions(+), 6082 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/74fddd1d/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/74fddd1d/samples/pom.xml
----------------------------------------------------------------------
diff --cc samples/pom.xml
index 2d6b235,95e3ddb..74c1775
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@@ -42,7 -42,13 +42,14 @@@
      <profile>
        <id>samples</id>
        <modules>
 +        <module>osgi/server</module>
+         <module>client</module>
+       </modules>
+     </profile>
+     <profile>
+       <id>tutorials</id>
+       <modules>
+         <module>tutorials</module>
        </modules>
      </profile>
    </profiles>


Mime
View raw message