[OLINGO-632] Merge branch 'master' into OLINGO-632_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/934d81db Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/934d81db Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/934d81db Branch: refs/heads/OLINGO-632_OSGi-Support Commit: 934d81db63e39ab29b7d87fcf10f9dd82005fa39 Parents: 8fc7782 91c2f6a Author: Michael Bolz <[email protected]> Authored: Fri May 29 11:57:06 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Fri May 29 11:57:06 2015 +0200 ---------------------------------------------------------------------- .../ActionComplexCollectionProcessor.java | 2 +- .../api/processor/ActionComplexProcessor.java | 2 +- .../ActionEntityCollectionProcessor.java | 2 +- .../api/processor/ActionEntityProcessor.java | 2 +- .../ActionPrimitiveCollectionProcessor.java | 2 +- .../api/processor/ActionPrimitiveProcessor.java | 2 +- .../olingo/server/tecsvc/TechnicalServlet.java | 4 +- .../processor/TechnicalActionProcessor.java | 315 +++++++++++++++++++ .../processor/TechnicalEntityProcessor.java | 159 ++-------- .../TechnicalPrimitiveComplexProcessor.java | 154 +-------- 10 files changed, 355 insertions(+), 289 deletions(-) ----------------------------------------------------------------------
